diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 19ccf272f..032b401af 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -10,26 +10,23 @@ ******************************************************************************/ package forestry.apiculture; -import java.util.Stack; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IApiaristTracker; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeekeepingLogic; +import forestry.api.core.IErrorState; import forestry.api.genetics.IEffectData; import forestry.api.genetics.IIndividual; import forestry.core.EnumErrorCode; -import forestry.api.core.IErrorState; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.proxy.Proxies; -import forestry.core.proxy.ProxyLog; import forestry.plugins.PluginApiculture; +import java.util.Stack; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; public class BeekeepingLogic implements IBeekeepingLogic { diff --git a/src/main/java/forestry/apiculture/FlowerProviderCacti.java b/src/main/java/forestry/apiculture/FlowerProviderCacti.java index c3cc19896..251f45f10 100755 --- a/src/main/java/forestry/apiculture/FlowerProviderCacti.java +++ b/src/main/java/forestry/apiculture/FlowerProviderCacti.java @@ -10,18 +10,16 @@ ******************************************************************************/ package forestry.apiculture; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import net.minecraftforge.common.EnumPlantType; - import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; import forestry.core.config.Defaults; import forestry.core.utils.StringUtil; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; public class FlowerProviderCacti implements IFlowerProvider { diff --git a/src/main/java/forestry/apiculture/FlowerProviderEnd.java b/src/main/java/forestry/apiculture/FlowerProviderEnd.java index 7aabb4c71..f904428a4 100755 --- a/src/main/java/forestry/apiculture/FlowerProviderEnd.java +++ b/src/main/java/forestry/apiculture/FlowerProviderEnd.java @@ -10,19 +10,16 @@ ******************************************************************************/ package forestry.apiculture; -import java.util.EnumSet; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import net.minecraftforge.common.EnumPlantType; - import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; import forestry.core.utils.StringUtil; +import java.util.EnumSet; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; public class FlowerProviderEnd implements IFlowerProvider { diff --git a/src/main/java/forestry/apiculture/FlowerProviderGourd.java b/src/main/java/forestry/apiculture/FlowerProviderGourd.java index 10eb185da..29b2ff473 100755 --- a/src/main/java/forestry/apiculture/FlowerProviderGourd.java +++ b/src/main/java/forestry/apiculture/FlowerProviderGourd.java @@ -10,20 +10,17 @@ ******************************************************************************/ package forestry.apiculture; -import java.util.EnumSet; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import net.minecraftforge.common.EnumPlantType; - import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; import forestry.core.config.Defaults; import forestry.core.utils.StringUtil; +import java.util.EnumSet; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; public class FlowerProviderGourd implements IFlowerProvider { diff --git a/src/main/java/forestry/apiculture/FlowerProviderJungle.java b/src/main/java/forestry/apiculture/FlowerProviderJungle.java index e223a6ae3..2f4c651e6 100755 --- a/src/main/java/forestry/apiculture/FlowerProviderJungle.java +++ b/src/main/java/forestry/apiculture/FlowerProviderJungle.java @@ -10,20 +10,17 @@ ******************************************************************************/ package forestry.apiculture; -import java.util.EnumSet; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import net.minecraftforge.common.EnumPlantType; - import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; import forestry.core.config.Defaults; import forestry.core.utils.StringUtil; +import java.util.EnumSet; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; public class FlowerProviderJungle implements IFlowerProvider { diff --git a/src/main/java/forestry/apiculture/FlowerProviderMushroom.java b/src/main/java/forestry/apiculture/FlowerProviderMushroom.java index ad6b1c705..91a030535 100755 --- a/src/main/java/forestry/apiculture/FlowerProviderMushroom.java +++ b/src/main/java/forestry/apiculture/FlowerProviderMushroom.java @@ -10,20 +10,17 @@ ******************************************************************************/ package forestry.apiculture; -import java.util.EnumSet; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import net.minecraftforge.common.EnumPlantType; - import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; import forestry.core.config.Defaults; import forestry.core.utils.StringUtil; +import java.util.EnumSet; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; public class FlowerProviderMushroom implements IFlowerProvider { diff --git a/src/main/java/forestry/apiculture/FlowerProviderNetherwart.java b/src/main/java/forestry/apiculture/FlowerProviderNetherwart.java index 66eb64f6c..898b5f89c 100755 --- a/src/main/java/forestry/apiculture/FlowerProviderNetherwart.java +++ b/src/main/java/forestry/apiculture/FlowerProviderNetherwart.java @@ -10,18 +10,16 @@ ******************************************************************************/ package forestry.apiculture; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import net.minecraftforge.common.EnumPlantType; - import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; import forestry.core.config.Defaults; import forestry.core.utils.StringUtil; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; public class FlowerProviderNetherwart implements IFlowerProvider { diff --git a/src/main/java/forestry/apiculture/FlowerProviderVanilla.java b/src/main/java/forestry/apiculture/FlowerProviderVanilla.java index 1698c85a4..11abee91e 100755 --- a/src/main/java/forestry/apiculture/FlowerProviderVanilla.java +++ b/src/main/java/forestry/apiculture/FlowerProviderVanilla.java @@ -10,16 +10,6 @@ ******************************************************************************/ package forestry.apiculture; -import java.util.Collections; -import java.util.EnumSet; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import net.minecraftforge.common.EnumPlantType; - import forestry.api.apiculture.FlowerManager; import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IIndividual; @@ -27,6 +17,13 @@ import forestry.api.genetics.IPollinatable; import forestry.core.config.Defaults; import forestry.core.utils.StackUtils; import forestry.core.utils.StringUtil; +import java.util.Collections; +import java.util.EnumSet; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; public class FlowerProviderVanilla implements IFlowerProvider { diff --git a/src/main/java/forestry/apiculture/FlowerProviderWheat.java b/src/main/java/forestry/apiculture/FlowerProviderWheat.java index ce2e5eaca..76c9f9d6a 100755 --- a/src/main/java/forestry/apiculture/FlowerProviderWheat.java +++ b/src/main/java/forestry/apiculture/FlowerProviderWheat.java @@ -10,20 +10,17 @@ ******************************************************************************/ package forestry.apiculture; -import java.util.EnumSet; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import net.minecraftforge.common.EnumPlantType; - import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; import forestry.core.config.Defaults; import forestry.core.utils.StringUtil; +import java.util.EnumSet; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; public class FlowerProviderWheat implements IFlowerProvider { diff --git a/src/main/java/forestry/apiculture/GuiHandlerApiculture.java b/src/main/java/forestry/apiculture/GuiHandlerApiculture.java index 3814ca8b8..fac85dfde 100755 --- a/src/main/java/forestry/apiculture/GuiHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/GuiHandlerApiculture.java @@ -10,10 +10,6 @@ ******************************************************************************/ package forestry.apiculture; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.apiculture.gadgets.TileAlvearyHygroregulator; import forestry.apiculture.gadgets.TileAlvearyPlain; import forestry.apiculture.gadgets.TileAlvearySieve; @@ -43,6 +39,9 @@ import forestry.apiculture.items.ItemImprinter.ImprinterInventory; import forestry.core.GuiHandlerBase; import forestry.core.network.GuiId; import forestry.plugins.PluginApiculture; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class GuiHandlerApiculture extends GuiHandlerBase { diff --git a/src/main/java/forestry/apiculture/PacketHandlerApiculture.java b/src/main/java/forestry/apiculture/PacketHandlerApiculture.java index 2337a7b32..1549ea933 100755 --- a/src/main/java/forestry/apiculture/PacketHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/PacketHandlerApiculture.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.apiculture; -import java.io.DataInputStream; - -import net.minecraft.entity.player.EntityPlayer; - import forestry.apiculture.gui.ContainerImprinter; import forestry.core.interfaces.IPacketHandler; import forestry.core.network.PacketCoordinates; import forestry.core.network.PacketIds; import forestry.core.proxy.Proxies; +import java.io.DataInputStream; +import net.minecraft.entity.player.EntityPlayer; public class PacketHandlerApiculture implements IPacketHandler { diff --git a/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java b/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java index 1a2ae4d05..c45213340 100755 --- a/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.apiculture; -import net.minecraft.world.World; - import forestry.core.interfaces.ISaveEventHandler; import forestry.plugins.PluginApiculture; +import net.minecraft.world.World; public class SaveEventHandlerApiculture implements ISaveEventHandler { diff --git a/src/main/java/forestry/apiculture/VillageHandlerApiculture.java b/src/main/java/forestry/apiculture/VillageHandlerApiculture.java index 55e0a0640..c95b27bd0 100755 --- a/src/main/java/forestry/apiculture/VillageHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/VillageHandlerApiculture.java @@ -21,6 +21,8 @@ import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.proxy.Proxies; import forestry.plugins.PluginApiculture; +import java.util.List; +import java.util.Random; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -31,9 +33,6 @@ import net.minecraft.village.MerchantRecipeList; import net.minecraft.world.gen.structure.MapGenStructureIO; import net.minecraft.world.gen.structure.StructureVillagePieces; -import java.util.List; -import java.util.Random; - public class VillageHandlerApiculture implements IVillageCreationHandler, IVillageTradeHandler { public static void registerVillageComponents() { diff --git a/src/main/java/forestry/apiculture/commands/BeeModeHelper.java b/src/main/java/forestry/apiculture/commands/BeeModeHelper.java index 5352e23c5..7590864f2 100644 --- a/src/main/java/forestry/apiculture/commands/BeeModeHelper.java +++ b/src/main/java/forestry/apiculture/commands/BeeModeHelper.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.apiculture.commands; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.world.World; - import forestry.api.apiculture.IBeekeepingMode; import forestry.core.commands.ICommandModeHelper; import forestry.plugins.PluginApiculture; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.world.World; public class BeeModeHelper implements ICommandModeHelper { diff --git a/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java b/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java index ed2e020b2..2cd81afc5 100644 --- a/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java +++ b/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java @@ -10,12 +10,7 @@ ******************************************************************************/ package forestry.apiculture.commands; -import java.util.ArrayList; -import java.util.Collection; - -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; - +import com.mojang.authlib.GameProfile; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IApiaristTracker; import forestry.api.genetics.AlleleManager; @@ -25,8 +20,10 @@ import forestry.api.genetics.IBreedingTracker; import forestry.core.commands.IStatsSaveHelper; import forestry.core.utils.StringUtil; import forestry.plugins.PluginApiculture; - -import com.mojang.authlib.GameProfile; +import java.util.ArrayList; +import java.util.Collection; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; public class BeeStatsSaveHelper implements IStatsSaveHelper { diff --git a/src/main/java/forestry/apiculture/commands/CommandBeeGive.java b/src/main/java/forestry/apiculture/commands/CommandBeeGive.java index b8a72b595..e3da4d890 100644 --- a/src/main/java/forestry/apiculture/commands/CommandBeeGive.java +++ b/src/main/java/forestry/apiculture/commands/CommandBeeGive.java @@ -10,14 +10,6 @@ ******************************************************************************/ package forestry.apiculture.commands; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; @@ -29,6 +21,12 @@ import forestry.core.commands.SpeciesNotFoundException; import forestry.core.commands.SubCommand; import forestry.core.commands.TemplateNotFoundException; import forestry.plugins.PluginApiculture; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class CommandBeeGive extends SubCommand { diff --git a/src/main/java/forestry/apiculture/entities/EntityBee.java b/src/main/java/forestry/apiculture/entities/EntityBee.java index d5716ddb5..3208ec398 100755 --- a/src/main/java/forestry/apiculture/entities/EntityBee.java +++ b/src/main/java/forestry/apiculture/entities/EntityBee.java @@ -10,20 +10,18 @@ ******************************************************************************/ package forestry.apiculture.entities; -import net.minecraft.entity.EntityCreature; -import net.minecraft.entity.passive.IAnimals; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; import forestry.core.config.Defaults; import forestry.core.utils.ForestryResource; import forestry.plugins.PluginApiculture; +import net.minecraft.entity.EntityCreature; +import net.minecraft.entity.passive.IAnimals; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; public class EntityBee extends EntityCreature implements IAnimals { diff --git a/src/main/java/forestry/apiculture/gadgets/BlockAlveary.java b/src/main/java/forestry/apiculture/gadgets/BlockAlveary.java index 231e9ae1f..6bae0eed5 100755 --- a/src/main/java/forestry/apiculture/gadgets/BlockAlveary.java +++ b/src/main/java/forestry/apiculture/gadgets/BlockAlveary.java @@ -10,9 +10,14 @@ ******************************************************************************/ package forestry.apiculture.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; +import forestry.apiculture.MaterialBeehive; +import forestry.core.gadgets.BlockStructure; +import forestry.core.render.TextureManager; import java.util.ArrayList; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -23,14 +28,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.api.core.Tabs; -import forestry.apiculture.MaterialBeehive; -import forestry.core.gadgets.BlockStructure; -import forestry.core.render.TextureManager; - public class BlockAlveary extends BlockStructure { public BlockAlveary() { diff --git a/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java b/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java index d4ac8c93d..72f9798ee 100755 --- a/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java +++ b/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java @@ -19,6 +19,9 @@ import forestry.apiculture.MaterialBeehive; import forestry.core.config.Config; import forestry.core.render.TextureManager; import forestry.core.utils.StackUtils; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import net.minecraft.block.BlockContainer; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -31,10 +34,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - public class BlockBeehives extends BlockContainer { public BlockBeehives() { diff --git a/src/main/java/forestry/apiculture/gadgets/BlockCandle.java b/src/main/java/forestry/apiculture/gadgets/BlockCandle.java index 5111fee49..76d59c2b4 100755 --- a/src/main/java/forestry/apiculture/gadgets/BlockCandle.java +++ b/src/main/java/forestry/apiculture/gadgets/BlockCandle.java @@ -10,10 +10,17 @@ ******************************************************************************/ package forestry.apiculture.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; +import forestry.core.ForestryClient; +import forestry.core.config.Defaults; +import forestry.core.render.TextureManager; +import forestry.core.utils.StackUtils; +import forestry.core.utils.StringUtil; import java.util.ArrayList; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockTorch; import net.minecraft.client.renderer.texture.IIconRegister; @@ -29,20 +36,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; -import forestry.api.core.Tabs; -import forestry.core.ForestryClient; -import forestry.core.config.Defaults; -import forestry.core.render.TextureManager; -import forestry.core.utils.StackUtils; -import forestry.core.utils.StringUtil; - public class BlockCandle extends BlockTorch { private final ArrayList lightingItems = new ArrayList(); diff --git a/src/main/java/forestry/apiculture/gadgets/BlockStump.java b/src/main/java/forestry/apiculture/gadgets/BlockStump.java index 53eca9bf4..ad797b592 100755 --- a/src/main/java/forestry/apiculture/gadgets/BlockStump.java +++ b/src/main/java/forestry/apiculture/gadgets/BlockStump.java @@ -10,9 +10,16 @@ ******************************************************************************/ package forestry.apiculture.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; +import forestry.core.config.Defaults; +import forestry.core.config.ForestryBlock; +import forestry.core.render.TextureManager; +import forestry.core.utils.StackUtils; +import forestry.core.utils.StringUtil; import java.util.List; import java.util.Random; - import net.minecraft.block.BlockTorch; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -23,16 +30,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.api.core.Tabs; -import forestry.core.config.Defaults; -import forestry.core.config.ForestryBlock; -import forestry.core.render.TextureManager; -import forestry.core.utils.StackUtils; -import forestry.core.utils.StringUtil; - public class BlockStump extends BlockTorch { public BlockStump() { diff --git a/src/main/java/forestry/apiculture/gadgets/StructureLogicAlveary.java b/src/main/java/forestry/apiculture/gadgets/StructureLogicAlveary.java index 57846bbb0..bc13fa17c 100755 --- a/src/main/java/forestry/apiculture/gadgets/StructureLogicAlveary.java +++ b/src/main/java/forestry/apiculture/gadgets/StructureLogicAlveary.java @@ -10,12 +10,6 @@ ******************************************************************************/ package forestry.apiculture.gadgets; -import java.util.HashSet; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.tileentity.TileEntity; - import forestry.api.apiculture.IAlvearyComponent; import forestry.api.core.ITileStructure; import forestry.core.config.ForestryBlock; @@ -24,6 +18,10 @@ import forestry.core.gadgets.StructureLogic; import forestry.core.utils.Schemata; import forestry.core.utils.Schemata.EnumStructureBlock; import forestry.core.utils.Vect; +import java.util.HashSet; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.tileentity.TileEntity; public class StructureLogicAlveary extends StructureLogic { diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlveary.java b/src/main/java/forestry/apiculture/gadgets/TileAlveary.java index 6f9b246e0..40be9194a 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlveary.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlveary.java @@ -23,14 +23,13 @@ import forestry.core.config.ForestryBlock; import forestry.core.gadgets.TileForestry; import forestry.core.network.PacketPayload; import forestry.core.proxy.Proxies; +import java.util.Collection; +import java.util.LinkedList; import net.minecraft.inventory.IInventory; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import java.util.Collection; -import java.util.LinkedList; - public abstract class TileAlveary extends TileForestry implements IAlvearyComponent { private final IStructureLogic structureLogic; diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java index 309a35bb6..bc57a0663 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java @@ -10,18 +10,6 @@ ******************************************************************************/ package forestry.apiculture.gadgets; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; - import forestry.api.apiculture.IAlvearyComponent; import forestry.api.core.ForestryAPI; import forestry.core.config.Defaults; @@ -34,6 +22,16 @@ import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.utils.Utils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; public class TileAlvearyHygroregulator extends TileAlveary implements IInventory, ILiquidTankContainer { diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java index a420f8fb7..797097dbd 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java @@ -18,7 +18,6 @@ import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeekeepingLogic; import forestry.api.core.BiomeHelper; -import forestry.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; @@ -27,20 +26,22 @@ import forestry.api.core.ISpecialInventory; import forestry.api.core.ITileStructure; import forestry.api.genetics.IIndividual; import forestry.apiculture.gui.ContainerAlveary; +import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.interfaces.IClimatised; import forestry.core.interfaces.IErrorSource; import forestry.core.interfaces.IHintSource; +import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.network.PacketIds; import forestry.core.network.PacketInventoryStack; import forestry.core.proxy.Proxies; -import forestry.core.inventory.InventoryAdapter; -import forestry.core.inventory.TileInventoryAdapter; import forestry.core.utils.Utils; import forestry.plugins.PluginApiculture; +import java.util.LinkedHashSet; +import java.util.Set; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; @@ -51,10 +52,6 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.ForgeDirection; -import java.util.LinkedHashSet; -import java.util.Set; -import scala.collection.SortedMap; - public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, ISpecialInventory, IBeeHousing, IClimatised, IHintSource { // / CONSTANTS diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java index dd8536ea9..413ada71e 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java @@ -10,10 +10,6 @@ ******************************************************************************/ package forestry.apiculture.gadgets; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - import forestry.api.apiculture.IAlvearyComponent; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeListener; @@ -22,8 +18,11 @@ import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; import forestry.core.interfaces.ICrafter; -import forestry.core.network.GuiId; import forestry.core.inventory.InventoryAdapter; +import forestry.core.network.GuiId; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class TileAlvearySieve extends TileAlveary implements ICrafter, IBeeListener { diff --git a/src/main/java/forestry/apiculture/gadgets/TileApiary.java b/src/main/java/forestry/apiculture/gadgets/TileApiary.java index 00d09357d..c3cb94abb 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileApiary.java +++ b/src/main/java/forestry/apiculture/gadgets/TileApiary.java @@ -20,13 +20,12 @@ import forestry.core.gadgets.TileBase; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.plugins.PluginApiculture; +import java.util.Collection; +import java.util.LinkedList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import java.util.Collection; -import java.util.LinkedList; - public class TileApiary extends TileBeehouse { @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java index f2918bc0f..178b18ca8 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java +++ b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java @@ -15,21 +15,21 @@ import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeekeepingLogic; -import forestry.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; import forestry.api.genetics.IIndividual; +import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.gadgets.TileBase; import forestry.core.interfaces.IClimatised; +import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.network.PacketIds; import forestry.core.network.PacketInventoryStack; import forestry.core.network.PacketTileUpdate; import forestry.core.proxy.Proxies; -import forestry.core.inventory.TileInventoryAdapter; import forestry.core.utils.Utils; import forestry.plugins.PluginApiculture; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/forestry/apiculture/gadgets/TileSwarm.java b/src/main/java/forestry/apiculture/gadgets/TileSwarm.java index e9595c0cf..7218eae58 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileSwarm.java +++ b/src/main/java/forestry/apiculture/gadgets/TileSwarm.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.apiculture.gadgets; +import forestry.core.inventory.InventoryAdapter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import forestry.core.inventory.InventoryAdapter; - public class TileSwarm extends TileEntity { public final InventoryAdapter contained = new InventoryAdapter(2, "Contained"); diff --git a/src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java b/src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java index 6686924aa..b960f7bff 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java @@ -29,15 +29,14 @@ import forestry.core.config.Defaults; import forestry.core.genetics.AlleleSpecies; import forestry.core.render.TextureManager; import forestry.core.utils.StackUtils; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.Locale; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies, IIconProvider { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectAggressive.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectAggressive.java index ecfd9b7c3..7f38a2fd7 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectAggressive.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectAggressive.java @@ -10,18 +10,16 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.List; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; - import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; import forestry.apiculture.items.ItemArmorApiarist; import forestry.core.utils.DamageSourceForestry; +import java.util.List; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; public class AlleleEffectAggressive extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectCreeper.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectCreeper.java index f3b932bf2..1b0612f0e 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectCreeper.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectCreeper.java @@ -10,17 +10,15 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; - import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; import forestry.apiculture.items.ItemArmorApiarist; import forestry.core.genetics.EffectData; +import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; public class AlleleEffectCreeper extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectExploration.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectExploration.java index 1d73a289f..3a9dee87f 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectExploration.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectExploration.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; - import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; +import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.AxisAlignedBB; public class AlleleEffectExploration extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectFertile.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectFertile.java index b95979e9e..989efc8ac 100644 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectFertile.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectFertile.java @@ -1,11 +1,11 @@ package forestry.apiculture.genetics; -import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.world.World; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; +import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.world.World; public class AlleleEffectFertile extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectFungification.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectFungification.java index cea2123d5..9de179817 100644 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectFungification.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectFungification.java @@ -1,8 +1,11 @@ package forestry.apiculture.genetics; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.genetics.IEffectData; +import forestry.core.genetics.EffectData; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntityCow; @@ -11,10 +14,6 @@ import net.minecraft.init.Blocks; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenBigMushroom; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.genetics.IEffectData; -import forestry.core.genetics.EffectData; public class AlleleEffectFungification extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectGlacial.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectGlacial.java index 7bb55b61f..af66476c2 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectGlacial.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectGlacial.java @@ -10,17 +10,16 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; - import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IEffectData; import forestry.core.proxy.Proxies; import forestry.core.utils.Vect; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; public class AlleleEffectGlacial extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectHeroic.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectHeroic.java index bfb0524e1..580eabeff 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectHeroic.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectHeroic.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.List; - -import net.minecraft.entity.monster.EntityMob; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; - import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; +import java.util.List; +import net.minecraft.entity.monster.EntityMob; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; public class AlleleEffectHeroic extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectIgnition.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectIgnition.java index b834d766f..05029e58d 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectIgnition.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectIgnition.java @@ -10,18 +10,16 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.List; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; - import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; import forestry.apiculture.items.ItemArmorApiarist; import forestry.plugins.PluginApiculture; +import java.util.List; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; public class AlleleEffectIgnition extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectMiasmic.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectMiasmic.java index 715db439d..8ce97f3a8 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectMiasmic.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectMiasmic.java @@ -10,19 +10,17 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; - import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; import forestry.apiculture.items.ItemArmorApiarist; import forestry.plugins.PluginApiculture; +import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; public class AlleleEffectMiasmic extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectMisanthrope.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectMisanthrope.java index 9599517b5..a45d208a1 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectMisanthrope.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectMisanthrope.java @@ -10,17 +10,15 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; - import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; import forestry.apiculture.items.ItemArmorApiarist; import forestry.core.utils.DamageSourceForestry; +import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; public class AlleleEffectMisanthrope extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectNone.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectNone.java index d7a4e799c..a7ac786a0 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectNone.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectNone.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import net.minecraft.world.World; - import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; import forestry.core.genetics.Allele; import forestry.plugins.PluginApiculture; +import net.minecraft.world.World; public class AlleleEffectNone extends Allele implements IAlleleBeeEffect { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectPotion.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectPotion.java index 1ca3a1674..0d0795022 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectPotion.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectPotion.java @@ -16,13 +16,12 @@ import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; import forestry.apiculture.items.ItemArmorApiarist; import forestry.core.proxy.Proxies; +import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; -import java.util.List; - public class AlleleEffectPotion extends AlleleEffectThrottled { private final Potion potion; diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectRadioactive.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectRadioactive.java index fb7601ad9..4f949e6d2 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectRadioactive.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectRadioactive.java @@ -10,17 +10,6 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; -import net.minecraft.world.World; - import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; @@ -29,6 +18,15 @@ import forestry.apiculture.gadgets.TileAlveary; import forestry.apiculture.items.ItemArmorApiarist; import forestry.core.utils.DamageSourceForestry; import forestry.core.utils.Vect; +import java.util.List; +import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.world.World; public class AlleleEffectRadioactive extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectRepulsion.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectRepulsion.java index 72c070217..3bfc605c1 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectRepulsion.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectRepulsion.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.List; - -import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; -import net.minecraft.entity.monster.EntityMob; -import net.minecraft.util.AxisAlignedBB; - import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; +import java.util.List; +import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; +import net.minecraft.entity.monster.EntityMob; +import net.minecraft.util.AxisAlignedBB; public class AlleleEffectRepulsion extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectResurrection.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectResurrection.java index 65e2381d7..6039ac567 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectResurrection.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectResurrection.java @@ -10,10 +10,14 @@ ******************************************************************************/ package forestry.apiculture.genetics; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.genetics.IEffectData; +import forestry.core.utils.StackUtils; +import forestry.core.utils.Utils; import java.util.ArrayList; import java.util.Collections; import java.util.List; - import net.minecraft.entity.EntityLiving; import net.minecraft.entity.boss.EntityDragon; import net.minecraft.entity.item.EntityItem; @@ -30,12 +34,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.genetics.IEffectData; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; - public class AlleleEffectResurrection extends AlleleEffectThrottled { public static class Resurrectable { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectSnowing.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectSnowing.java index 9117fad58..864f9d11b 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectSnowing.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectSnowing.java @@ -10,18 +10,16 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; - -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IEffectData; import forestry.core.proxy.Proxies; import forestry.core.utils.Vect; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.util.ForgeDirection; public class AlleleEffectSnowing extends AlleleEffectThrottled { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java index 4fe7543a8..250f86599 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import net.minecraft.util.AxisAlignedBB; - import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; @@ -21,6 +19,7 @@ import forestry.core.genetics.Allele; import forestry.core.genetics.EffectData; import forestry.core.utils.Vect; import forestry.plugins.PluginApiculture; +import net.minecraft.util.AxisAlignedBB; public abstract class AlleleEffectThrottled extends Allele implements IAlleleBeeEffect { diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index ea52b7f6e..c55a3eeee 100755 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -20,7 +20,6 @@ import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeMutation; import forestry.api.apiculture.IBeekeepingMode; import forestry.api.core.BiomeHelper; -import forestry.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; @@ -32,6 +31,7 @@ import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; +import forestry.core.EnumErrorCode; import forestry.core.config.Defaults; import forestry.core.genetics.Chromosome; import forestry.core.genetics.GenericRatings; @@ -42,17 +42,16 @@ import forestry.core.utils.StringUtil; import forestry.core.utils.Utils; import forestry.core.utils.Vect; import forestry.plugins.PluginApiculture; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - public class Bee extends IndividualLiving implements IBee { public IBeeGenome genome; diff --git a/src/main/java/forestry/apiculture/genetics/BeeHelper.java b/src/main/java/forestry/apiculture/genetics/BeeHelper.java index 6bc34f5ba..9eb3963ba 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeHelper.java +++ b/src/main/java/forestry/apiculture/genetics/BeeHelper.java @@ -10,22 +10,8 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.Locale; -import java.util.Map.Entry; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - -import cpw.mods.fml.common.FMLCommonHandler; - import com.mojang.authlib.GameProfile; - +import cpw.mods.fml.common.FMLCommonHandler; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -49,6 +35,16 @@ import forestry.apiculture.gadgets.StructureLogicAlveary; import forestry.core.config.ForestryItem; import forestry.core.genetics.SpeciesRoot; import forestry.plugins.PluginApiculture; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map.Entry; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class BeeHelper extends SpeciesRoot implements IBeeRoot { diff --git a/src/main/java/forestry/apiculture/genetics/BeeMutation.java b/src/main/java/forestry/apiculture/genetics/BeeMutation.java index 184650b0a..4013e01ba 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeMutation.java +++ b/src/main/java/forestry/apiculture/genetics/BeeMutation.java @@ -10,13 +10,6 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.ArrayList; - -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; - -import net.minecraftforge.common.BiomeDictionary; - import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeMutation; @@ -26,6 +19,10 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.core.genetics.Mutation; import forestry.plugins.PluginApiculture; +import java.util.ArrayList; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.BiomeDictionary; public class BeeMutation extends Mutation implements IBeeMutation { diff --git a/src/main/java/forestry/apiculture/genetics/BeeTemplates.java b/src/main/java/forestry/apiculture/genetics/BeeTemplates.java index 55aa04097..dbc0f5b90 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeTemplates.java +++ b/src/main/java/forestry/apiculture/genetics/BeeTemplates.java @@ -14,7 +14,6 @@ import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.genetics.IAllele; import forestry.api.genetics.IMutation; import forestry.core.genetics.Allele; - import java.util.Arrays; public class BeeTemplates { diff --git a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java index 1b928a23e..efc5c64d1 100755 --- a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java +++ b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java @@ -10,16 +10,14 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.ArrayList; -import java.util.Locale; -import java.util.Random; - -import net.minecraft.world.World; - import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeekeepingMode; +import java.util.ArrayList; +import java.util.Locale; +import java.util.Random; +import net.minecraft.world.World; public class BeekeepingMode implements IBeekeepingMode { diff --git a/src/main/java/forestry/apiculture/genetics/HiveDrop.java b/src/main/java/forestry/apiculture/genetics/HiveDrop.java index 11c20ea35..da3c881fc 100755 --- a/src/main/java/forestry/apiculture/genetics/HiveDrop.java +++ b/src/main/java/forestry/apiculture/genetics/HiveDrop.java @@ -15,11 +15,10 @@ import forestry.api.apiculture.IBee; import forestry.api.apiculture.IHiveDrop; import forestry.api.genetics.IAllele; import forestry.plugins.PluginApiculture; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import java.util.ArrayList; import java.util.Collections; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class HiveDrop implements IHiveDrop { diff --git a/src/main/java/forestry/apiculture/genetics/JubilanceDefault.java b/src/main/java/forestry/apiculture/genetics/JubilanceDefault.java index adcc05f01..6b6a1d2c4 100755 --- a/src/main/java/forestry/apiculture/genetics/JubilanceDefault.java +++ b/src/main/java/forestry/apiculture/genetics/JubilanceDefault.java @@ -10,15 +10,14 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.biome.BiomeGenBase; - import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.core.utils.Vect; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.biome.BiomeGenBase; public class JubilanceDefault implements IJubilanceProvider { diff --git a/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java b/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java index 0285d8e3d..56c37976a 100755 --- a/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java +++ b/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.List; - -import net.minecraft.entity.EntityLiving; -import net.minecraft.util.AxisAlignedBB; - import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; +import java.util.List; +import net.minecraft.entity.EntityLiving; +import net.minecraft.util.AxisAlignedBB; /** * Hermits will not produce if there are any other living creatures nearby. diff --git a/src/main/java/forestry/apiculture/genetics/JubilanceReqRes.java b/src/main/java/forestry/apiculture/genetics/JubilanceReqRes.java index ffef6a5f1..5eb1fc8dc 100755 --- a/src/main/java/forestry/apiculture/genetics/JubilanceReqRes.java +++ b/src/main/java/forestry/apiculture/genetics/JubilanceReqRes.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.core.utils.StackUtils; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; public class JubilanceReqRes implements IJubilanceProvider { diff --git a/src/main/java/forestry/apiculture/genetics/MutationEMC.java b/src/main/java/forestry/apiculture/genetics/MutationEMC.java index 1b18779ff..f893aea25 100755 --- a/src/main/java/forestry/apiculture/genetics/MutationEMC.java +++ b/src/main/java/forestry/apiculture/genetics/MutationEMC.java @@ -10,17 +10,15 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.lang.reflect.Field; - -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.core.proxy.Proxies; import forestry.core.utils.Vect; +import java.lang.reflect.Field; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class MutationEMC extends MutationReqRes { diff --git a/src/main/java/forestry/apiculture/genetics/MutationReqRes.java b/src/main/java/forestry/apiculture/genetics/MutationReqRes.java index 4a51d2d6b..6d7a6fb60 100755 --- a/src/main/java/forestry/apiculture/genetics/MutationReqRes.java +++ b/src/main/java/forestry/apiculture/genetics/MutationReqRes.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.core.utils.StackUtils; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class MutationReqRes extends BeeMutation { diff --git a/src/main/java/forestry/apiculture/genetics/MutationTimeLimited.java b/src/main/java/forestry/apiculture/genetics/MutationTimeLimited.java index 244c1a07b..9a8eaf9e5 100755 --- a/src/main/java/forestry/apiculture/genetics/MutationTimeLimited.java +++ b/src/main/java/forestry/apiculture/genetics/MutationTimeLimited.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.Calendar; - import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; +import java.util.Calendar; public class MutationTimeLimited extends BeeMutation { diff --git a/src/main/java/forestry/apiculture/gui/ContainerAlveary.java b/src/main/java/forestry/apiculture/gui/ContainerAlveary.java index 6c1d21c4a..5c1f90caf 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerAlveary.java +++ b/src/main/java/forestry/apiculture/gui/ContainerAlveary.java @@ -10,15 +10,14 @@ ******************************************************************************/ package forestry.apiculture.gui; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.Slot; - import forestry.apiculture.gadgets.TileAlvearyPlain; import forestry.core.config.ForestryItem; import forestry.core.gui.ContainerForestry; import forestry.core.gui.slots.SlotClosed; import forestry.core.gui.slots.SlotCustom; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.Slot; public class ContainerAlveary extends ContainerForestry { diff --git a/src/main/java/forestry/apiculture/gui/ContainerAlvearySieve.java b/src/main/java/forestry/apiculture/gui/ContainerAlvearySieve.java index 0db2433b3..a67f45819 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerAlvearySieve.java +++ b/src/main/java/forestry/apiculture/gui/ContainerAlvearySieve.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.apiculture.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; - import forestry.apiculture.gadgets.TileAlvearySieve; import forestry.core.config.ForestryItem; import forestry.core.gui.ContainerForestry; import forestry.core.gui.slots.SlotCustom; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; public class ContainerAlvearySieve extends ContainerForestry { diff --git a/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java b/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java index bd1f62461..f4caf8a85 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java @@ -14,12 +14,11 @@ import forestry.api.apiculture.BeeManager; import forestry.apiculture.gadgets.TileAlvearySwarmer; import forestry.core.gui.ContainerForestry; import forestry.core.gui.slots.SlotCustom; +import java.util.Set; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import java.util.Set; - public class ContainerAlvearySwarmer extends ContainerForestry { public ContainerAlvearySwarmer(InventoryPlayer player, TileAlvearySwarmer tile) { diff --git a/src/main/java/forestry/apiculture/gui/ContainerApiary.java b/src/main/java/forestry/apiculture/gui/ContainerApiary.java index 414118aca..ac13523f9 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerApiary.java +++ b/src/main/java/forestry/apiculture/gui/ContainerApiary.java @@ -10,17 +10,16 @@ ******************************************************************************/ package forestry.apiculture.gui; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; - import forestry.api.apiculture.IHiveFrame; import forestry.apiculture.gadgets.TileBeehouse; import forestry.core.config.ForestryItem; import forestry.core.gui.ContainerForestry; import forestry.core.gui.slots.SlotClosed; import forestry.core.gui.slots.SlotCustom; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; public class ContainerApiary extends ContainerForestry { diff --git a/src/main/java/forestry/apiculture/gui/ContainerBeealyzer.java b/src/main/java/forestry/apiculture/gui/ContainerBeealyzer.java index 2dee50281..cec92c298 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/ContainerBeealyzer.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.apiculture.gui; -import forestry.core.gui.ContainerAlyzer; -import forestry.core.config.ForestryItem; import forestry.apiculture.items.ItemBeeGE; import forestry.apiculture.items.ItemBeealyzer.BeealyzerInventory; - +import forestry.core.config.ForestryItem; +import forestry.core.gui.ContainerAlyzer; import net.minecraft.entity.player.InventoryPlayer; public class ContainerBeealyzer extends ContainerAlyzer { diff --git a/src/main/java/forestry/apiculture/gui/ContainerHabitatLocator.java b/src/main/java/forestry/apiculture/gui/ContainerHabitatLocator.java index af5b2bbe2..62eef0741 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerHabitatLocator.java +++ b/src/main/java/forestry/apiculture/gui/ContainerHabitatLocator.java @@ -10,10 +10,6 @@ ******************************************************************************/ package forestry.apiculture.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; - import forestry.apiculture.items.ItemBeeGE; import forestry.apiculture.items.ItemBiomefinder; import forestry.apiculture.items.ItemBiomefinder.BiomefinderInventory; @@ -21,6 +17,9 @@ import forestry.core.config.ForestryItem; import forestry.core.gui.ContainerItemInventory; import forestry.core.gui.slots.SlotCustom; import forestry.core.proxy.Proxies; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; public class ContainerHabitatLocator extends ContainerItemInventory { diff --git a/src/main/java/forestry/apiculture/gui/ContainerImprinter.java b/src/main/java/forestry/apiculture/gui/ContainerImprinter.java index 1e871c94e..a280a9a05 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerImprinter.java +++ b/src/main/java/forestry/apiculture/gui/ContainerImprinter.java @@ -10,12 +10,6 @@ ******************************************************************************/ package forestry.apiculture.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.apiculture.items.ItemBeeGE; import forestry.apiculture.items.ItemImprinter.ImprinterInventory; import forestry.core.gui.ContainerForestry; @@ -25,6 +19,11 @@ import forestry.core.network.PacketIds; import forestry.core.network.PacketPayload; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class ContainerImprinter extends ContainerForestry implements IGuiSelectable { diff --git a/src/main/java/forestry/apiculture/gui/GuiAlveary.java b/src/main/java/forestry/apiculture/gui/GuiAlveary.java index 4285f6889..75d5b67fa 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlveary.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlveary.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.apiculture.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.apiculture.gadgets.TileAlvearyPlain; import forestry.core.config.Defaults; import forestry.core.gui.GuiForestryTitled; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.Utils; +import net.minecraft.entity.player.InventoryPlayer; public class GuiAlveary extends GuiForestryTitled { diff --git a/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java index 6a7c16190..ce8051f14 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.apiculture.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.apiculture.gadgets.TileAlvearyHygroregulator; import forestry.core.config.Defaults; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; +import net.minecraft.entity.player.InventoryPlayer; public class GuiAlvearyHygroregulator extends GuiForestryTitled { diff --git a/src/main/java/forestry/apiculture/gui/GuiAlvearySieve.java b/src/main/java/forestry/apiculture/gui/GuiAlvearySieve.java index 3a57d0801..75fb66a89 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlvearySieve.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlvearySieve.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.apiculture.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.apiculture.gadgets.TileAlvearySieve; import forestry.core.config.Defaults; import forestry.core.gui.GuiForestry; +import net.minecraft.entity.player.InventoryPlayer; public class GuiAlvearySieve extends GuiForestry { diff --git a/src/main/java/forestry/apiculture/gui/GuiAlvearySwarmer.java b/src/main/java/forestry/apiculture/gui/GuiAlvearySwarmer.java index a07ac33bf..80e2043c3 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlvearySwarmer.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.apiculture.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.apiculture.gadgets.TileAlvearySwarmer; import forestry.core.config.Defaults; import forestry.core.gui.GuiForestry; +import net.minecraft.entity.player.InventoryPlayer; public class GuiAlvearySwarmer extends GuiForestry { diff --git a/src/main/java/forestry/apiculture/gui/GuiApiary.java b/src/main/java/forestry/apiculture/gui/GuiApiary.java index 1a73b16a3..c366a2c3b 100755 --- a/src/main/java/forestry/apiculture/gui/GuiApiary.java +++ b/src/main/java/forestry/apiculture/gui/GuiApiary.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.apiculture.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.apiculture.gadgets.TileApiary; import forestry.apiculture.gadgets.TileBeehouse; import forestry.core.config.Defaults; import forestry.core.gui.GuiForestryTitled; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.Utils; +import net.minecraft.entity.player.InventoryPlayer; public class GuiApiary extends GuiForestryTitled { diff --git a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java index 01deaf8d2..6cd2f69ca 100755 --- a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java @@ -27,11 +27,10 @@ import forestry.core.gui.GuiAlyzer; import forestry.core.utils.StringUtil; import forestry.core.utils.Vect; import forestry.plugins.PluginApiculture; +import java.util.ArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import java.util.ArrayList; - public class GuiBeealyzer extends GuiAlyzer { public GuiBeealyzer(EntityPlayer player, BeealyzerInventory inventory) { diff --git a/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java b/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java index bee2019f2..24d232510 100755 --- a/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java +++ b/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java @@ -10,17 +10,6 @@ ******************************************************************************/ package forestry.apiculture.gui; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Locale; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.IIcon; -import net.minecraft.world.biome.BiomeGenBase; - -import org.lwjgl.opengl.GL11; - import forestry.apiculture.items.ItemBiomefinder.BiomefinderInventory; import forestry.core.config.Defaults; import forestry.core.gadgets.TileForestry; @@ -30,6 +19,14 @@ import forestry.core.proxy.Proxies; import forestry.core.render.SpriteSheet; import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Locale; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.IIcon; +import net.minecraft.world.biome.BiomeGenBase; +import org.lwjgl.opengl.GL11; public class GuiHabitatLocator extends GuiForestry { diff --git a/src/main/java/forestry/apiculture/gui/GuiImprinter.java b/src/main/java/forestry/apiculture/gui/GuiImprinter.java index 7eaf63246..0d677d7c1 100755 --- a/src/main/java/forestry/apiculture/gui/GuiImprinter.java +++ b/src/main/java/forestry/apiculture/gui/GuiImprinter.java @@ -20,11 +20,10 @@ import forestry.core.gadgets.TileForestry; import forestry.core.gui.GuiForestry; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; - import java.util.ArrayList; import java.util.HashMap; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; public class GuiImprinter extends GuiForestry { diff --git a/src/main/java/forestry/apiculture/items/ItemAlvearyBlock.java b/src/main/java/forestry/apiculture/items/ItemAlvearyBlock.java index 90f6f7b8c..fa37001c6 100755 --- a/src/main/java/forestry/apiculture/items/ItemAlvearyBlock.java +++ b/src/main/java/forestry/apiculture/items/ItemAlvearyBlock.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.apiculture.items; -import net.minecraft.block.Block; - import forestry.core.gadgets.IStructureBlockItem; import forestry.core.items.ItemForestryBlock; +import net.minecraft.block.Block; /** * diff --git a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java index 5a5efabe4..8466cd361 100755 --- a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java +++ b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java @@ -10,16 +10,8 @@ ******************************************************************************/ package forestry.apiculture.items; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.apiculture.IArmorApiarist; import forestry.api.core.IArmorNaturalist; import forestry.api.core.Tabs; @@ -27,6 +19,12 @@ import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; public class ItemArmorApiarist extends ItemArmor implements IArmorApiarist, IArmorNaturalist { diff --git a/src/main/java/forestry/apiculture/items/ItemBeeGE.java b/src/main/java/forestry/apiculture/items/ItemBeeGE.java index 5f19e8b7f..eb5decdff 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeeGE.java +++ b/src/main/java/forestry/apiculture/items/ItemBeeGE.java @@ -27,6 +27,7 @@ import forestry.core.config.Config; import forestry.core.genetics.ItemGE; import forestry.core.utils.StringUtil; import forestry.plugins.PluginApiculture; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -35,8 +36,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; -import java.util.List; - public class ItemBeeGE extends ItemGE { private final EnumBeeType type; diff --git a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java index c2ec454a4..bbd2df988 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java +++ b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java @@ -10,12 +10,6 @@ ******************************************************************************/ package forestry.apiculture.items; -import forestry.core.inventory.AlyzerInventory; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - import forestry.api.apiculture.IBee; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; @@ -24,10 +18,15 @@ import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.interfaces.IErrorSource; import forestry.core.interfaces.IHintSource; +import forestry.core.inventory.AlyzerInventory; import forestry.core.items.ItemInventoried; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.plugins.PluginApiculture; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class ItemBeealyzer extends ItemInventoried { diff --git a/src/main/java/forestry/apiculture/items/ItemBiomefinder.java b/src/main/java/forestry/apiculture/items/ItemBiomefinder.java index 0836ef00d..88301d50d 100755 --- a/src/main/java/forestry/apiculture/items/ItemBiomefinder.java +++ b/src/main/java/forestry/apiculture/items/ItemBiomefinder.java @@ -10,8 +10,24 @@ ******************************************************************************/ package forestry.apiculture.items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.apiculture.IBee; +import forestry.api.core.ForestryAPI; +import forestry.api.core.Tabs; +import forestry.apiculture.render.TextureBiomefinder; +import forestry.core.EnumErrorCode; +import forestry.core.config.Config; +import forestry.core.config.ForestryItem; +import forestry.core.interfaces.IErrorSource; +import forestry.core.interfaces.IHintSource; +import forestry.core.inventory.ItemInventory; +import forestry.core.items.ItemInventoried; +import forestry.core.network.GuiId; +import forestry.core.proxy.Proxies; +import forestry.core.utils.Vect; +import forestry.plugins.PluginApiculture; import java.util.ArrayList; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -23,25 +39,6 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.api.apiculture.IBee; -import forestry.api.core.ForestryAPI; -import forestry.api.core.Tabs; -import forestry.apiculture.render.TextureBiomefinder; -import forestry.core.EnumErrorCode; -import forestry.core.config.Config; -import forestry.core.config.ForestryItem; -import forestry.core.interfaces.IErrorSource; -import forestry.core.interfaces.IHintSource; -import forestry.core.items.ItemInventoried; -import forestry.core.network.GuiId; -import forestry.core.proxy.Proxies; -import forestry.core.inventory.ItemInventory; -import forestry.core.utils.Vect; -import forestry.plugins.PluginApiculture; - public class ItemBiomefinder extends ItemInventoried { public static class BiomefinderInventory extends ItemInventory implements IErrorSource, IHintSource { diff --git a/src/main/java/forestry/apiculture/items/ItemCandleBlock.java b/src/main/java/forestry/apiculture/items/ItemCandleBlock.java index 951beb0c4..f76cf7f25 100755 --- a/src/main/java/forestry/apiculture/items/ItemCandleBlock.java +++ b/src/main/java/forestry/apiculture/items/ItemCandleBlock.java @@ -10,17 +10,15 @@ ******************************************************************************/ package forestry.apiculture.items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.apiculture.gadgets.BlockCandle; +import forestry.core.items.ItemForestryBlock; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.apiculture.gadgets.BlockCandle; -import forestry.core.items.ItemForestryBlock; - public class ItemCandleBlock extends ItemForestryBlock { public ItemCandleBlock(Block block) { diff --git a/src/main/java/forestry/apiculture/items/ItemHiveFrame.java b/src/main/java/forestry/apiculture/items/ItemHiveFrame.java index c23d3edcf..2a7f25e88 100755 --- a/src/main/java/forestry/apiculture/items/ItemHiveFrame.java +++ b/src/main/java/forestry/apiculture/items/ItemHiveFrame.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.apiculture.items; -import net.minecraft.item.ItemStack; - import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IHiveFrame; import forestry.api.core.Tabs; import forestry.core.items.ItemForestry; +import net.minecraft.item.ItemStack; public class ItemHiveFrame extends ItemForestry implements IHiveFrame { diff --git a/src/main/java/forestry/apiculture/items/ItemHoneycomb.java b/src/main/java/forestry/apiculture/items/ItemHoneycomb.java index 1c2ba6041..c75dc42a2 100755 --- a/src/main/java/forestry/apiculture/items/ItemHoneycomb.java +++ b/src/main/java/forestry/apiculture/items/ItemHoneycomb.java @@ -10,18 +10,16 @@ ******************************************************************************/ package forestry.apiculture.items; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - import forestry.api.core.Tabs; import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.items.ItemForestryMultiPass; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; public class ItemHoneycomb extends ItemForestryMultiPass { diff --git a/src/main/java/forestry/apiculture/items/ItemImprinter.java b/src/main/java/forestry/apiculture/items/ItemImprinter.java index 3c61ff934..70512ecf4 100755 --- a/src/main/java/forestry/apiculture/items/ItemImprinter.java +++ b/src/main/java/forestry/apiculture/items/ItemImprinter.java @@ -10,12 +10,6 @@ ******************************************************************************/ package forestry.apiculture.items; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; import forestry.api.core.ForestryAPI; @@ -25,6 +19,11 @@ import forestry.core.items.ItemForestry; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.plugins.PluginApiculture; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class ItemImprinter extends ItemForestry { diff --git a/src/main/java/forestry/apiculture/items/ItemWaxCast.java b/src/main/java/forestry/apiculture/items/ItemWaxCast.java index dae81a1be..df600f0b5 100755 --- a/src/main/java/forestry/apiculture/items/ItemWaxCast.java +++ b/src/main/java/forestry/apiculture/items/ItemWaxCast.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.apiculture.items; -import net.minecraft.item.ItemStack; - import forestry.core.interfaces.ICraftingPlan; import forestry.core.items.ItemForestry; +import net.minecraft.item.ItemStack; public class ItemWaxCast extends ItemForestry implements ICraftingPlan { diff --git a/src/main/java/forestry/apiculture/proxy/ClientProxyApiculture.java b/src/main/java/forestry/apiculture/proxy/ClientProxyApiculture.java index 167b26122..bb6516859 100755 --- a/src/main/java/forestry/apiculture/proxy/ClientProxyApiculture.java +++ b/src/main/java/forestry/apiculture/proxy/ClientProxyApiculture.java @@ -10,13 +10,7 @@ ******************************************************************************/ package forestry.apiculture.proxy; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.world.World; - import cpw.mods.fml.client.registry.RenderingRegistry; - -import net.minecraftforge.client.MinecraftForgeClient; - import forestry.apiculture.entities.EntityBee; import forestry.apiculture.render.BeeItemRenderer; import forestry.apiculture.render.EntityBeeFX; @@ -28,6 +22,9 @@ import forestry.core.interfaces.IBlockRenderer; import forestry.core.render.RenderAnalyzer; import forestry.core.render.TextureManager; import forestry.plugins.PluginApiculture; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.world.World; +import net.minecraftforge.client.MinecraftForgeClient; public class ClientProxyApiculture extends ProxyApiculture { diff --git a/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java b/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java index 267396f1b..939dd6b42 100755 --- a/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java +++ b/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java @@ -10,9 +10,8 @@ ******************************************************************************/ package forestry.apiculture.proxy; -import net.minecraft.world.World; - import forestry.core.interfaces.IBlockRenderer; +import net.minecraft.world.World; public class ProxyApiculture { public void addBeeHiveFX(String texture, World world, double xCoord, double yCoord, double zCoord, int color, int areaX, int areaY, int areaZ) { diff --git a/src/main/java/forestry/apiculture/render/BeeItemRenderer.java b/src/main/java/forestry/apiculture/render/BeeItemRenderer.java index 130114b50..c8ba2b5d5 100755 --- a/src/main/java/forestry/apiculture/render/BeeItemRenderer.java +++ b/src/main/java/forestry/apiculture/render/BeeItemRenderer.java @@ -10,20 +10,17 @@ ******************************************************************************/ package forestry.apiculture.render; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import forestry.api.apiculture.IBee; import forestry.apiculture.entities.EntityBee; import forestry.core.proxy.Proxies; import forestry.plugins.PluginApiculture; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; public class BeeItemRenderer implements IItemRenderer { diff --git a/src/main/java/forestry/apiculture/render/BlockCandleRenderer.java b/src/main/java/forestry/apiculture/render/BlockCandleRenderer.java index c525fbc99..40c18927d 100755 --- a/src/main/java/forestry/apiculture/render/BlockCandleRenderer.java +++ b/src/main/java/forestry/apiculture/render/BlockCandleRenderer.java @@ -10,18 +10,16 @@ ******************************************************************************/ package forestry.apiculture.render; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import forestry.apiculture.gadgets.BlockCandle; +import forestry.apiculture.gadgets.TileCandle; +import forestry.core.ForestryClient; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - -import forestry.apiculture.gadgets.BlockCandle; -import forestry.apiculture.gadgets.TileCandle; -import forestry.core.ForestryClient; - public class BlockCandleRenderer implements ISimpleBlockRenderingHandler { @Override diff --git a/src/main/java/forestry/apiculture/render/ModelAnalyzer.java b/src/main/java/forestry/apiculture/render/ModelAnalyzer.java index 1cd316b8b..80fcd495c 100755 --- a/src/main/java/forestry/apiculture/render/ModelAnalyzer.java +++ b/src/main/java/forestry/apiculture/render/ModelAnalyzer.java @@ -10,17 +10,14 @@ ******************************************************************************/ package forestry.apiculture.render; +import forestry.core.proxy.Proxies; +import forestry.core.utils.ForestryResource; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; -import forestry.core.proxy.Proxies; -import forestry.core.utils.ForestryResource; - public class ModelAnalyzer extends ModelBase { private final ModelRenderer pedestal; diff --git a/src/main/java/forestry/apiculture/render/ModelBee.java b/src/main/java/forestry/apiculture/render/ModelBee.java index 56ff58961..c3c715640 100755 --- a/src/main/java/forestry/apiculture/render/ModelBee.java +++ b/src/main/java/forestry/apiculture/render/ModelBee.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.apiculture.render; +import forestry.api.apiculture.EnumBeeType; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; - import org.lwjgl.opengl.GL11; -import forestry.api.apiculture.EnumBeeType; - public class ModelBee extends ModelBase { //fields diff --git a/src/main/java/forestry/apiculture/render/ParticleRenderer.java b/src/main/java/forestry/apiculture/render/ParticleRenderer.java index 805f4b2f6..ea5633154 100755 --- a/src/main/java/forestry/apiculture/render/ParticleRenderer.java +++ b/src/main/java/forestry/apiculture/render/ParticleRenderer.java @@ -10,28 +10,24 @@ ******************************************************************************/ package forestry.apiculture.render; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.ActiveRenderInfo; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.EntityLivingBase; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.renderer.ActiveRenderInfo; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.WorldEvent; - import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/forestry/apiculture/render/RenderBee.java b/src/main/java/forestry/apiculture/render/RenderBee.java index 61ff1608c..02cf0fb6e 100755 --- a/src/main/java/forestry/apiculture/render/RenderBee.java +++ b/src/main/java/forestry/apiculture/render/RenderBee.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.apiculture.render; +import forestry.apiculture.entities.EntityBee; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import forestry.apiculture.entities.EntityBee; - public class RenderBee extends RenderLiving { private final ModelBee beeModel; diff --git a/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java b/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java index bb5eeb796..69f15b3e9 100755 --- a/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java +++ b/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java @@ -10,23 +10,6 @@ ******************************************************************************/ package forestry.apiculture.worldgen; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.gen.structure.StructureBoundingBox; -import net.minecraft.world.gen.structure.StructureComponent; -import net.minecraft.world.gen.structure.StructureVillagePieces; - -import net.minecraftforge.common.ChestGenHooks; - import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.FlowerManager; @@ -42,6 +25,20 @@ import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.utils.StackUtils; import forestry.plugins.PluginApiculture; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.gen.structure.StructureBoundingBox; +import net.minecraft.world.gen.structure.StructureComponent; +import net.minecraft.world.gen.structure.StructureVillagePieces; +import net.minecraftforge.common.ChestGenHooks; public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java index 65ea83051..5869040af 100755 --- a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java @@ -17,6 +17,7 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.core.config.Config; import forestry.core.config.Defaults; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -25,8 +26,6 @@ import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType; import net.minecraftforge.event.terraingen.TerrainGen; -import java.util.Random; - /** * * @author CovertJaguar diff --git a/src/main/java/forestry/arboriculture/FruitProviderNone.java b/src/main/java/forestry/arboriculture/FruitProviderNone.java index b9b6ead28..47804f0c8 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderNone.java +++ b/src/main/java/forestry/arboriculture/FruitProviderNone.java @@ -10,20 +10,17 @@ ******************************************************************************/ package forestry.arboriculture; -import java.util.HashMap; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.ITreeGenome; import forestry.api.genetics.IFruitFamily; import forestry.core.render.TextureManager; +import java.util.HashMap; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; public class FruitProviderNone implements IFruitProvider { diff --git a/src/main/java/forestry/arboriculture/FruitProviderPod.java b/src/main/java/forestry/arboriculture/FruitProviderPod.java index 128630dc2..f94e05a75 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderPod.java +++ b/src/main/java/forestry/arboriculture/FruitProviderPod.java @@ -10,17 +10,8 @@ ******************************************************************************/ package forestry.arboriculture; -import java.util.Locale; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.ITreeGenome; @@ -28,6 +19,12 @@ import forestry.api.genetics.IFruitFamily; import forestry.core.render.TextureManager; import forestry.core.utils.BlockUtil; import forestry.plugins.PluginArboriculture; +import java.util.Locale; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; public class FruitProviderPod extends FruitProviderNone { diff --git a/src/main/java/forestry/arboriculture/FruitProviderRandom.java b/src/main/java/forestry/arboriculture/FruitProviderRandom.java index c9194eae2..e353d1def 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderRandom.java +++ b/src/main/java/forestry/arboriculture/FruitProviderRandom.java @@ -13,14 +13,13 @@ package forestry.arboriculture; import forestry.api.arboriculture.ITreeGenome; import forestry.api.genetics.IFruitFamily; import forestry.plugins.PluginArboriculture; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import java.util.Set; +import net.minecraft.item.ItemStack; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; /** * Simple fruit provider which drops from any leaf block according to yield and either marks all leave blocks as fruit leaves or none. diff --git a/src/main/java/forestry/arboriculture/FruitProviderRipening.java b/src/main/java/forestry/arboriculture/FruitProviderRipening.java index 3d7c83320..69ba7afcd 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderRipening.java +++ b/src/main/java/forestry/arboriculture/FruitProviderRipening.java @@ -13,14 +13,13 @@ package forestry.arboriculture; import forestry.api.arboriculture.ITreeGenome; import forestry.api.genetics.IFruitFamily; import forestry.plugins.PluginArboriculture; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import java.util.Set; +import net.minecraft.item.ItemStack; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; public class FruitProviderRipening extends FruitProviderNone { diff --git a/src/main/java/forestry/arboriculture/GuiHandlerArboriculture.java b/src/main/java/forestry/arboriculture/GuiHandlerArboriculture.java index b0c9fa378..481604189 100755 --- a/src/main/java/forestry/arboriculture/GuiHandlerArboriculture.java +++ b/src/main/java/forestry/arboriculture/GuiHandlerArboriculture.java @@ -10,16 +10,15 @@ ******************************************************************************/ package forestry.arboriculture; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.arboriculture.genetics.TreeHelper; import forestry.arboriculture.gui.ContainerTreealyzer; import forestry.arboriculture.gui.GuiTreealyzer; import forestry.arboriculture.items.ItemTreealyzer.TreealyzerInventory; import forestry.core.GuiHandlerBase; import forestry.core.network.GuiId; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class GuiHandlerArboriculture extends GuiHandlerBase { diff --git a/src/main/java/forestry/arboriculture/PacketHandlerArboriculture.java b/src/main/java/forestry/arboriculture/PacketHandlerArboriculture.java index 9f275d5c2..a7588eb54 100755 --- a/src/main/java/forestry/arboriculture/PacketHandlerArboriculture.java +++ b/src/main/java/forestry/arboriculture/PacketHandlerArboriculture.java @@ -10,17 +10,14 @@ ******************************************************************************/ package forestry.arboriculture; -import java.io.DataInputStream; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; - import forestry.arboriculture.gadgets.TileLeaves; import forestry.arboriculture.network.PacketLeafUpdate; import forestry.core.interfaces.IPacketHandler; -import forestry.core.network.ILocatedPacket; import forestry.core.network.PacketIds; import forestry.core.proxy.Proxies; +import java.io.DataInputStream; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; public class PacketHandlerArboriculture implements IPacketHandler { diff --git a/src/main/java/forestry/arboriculture/VillageHandlerArboriculture.java b/src/main/java/forestry/arboriculture/VillageHandlerArboriculture.java index d661c3a04..14a2e7f79 100755 --- a/src/main/java/forestry/arboriculture/VillageHandlerArboriculture.java +++ b/src/main/java/forestry/arboriculture/VillageHandlerArboriculture.java @@ -10,8 +10,12 @@ ******************************************************************************/ package forestry.arboriculture; +import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; +import forestry.api.arboriculture.EnumGermlingType; +import forestry.core.config.ForestryBlock; +import forestry.core.config.ForestryItem; +import forestry.plugins.PluginArboriculture; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.init.Items; @@ -19,13 +23,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.village.MerchantRecipe; import net.minecraft.village.MerchantRecipeList; -import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; - -import forestry.api.arboriculture.EnumGermlingType; -import forestry.core.config.ForestryBlock; -import forestry.core.config.ForestryItem; -import forestry.plugins.PluginArboriculture; - public class VillageHandlerArboriculture implements IVillageTradeHandler { @SuppressWarnings("unchecked") diff --git a/src/main/java/forestry/arboriculture/WoodType.java b/src/main/java/forestry/arboriculture/WoodType.java index 0086a0317..1e6420c98 100755 --- a/src/main/java/forestry/arboriculture/WoodType.java +++ b/src/main/java/forestry/arboriculture/WoodType.java @@ -10,17 +10,14 @@ ******************************************************************************/ package forestry.arboriculture; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.render.TextureManager; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.render.TextureManager; - public enum WoodType { LARCH, TEAK, ACACIA, LIME, CHESTNUT, WENGE, BAOBAB, SEQUOIA(4.0f), KAPOK, EBONY, MAHOGANY, BALSA(1.0f), WILLOW, WALNUT, GREENHEART(7.5f), CHERRY, MAHOE, POPLAR, PALM, PAPAYA, PINE( 3.0f), PLUM, MAPLE, CITRUS, GIGANTEUM(2.0f, false); diff --git a/src/main/java/forestry/arboriculture/commands/CommandTreeSpawn.java b/src/main/java/forestry/arboriculture/commands/CommandTreeSpawn.java index 39341c665..eb273dc58 100644 --- a/src/main/java/forestry/arboriculture/commands/CommandTreeSpawn.java +++ b/src/main/java/forestry/arboriculture/commands/CommandTreeSpawn.java @@ -10,19 +10,16 @@ ******************************************************************************/ package forestry.arboriculture.commands; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.command.ICommandSender; -import net.minecraft.command.PlayerNotFoundException; -import net.minecraft.entity.player.EntityPlayer; - import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.core.commands.CommandHelpers; import forestry.core.commands.SubCommand; - +import java.util.ArrayList; +import java.util.List; +import net.minecraft.command.ICommandSender; +import net.minecraft.command.PlayerNotFoundException; +import net.minecraft.entity.player.EntityPlayer; import org.apache.commons.lang3.StringUtils; public final class CommandTreeSpawn extends SubCommand { diff --git a/src/main/java/forestry/arboriculture/commands/TreeGenHelper.java b/src/main/java/forestry/arboriculture/commands/TreeGenHelper.java index 870b7d1b6..977d3c318 100644 --- a/src/main/java/forestry/arboriculture/commands/TreeGenHelper.java +++ b/src/main/java/forestry/arboriculture/commands/TreeGenHelper.java @@ -10,9 +10,6 @@ ******************************************************************************/ package forestry.arboriculture.commands; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.gen.feature.WorldGenerator; - import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; @@ -22,6 +19,8 @@ import forestry.core.commands.SpeciesNotFoundException; import forestry.core.commands.TemplateNotFoundException; import forestry.core.worldgen.WorldGenBase; import forestry.plugins.PluginArboriculture; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.gen.feature.WorldGenerator; public final class TreeGenHelper { diff --git a/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java b/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java index 61c4b5fc1..cf84d8016 100644 --- a/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java +++ b/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.arboriculture.commands; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.world.World; - import forestry.api.arboriculture.ITreekeepingMode; import forestry.core.commands.ICommandModeHelper; import forestry.plugins.PluginArboriculture; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.world.World; public class TreeModeHelper implements ICommandModeHelper { diff --git a/src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java b/src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java index 8eae52876..94f5a7f9e 100644 --- a/src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java +++ b/src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java @@ -10,11 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.commands; -import java.util.ArrayList; -import java.util.Collection; - -import net.minecraft.world.World; - +import com.mojang.authlib.GameProfile; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -22,8 +18,9 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.core.commands.IStatsSaveHelper; import forestry.plugins.PluginArboriculture; - -import com.mojang.authlib.GameProfile; +import java.util.ArrayList; +import java.util.Collection; +import net.minecraft.world.World; public class TreeStatsSaveHelper implements IStatsSaveHelper { diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockArbFence.java b/src/main/java/forestry/arboriculture/gadgets/BlockArbFence.java index ade3bccf6..48233a27c 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockArbFence.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockArbFence.java @@ -16,6 +16,7 @@ import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodType; import forestry.plugins.PluginArboriculture; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; @@ -28,8 +29,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.List; - public class BlockArbFence extends BlockFence implements IWoodTyped { public static enum FenceCat { diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java b/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java index 89ae9b7a8..6c2c5b554 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java @@ -10,9 +10,14 @@ ******************************************************************************/ package forestry.arboriculture.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; +import forestry.arboriculture.WoodType; +import forestry.core.proxy.Proxies; +import forestry.core.utils.StackUtils; import java.util.ArrayList; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.client.renderer.texture.IIconRegister; @@ -26,14 +31,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.api.core.Tabs; -import forestry.arboriculture.WoodType; -import forestry.core.proxy.Proxies; -import forestry.core.utils.StackUtils; - public class BlockArbStairs extends BlockStairs { public BlockArbStairs(Block par2Block, int par3) { diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockFruitPod.java b/src/main/java/forestry/arboriculture/gadgets/BlockFruitPod.java index ee1fedd29..14d768c90 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockFruitPod.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockFruitPod.java @@ -10,9 +10,15 @@ ******************************************************************************/ package forestry.arboriculture.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.proxy.Proxies; +import forestry.core.render.TextureManager; +import forestry.core.utils.BlockUtil; +import forestry.core.utils.StackUtils; +import forestry.plugins.PluginArboriculture; import java.util.ArrayList; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockCocoa; import net.minecraft.client.renderer.texture.IIconRegister; @@ -23,15 +29,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; -import forestry.core.utils.BlockUtil; -import forestry.core.utils.StackUtils; -import forestry.plugins.PluginArboriculture; - public class BlockFruitPod extends BlockCocoa { public BlockFruitPod() { diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockLog.java b/src/main/java/forestry/arboriculture/gadgets/BlockLog.java index 86279c6a2..97ab2f49a 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockLog.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockLog.java @@ -10,8 +10,12 @@ ******************************************************************************/ package forestry.arboriculture.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; +import forestry.arboriculture.IWoodTyped; +import forestry.arboriculture.WoodType; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,16 +26,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; -import forestry.api.core.Tabs; -import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.WoodType; - public class BlockLog extends Block implements IWoodTyped { public enum LogCat { diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockPlanks.java b/src/main/java/forestry/arboriculture/gadgets/BlockPlanks.java index 2404d5f62..d46cbaea0 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockPlanks.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockPlanks.java @@ -10,8 +10,12 @@ ******************************************************************************/ package forestry.arboriculture.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; +import forestry.arboriculture.IWoodTyped; +import forestry.arboriculture.WoodType; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -21,16 +25,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; -import forestry.api.core.Tabs; -import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.WoodType; - public class BlockPlanks extends Block implements IWoodTyped { public static enum PlankCat { diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java b/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java index 0c1365832..72185c13b 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java @@ -10,8 +10,18 @@ ******************************************************************************/ package forestry.arboriculture.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.core.proxy.Proxies; +import forestry.core.render.TextureManager; +import forestry.core.utils.StackUtils; +import forestry.plugins.PluginArboriculture; import java.util.ArrayList; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -24,19 +34,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.IAlleleFruit; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; -import forestry.core.utils.StackUtils; -import forestry.plugins.PluginArboriculture; - public class BlockSapling extends BlockTreeContainer { public static TileSapling getSaplingTile(IBlockAccess world, int x, int y, int z) { diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockSlab.java b/src/main/java/forestry/arboriculture/gadgets/BlockSlab.java index 7f6e61789..f72dfa92f 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockSlab.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockSlab.java @@ -10,9 +10,13 @@ ******************************************************************************/ package forestry.arboriculture.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; +import forestry.arboriculture.IWoodTyped; +import forestry.arboriculture.WoodType; import java.util.List; import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -22,16 +26,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; -import forestry.api.core.Tabs; -import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.WoodType; - public class BlockSlab extends net.minecraft.block.BlockSlab implements IWoodTyped { public static enum SlabCat { diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockTreeContainer.java b/src/main/java/forestry/arboriculture/gadgets/BlockTreeContainer.java index 897f98536..ac5f3cc30 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockTreeContainer.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockTreeContainer.java @@ -11,7 +11,6 @@ package forestry.arboriculture.gadgets; import java.util.Random; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java b/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java index 652a3b447..bf08afde0 100644 --- a/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java +++ b/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java @@ -24,6 +24,10 @@ import forestry.core.render.TextureManager; import forestry.core.utils.StackUtils; import forestry.plugins.PluginArboriculture; import forestry.plugins.PluginLepidopterology; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Random; import net.minecraft.block.BlockNewLeaf; import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.IIconRegister; @@ -40,11 +44,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Random; - public class ForestryBlockLeaves extends BlockNewLeaf implements ITileEntityProvider { public ForestryBlockLeaves() { diff --git a/src/main/java/forestry/arboriculture/gadgets/TileFruitPod.java b/src/main/java/forestry/arboriculture/gadgets/TileFruitPod.java index 90834d341..fd3599612 100755 --- a/src/main/java/forestry/arboriculture/gadgets/TileFruitPod.java +++ b/src/main/java/forestry/arboriculture/gadgets/TileFruitPod.java @@ -10,19 +10,8 @@ ******************************************************************************/ package forestry.arboriculture.gadgets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.Packet; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.arboriculture.IAlleleFruit; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -35,6 +24,14 @@ import forestry.core.network.PacketPayload; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.Packet; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; public class TileFruitPod extends TileEntity implements INetworkedEntity, IFruitBearer { diff --git a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java index 0c474ea9b..6aff7149f 100755 --- a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java @@ -17,7 +17,6 @@ import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.ILeafTickHandler; import forestry.api.arboriculture.ITree; -import forestry.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IErrorState; @@ -31,12 +30,17 @@ import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyNursery; import forestry.api.lepidopterology.IButterflyRoot; import forestry.arboriculture.network.PacketLeafUpdate; +import forestry.core.EnumErrorCode; import forestry.core.genetics.Allele; import forestry.core.network.ForestryPacket; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; import forestry.core.utils.Utils; import forestry.plugins.PluginArboriculture; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.EnumSet; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -47,11 +51,6 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.EnumPlantType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.EnumSet; - public class TileLeaves extends TileTreeContainer implements IPollinatable, IFruitBearer, IButterflyNursery { private int colourLeaves; diff --git a/src/main/java/forestry/arboriculture/gadgets/TileSapling.java b/src/main/java/forestry/arboriculture/gadgets/TileSapling.java index 93e5f5968..39bc6c663 100755 --- a/src/main/java/forestry/arboriculture/gadgets/TileSapling.java +++ b/src/main/java/forestry/arboriculture/gadgets/TileSapling.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.arboriculture.gadgets; +import forestry.plugins.PluginArboriculture; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.gen.feature.WorldGenerator; -import forestry.plugins.PluginArboriculture; - public class TileSapling extends TileTreeContainer { private int timesTicked = 0; diff --git a/src/main/java/forestry/arboriculture/gadgets/TileStairs.java b/src/main/java/forestry/arboriculture/gadgets/TileStairs.java index 7af38b34b..d659b1766 100755 --- a/src/main/java/forestry/arboriculture/gadgets/TileStairs.java +++ b/src/main/java/forestry/arboriculture/gadgets/TileStairs.java @@ -10,16 +10,15 @@ ******************************************************************************/ package forestry.arboriculture.gadgets; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.Packet; -import net.minecraft.tileentity.TileEntity; - import forestry.arboriculture.WoodType; import forestry.core.network.ForestryPacket; import forestry.core.network.INetworkedEntity; import forestry.core.network.PacketIds; import forestry.core.network.PacketTileNBT; import forestry.core.proxy.Proxies; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.Packet; +import net.minecraft.tileentity.TileEntity; public class TileStairs extends TileEntity implements INetworkedEntity { diff --git a/src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java b/src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java index 8013dc1ae..f011cdd38 100755 --- a/src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java +++ b/src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; - import forestry.api.arboriculture.IAlleleLeafEffect; import forestry.api.arboriculture.ITreeGenome; import forestry.api.genetics.IEffectData; import forestry.core.genetics.Allele; import forestry.core.utils.Vect; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; public class AlleleLeafEffectNone extends Allele implements IAlleleLeafEffect { diff --git a/src/main/java/forestry/arboriculture/genetics/AlleleTreeSpecies.java b/src/main/java/forestry/arboriculture/genetics/AlleleTreeSpecies.java index 08e001ca3..16144fe76 100755 --- a/src/main/java/forestry/arboriculture/genetics/AlleleTreeSpecies.java +++ b/src/main/java/forestry/arboriculture/genetics/AlleleTreeSpecies.java @@ -10,21 +10,8 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import java.util.ArrayList; -import java.util.HashMap; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraftforge.common.EnumPlantType; - import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.IAlleleTreeSpecies; @@ -43,6 +30,15 @@ import forestry.core.config.ForestryItem; import forestry.core.genetics.AlleleSpecies; import forestry.core.render.TextureManager; import forestry.core.utils.Utils; +import java.util.ArrayList; +import java.util.HashMap; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; +import net.minecraftforge.common.EnumPlantType; public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpecies, IIconProvider { diff --git a/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java b/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java index 35ff15bd4..eb42b0197 100755 --- a/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java +++ b/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import net.minecraft.entity.player.EntityPlayer; - import com.mojang.authlib.GameProfile; - import forestry.api.arboriculture.IArboristTracker; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.core.genetics.BreedingTracker; import forestry.plugins.PluginArboriculture; +import net.minecraft.entity.player.EntityPlayer; public class ArboristTracker extends BreedingTracker implements IArboristTracker { diff --git a/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java b/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java index 9f367b6d2..7047f7910 100755 --- a/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java +++ b/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java @@ -10,18 +10,17 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import forestry.core.utils.StringUtil; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; - import forestry.api.arboriculture.EnumGrowthConditions; import forestry.api.arboriculture.IGrowthProvider; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; import forestry.arboriculture.gadgets.TileSapling; +import forestry.core.utils.StringUtil; import forestry.core.utils.Utils; import forestry.core.utils.Vect; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; public class GrowthProvider implements IGrowthProvider { diff --git a/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java b/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java index 2c3125665..879e4e892 100755 --- a/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java +++ b/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import java.util.EnumSet; - -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.World; - import forestry.api.arboriculture.EnumGrowthConditions; import forestry.api.arboriculture.ITreeGenome; import forestry.core.utils.StringUtil; +import java.util.EnumSet; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; public class GrowthProviderTropical extends GrowthProvider { diff --git a/src/main/java/forestry/arboriculture/genetics/Tree.java b/src/main/java/forestry/arboriculture/genetics/Tree.java index 4f3e71e83..b8ab72fff 100755 --- a/src/main/java/forestry/arboriculture/genetics/Tree.java +++ b/src/main/java/forestry/arboriculture/genetics/Tree.java @@ -31,6 +31,10 @@ import forestry.core.genetics.Chromosome; import forestry.core.genetics.Individual; import forestry.core.utils.StringUtil; import forestry.plugins.PluginArboriculture; +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumSet; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -42,11 +46,6 @@ import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; -import java.util.Collection; -import java.util.EnumSet; -import java.util.List; - public class Tree extends Individual implements ITree, ITreeGenData, IPlantable { private ITreeGenome genome; diff --git a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java index c1d3586d4..fd8468608 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java @@ -10,13 +10,6 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import java.util.EnumSet; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.EnumPlantType; - import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IAlleleGrowth; @@ -35,6 +28,10 @@ import forestry.core.genetics.AllelePlantType; import forestry.core.genetics.Chromosome; import forestry.core.genetics.Genome; import forestry.plugins.PluginArboriculture; +import java.util.EnumSet; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.EnumPlantType; public class TreeGenome extends Genome implements ITreeGenome { diff --git a/src/main/java/forestry/arboriculture/genetics/TreeHelper.java b/src/main/java/forestry/arboriculture/genetics/TreeHelper.java index 03150c448..c615a6ea0 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeHelper.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeHelper.java @@ -10,25 +10,8 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.Locale; -import java.util.Map.Entry; - -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import cpw.mods.fml.common.FMLCommonHandler; - import com.mojang.authlib.GameProfile; - +import cpw.mods.fml.common.FMLCommonHandler; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; @@ -55,6 +38,19 @@ import forestry.core.config.ForestryItem; import forestry.core.genetics.SpeciesRoot; import forestry.core.utils.BlockUtil; import forestry.plugins.PluginArboriculture; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Locale; +import java.util.Map.Entry; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class TreeHelper extends SpeciesRoot implements ITreeRoot { diff --git a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java index 043572ee5..2ebaadb06 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java @@ -10,9 +10,6 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; - import forestry.api.arboriculture.ITreeGenome; import forestry.api.arboriculture.ITreeMutation; import forestry.api.arboriculture.ITreeRoot; @@ -21,6 +18,8 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.core.genetics.Mutation; import forestry.plugins.PluginArboriculture; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; public class TreeMutation extends Mutation implements ITreeMutation { diff --git a/src/main/java/forestry/arboriculture/genetics/TreekeepingMode.java b/src/main/java/forestry/arboriculture/genetics/TreekeepingMode.java index e7083d3d9..04e623520 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreekeepingMode.java +++ b/src/main/java/forestry/arboriculture/genetics/TreekeepingMode.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import java.util.ArrayList; -import java.util.Locale; - import forestry.api.arboriculture.ITreeGenome; import forestry.api.arboriculture.ITreekeepingMode; +import java.util.ArrayList; +import java.util.Locale; public class TreekeepingMode implements ITreekeepingMode { diff --git a/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java b/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java index 6d92cae38..25dc69b6d 100755 --- a/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java +++ b/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java @@ -11,11 +11,10 @@ package forestry.arboriculture.gui; import forestry.api.genetics.AlleleManager; -import forestry.core.gui.ContainerAlyzer; -import forestry.core.config.ForestryItem; import forestry.arboriculture.items.ItemGermlingGE; import forestry.arboriculture.items.ItemTreealyzer.TreealyzerInventory; - +import forestry.core.config.ForestryItem; +import forestry.core.gui.ContainerAlyzer; import net.minecraft.entity.player.InventoryPlayer; import org.apache.commons.lang3.ArrayUtils; diff --git a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java index 34e130e7b..e15442e58 100755 --- a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java +++ b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java @@ -15,7 +15,6 @@ import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IAlleleGrowth; import forestry.api.arboriculture.ITree; -import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleFloat; import forestry.api.genetics.IAlleleInteger; @@ -30,14 +29,13 @@ import forestry.core.genetics.AllelePlantType; import forestry.core.gui.GuiAlyzer; import forestry.core.utils.StringUtil; import forestry.plugins.PluginArboriculture; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.EnumPlantType; - import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Locale; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.EnumPlantType; public class GuiTreealyzer extends GuiAlyzer { diff --git a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java index f31a42b97..f153237b4 100755 --- a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java +++ b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java @@ -31,6 +31,7 @@ import forestry.core.render.SpriteSheet; import forestry.core.utils.StringUtil; import forestry.core.utils.Utils; import forestry.plugins.PluginArboriculture; +import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -39,8 +40,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import java.util.List; - public class ItemGermlingGE extends ItemGE implements IVariableFermentable { private final EnumGermlingType type; diff --git a/src/main/java/forestry/arboriculture/items/ItemGrafter.java b/src/main/java/forestry/arboriculture/items/ItemGrafter.java index a97b60cfd..84d55f901 100755 --- a/src/main/java/forestry/arboriculture/items/ItemGrafter.java +++ b/src/main/java/forestry/arboriculture/items/ItemGrafter.java @@ -10,18 +10,16 @@ ******************************************************************************/ package forestry.arboriculture.items; +import forestry.api.arboriculture.IToolGrafter; +import forestry.api.core.Tabs; +import forestry.core.items.ItemForestry; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import net.minecraftforge.common.ForgeHooks; -import forestry.api.arboriculture.IToolGrafter; -import forestry.api.core.Tabs; -import forestry.core.items.ItemForestry; - public class ItemGrafter extends ItemForestry implements IToolGrafter { private final float efficiencyOnProperMaterial; diff --git a/src/main/java/forestry/arboriculture/items/ItemLeavesBlock.java b/src/main/java/forestry/arboriculture/items/ItemLeavesBlock.java index c07e726fb..53b7685a8 100644 --- a/src/main/java/forestry/arboriculture/items/ItemLeavesBlock.java +++ b/src/main/java/forestry/arboriculture/items/ItemLeavesBlock.java @@ -9,7 +9,6 @@ import forestry.plugins.PluginArboriculture; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; public class ItemLeavesBlock extends ItemForestryBlock { diff --git a/src/main/java/forestry/arboriculture/items/ItemStairs.java b/src/main/java/forestry/arboriculture/items/ItemStairs.java index 531e25b91..4be8db5c3 100755 --- a/src/main/java/forestry/arboriculture/items/ItemStairs.java +++ b/src/main/java/forestry/arboriculture/items/ItemStairs.java @@ -10,17 +10,16 @@ ******************************************************************************/ package forestry.arboriculture.items; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - import forestry.arboriculture.WoodType; import forestry.arboriculture.gadgets.TileStairs; import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.items.ItemForestryBlock; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class ItemStairs extends ItemForestryBlock { diff --git a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java index 2d43d08f2..823507c18 100755 --- a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java +++ b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java @@ -10,12 +10,6 @@ ******************************************************************************/ package forestry.arboriculture.items; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - -import forestry.core.inventory.AlyzerInventory; import forestry.api.arboriculture.ITree; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; @@ -24,11 +18,16 @@ import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.interfaces.IErrorSource; import forestry.core.interfaces.IHintSource; +import forestry.core.inventory.AlyzerInventory; import forestry.core.items.ItemInventoried; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.utils.Utils; import forestry.plugins.PluginArboriculture; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class ItemTreealyzer extends ItemInventoried { diff --git a/src/main/java/forestry/arboriculture/items/ItemWoodBlock.java b/src/main/java/forestry/arboriculture/items/ItemWoodBlock.java index 6a1435151..73c61e383 100755 --- a/src/main/java/forestry/arboriculture/items/ItemWoodBlock.java +++ b/src/main/java/forestry/arboriculture/items/ItemWoodBlock.java @@ -11,13 +11,12 @@ package forestry.arboriculture.items; import forestry.arboriculture.IWoodFireproof; -import forestry.core.utils.StringUtil; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodType; import forestry.core.items.ItemForestryBlock; +import forestry.core.utils.StringUtil; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; public class ItemWoodBlock extends ItemForestryBlock { diff --git a/src/main/java/forestry/arboriculture/network/PacketLeafUpdate.java b/src/main/java/forestry/arboriculture/network/PacketLeafUpdate.java index abcff5967..11398d46b 100755 --- a/src/main/java/forestry/arboriculture/network/PacketLeafUpdate.java +++ b/src/main/java/forestry/arboriculture/network/PacketLeafUpdate.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.arboriculture.network; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - import forestry.arboriculture.gadgets.TileLeaves; import forestry.core.network.PacketIds; import forestry.core.network.PacketTileNBT; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; public class PacketLeafUpdate extends PacketTileNBT { diff --git a/src/main/java/forestry/arboriculture/proxy/ClientProxyArboriculture.java b/src/main/java/forestry/arboriculture/proxy/ClientProxyArboriculture.java index 1f3e27e96..dd163b039 100755 --- a/src/main/java/forestry/arboriculture/proxy/ClientProxyArboriculture.java +++ b/src/main/java/forestry/arboriculture/proxy/ClientProxyArboriculture.java @@ -10,13 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.proxy; -import net.minecraft.item.Item; -import net.minecraft.world.ColorizerFoliage; - import cpw.mods.fml.client.registry.RenderingRegistry; - -import net.minecraftforge.client.MinecraftForgeClient; - import forestry.arboriculture.render.FenceRenderingHandler; import forestry.arboriculture.render.FruitPodRenderingHandler; import forestry.arboriculture.render.LeavesRenderingHandler; @@ -24,6 +18,8 @@ import forestry.arboriculture.render.SaplingRenderHandler; import forestry.arboriculture.render.StairItemRenderer; import forestry.core.config.ForestryBlock; import forestry.plugins.PluginArboriculture; +import net.minecraft.world.ColorizerFoliage; +import net.minecraftforge.client.MinecraftForgeClient; public class ClientProxyArboriculture extends ProxyArboriculture { @Override diff --git a/src/main/java/forestry/arboriculture/render/FenceRenderingHandler.java b/src/main/java/forestry/arboriculture/render/FenceRenderingHandler.java index 619fabf54..b06e6610d 100755 --- a/src/main/java/forestry/arboriculture/render/FenceRenderingHandler.java +++ b/src/main/java/forestry/arboriculture/render/FenceRenderingHandler.java @@ -10,18 +10,15 @@ ******************************************************************************/ package forestry.arboriculture.render; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import forestry.plugins.PluginArboriculture; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - import org.lwjgl.opengl.GL11; -import forestry.plugins.PluginArboriculture; - public class FenceRenderingHandler implements ISimpleBlockRenderingHandler { @Override diff --git a/src/main/java/forestry/arboriculture/render/FruitPodRenderingHandler.java b/src/main/java/forestry/arboriculture/render/FruitPodRenderingHandler.java index 0c7a34959..dcf2d7b3a 100755 --- a/src/main/java/forestry/arboriculture/render/FruitPodRenderingHandler.java +++ b/src/main/java/forestry/arboriculture/render/FruitPodRenderingHandler.java @@ -10,6 +10,10 @@ ******************************************************************************/ package forestry.arboriculture.render; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import forestry.arboriculture.gadgets.BlockFruitPod; +import forestry.arboriculture.gadgets.TileFruitPod; +import forestry.plugins.PluginArboriculture; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.client.renderer.RenderBlocks; @@ -17,12 +21,6 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - -import forestry.arboriculture.gadgets.BlockFruitPod; -import forestry.arboriculture.gadgets.TileFruitPod; -import forestry.plugins.PluginArboriculture; - public class FruitPodRenderingHandler implements ISimpleBlockRenderingHandler { @Override diff --git a/src/main/java/forestry/arboriculture/render/SaplingRenderHandler.java b/src/main/java/forestry/arboriculture/render/SaplingRenderHandler.java index b65e70a9b..a77201f72 100755 --- a/src/main/java/forestry/arboriculture/render/SaplingRenderHandler.java +++ b/src/main/java/forestry/arboriculture/render/SaplingRenderHandler.java @@ -10,6 +10,12 @@ ******************************************************************************/ package forestry.arboriculture.render; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.arboriculture.gadgets.BlockSapling; +import forestry.arboriculture.gadgets.TileSapling; +import forestry.plugins.PluginArboriculture; import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; @@ -17,14 +23,6 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - -import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.arboriculture.gadgets.BlockSapling; -import forestry.arboriculture.gadgets.TileSapling; -import forestry.plugins.PluginArboriculture; - public class SaplingRenderHandler implements ISimpleBlockRenderingHandler { public static int renderLayer = 0; diff --git a/src/main/java/forestry/arboriculture/render/StairItemRenderer.java b/src/main/java/forestry/arboriculture/render/StairItemRenderer.java index d2add95b1..8f9b0dbc4 100755 --- a/src/main/java/forestry/arboriculture/render/StairItemRenderer.java +++ b/src/main/java/forestry/arboriculture/render/StairItemRenderer.java @@ -10,19 +10,16 @@ ******************************************************************************/ package forestry.arboriculture.render; +import forestry.arboriculture.WoodType; +import forestry.core.utils.StackUtils; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; - import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; -import forestry.arboriculture.WoodType; -import forestry.core.utils.StackUtils; - public class StairItemRenderer implements IItemRenderer { private void renderStairBlock(RenderBlocks renderBlocks, ItemStack item, float f, float g, float h) { diff --git a/src/main/java/forestry/arboriculture/worldgen/BlockTypeLeaf.java b/src/main/java/forestry/arboriculture/worldgen/BlockTypeLeaf.java index c2af659d4..0038053da 100755 --- a/src/main/java/forestry/arboriculture/worldgen/BlockTypeLeaf.java +++ b/src/main/java/forestry/arboriculture/worldgen/BlockTypeLeaf.java @@ -10,13 +10,11 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; -import net.minecraft.world.World; - import com.mojang.authlib.GameProfile; - import forestry.api.world.ITreeGenData; import forestry.core.config.ForestryBlock; import forestry.core.worldgen.BlockType; +import net.minecraft.world.World; public class BlockTypeLeaf extends BlockType { diff --git a/src/main/java/forestry/arboriculture/worldgen/BlockTypeVoid.java b/src/main/java/forestry/arboriculture/worldgen/BlockTypeVoid.java index 884e6da7a..1f07fd2ac 100755 --- a/src/main/java/forestry/arboriculture/worldgen/BlockTypeVoid.java +++ b/src/main/java/forestry/arboriculture/worldgen/BlockTypeVoid.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; - import forestry.api.world.ITreeGenData; import forestry.core.worldgen.BlockType; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; public class BlockTypeVoid extends BlockType { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java index 56a233291..6f7e5c966 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenAcacia extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenAcaciaVanilla.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenAcaciaVanilla.java index 9fe119e25..fa0baa824 100644 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenAcaciaVanilla.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenAcaciaVanilla.java @@ -10,9 +10,9 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; -import net.minecraft.init.Blocks; import forestry.api.world.ITreeGenData; import forestry.core.worldgen.BlockType; +import net.minecraft.init.Blocks; public class WorldGenAcaciaVanilla extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java index f93b72d7d..ac89f234b 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java @@ -10,17 +10,15 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; -import net.minecraft.init.Blocks; -import net.minecraft.tileentity.TileEntity; - import com.mojang.authlib.GameProfile; - import forestry.api.world.ITreeGenData; import forestry.arboriculture.gadgets.TileSapling; import forestry.core.utils.Utils; import forestry.core.utils.Vect; import forestry.core.worldgen.BlockType; import forestry.core.worldgen.WorldGenBase; +import net.minecraft.init.Blocks; +import net.minecraft.tileentity.TileEntity; public abstract class WorldGenArboriculture extends WorldGenBase { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java index 0bdcde71b..605fae511 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenBalsa extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java index e4e22fb73..2b53012c8 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenBaobab extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenBirch.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenBirch.java index 419c9ebf8..5dfc1c96b 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenBirch.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenBirch.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; -import net.minecraft.init.Blocks; - import forestry.api.world.ITreeGenData; import forestry.core.worldgen.BlockType; +import net.minecraft.init.Blocks; public class WorldGenBirch extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java index 775ae8030..a8f37be32 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenCherry extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java index 28bfc8589..ab2e2208e 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenChestnut extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenDarkOak.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenDarkOak.java index 97c5bef38..7dbda55a8 100644 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenDarkOak.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenDarkOak.java @@ -10,9 +10,9 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; -import net.minecraft.init.Blocks; import forestry.api.world.ITreeGenData; import forestry.core.worldgen.BlockType; +import net.minecraft.init.Blocks; public class WorldGenDarkOak extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java index 896debc79..f417707a0 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenDate extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java index 7e876e6bf..8bc0b01cb 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenEbony extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenGiganteum.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenGiganteum.java index ad32a8c94..0777a34f2 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenGiganteum.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenGiganteum.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenGiganteum extends WorldGenSequoia { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenGreenheart.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenGreenheart.java index 3ebdf1b27..b89ff2e48 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenGreenheart.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenGreenheart.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenGreenheart extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java index a886f1e5b..60a438e7a 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; -import net.minecraft.init.Blocks; - import forestry.api.world.ITreeGenData; import forestry.core.worldgen.BlockType; +import net.minecraft.init.Blocks; /** * This is a dummy and needs to be replaced with something proper. diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java index bf5024372..093fda86b 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenKapok extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java index 5acc0af6c..9538e7bd8 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenLarch extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java index 0dbf4ddc2..9046d47bf 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenLemon extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenLime.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenLime.java index aa17569fc..ae8c0a042 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenLime.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenLime.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenLime extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java index 37256c938..06a9582cb 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenMahoe extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java index e43b3246d..010403379 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenMahogany extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java index 239abd278..a6a543d01 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenMaple extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenOak.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenOak.java index 488720a41..274b68da0 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenOak.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenOak.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; -import net.minecraft.init.Blocks; - import forestry.api.world.ITreeGenData; import forestry.core.worldgen.BlockType; +import net.minecraft.init.Blocks; public class WorldGenOak extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java index 1c86f58f9..5ec3d0830 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenPapaya extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java index 5c93ebedf..694aba393 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenPine extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java index 9036dbf7a..dc1080cb1 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenPlum extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java index 9de0d72f0..c907db527 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenPoplar extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java index b6ab46e0e..60e79b659 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenSequoia extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java index 0889e7cf2..82b301495 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java @@ -10,10 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; -import net.minecraft.init.Blocks; - import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.BlockType; public class WorldGenSpruce extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java index 1a7e0bd0b..b0adfd9df 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenTeak extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java index d0cf8d808..ff308cb79 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java @@ -11,7 +11,6 @@ package forestry.arboriculture.worldgen; import com.mojang.authlib.GameProfile; - import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.IAlleleBoolean; import forestry.api.world.ITreeGenData; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java index 98e62a503..f5c0e0d72 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenWalnut extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java index f962592ed..451ae6a1a 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenWenge extends WorldGenTree { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenWillow.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenWillow.java index a81ec973a..187314929 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenWillow.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenWillow.java @@ -11,8 +11,6 @@ package forestry.arboriculture.worldgen; import forestry.api.world.ITreeGenData; -import forestry.core.config.ForestryBlock; -import forestry.core.worldgen.BlockType; public class WorldGenWillow extends WorldGenTree { diff --git a/src/main/java/forestry/core/CreativeTabForestry.java b/src/main/java/forestry/core/CreativeTabForestry.java index 77172eeb5..a2026a194 100755 --- a/src/main/java/forestry/core/CreativeTabForestry.java +++ b/src/main/java/forestry/core/CreativeTabForestry.java @@ -10,17 +10,14 @@ ******************************************************************************/ package forestry.core; +import cpw.mods.fml.common.registry.GameRegistry; +import forestry.api.core.Tabs; +import forestry.core.config.ForestryItem; import forestry.plugins.PluginManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.common.registry.GameRegistry; - -import forestry.api.core.Tabs; -import forestry.core.config.ForestryItem; - public class CreativeTabForestry extends CreativeTabs { static { diff --git a/src/main/java/forestry/core/EnumErrorCode.java b/src/main/java/forestry/core/EnumErrorCode.java index 6fcaa0fa8..4fb450e9a 100644 --- a/src/main/java/forestry/core/EnumErrorCode.java +++ b/src/main/java/forestry/core/EnumErrorCode.java @@ -5,13 +5,12 @@ ******************************************************************************/ package forestry.core; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.ErrorStateRegistry; import forestry.api.core.IErrorState; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; public enum EnumErrorCode implements IErrorState { diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java index 13c061bac..dd5caadce 100755 --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -10,25 +10,22 @@ ******************************************************************************/ package forestry.core; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; -import net.minecraftforge.event.world.WorldEvent; -import net.minecraftforge.oredict.OreDictionary; - import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.ErrorStateRegistry; - import forestry.core.fluids.Fluids; import forestry.core.interfaces.IOreDictionaryHandler; import forestry.core.interfaces.IPickupHandler; import forestry.core.interfaces.ISaveEventHandler; import forestry.core.render.TextureManager; import forestry.plugins.PluginManager; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import net.minecraftforge.event.world.WorldEvent; +import net.minecraftforge.oredict.OreDictionary; public class EventHandlerCore { diff --git a/src/main/java/forestry/core/ForestryClient.java b/src/main/java/forestry/core/ForestryClient.java index 616413cbe..ab3a36520 100755 --- a/src/main/java/forestry/core/ForestryClient.java +++ b/src/main/java/forestry/core/ForestryClient.java @@ -11,7 +11,6 @@ package forestry.core; import cpw.mods.fml.client.registry.RenderingRegistry; - import forestry.apiculture.render.BlockCandleRenderer; import forestry.core.proxy.Proxies; import forestry.core.render.BlockRenderingHandler; diff --git a/src/main/java/forestry/core/ForestryCore.java b/src/main/java/forestry/core/ForestryCore.java index 2b797d3af..12da31df3 100755 --- a/src/main/java/forestry/core/ForestryCore.java +++ b/src/main/java/forestry/core/ForestryCore.java @@ -11,21 +11,10 @@ package forestry.core; import com.google.common.collect.ImmutableList; - -import java.io.File; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; - -import net.minecraftforge.common.MinecraftForge; - import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; - import forestry.api.apiculture.FlowerManager; import forestry.api.core.ForestryAPI; import forestry.api.fuels.EngineBronzeFuel; @@ -45,6 +34,12 @@ import forestry.core.gadgets.TileMill; import forestry.core.proxy.Proxies; import forestry.core.utils.LiquidHelper; import forestry.plugins.PluginManager; +import java.io.File; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; +import net.minecraftforge.common.MinecraftForge; public class ForestryCore { diff --git a/src/main/java/forestry/core/GameMode.java b/src/main/java/forestry/core/GameMode.java index eb421fa6b..6ca77066a 100755 --- a/src/main/java/forestry/core/GameMode.java +++ b/src/main/java/forestry/core/GameMode.java @@ -10,11 +10,6 @@ ******************************************************************************/ package forestry.core; -import java.util.HashMap; - -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - import forestry.api.core.ForestryAPI; import forestry.api.core.IGameMode; import forestry.core.config.Config; @@ -23,6 +18,9 @@ import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.config.Property; import forestry.core.proxy.Proxies; +import java.util.HashMap; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; public class GameMode implements IGameMode { diff --git a/src/main/java/forestry/core/GuiHandler.java b/src/main/java/forestry/core/GuiHandler.java index 675d7fb68..d130c6a76 100755 --- a/src/main/java/forestry/core/GuiHandler.java +++ b/src/main/java/forestry/core/GuiHandler.java @@ -10,11 +10,7 @@ ******************************************************************************/ package forestry.core; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - import cpw.mods.fml.common.network.IGuiHandler; - import forestry.core.circuits.ContainerSolderingIron; import forestry.core.circuits.GuiSolderingIron; import forestry.core.circuits.ItemSolderingIron.SolderingInventory; @@ -26,6 +22,8 @@ import forestry.core.gui.GuiAnalyzer; import forestry.core.gui.GuiEscritoire; import forestry.core.network.GuiId; import forestry.plugins.PluginManager; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; public class GuiHandler extends GuiHandlerBase { diff --git a/src/main/java/forestry/core/GuiHandlerBase.java b/src/main/java/forestry/core/GuiHandlerBase.java index 83c96e77a..8b0af8053 100755 --- a/src/main/java/forestry/core/GuiHandlerBase.java +++ b/src/main/java/forestry/core/GuiHandlerBase.java @@ -10,12 +10,7 @@ ******************************************************************************/ package forestry.core; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import cpw.mods.fml.common.network.IGuiHandler; - import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; import forestry.core.gadgets.TileForestry; @@ -23,6 +18,9 @@ import forestry.core.gadgets.TileNaturalistChest; import forestry.core.gui.ContainerNaturalistInventory; import forestry.core.gui.GuiNaturalistInventory; import forestry.core.proxy.Proxies; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public abstract class GuiHandlerBase implements IGuiHandler { diff --git a/src/main/java/forestry/core/PickupHandlerCore.java b/src/main/java/forestry/core/PickupHandlerCore.java index e27f04063..83170fb46 100755 --- a/src/main/java/forestry/core/PickupHandlerCore.java +++ b/src/main/java/forestry/core/PickupHandlerCore.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.core; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; import forestry.core.interfaces.IPickupHandler; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class PickupHandlerCore implements IPickupHandler { diff --git a/src/main/java/forestry/core/SaveEventHandlerCore.java b/src/main/java/forestry/core/SaveEventHandlerCore.java index b51152825..5375d81e1 100755 --- a/src/main/java/forestry/core/SaveEventHandlerCore.java +++ b/src/main/java/forestry/core/SaveEventHandlerCore.java @@ -10,9 +10,8 @@ ******************************************************************************/ package forestry.core; -import net.minecraft.world.World; - import forestry.core.interfaces.ISaveEventHandler; +import net.minecraft.world.World; public class SaveEventHandlerCore implements ISaveEventHandler { diff --git a/src/main/java/forestry/core/TickHandlerCoreClient.java b/src/main/java/forestry/core/TickHandlerCoreClient.java index 99ffeb4f6..b31091770 100755 --- a/src/main/java/forestry/core/TickHandlerCoreClient.java +++ b/src/main/java/forestry/core/TickHandlerCoreClient.java @@ -10,20 +10,17 @@ ******************************************************************************/ package forestry.core; -import java.util.concurrent.ConcurrentLinkedQueue; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatComponentText; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; - import forestry.core.config.Config; import forestry.core.config.Version; import forestry.core.proxy.Proxies; import forestry.core.utils.Utils; +import java.util.concurrent.ConcurrentLinkedQueue; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ChatComponentText; public class TickHandlerCoreClient { diff --git a/src/main/java/forestry/core/TickHandlerCoreServer.java b/src/main/java/forestry/core/TickHandlerCoreServer.java index 3345d7214..ac90cedf4 100755 --- a/src/main/java/forestry/core/TickHandlerCoreServer.java +++ b/src/main/java/forestry/core/TickHandlerCoreServer.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.core; -import net.minecraft.entity.player.EntityPlayer; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent; - import forestry.core.interfaces.IResupplyHandler; import forestry.plugins.PluginManager; +import net.minecraft.entity.player.EntityPlayer; public class TickHandlerCoreServer { public TickHandlerCoreServer() { diff --git a/src/main/java/forestry/core/WorldGenerator.java b/src/main/java/forestry/core/WorldGenerator.java index ea57f2105..5b199687d 100755 --- a/src/main/java/forestry/core/WorldGenerator.java +++ b/src/main/java/forestry/core/WorldGenerator.java @@ -10,19 +10,15 @@ ******************************************************************************/ package forestry.core; -import java.util.Random; - -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkProvider; - import cpw.mods.fml.common.IWorldGenerator; - import forestry.core.config.Config; import forestry.core.config.ForestryBlock; import forestry.core.proxy.Proxies; import forestry.core.worldgen.WorldGenMinableMeta; -import forestry.plugins.ForestryPlugin; import forestry.plugins.PluginManager; +import java.util.Random; +import net.minecraft.world.World; +import net.minecraft.world.chunk.IChunkProvider; public class WorldGenerator implements IWorldGenerator { diff --git a/src/main/java/forestry/core/circuits/Circuit.java b/src/main/java/forestry/core/circuits/Circuit.java index ac8b4989e..be7061f2f 100755 --- a/src/main/java/forestry/core/circuits/Circuit.java +++ b/src/main/java/forestry/core/circuits/Circuit.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.core.circuits; -import java.util.List; - import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuit; import forestry.core.utils.StringUtil; +import java.util.List; public abstract class Circuit implements ICircuit { diff --git a/src/main/java/forestry/core/circuits/CircuitBoard.java b/src/main/java/forestry/core/circuits/CircuitBoard.java index 744bffaff..009ddb54a 100755 --- a/src/main/java/forestry/core/circuits/CircuitBoard.java +++ b/src/main/java/forestry/core/circuits/CircuitBoard.java @@ -14,13 +14,12 @@ import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitBoard; import forestry.api.circuits.ICircuitLayout; +import java.util.ArrayList; +import java.util.List; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import java.util.ArrayList; -import java.util.List; - public class CircuitBoard implements ICircuitBoard { EnumCircuitBoardType type; diff --git a/src/main/java/forestry/core/circuits/CircuitLibrary.java b/src/main/java/forestry/core/circuits/CircuitLibrary.java index 22d9d6d09..591d5de80 100755 --- a/src/main/java/forestry/core/circuits/CircuitLibrary.java +++ b/src/main/java/forestry/core/circuits/CircuitLibrary.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.core.circuits; +import forestry.api.circuits.ICircuitLibrary; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.WorldSavedData; -import forestry.api.circuits.ICircuitLibrary; - public class CircuitLibrary extends WorldSavedData implements ICircuitLibrary { public CircuitLibrary(String par1Str) { diff --git a/src/main/java/forestry/core/circuits/CircuitRegistry.java b/src/main/java/forestry/core/circuits/CircuitRegistry.java index 3d316449f..00f496615 100755 --- a/src/main/java/forestry/core/circuits/CircuitRegistry.java +++ b/src/main/java/forestry/core/circuits/CircuitRegistry.java @@ -10,20 +10,18 @@ ******************************************************************************/ package forestry.core.circuits; -import java.util.HashMap; -import java.util.LinkedHashMap; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitBoard; import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ICircuitLibrary; import forestry.api.circuits.ICircuitRegistry; import forestry.core.config.ForestryItem; +import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class CircuitRegistry implements ICircuitRegistry { diff --git a/src/main/java/forestry/core/circuits/ContainerSolderingIron.java b/src/main/java/forestry/core/circuits/ContainerSolderingIron.java index 5c4555a28..43845eaa0 100755 --- a/src/main/java/forestry/core/circuits/ContainerSolderingIron.java +++ b/src/main/java/forestry/core/circuits/ContainerSolderingIron.java @@ -10,12 +10,6 @@ ******************************************************************************/ package forestry.core.circuits; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.api.circuits.ICircuitLayout; import forestry.core.circuits.ItemSolderingIron.SolderingInventory; import forestry.core.gui.ContainerItemInventory; @@ -25,6 +19,11 @@ import forestry.core.network.PacketIds; import forestry.core.network.PacketPayload; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class ContainerSolderingIron extends ContainerItemInventory implements IGuiSelectable { diff --git a/src/main/java/forestry/core/circuits/GuiSolderingIron.java b/src/main/java/forestry/core/circuits/GuiSolderingIron.java index 5f47254c2..68ed4d15a 100755 --- a/src/main/java/forestry/core/circuits/GuiSolderingIron.java +++ b/src/main/java/forestry/core/circuits/GuiSolderingIron.java @@ -10,10 +10,6 @@ ******************************************************************************/ package forestry.core.circuits; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; - import forestry.api.circuits.ICircuitLayout; import forestry.core.circuits.ItemSolderingIron.CircuitRecipe; import forestry.core.circuits.ItemSolderingIron.SolderingInventory; @@ -22,6 +18,9 @@ import forestry.core.gadgets.TileForestry; import forestry.core.gui.GuiForestry; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; public class GuiSolderingIron extends GuiForestry { diff --git a/src/main/java/forestry/core/circuits/ItemCircuitBoard.java b/src/main/java/forestry/core/circuits/ItemCircuitBoard.java index 626d549a0..22999f920 100755 --- a/src/main/java/forestry/core/circuits/ItemCircuitBoard.java +++ b/src/main/java/forestry/core/circuits/ItemCircuitBoard.java @@ -10,21 +10,19 @@ ******************************************************************************/ package forestry.core.circuits; -import java.util.List; -import java.util.Locale; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitBoard; import forestry.api.circuits.ICircuitLayout; import forestry.core.config.ForestryItem; import forestry.core.items.ItemForestryMultiPass; +import java.util.List; +import java.util.Locale; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class ItemCircuitBoard extends ItemForestryMultiPass { diff --git a/src/main/java/forestry/core/circuits/ItemSolderingIron.java b/src/main/java/forestry/core/circuits/ItemSolderingIron.java index b93e219e7..5fb8c6f61 100755 --- a/src/main/java/forestry/core/circuits/ItemSolderingIron.java +++ b/src/main/java/forestry/core/circuits/ItemSolderingIron.java @@ -10,14 +10,6 @@ ******************************************************************************/ package forestry.core.circuits; -import java.util.ArrayList; -import java.util.Collection; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitLayout; @@ -31,6 +23,12 @@ import forestry.core.items.ItemForestry; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.utils.RevolvingList; +import java.util.ArrayList; +import java.util.Collection; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class ItemSolderingIron extends ItemForestry implements ISolderingIron { diff --git a/src/main/java/forestry/core/commands/CommandHelpers.java b/src/main/java/forestry/core/commands/CommandHelpers.java index 71d440ca3..f2f5100fa 100644 --- a/src/main/java/forestry/core/commands/CommandHelpers.java +++ b/src/main/java/forestry/core/commands/CommandHelpers.java @@ -11,6 +11,9 @@ package forestry.core.commands; import forestry.core.utils.StringUtil; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; @@ -22,10 +25,6 @@ import net.minecraft.util.ChatStyle; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * * @author CovertJaguar diff --git a/src/main/java/forestry/core/commands/CommandModeInfo.java b/src/main/java/forestry/core/commands/CommandModeInfo.java index 419e5cd09..62b3ce7dc 100644 --- a/src/main/java/forestry/core/commands/CommandModeInfo.java +++ b/src/main/java/forestry/core/commands/CommandModeInfo.java @@ -11,12 +11,10 @@ package forestry.core.commands; import java.util.List; - import net.minecraft.command.ICommandSender; import net.minecraft.util.ChatStyle; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; - import org.apache.commons.lang3.StringUtils; public class CommandModeInfo extends SubCommand { diff --git a/src/main/java/forestry/core/commands/CommandModeSet.java b/src/main/java/forestry/core/commands/CommandModeSet.java index 1fd50ba9d..c7071d405 100644 --- a/src/main/java/forestry/core/commands/CommandModeSet.java +++ b/src/main/java/forestry/core/commands/CommandModeSet.java @@ -11,7 +11,6 @@ package forestry.core.commands; import java.util.List; - import net.minecraft.command.ICommandSender; import net.minecraft.world.World; diff --git a/src/main/java/forestry/core/commands/CommandSaveStats.java b/src/main/java/forestry/core/commands/CommandSaveStats.java index 658d15086..7c0d457d0 100644 --- a/src/main/java/forestry/core/commands/CommandSaveStats.java +++ b/src/main/java/forestry/core/commands/CommandSaveStats.java @@ -10,6 +10,13 @@ ******************************************************************************/ package forestry.core.commands; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.core.config.Defaults; +import forestry.core.config.Version; +import forestry.core.proxy.Proxies; +import forestry.core.utils.StringUtil; import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; @@ -21,20 +28,11 @@ import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Locale; - import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IBreedingTracker; -import forestry.core.config.Defaults; -import forestry.core.config.Version; -import forestry.core.proxy.Proxies; -import forestry.core.utils.StringUtil; - public final class CommandSaveStats extends SubCommand { private static final String discoveredSymbol; diff --git a/src/main/java/forestry/core/commands/CommandVersion.java b/src/main/java/forestry/core/commands/CommandVersion.java index 045aaf84d..feee964df 100644 --- a/src/main/java/forestry/core/commands/CommandVersion.java +++ b/src/main/java/forestry/core/commands/CommandVersion.java @@ -10,9 +10,9 @@ ******************************************************************************/ package forestry.core.commands; -import net.minecraft.command.ICommandSender; import forestry.core.config.Version; import forestry.core.proxy.Proxies; +import net.minecraft.command.ICommandSender; import net.minecraft.util.ChatStyle; import net.minecraft.util.EnumChatFormatting; diff --git a/src/main/java/forestry/core/commands/IStatsSaveHelper.java b/src/main/java/forestry/core/commands/IStatsSaveHelper.java index 51ab4d130..8a671b739 100644 --- a/src/main/java/forestry/core/commands/IStatsSaveHelper.java +++ b/src/main/java/forestry/core/commands/IStatsSaveHelper.java @@ -10,14 +10,11 @@ ******************************************************************************/ package forestry.core.commands; -import java.util.Collection; - -import net.minecraft.world.World; - +import com.mojang.authlib.GameProfile; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; - -import com.mojang.authlib.GameProfile; +import java.util.Collection; +import net.minecraft.world.World; public interface IStatsSaveHelper { diff --git a/src/main/java/forestry/core/commands/TemplateNotFoundException.java b/src/main/java/forestry/core/commands/TemplateNotFoundException.java index 06da28fc5..a8a6cea35 100644 --- a/src/main/java/forestry/core/commands/TemplateNotFoundException.java +++ b/src/main/java/forestry/core/commands/TemplateNotFoundException.java @@ -10,9 +10,8 @@ ******************************************************************************/ package forestry.core.commands; -import net.minecraft.command.CommandException; - import forestry.api.genetics.IAlleleSpecies; +import net.minecraft.command.CommandException; public class TemplateNotFoundException extends CommandException { diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index 52b01dc0f..34ccbeb14 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -11,7 +11,6 @@ package forestry.core.config; import forestry.core.proxy.Proxies; - import java.io.File; import java.io.FileOutputStream; import java.io.InputStream; diff --git a/src/main/java/forestry/core/config/Configuration.java b/src/main/java/forestry/core/config/Configuration.java index 2f6eabbc9..4c6f105b2 100755 --- a/src/main/java/forestry/core/config/Configuration.java +++ b/src/main/java/forestry/core/config/Configuration.java @@ -11,8 +11,6 @@ package forestry.core.config; import forestry.core.proxy.Proxies; -import net.minecraftforge.common.config.Configuration.UnicodeInputStreamReader; - import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -24,6 +22,7 @@ import java.util.Iterator; import java.util.Locale; import java.util.Map; import java.util.TreeMap; +import net.minecraftforge.common.config.Configuration.UnicodeInputStreamReader; public class Configuration { diff --git a/src/main/java/forestry/core/config/Defaults.java b/src/main/java/forestry/core/config/Defaults.java index 97122bd75..2cfad766a 100755 --- a/src/main/java/forestry/core/config/Defaults.java +++ b/src/main/java/forestry/core/config/Defaults.java @@ -11,7 +11,6 @@ package forestry.core.config; import java.util.Locale; - import net.minecraftforge.oredict.OreDictionary; public class Defaults { diff --git a/src/main/java/forestry/core/config/ForestryItem.java b/src/main/java/forestry/core/config/ForestryItem.java index eb8838dae..46465d42c 100755 --- a/src/main/java/forestry/core/config/ForestryItem.java +++ b/src/main/java/forestry/core/config/ForestryItem.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.core.config; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - import forestry.core.proxy.Proxies; import forestry.plugins.PluginManager; import forestry.plugins.PluginManager.Stage; import java.util.EnumSet; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; /** diff --git a/src/main/java/forestry/core/config/Version.java b/src/main/java/forestry/core/config/Version.java index 0d675b126..464813d01 100755 --- a/src/main/java/forestry/core/config/Version.java +++ b/src/main/java/forestry/core/config/Version.java @@ -10,18 +10,16 @@ ******************************************************************************/ package forestry.core.config; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.versioning.DefaultArtifactVersion; +import forestry.Forestry; +import forestry.core.proxy.Proxies; import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; import java.util.ArrayList; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.versioning.DefaultArtifactVersion; - -import forestry.Forestry; -import forestry.core.proxy.Proxies; - /** * With permission from pahimar. * diff --git a/src/main/java/forestry/core/fluids/FluidHelper.java b/src/main/java/forestry/core/fluids/FluidHelper.java index 593ed4d4d..6320b5979 100644 --- a/src/main/java/forestry/core/fluids/FluidHelper.java +++ b/src/main/java/forestry/core/fluids/FluidHelper.java @@ -10,6 +10,9 @@ ******************************************************************************/ package forestry.core.fluids; +import forestry.core.fluids.tanks.StandardTank; +import forestry.core.inventory.InvTools; +import forestry.core.utils.StackUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.entity.player.EntityPlayer; @@ -18,7 +21,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -29,10 +31,6 @@ import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; -import forestry.core.fluids.tanks.StandardTank; -import forestry.core.inventory.InvTools; -import forestry.core.utils.StackUtils; - /** * * @author CovertJaguar diff --git a/src/main/java/forestry/core/fluids/Fluids.java b/src/main/java/forestry/core/fluids/Fluids.java index 46e294f8f..12040b03a 100644 --- a/src/main/java/forestry/core/fluids/Fluids.java +++ b/src/main/java/forestry/core/fluids/Fluids.java @@ -10,20 +10,17 @@ ******************************************************************************/ package forestry.core.fluids; +import forestry.core.render.TextureManager; import java.util.ArrayList; import java.util.List; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import forestry.core.render.TextureManager; - /** * * @author CovertJaguar diff --git a/src/main/java/forestry/core/fluids/TankManager.java b/src/main/java/forestry/core/fluids/TankManager.java index 65b8c7357..85b348684 100644 --- a/src/main/java/forestry/core/fluids/TankManager.java +++ b/src/main/java/forestry/core/fluids/TankManager.java @@ -11,28 +11,6 @@ package forestry.core.fluids; import com.google.common.collect.ForwardingList; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; - import forestry.core.fluids.tanks.FakeTank; import forestry.core.fluids.tanks.StandardTank; import forestry.core.inventory.ITileFilter; @@ -40,6 +18,24 @@ import forestry.core.network.PacketGuiInteger; import forestry.core.proxy.Proxies; import forestry.core.utils.NBTUtil; import forestry.core.utils.NBTUtil.NBTList; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; /** * diff --git a/src/main/java/forestry/core/fluids/tanks/FilteredTank.java b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java index 18c67dbce..5766aa800 100644 --- a/src/main/java/forestry/core/fluids/tanks/FilteredTank.java +++ b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java @@ -11,14 +11,14 @@ package forestry.core.fluids.tanks; import forestry.core.gui.tooltips.ToolTipLine; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; import net.minecraft.item.EnumRarity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; /** * diff --git a/src/main/java/forestry/core/gadgets/BlockBase.java b/src/main/java/forestry/core/gadgets/BlockBase.java index 48d766f23..a7b4bc486 100755 --- a/src/main/java/forestry/core/gadgets/BlockBase.java +++ b/src/main/java/forestry/core/gadgets/BlockBase.java @@ -10,9 +10,16 @@ ******************************************************************************/ package forestry.core.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.fluids.FluidHelper; +import forestry.core.interfaces.IOwnable; +import forestry.core.items.ItemNBTTile; +import forestry.core.proxy.Proxies; +import forestry.core.utils.StringUtil; +import forestry.core.utils.Utils; import java.util.ArrayList; import java.util.List; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -26,21 +33,10 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.IFluidHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.fluids.FluidHelper; -import forestry.core.interfaces.IOwnable; -import forestry.core.items.ItemNBTTile; -import forestry.core.proxy.Proxies; -import forestry.core.utils.StringUtil; -import forestry.core.utils.Utils; - public class BlockBase extends BlockForestry { private final List definitions = new ArrayList(); diff --git a/src/main/java/forestry/core/gadgets/BlockForestry.java b/src/main/java/forestry/core/gadgets/BlockForestry.java index 5c9fab2e3..1ddf1c8dc 100755 --- a/src/main/java/forestry/core/gadgets/BlockForestry.java +++ b/src/main/java/forestry/core/gadgets/BlockForestry.java @@ -10,6 +10,10 @@ ******************************************************************************/ package forestry.core.gadgets; +import forestry.core.CreativeTabForestry; +import forestry.core.interfaces.IOwnable; +import forestry.core.proxy.Proxies; +import forestry.core.utils.Utils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -19,11 +23,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import forestry.core.CreativeTabForestry; -import forestry.core.interfaces.IOwnable; -import forestry.core.proxy.Proxies; -import forestry.core.utils.Utils; - public abstract class BlockForestry extends BlockContainer { public BlockForestry(Material material) { diff --git a/src/main/java/forestry/core/gadgets/BlockResource.java b/src/main/java/forestry/core/gadgets/BlockResource.java index 66fd7b3ff..cf9ef65e3 100755 --- a/src/main/java/forestry/core/gadgets/BlockResource.java +++ b/src/main/java/forestry/core/gadgets/BlockResource.java @@ -10,9 +10,13 @@ ******************************************************************************/ package forestry.core.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.CreativeTabForestry; +import forestry.core.config.ForestryItem; +import forestry.core.render.TextureManager; import java.util.ArrayList; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -23,13 +27,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.CreativeTabForestry; -import forestry.core.config.ForestryItem; -import forestry.core.render.TextureManager; - public class BlockResource extends Block { public BlockResource() { super(Material.rock); diff --git a/src/main/java/forestry/core/gadgets/BlockResourceStorageBlock.java b/src/main/java/forestry/core/gadgets/BlockResourceStorageBlock.java index bd0a97c4d..816a34681 100644 --- a/src/main/java/forestry/core/gadgets/BlockResourceStorageBlock.java +++ b/src/main/java/forestry/core/gadgets/BlockResourceStorageBlock.java @@ -1,7 +1,10 @@ package forestry.core.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.CreativeTabForestry; +import forestry.core.render.TextureManager; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,10 +12,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.core.CreativeTabForestry; -import forestry.core.render.TextureManager; public class BlockResourceStorageBlock extends Block { diff --git a/src/main/java/forestry/core/gadgets/BlockSoil.java b/src/main/java/forestry/core/gadgets/BlockSoil.java index 08d67af41..6f1740e42 100755 --- a/src/main/java/forestry/core/gadgets/BlockSoil.java +++ b/src/main/java/forestry/core/gadgets/BlockSoil.java @@ -10,11 +10,18 @@ ******************************************************************************/ package forestry.core.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.CreativeTabForestry; +import forestry.core.IItemTyped; +import forestry.core.config.Defaults; +import forestry.core.config.ForestryBlock; +import forestry.core.config.ForestryItem; +import forestry.core.proxy.Proxies; +import forestry.core.render.TextureManager; import java.util.ArrayList; import java.util.List; import java.util.Random; - -import forestry.core.IItemTyped; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,21 +32,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; -import forestry.core.CreativeTabForestry; -import forestry.core.config.Defaults; -import forestry.core.config.ForestryBlock; -import forestry.core.config.ForestryItem; -import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; - /** * Humus, bog earth, peat */ diff --git a/src/main/java/forestry/core/gadgets/BlockStainedGlass.java b/src/main/java/forestry/core/gadgets/BlockStainedGlass.java index ff4e31e05..2cd12a511 100755 --- a/src/main/java/forestry/core/gadgets/BlockStainedGlass.java +++ b/src/main/java/forestry/core/gadgets/BlockStainedGlass.java @@ -10,9 +10,12 @@ ******************************************************************************/ package forestry.core.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.CreativeTabForestry; +import forestry.core.render.TextureManager; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockBreakable; import net.minecraft.block.material.Material; @@ -23,12 +26,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.CreativeTabForestry; -import forestry.core.render.TextureManager; - public class BlockStainedGlass extends BlockBreakable { public BlockStainedGlass() { diff --git a/src/main/java/forestry/core/gadgets/BlockStructure.java b/src/main/java/forestry/core/gadgets/BlockStructure.java index a26f5b69f..268f71697 100755 --- a/src/main/java/forestry/core/gadgets/BlockStructure.java +++ b/src/main/java/forestry/core/gadgets/BlockStructure.java @@ -10,17 +10,16 @@ ******************************************************************************/ package forestry.core.gadgets; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.world.World; import forestry.api.core.ITileStructure; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; import forestry.core.utils.Utils; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.world.World; public abstract class BlockStructure extends BlockForestry { diff --git a/src/main/java/forestry/core/gadgets/Engine.java b/src/main/java/forestry/core/gadgets/Engine.java index b64929df5..8c48940d4 100755 --- a/src/main/java/forestry/core/gadgets/Engine.java +++ b/src/main/java/forestry/core/gadgets/Engine.java @@ -11,6 +11,11 @@ package forestry.core.gadgets; import cofh.api.energy.IEnergyConnection; +import forestry.core.TemperatureState; +import forestry.core.config.Defaults; +import forestry.core.network.PacketPayload; +import forestry.core.utils.BlockUtil; +import forestry.energy.EnergyManager; import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -19,11 +24,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import forestry.core.TemperatureState; -import forestry.core.config.Defaults; -import forestry.core.network.PacketPayload; -import forestry.core.utils.BlockUtil; -import forestry.energy.EnergyManager; public abstract class Engine extends TileBase implements IEnergyConnection { diff --git a/src/main/java/forestry/core/gadgets/MachineDefinition.java b/src/main/java/forestry/core/gadgets/MachineDefinition.java index 99a644b1f..de0c5a9a7 100755 --- a/src/main/java/forestry/core/gadgets/MachineDefinition.java +++ b/src/main/java/forestry/core/gadgets/MachineDefinition.java @@ -16,6 +16,9 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.core.interfaces.IBlockRenderer; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -30,10 +33,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - /** * This will replace the whole {@link Gadget}-nonsense at some point, using the proper Forge hook. Will hopefully sort out any issues with interfaces. */ diff --git a/src/main/java/forestry/core/gadgets/MachineNBTDefinition.java b/src/main/java/forestry/core/gadgets/MachineNBTDefinition.java index a0dbf916b..338a8a3e9 100755 --- a/src/main/java/forestry/core/gadgets/MachineNBTDefinition.java +++ b/src/main/java/forestry/core/gadgets/MachineNBTDefinition.java @@ -10,6 +10,10 @@ ******************************************************************************/ package forestry.core.gadgets; +import forestry.core.interfaces.IBlockRenderer; +import forestry.core.proxy.Proxies; +import forestry.core.utils.StackUtils; +import forestry.core.utils.Utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -17,11 +21,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import forestry.core.interfaces.IBlockRenderer; -import forestry.core.proxy.Proxies; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; - public class MachineNBTDefinition extends MachineDefinition { public MachineNBTDefinition(int meta, String teIdent, Class teClass, IRecipe... recipes) { diff --git a/src/main/java/forestry/core/gadgets/NaturalistGame.java b/src/main/java/forestry/core/gadgets/NaturalistGame.java index e55f3d5b0..399c041d5 100755 --- a/src/main/java/forestry/core/gadgets/NaturalistGame.java +++ b/src/main/java/forestry/core/gadgets/NaturalistGame.java @@ -10,21 +10,19 @@ ******************************************************************************/ package forestry.core.gadgets; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Random; - -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - import forestry.api.core.INBTTagable; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import forestry.core.utils.StringUtil; import forestry.core.utils.Utils; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Random; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; public class NaturalistGame implements INBTTagable { diff --git a/src/main/java/forestry/core/gadgets/StructureLogic.java b/src/main/java/forestry/core/gadgets/StructureLogic.java index 4180424e7..bf7ec925d 100755 --- a/src/main/java/forestry/core/gadgets/StructureLogic.java +++ b/src/main/java/forestry/core/gadgets/StructureLogic.java @@ -10,11 +10,6 @@ ******************************************************************************/ package forestry.core.gadgets; -import java.util.HashMap; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; - import forestry.api.core.IStructureLogic; import forestry.api.core.ITileStructure; import forestry.core.config.Defaults; @@ -22,6 +17,9 @@ import forestry.core.gadgets.BlockStructure.EnumStructureState; import forestry.core.utils.Schemata; import forestry.core.utils.Schemata.EnumStructureBlock; import forestry.core.utils.Vect; +import java.util.HashMap; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; public abstract class StructureLogic implements IStructureLogic { diff --git a/src/main/java/forestry/core/gadgets/TileAnalyzer.java b/src/main/java/forestry/core/gadgets/TileAnalyzer.java index 762880da6..9dde8f4f6 100755 --- a/src/main/java/forestry/core/gadgets/TileAnalyzer.java +++ b/src/main/java/forestry/core/gadgets/TileAnalyzer.java @@ -10,26 +10,10 @@ ******************************************************************************/ package forestry.core.gadgets; -import java.util.Stack; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; - -import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; +import forestry.core.EnumErrorCode; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.fluids.FluidHelper; @@ -43,6 +27,19 @@ import forestry.core.inventory.wrappers.IInvSlot; import forestry.core.inventory.wrappers.InventoryIterator; import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.network.GuiId; +import java.util.Stack; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiquidTankContainer { diff --git a/src/main/java/forestry/core/gadgets/TileBase.java b/src/main/java/forestry/core/gadgets/TileBase.java index c4d9982f5..33f9e9e8e 100755 --- a/src/main/java/forestry/core/gadgets/TileBase.java +++ b/src/main/java/forestry/core/gadgets/TileBase.java @@ -10,14 +10,10 @@ ******************************************************************************/ package forestry.core.gadgets; -import net.minecraft.entity.player.EntityPlayer; - import forestry.core.interfaces.IHintSource; import forestry.core.network.PacketPayload; import forestry.core.proxy.Proxies; -import forestry.core.utils.EnumAccess; -import forestry.core.utils.PlayerUtil; -import forestry.core.utils.Utils; +import net.minecraft.entity.player.EntityPlayer; public abstract class TileBase extends TileForestry implements IHintSource { diff --git a/src/main/java/forestry/core/gadgets/TileEscritoire.java b/src/main/java/forestry/core/gadgets/TileEscritoire.java index 047f0c9c2..4a94eec1d 100755 --- a/src/main/java/forestry/core/gadgets/TileEscritoire.java +++ b/src/main/java/forestry/core/gadgets/TileEscritoire.java @@ -10,18 +10,13 @@ ******************************************************************************/ package forestry.core.gadgets; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - import com.mojang.authlib.GameProfile; - import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; import forestry.core.interfaces.ICrafter; import forestry.core.interfaces.IRenderableMachine; +import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.ForestryPacket; import forestry.core.network.GuiId; import forestry.core.network.PacketIds; @@ -29,8 +24,11 @@ import forestry.core.network.PacketTileNBT; import forestry.core.network.PacketTileUpdate; import forestry.core.proxy.Proxies; import forestry.core.utils.EnumTankLevel; -import forestry.core.inventory.TileInventoryAdapter; import forestry.core.utils.Utils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class TileEscritoire extends TileBase implements ISidedInventory, IRenderableMachine, ICrafter { diff --git a/src/main/java/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/gadgets/TileForestry.java index 4ee898b19..2f3452031 100755 --- a/src/main/java/forestry/core/gadgets/TileForestry.java +++ b/src/main/java/forestry/core/gadgets/TileForestry.java @@ -21,15 +21,16 @@ import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.interfaces.IErrorSource; import forestry.core.interfaces.IOwnable; +import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.ForestryPacket; import forestry.core.network.INetworkedEntity; import forestry.core.network.PacketPayload; import forestry.core.network.PacketTileUpdate; import forestry.core.proxy.Proxies; import forestry.core.utils.EnumAccess; -import forestry.core.inventory.TileInventoryAdapter; import forestry.core.utils.PlayerUtil; import forestry.core.utils.Vect; +import java.util.Collection; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -41,8 +42,6 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.Collection; - @Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraftAPI|statements") public abstract class TileForestry extends TileEntity implements INetworkedEntity, IOwnable, IErrorSource, ITriggerProvider { diff --git a/src/main/java/forestry/core/gadgets/TileMachine.java b/src/main/java/forestry/core/gadgets/TileMachine.java index 532cfc120..55d6f212a 100755 --- a/src/main/java/forestry/core/gadgets/TileMachine.java +++ b/src/main/java/forestry/core/gadgets/TileMachine.java @@ -24,13 +24,12 @@ import forestry.plugins.PluginEnergy; import forestry.plugins.PluginFactory; import forestry.plugins.PluginIC2; import forestry.plugins.PluginMail; +import java.util.HashMap; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; -import java.util.HashMap; - public abstract class TileMachine extends TileForestry implements IClimatised, IHintSource { public TileMachine() { diff --git a/src/main/java/forestry/core/gadgets/TileNaturalistChest.java b/src/main/java/forestry/core/gadgets/TileNaturalistChest.java index e3ea31c2c..cec96a706 100755 --- a/src/main/java/forestry/core/gadgets/TileNaturalistChest.java +++ b/src/main/java/forestry/core/gadgets/TileNaturalistChest.java @@ -10,17 +10,16 @@ ******************************************************************************/ package forestry.core.gadgets; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - import forestry.api.core.ForestryAPI; import forestry.api.genetics.ISpeciesRoot; import forestry.core.GuiHandler; import forestry.core.config.Config; import forestry.core.gui.IPagedInventory; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; public abstract class TileNaturalistChest extends TileBase implements IInventory, IPagedInventory { diff --git a/src/main/java/forestry/core/gadgets/TilePowered.java b/src/main/java/forestry/core/gadgets/TilePowered.java index b62b23fb6..587725271 100644 --- a/src/main/java/forestry/core/gadgets/TilePowered.java +++ b/src/main/java/forestry/core/gadgets/TilePowered.java @@ -10,19 +10,15 @@ ******************************************************************************/ package forestry.core.gadgets; -import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; - +import buildcraft.api.tiles.IHasWork; import cpw.mods.fml.common.Optional; - import forestry.core.interfaces.IPowerHandler; import forestry.core.interfaces.IRenderableMachine; import forestry.core.proxy.Proxies; import forestry.core.utils.EnumTankLevel; import forestry.energy.EnergyManager; - -import buildcraft.api.tiles.IHasWork; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; @Optional.Interface(iface = "buildcraft.api.tiles.IHasWork", modid = "BuildCraftAPI|tiles") public abstract class TilePowered extends TileBase implements IRenderableMachine, IPowerHandler, IHasWork { diff --git a/src/main/java/forestry/core/genetics/Allele.java b/src/main/java/forestry/core/genetics/Allele.java index e36f76e85..b652ae3ac 100755 --- a/src/main/java/forestry/core/genetics/Allele.java +++ b/src/main/java/forestry/core/genetics/Allele.java @@ -10,16 +10,14 @@ ******************************************************************************/ package forestry.core.genetics; -import java.util.EnumSet; - -import net.minecraftforge.common.EnumPlantType; - import forestry.api.genetics.AlleleManager; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; import forestry.api.genetics.ILegacyHandler; import forestry.core.config.Defaults; import forestry.core.utils.StringUtil; +import java.util.EnumSet; +import net.minecraftforge.common.EnumPlantType; public class Allele implements IAllele { diff --git a/src/main/java/forestry/core/genetics/AllelePlantType.java b/src/main/java/forestry/core/genetics/AllelePlantType.java index 756f9737c..25c1be1cf 100755 --- a/src/main/java/forestry/core/genetics/AllelePlantType.java +++ b/src/main/java/forestry/core/genetics/AllelePlantType.java @@ -10,11 +10,9 @@ ******************************************************************************/ package forestry.core.genetics; -import java.util.EnumSet; - -import net.minecraftforge.common.EnumPlantType; - import forestry.api.genetics.IAllelePlantType; +import java.util.EnumSet; +import net.minecraftforge.common.EnumPlantType; public class AllelePlantType extends Allele implements IAllelePlantType { diff --git a/src/main/java/forestry/core/genetics/AlleleRegistry.java b/src/main/java/forestry/core/genetics/AlleleRegistry.java index 3b3f8588c..fa390ba02 100755 --- a/src/main/java/forestry/core/genetics/AlleleRegistry.java +++ b/src/main/java/forestry/core/genetics/AlleleRegistry.java @@ -10,18 +10,7 @@ ******************************************************************************/ package forestry.core.genetics; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.Map; - -import net.minecraft.item.ItemStack; - import com.mojang.authlib.GameProfile; - import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleHandler; import forestry.api.genetics.IAlleleRegistry; @@ -35,6 +24,14 @@ import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.core.config.ForestryItem; import forestry.core.genetics.ItemResearchNote.EnumNoteType; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Map; +import net.minecraft.item.ItemStack; public class AlleleRegistry implements IAlleleRegistry, ILegacyHandler { diff --git a/src/main/java/forestry/core/genetics/AlleleSpecies.java b/src/main/java/forestry/core/genetics/AlleleSpecies.java index a387ecc31..c993de517 100755 --- a/src/main/java/forestry/core/genetics/AlleleSpecies.java +++ b/src/main/java/forestry/core/genetics/AlleleSpecies.java @@ -24,11 +24,10 @@ import forestry.api.genetics.IMutation; import forestry.core.config.ForestryItem; import forestry.core.utils.StackUtils; import forestry.core.utils.StringUtil; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import java.util.Collection; import java.util.Map; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public abstract class AlleleSpecies extends Allele implements IAlleleSpecies { diff --git a/src/main/java/forestry/core/genetics/AlleleTolerance.java b/src/main/java/forestry/core/genetics/AlleleTolerance.java index e046cc4d6..0a13075d9 100755 --- a/src/main/java/forestry/core/genetics/AlleleTolerance.java +++ b/src/main/java/forestry/core/genetics/AlleleTolerance.java @@ -12,7 +12,6 @@ package forestry.core.genetics; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAlleleTolerance; -import forestry.core.utils.StringUtil; public class AlleleTolerance extends Allele implements IAlleleTolerance { diff --git a/src/main/java/forestry/core/genetics/BreedingTracker.java b/src/main/java/forestry/core/genetics/BreedingTracker.java index b3b1d8c1d..90b3f71a9 100755 --- a/src/main/java/forestry/core/genetics/BreedingTracker.java +++ b/src/main/java/forestry/core/genetics/BreedingTracker.java @@ -10,16 +10,7 @@ ******************************************************************************/ package forestry.core.genetics; -import java.util.ArrayList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.WorldSavedData; - -import net.minecraftforge.common.MinecraftForge; - import com.mojang.authlib.GameProfile; - import forestry.api.core.ForestryEvent; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; @@ -29,6 +20,11 @@ import forestry.api.genetics.IMutation; import forestry.core.network.PacketIds; import forestry.core.network.PacketNBT; import forestry.core.proxy.Proxies; +import java.util.ArrayList; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.WorldSavedData; +import net.minecraftforge.common.MinecraftForge; public abstract class BreedingTracker extends WorldSavedData implements IBreedingTracker { diff --git a/src/main/java/forestry/core/genetics/Chromosome.java b/src/main/java/forestry/core/genetics/Chromosome.java index 36e9253ec..4b4a4e0f4 100755 --- a/src/main/java/forestry/core/genetics/Chromosome.java +++ b/src/main/java/forestry/core/genetics/Chromosome.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.core.genetics; -import java.util.Random; - -import net.minecraft.nbt.NBTTagCompound; - import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosome; import forestry.api.genetics.ILegacyHandler; +import java.util.Random; +import net.minecraft.nbt.NBTTagCompound; public class Chromosome implements IChromosome { diff --git a/src/main/java/forestry/core/genetics/Classification.java b/src/main/java/forestry/core/genetics/Classification.java index 1641cbe72..9120725f9 100755 --- a/src/main/java/forestry/core/genetics/Classification.java +++ b/src/main/java/forestry/core/genetics/Classification.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.core.genetics; -import java.util.ArrayList; -import java.util.Locale; - import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; import forestry.core.utils.StringUtil; +import java.util.ArrayList; +import java.util.Locale; public class Classification implements IClassification { diff --git a/src/main/java/forestry/core/genetics/ClimateHelper.java b/src/main/java/forestry/core/genetics/ClimateHelper.java index b0cc7384d..27e0f425c 100755 --- a/src/main/java/forestry/core/genetics/ClimateHelper.java +++ b/src/main/java/forestry/core/genetics/ClimateHelper.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.core.genetics; -import java.util.ArrayList; -import java.util.Locale; - import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IClimateHelper; import forestry.core.utils.StringUtil; +import java.util.ArrayList; +import java.util.Locale; public class ClimateHelper implements IClimateHelper { diff --git a/src/main/java/forestry/core/genetics/EffectData.java b/src/main/java/forestry/core/genetics/EffectData.java index 075199735..70d7feda2 100755 --- a/src/main/java/forestry/core/genetics/EffectData.java +++ b/src/main/java/forestry/core/genetics/EffectData.java @@ -10,9 +10,8 @@ ******************************************************************************/ package forestry.core.genetics; -import net.minecraft.nbt.NBTTagCompound; - import forestry.api.genetics.IEffectData; +import net.minecraft.nbt.NBTTagCompound; public class EffectData implements IEffectData { diff --git a/src/main/java/forestry/core/genetics/Individual.java b/src/main/java/forestry/core/genetics/Individual.java index bb03a385f..70c86e9f7 100755 --- a/src/main/java/forestry/core/genetics/Individual.java +++ b/src/main/java/forestry/core/genetics/Individual.java @@ -11,9 +11,8 @@ package forestry.core.genetics; import forestry.api.genetics.IChromosomeType; -import net.minecraft.nbt.NBTTagCompound; - import forestry.api.genetics.IIndividual; +import net.minecraft.nbt.NBTTagCompound; public abstract class Individual implements IIndividual { diff --git a/src/main/java/forestry/core/genetics/IndividualLiving.java b/src/main/java/forestry/core/genetics/IndividualLiving.java index b48058f9d..9781aa5db 100755 --- a/src/main/java/forestry/core/genetics/IndividualLiving.java +++ b/src/main/java/forestry/core/genetics/IndividualLiving.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.core.genetics; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividualLiving; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public abstract class IndividualLiving extends Individual implements IIndividualLiving { diff --git a/src/main/java/forestry/core/genetics/ItemGE.java b/src/main/java/forestry/core/genetics/ItemGE.java index 0d3395dc0..669763d7e 100755 --- a/src/main/java/forestry/core/genetics/ItemGE.java +++ b/src/main/java/forestry/core/genetics/ItemGE.java @@ -10,20 +10,17 @@ ******************************************************************************/ package forestry.core.genetics; -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; +import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; public abstract class ItemGE extends Item { diff --git a/src/main/java/forestry/core/genetics/ItemResearchNote.java b/src/main/java/forestry/core/genetics/ItemResearchNote.java index 0025a41ef..38eeb9256 100755 --- a/src/main/java/forestry/core/genetics/ItemResearchNote.java +++ b/src/main/java/forestry/core/genetics/ItemResearchNote.java @@ -10,12 +10,21 @@ ******************************************************************************/ package forestry.core.genetics; +import com.mojang.authlib.GameProfile; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesRoot; +import forestry.core.items.ItemForestry; +import forestry.core.proxy.Proxies; +import forestry.core.utils.StringUtil; import java.util.ArrayList; -import java.util.IllegalFormatException; import java.util.List; import java.util.Locale; - -import forestry.core.utils.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -25,23 +34,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import com.mojang.authlib.GameProfile; - -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.ISpeciesRoot; -import forestry.core.items.ItemForestry; -import forestry.core.proxy.Proxies; - public class ItemResearchNote extends ItemForestry { public static enum EnumNoteType { diff --git a/src/main/java/forestry/core/genetics/Mutation.java b/src/main/java/forestry/core/genetics/Mutation.java index 41cfc1ffa..031e8aabf 100755 --- a/src/main/java/forestry/core/genetics/Mutation.java +++ b/src/main/java/forestry/core/genetics/Mutation.java @@ -11,13 +11,12 @@ package forestry.core.genetics; -import java.util.ArrayList; -import java.util.Collection; - import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; import forestry.api.genetics.IMutation; +import java.util.ArrayList; +import java.util.Collection; public abstract class Mutation implements IMutation { diff --git a/src/main/java/forestry/core/genetics/SpeciesRoot.java b/src/main/java/forestry/core/genetics/SpeciesRoot.java index 62c5ce923..1db63e276 100755 --- a/src/main/java/forestry/core/genetics/SpeciesRoot.java +++ b/src/main/java/forestry/core/genetics/SpeciesRoot.java @@ -15,8 +15,6 @@ import forestry.api.genetics.IChromosome; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -24,6 +22,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.Random; +import net.minecraft.item.ItemStack; public abstract class SpeciesRoot implements ISpeciesRoot { diff --git a/src/main/java/forestry/core/gui/ContainerAlyzer.java b/src/main/java/forestry/core/gui/ContainerAlyzer.java index eddc05d5f..360a13805 100644 --- a/src/main/java/forestry/core/gui/ContainerAlyzer.java +++ b/src/main/java/forestry/core/gui/ContainerAlyzer.java @@ -1,9 +1,8 @@ package forestry.core.gui; import forestry.core.gui.slots.SlotCustom; -import forestry.core.proxy.Proxies; import forestry.core.inventory.AlyzerInventory; - +import forestry.core.proxy.Proxies; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/core/gui/ContainerAnalyzer.java b/src/main/java/forestry/core/gui/ContainerAnalyzer.java index b6cfbd5f2..43c99f5ee 100755 --- a/src/main/java/forestry/core/gui/ContainerAnalyzer.java +++ b/src/main/java/forestry/core/gui/ContainerAnalyzer.java @@ -12,14 +12,13 @@ package forestry.core.gui; import forestry.core.config.ForestryItem; import forestry.core.fluids.Fluids; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; - import forestry.core.gadgets.TileAnalyzer; import forestry.core.genetics.ItemGE; import forestry.core.gui.slots.SlotCustom; import forestry.core.gui.slots.SlotLiquidContainer; import forestry.core.gui.slots.SlotOutput; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; public class ContainerAnalyzer extends ContainerLiquidTanks { diff --git a/src/main/java/forestry/core/gui/ContainerEscritoire.java b/src/main/java/forestry/core/gui/ContainerEscritoire.java index cb279ddc9..11ae103ac 100755 --- a/src/main/java/forestry/core/gui/ContainerEscritoire.java +++ b/src/main/java/forestry/core/gui/ContainerEscritoire.java @@ -10,13 +10,6 @@ ******************************************************************************/ package forestry.core.gui; -import java.util.ArrayList; -import java.util.Collection; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.inventory.Slot; - import forestry.api.genetics.AlleleManager; import forestry.core.gadgets.TileEscritoire; import forestry.core.gui.slots.SlotClosed; @@ -25,6 +18,11 @@ import forestry.core.network.PacketIds; import forestry.core.network.PacketPayload; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; +import java.util.ArrayList; +import java.util.Collection; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.inventory.Slot; public class ContainerEscritoire extends ContainerForestry implements IGuiSelectable { diff --git a/src/main/java/forestry/core/gui/ContainerItemInventory.java b/src/main/java/forestry/core/gui/ContainerItemInventory.java index 755b88708..0cee5c7c5 100755 --- a/src/main/java/forestry/core/gui/ContainerItemInventory.java +++ b/src/main/java/forestry/core/gui/ContainerItemInventory.java @@ -10,15 +10,14 @@ ******************************************************************************/ package forestry.core.gui; +import forestry.core.gui.slots.SlotItemInventory; +import forestry.core.gui.slots.SlotLocked; +import forestry.core.inventory.ItemInventory; +import forestry.core.proxy.Proxies; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import forestry.core.gui.slots.SlotItemInventory; -import forestry.core.gui.slots.SlotLocked; -import forestry.core.proxy.Proxies; -import forestry.core.inventory.ItemInventory; - public abstract class ContainerItemInventory extends ContainerForestry { protected final EntityPlayer player; diff --git a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java index 1def8b1f0..0c8cc1b09 100755 --- a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java +++ b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java @@ -10,14 +10,6 @@ ******************************************************************************/ package forestry.core.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.FluidStack; - import forestry.api.core.IToolPipette; import forestry.core.fluids.tanks.StandardTank; import forestry.core.interfaces.ILiquidTankContainer; @@ -25,6 +17,12 @@ import forestry.core.network.PacketIds; import forestry.core.network.PacketPayload; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; public class ContainerLiquidTanks extends ContainerForestry { diff --git a/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java b/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java index 156ba3b65..0eaa91cac 100755 --- a/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java +++ b/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java @@ -10,15 +10,14 @@ ******************************************************************************/ package forestry.core.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - import forestry.api.genetics.ISpeciesRoot; import forestry.core.gui.slots.SlotCustom; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; public class ContainerNaturalistInventory extends ContainerForestry implements IGuiSelectable { diff --git a/src/main/java/forestry/core/gui/ContainerSocketed.java b/src/main/java/forestry/core/gui/ContainerSocketed.java index 9489911a7..90ad17791 100755 --- a/src/main/java/forestry/core/gui/ContainerSocketed.java +++ b/src/main/java/forestry/core/gui/ContainerSocketed.java @@ -10,11 +10,6 @@ ******************************************************************************/ package forestry.core.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - import forestry.core.interfaces.ISocketable; import forestry.core.network.PacketIds; import forestry.core.network.PacketPayload; @@ -22,6 +17,10 @@ import forestry.core.network.PacketSocketUpdate; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; import forestry.core.utils.StackUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; public class ContainerSocketed extends ContainerForestry { diff --git a/src/main/java/forestry/core/gui/ErrorLedger.java b/src/main/java/forestry/core/gui/ErrorLedger.java index 7ea4c454b..9e5fda8e8 100755 --- a/src/main/java/forestry/core/gui/ErrorLedger.java +++ b/src/main/java/forestry/core/gui/ErrorLedger.java @@ -10,8 +10,8 @@ ******************************************************************************/ package forestry.core.gui; -import forestry.core.EnumErrorCode; import forestry.api.core.IErrorState; +import forestry.core.EnumErrorCode; import forestry.core.interfaces.IErrorSource; import forestry.core.utils.StringUtil; diff --git a/src/main/java/forestry/core/gui/GuiAlyzer.java b/src/main/java/forestry/core/gui/GuiAlyzer.java index 10d3fa55b..d7bfc4090 100755 --- a/src/main/java/forestry/core/gui/GuiAlyzer.java +++ b/src/main/java/forestry/core/gui/GuiAlyzer.java @@ -28,6 +28,10 @@ import forestry.core.gadgets.TileForestry; import forestry.core.genetics.EnumMutateChance; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Stack; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -35,11 +39,6 @@ import net.minecraft.item.ItemStack; import org.apache.commons.lang3.StringUtils; import org.lwjgl.opengl.GL11; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.Stack; - public abstract class GuiAlyzer extends GuiForestry { protected static final int COLUMN_0 = 12; diff --git a/src/main/java/forestry/core/gui/GuiAnalyzer.java b/src/main/java/forestry/core/gui/GuiAnalyzer.java index f03f2b9d4..6211b4639 100755 --- a/src/main/java/forestry/core/gui/GuiAnalyzer.java +++ b/src/main/java/forestry/core/gui/GuiAnalyzer.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.core.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.core.config.Defaults; import forestry.core.gadgets.TileAnalyzer; import forestry.core.gui.widgets.TankWidget; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.Utils; +import net.minecraft.entity.player.InventoryPlayer; public class GuiAnalyzer extends GuiForestryTitled { diff --git a/src/main/java/forestry/core/gui/GuiEscritoire.java b/src/main/java/forestry/core/gui/GuiEscritoire.java index 515e56643..ec3b69252 100755 --- a/src/main/java/forestry/core/gui/GuiEscritoire.java +++ b/src/main/java/forestry/core/gui/GuiEscritoire.java @@ -10,13 +10,6 @@ ******************************************************************************/ package forestry.core.gui; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - import forestry.core.config.Defaults; import forestry.core.gadgets.NaturalistGame; import forestry.core.gadgets.NaturalistGame.GameToken; @@ -26,6 +19,11 @@ import forestry.core.proxy.Proxies; import forestry.core.render.SpriteSheet; import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; public class GuiEscritoire extends GuiForestry { diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java index dd55ed8ac..7f4e0dffb 100755 --- a/src/main/java/forestry/core/gui/GuiForestry.java +++ b/src/main/java/forestry/core/gui/GuiForestry.java @@ -16,7 +16,6 @@ import codechicken.nei.api.TaggedInventoryArea; import cpw.mods.fml.common.Optional; import forestry.core.config.Config; import forestry.core.gadgets.TileForestry; -import forestry.core.gui.slots.SlotForestry; import forestry.core.gui.tooltips.IToolTipProvider; import forestry.core.gui.tooltips.ToolTip; import forestry.core.gui.tooltips.ToolTipLine; @@ -28,6 +27,9 @@ import forestry.core.interfaces.IOwnable; import forestry.core.interfaces.IPowerHandler; import forestry.core.proxy.Proxies; import forestry.core.utils.FontColour; +import java.awt.Color; +import java.util.Collection; +import java.util.List; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.OpenGlHelper; @@ -41,10 +43,6 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import java.awt.Color; -import java.util.Collection; -import java.util.List; - @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") public abstract class GuiForestry extends GuiContainer implements INEIGuiHandler { diff --git a/src/main/java/forestry/core/gui/GuiForestryTitled.java b/src/main/java/forestry/core/gui/GuiForestryTitled.java index d09b4ec30..f4550559b 100644 --- a/src/main/java/forestry/core/gui/GuiForestryTitled.java +++ b/src/main/java/forestry/core/gui/GuiForestryTitled.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.core.gui; -import net.minecraft.util.ResourceLocation; - import forestry.core.gadgets.TileForestry; import forestry.core.utils.StringUtil; +import net.minecraft.util.ResourceLocation; public abstract class GuiForestryTitled extends GuiForestry { diff --git a/src/main/java/forestry/core/gui/GuiNaturalistInventory.java b/src/main/java/forestry/core/gui/GuiNaturalistInventory.java index 9f94c4f2e..643c2d80c 100755 --- a/src/main/java/forestry/core/gui/GuiNaturalistInventory.java +++ b/src/main/java/forestry/core/gui/GuiNaturalistInventory.java @@ -10,16 +10,8 @@ ******************************************************************************/ package forestry.core.gui; -import java.util.HashMap; - -import forestry.api.arboriculture.EnumTreeChromosome; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - import forestry.api.apiculture.IApiaristTracker; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; @@ -35,6 +27,12 @@ import forestry.core.network.PacketPayload; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; +import java.util.HashMap; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; public class GuiNaturalistInventory extends GuiForestry { private final ISpeciesRoot speciesRoot; diff --git a/src/main/java/forestry/core/gui/GuiTextBox.java b/src/main/java/forestry/core/gui/GuiTextBox.java index 48a92b981..174330634 100755 --- a/src/main/java/forestry/core/gui/GuiTextBox.java +++ b/src/main/java/forestry/core/gui/GuiTextBox.java @@ -10,9 +10,7 @@ ******************************************************************************/ package forestry.core.gui; -import java.util.Iterator; import java.util.List; - import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiTextField; diff --git a/src/main/java/forestry/core/gui/HintLedger.java b/src/main/java/forestry/core/gui/HintLedger.java index 61a2f4141..710ebde32 100755 --- a/src/main/java/forestry/core/gui/HintLedger.java +++ b/src/main/java/forestry/core/gui/HintLedger.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.core.gui; -import java.util.Random; - import forestry.core.interfaces.IHintSource; import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; +import java.util.Random; public class HintLedger extends Ledger { diff --git a/src/main/java/forestry/core/gui/IGuiSelectable.java b/src/main/java/forestry/core/gui/IGuiSelectable.java index f1e6349c2..d231aba5d 100755 --- a/src/main/java/forestry/core/gui/IGuiSelectable.java +++ b/src/main/java/forestry/core/gui/IGuiSelectable.java @@ -10,9 +10,8 @@ ******************************************************************************/ package forestry.core.gui; -import net.minecraft.entity.player.EntityPlayer; - import forestry.core.network.PacketUpdate; +import net.minecraft.entity.player.EntityPlayer; public interface IGuiSelectable { void handleSelectionChange(EntityPlayer player, PacketUpdate packet); diff --git a/src/main/java/forestry/core/gui/Ledger.java b/src/main/java/forestry/core/gui/Ledger.java index c011ee618..8621d3f4f 100755 --- a/src/main/java/forestry/core/gui/Ledger.java +++ b/src/main/java/forestry/core/gui/Ledger.java @@ -10,16 +10,14 @@ ******************************************************************************/ package forestry.core.gui; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import forestry.core.config.Defaults; import forestry.core.config.SessionVars; import forestry.core.proxy.Proxies; import forestry.core.render.SpriteSheet; import forestry.core.utils.ForestryResource; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; /** * Side ledger for guis diff --git a/src/main/java/forestry/core/gui/LedgerManager.java b/src/main/java/forestry/core/gui/LedgerManager.java index 69aa3353c..53f9d9f78 100755 --- a/src/main/java/forestry/core/gui/LedgerManager.java +++ b/src/main/java/forestry/core/gui/LedgerManager.java @@ -10,15 +10,12 @@ ******************************************************************************/ package forestry.core.gui; -import java.util.ArrayList; - -import net.minecraft.client.Minecraft; - -import org.lwjgl.opengl.GL11; - import forestry.core.config.SessionVars; import forestry.core.gadgets.TileForestry; import forestry.core.proxy.Proxies; +import java.util.ArrayList; +import net.minecraft.client.Minecraft; +import org.lwjgl.opengl.GL11; public class LedgerManager { diff --git a/src/main/java/forestry/core/gui/OwnerLedger.java b/src/main/java/forestry/core/gui/OwnerLedger.java index 0fa6803b4..e501a585a 100755 --- a/src/main/java/forestry/core/gui/OwnerLedger.java +++ b/src/main/java/forestry/core/gui/OwnerLedger.java @@ -10,10 +10,6 @@ ******************************************************************************/ package forestry.core.gui; -import java.util.Locale; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import forestry.core.interfaces.IOwnable; import forestry.core.network.PacketCoordinates; import forestry.core.network.PacketIds; @@ -21,6 +17,9 @@ import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; import forestry.core.utils.EnumAccess; import forestry.core.utils.StringUtil; +import java.util.Locale; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; /** * Ledger displaying ownership information diff --git a/src/main/java/forestry/core/gui/WidgetManager.java b/src/main/java/forestry/core/gui/WidgetManager.java index f96f66a4b..38cc516be 100755 --- a/src/main/java/forestry/core/gui/WidgetManager.java +++ b/src/main/java/forestry/core/gui/WidgetManager.java @@ -10,15 +10,12 @@ ******************************************************************************/ package forestry.core.gui; -import java.util.ArrayList; - -import net.minecraft.client.Minecraft; - -import org.lwjgl.opengl.GL11; - import forestry.core.gadgets.TileForestry; import forestry.core.gui.widgets.Widget; import forestry.core.proxy.Proxies; +import java.util.ArrayList; +import net.minecraft.client.Minecraft; +import org.lwjgl.opengl.GL11; public class WidgetManager { diff --git a/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java b/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java index 4a3fa0782..a21c8887a 100755 --- a/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java +++ b/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java @@ -10,20 +10,17 @@ ******************************************************************************/ package forestry.core.gui.buttons; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.config.Defaults; +import forestry.core.gui.tooltips.IToolTipProvider; +import forestry.core.gui.tooltips.ToolTip; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import org.lwjgl.opengl.GL11; -import forestry.core.config.Defaults; -import forestry.core.gui.tooltips.IToolTipProvider; -import forestry.core.gui.tooltips.ToolTip; - @SideOnly(Side.CLIENT) public class GuiBetterButton extends GuiButton implements IToolTipProvider{ diff --git a/src/main/java/forestry/core/gui/buttons/GuiMultiButton.java b/src/main/java/forestry/core/gui/buttons/GuiMultiButton.java index dcadc2621..85873f60f 100755 --- a/src/main/java/forestry/core/gui/buttons/GuiMultiButton.java +++ b/src/main/java/forestry/core/gui/buttons/GuiMultiButton.java @@ -10,17 +10,14 @@ ******************************************************************************/ package forestry.core.gui.buttons; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - +import forestry.core.gui.tooltips.ToolTip; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import forestry.core.gui.tooltips.ToolTip; - /** * * @author CovertJaguar diff --git a/src/main/java/forestry/core/gui/slots/SlotCraftAuto.java b/src/main/java/forestry/core/gui/slots/SlotCraftAuto.java index 51687ae8c..44f1c9074 100755 --- a/src/main/java/forestry/core/gui/slots/SlotCraftAuto.java +++ b/src/main/java/forestry/core/gui/slots/SlotCraftAuto.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.core.gui.slots; +import forestry.core.interfaces.IContainerCrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import forestry.core.interfaces.IContainerCrafting; - /** * Informs the passed container of slot changes. */ diff --git a/src/main/java/forestry/core/gui/slots/SlotForestry.java b/src/main/java/forestry/core/gui/slots/SlotForestry.java index 1171bda30..2c6807e46 100755 --- a/src/main/java/forestry/core/gui/slots/SlotForestry.java +++ b/src/main/java/forestry/core/gui/slots/SlotForestry.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.core.gui.slots; +import forestry.core.gui.tooltips.IToolTipProvider; +import forestry.core.gui.tooltips.ToolTip; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import forestry.core.gui.tooltips.IToolTipProvider; -import forestry.core.gui.tooltips.ToolTip; - public class SlotForestry extends Slot implements IToolTipProvider{ protected boolean isPhantom; diff --git a/src/main/java/forestry/core/gui/slots/SlotItemInventory.java b/src/main/java/forestry/core/gui/slots/SlotItemInventory.java index d2f99fb1b..d4a6e05f1 100755 --- a/src/main/java/forestry/core/gui/slots/SlotItemInventory.java +++ b/src/main/java/forestry/core/gui/slots/SlotItemInventory.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.core.gui.slots; +import forestry.core.gui.ContainerItemInventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import forestry.core.gui.ContainerItemInventory; - public class SlotItemInventory extends Slot { private final EntityPlayer player; diff --git a/src/main/java/forestry/core/gui/slots/SlotLiquidContainer.java b/src/main/java/forestry/core/gui/slots/SlotLiquidContainer.java index 2a73c551d..0637d577e 100755 --- a/src/main/java/forestry/core/gui/slots/SlotLiquidContainer.java +++ b/src/main/java/forestry/core/gui/slots/SlotLiquidContainer.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.core.gui.slots; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.core.fluids.FluidHelper; - import forestry.core.render.TextureManager; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import net.minecraftforge.fluids.Fluid; public class SlotLiquidContainer extends SlotForestry { diff --git a/src/main/java/forestry/core/gui/tooltips/ToolTip.java b/src/main/java/forestry/core/gui/tooltips/ToolTip.java index d254a0ff8..7676e25ea 100755 --- a/src/main/java/forestry/core/gui/tooltips/ToolTip.java +++ b/src/main/java/forestry/core/gui/tooltips/ToolTip.java @@ -10,13 +10,11 @@ ******************************************************************************/ package forestry.core.gui.tooltips; +import com.google.common.collect.ForwardingList; +import forestry.core.utils.StringUtil; import java.util.ArrayList; import java.util.List; -import com.google.common.collect.ForwardingList; - -import forestry.core.utils.StringUtil; - /** * @author CovertJaguar */ diff --git a/src/main/java/forestry/core/gui/widgets/ReservoirWidget.java b/src/main/java/forestry/core/gui/widgets/ReservoirWidget.java index e10165d82..1660c9a1a 100755 --- a/src/main/java/forestry/core/gui/widgets/ReservoirWidget.java +++ b/src/main/java/forestry/core/gui/widgets/ReservoirWidget.java @@ -10,15 +10,12 @@ ******************************************************************************/ package forestry.core.gui.widgets; -import net.minecraft.util.IIcon; - -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - import forestry.core.gui.WidgetManager; import forestry.core.proxy.Proxies; import forestry.core.render.SpriteSheet; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidStack; +import org.lwjgl.opengl.GL11; public class ReservoirWidget extends TankWidget { diff --git a/src/main/java/forestry/core/gui/widgets/SocketWidget.java b/src/main/java/forestry/core/gui/widgets/SocketWidget.java index 68d10ad25..f2a98eb9d 100755 --- a/src/main/java/forestry/core/gui/widgets/SocketWidget.java +++ b/src/main/java/forestry/core/gui/widgets/SocketWidget.java @@ -10,11 +10,6 @@ ******************************************************************************/ package forestry.core.gui.widgets; -import java.util.List; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - import forestry.core.circuits.ISolderingIron; import forestry.core.circuits.ItemCircuitBoard; import forestry.core.gui.ContainerSocketed; @@ -24,6 +19,9 @@ import forestry.core.gui.tooltips.ToolTip; import forestry.core.interfaces.ISocketable; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; +import java.util.List; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; public class SocketWidget extends Widget { diff --git a/src/main/java/forestry/core/gui/widgets/TankWidget.java b/src/main/java/forestry/core/gui/widgets/TankWidget.java index 67ea39a73..d74db7e4c 100755 --- a/src/main/java/forestry/core/gui/widgets/TankWidget.java +++ b/src/main/java/forestry/core/gui/widgets/TankWidget.java @@ -10,24 +10,20 @@ ******************************************************************************/ package forestry.core.gui.widgets; -import forestry.farming.gui.ContainerFarm; -import net.minecraft.inventory.Container; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - import forestry.api.core.IToolPipette; import forestry.core.fluids.tanks.StandardTank; -import forestry.core.gui.ContainerForestry; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.WidgetManager; import forestry.core.gui.tooltips.ToolTip; import forestry.core.proxy.Proxies; import forestry.core.render.SpriteSheet; +import forestry.farming.gui.ContainerFarm; +import net.minecraft.inventory.Container; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidStack; +import org.lwjgl.opengl.GL11; /** * Slot for liquid tanks diff --git a/src/main/java/forestry/core/gui/widgets/Widget.java b/src/main/java/forestry/core/gui/widgets/Widget.java index e0e2e45d6..d9a57c6ab 100755 --- a/src/main/java/forestry/core/gui/widgets/Widget.java +++ b/src/main/java/forestry/core/gui/widgets/Widget.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.core.gui.widgets; -import net.minecraft.entity.player.EntityPlayer; - import forestry.core.gui.WidgetManager; import forestry.core.gui.tooltips.IToolTipProvider; import forestry.core.gui.tooltips.ToolTip; import forestry.core.proxy.Proxies; +import net.minecraft.entity.player.EntityPlayer; /** * Basic non-ItemStack slot diff --git a/src/main/java/forestry/core/interfaces/ILiquidTankContainer.java b/src/main/java/forestry/core/interfaces/ILiquidTankContainer.java index f3b410ba7..5dbf7fff5 100755 --- a/src/main/java/forestry/core/interfaces/ILiquidTankContainer.java +++ b/src/main/java/forestry/core/interfaces/ILiquidTankContainer.java @@ -11,7 +11,6 @@ package forestry.core.interfaces; import forestry.core.fluids.TankManager; -import forestry.core.fluids.tanks.StandardTank; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraftforge.fluids.IFluidHandler; diff --git a/src/main/java/forestry/core/interfaces/IOwnable.java b/src/main/java/forestry/core/interfaces/IOwnable.java index ef87cd4f8..f79c7770a 100755 --- a/src/main/java/forestry/core/interfaces/IOwnable.java +++ b/src/main/java/forestry/core/interfaces/IOwnable.java @@ -10,11 +10,9 @@ ******************************************************************************/ package forestry.core.interfaces; -import net.minecraft.entity.player.EntityPlayer; - import com.mojang.authlib.GameProfile; - import forestry.core.utils.EnumAccess; +import net.minecraft.entity.player.EntityPlayer; public interface IOwnable { diff --git a/src/main/java/forestry/core/interfaces/IPacketHandler.java b/src/main/java/forestry/core/interfaces/IPacketHandler.java index ab17f5b0a..70e7f6efa 100755 --- a/src/main/java/forestry/core/interfaces/IPacketHandler.java +++ b/src/main/java/forestry/core/interfaces/IPacketHandler.java @@ -11,7 +11,6 @@ package forestry.core.interfaces; import java.io.DataInputStream; - import net.minecraft.entity.player.EntityPlayer; public interface IPacketHandler { diff --git a/src/main/java/forestry/core/interfaces/IRenderableMachine.java b/src/main/java/forestry/core/interfaces/IRenderableMachine.java index 6a36d9135..8a9741878 100755 --- a/src/main/java/forestry/core/interfaces/IRenderableMachine.java +++ b/src/main/java/forestry/core/interfaces/IRenderableMachine.java @@ -10,9 +10,8 @@ ******************************************************************************/ package forestry.core.interfaces; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.core.utils.EnumTankLevel; +import net.minecraftforge.common.util.ForgeDirection; public interface IRenderableMachine { diff --git a/src/main/java/forestry/core/inventory/InvTools.java b/src/main/java/forestry/core/inventory/InvTools.java index d0c13abf2..582687b48 100755 --- a/src/main/java/forestry/core/inventory/InvTools.java +++ b/src/main/java/forestry/core/inventory/InvTools.java @@ -10,28 +10,6 @@ ******************************************************************************/ package forestry.core.inventory; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -import net.minecraft.block.Block; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.oredict.OreDictionary; - import buildcraft.api.transport.PipeManager; import forestry.api.core.ISpecialInventory; import forestry.core.inventory.filters.ArrayStackFilter; @@ -45,6 +23,25 @@ import forestry.core.inventory.wrappers.InventoryIterator; import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.inventory.wrappers.SidedInventoryMapper; import forestry.core.utils.PlainInventory; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import net.minecraft.block.Block; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.oredict.OreDictionary; public abstract class InvTools { diff --git a/src/main/java/forestry/core/inventory/InventoryAdapter.java b/src/main/java/forestry/core/inventory/InventoryAdapter.java index dc35a1fbb..3966f48ce 100755 --- a/src/main/java/forestry/core/inventory/InventoryAdapter.java +++ b/src/main/java/forestry/core/inventory/InventoryAdapter.java @@ -10,17 +10,16 @@ ******************************************************************************/ package forestry.core.inventory; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - import forestry.api.core.INBTTagable; import forestry.core.config.Defaults; import forestry.core.utils.PlainInventory; import forestry.core.utils.StackUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; /** * With permission from Krapht. diff --git a/src/main/java/forestry/core/inventory/InventoryConcatenator.java b/src/main/java/forestry/core/inventory/InventoryConcatenator.java index 55c0d31bb..0bdaa174c 100755 --- a/src/main/java/forestry/core/inventory/InventoryConcatenator.java +++ b/src/main/java/forestry/core/inventory/InventoryConcatenator.java @@ -12,7 +12,6 @@ package forestry.core.inventory; import java.util.ArrayList; import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/core/inventory/InventorySorter.java b/src/main/java/forestry/core/inventory/InventorySorter.java index b20aabb8c..f40398ba4 100755 --- a/src/main/java/forestry/core/inventory/InventorySorter.java +++ b/src/main/java/forestry/core/inventory/InventorySorter.java @@ -11,7 +11,6 @@ package forestry.core.inventory; import java.util.Comparator; - import net.minecraft.inventory.IInventory; /** diff --git a/src/main/java/forestry/core/inventory/ItemInventory.java b/src/main/java/forestry/core/inventory/ItemInventory.java index 99f0425b1..267d099da 100755 --- a/src/main/java/forestry/core/inventory/ItemInventory.java +++ b/src/main/java/forestry/core/inventory/ItemInventory.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.core.inventory; +import forestry.api.core.INBTTagable; +import forestry.core.utils.Utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -17,9 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import forestry.api.core.INBTTagable; -import forestry.core.utils.Utils; - public class ItemInventory implements IInventory, INBTTagable { public final Class itemClass; diff --git a/src/main/java/forestry/core/inventory/ItemStackMap.java b/src/main/java/forestry/core/inventory/ItemStackMap.java index 85e18cab6..8fee3212d 100755 --- a/src/main/java/forestry/core/inventory/ItemStackMap.java +++ b/src/main/java/forestry/core/inventory/ItemStackMap.java @@ -15,7 +15,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; - import net.minecraft.item.ItemStack; /** diff --git a/src/main/java/forestry/core/inventory/ItemStackSet.java b/src/main/java/forestry/core/inventory/ItemStackSet.java index af3d35be0..73ea63f82 100755 --- a/src/main/java/forestry/core/inventory/ItemStackSet.java +++ b/src/main/java/forestry/core/inventory/ItemStackSet.java @@ -15,7 +15,6 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Set; - import net.minecraft.item.ItemStack; /** diff --git a/src/main/java/forestry/core/inventory/TileInventoryAdapter.java b/src/main/java/forestry/core/inventory/TileInventoryAdapter.java index 4e225033c..139cab099 100755 --- a/src/main/java/forestry/core/inventory/TileInventoryAdapter.java +++ b/src/main/java/forestry/core/inventory/TileInventoryAdapter.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.core.inventory; -import net.minecraft.entity.player.EntityPlayer; - import forestry.core.gadgets.TileForestry; import forestry.core.utils.EnumAccess; import forestry.core.utils.PlayerUtil; import forestry.core.utils.Utils; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; public class TileInventoryAdapter extends InventoryAdapter { diff --git a/src/main/java/forestry/core/inventory/filters/ArrayStackFilter.java b/src/main/java/forestry/core/inventory/filters/ArrayStackFilter.java index 9e9a7fb3a..3b8f166f4 100755 --- a/src/main/java/forestry/core/inventory/filters/ArrayStackFilter.java +++ b/src/main/java/forestry/core/inventory/filters/ArrayStackFilter.java @@ -10,9 +10,8 @@ ******************************************************************************/ package forestry.core.inventory.filters; -import net.minecraft.item.ItemStack; - import forestry.core.inventory.InvTools; +import net.minecraft.item.ItemStack; /** * @author CovertJaguar diff --git a/src/main/java/forestry/core/inventory/manipulators/InventoryManipulator.java b/src/main/java/forestry/core/inventory/manipulators/InventoryManipulator.java index 0b175bfd1..f3651041a 100755 --- a/src/main/java/forestry/core/inventory/manipulators/InventoryManipulator.java +++ b/src/main/java/forestry/core/inventory/manipulators/InventoryManipulator.java @@ -10,17 +10,14 @@ ******************************************************************************/ package forestry.core.inventory.manipulators; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - -import forestry.api.core.ISpecialInventory; import forestry.core.inventory.InvTools; import forestry.core.inventory.filters.IStackFilter; import forestry.core.inventory.wrappers.IInvSlot; import forestry.core.inventory.wrappers.InventoryIterator; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; /** * @author CovertJaguar diff --git a/src/main/java/forestry/core/inventory/wrappers/InventoryIterator.java b/src/main/java/forestry/core/inventory/wrappers/InventoryIterator.java index 653c6b935..f9f4c3a7d 100755 --- a/src/main/java/forestry/core/inventory/wrappers/InventoryIterator.java +++ b/src/main/java/forestry/core/inventory/wrappers/InventoryIterator.java @@ -11,7 +11,6 @@ package forestry.core.inventory.wrappers; import java.util.Iterator; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java b/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java index a13246998..a5b83e189 100755 --- a/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java +++ b/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java @@ -13,7 +13,6 @@ package forestry.core.inventory.wrappers; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - import net.minecraftforge.common.util.ForgeDirection; /** diff --git a/src/main/java/forestry/core/inventory/wrappers/SidedInventoryIterator.java b/src/main/java/forestry/core/inventory/wrappers/SidedInventoryIterator.java index 71ca7007a..aa823fd2d 100755 --- a/src/main/java/forestry/core/inventory/wrappers/SidedInventoryIterator.java +++ b/src/main/java/forestry/core/inventory/wrappers/SidedInventoryIterator.java @@ -11,7 +11,6 @@ package forestry.core.inventory.wrappers; import java.util.Iterator; - import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/core/inventory/wrappers/SidedInventoryMapper.java b/src/main/java/forestry/core/inventory/wrappers/SidedInventoryMapper.java index 4b3afe28e..dcb013c9e 100755 --- a/src/main/java/forestry/core/inventory/wrappers/SidedInventoryMapper.java +++ b/src/main/java/forestry/core/inventory/wrappers/SidedInventoryMapper.java @@ -14,7 +14,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; - import net.minecraftforge.common.util.ForgeDirection; /** diff --git a/src/main/java/forestry/core/items/ItemArmorNaturalist.java b/src/main/java/forestry/core/items/ItemArmorNaturalist.java index b61620889..d533b9e0e 100755 --- a/src/main/java/forestry/core/items/ItemArmorNaturalist.java +++ b/src/main/java/forestry/core/items/ItemArmorNaturalist.java @@ -10,6 +10,13 @@ ******************************************************************************/ package forestry.core.items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.IArmorNaturalist; +import forestry.core.CreativeTabForestry; +import forestry.core.config.Defaults; +import forestry.core.render.TextureManager; +import forestry.core.utils.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -17,15 +24,6 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.api.core.IArmorNaturalist; -import forestry.core.CreativeTabForestry; -import forestry.core.config.Defaults; -import forestry.core.render.TextureManager; -import forestry.core.utils.StringUtil; - public class ItemArmorNaturalist extends ItemArmor implements IArmorNaturalist { public ItemArmorNaturalist(int slot) { diff --git a/src/main/java/forestry/core/items/ItemAssemblyKit.java b/src/main/java/forestry/core/items/ItemAssemblyKit.java index 803e53ec0..27a74f9b8 100755 --- a/src/main/java/forestry/core/items/ItemAssemblyKit.java +++ b/src/main/java/forestry/core/items/ItemAssemblyKit.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.core.items; +import forestry.core.proxy.Proxies; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import forestry.core.proxy.Proxies; - public class ItemAssemblyKit extends ItemForestry { private final ItemStack assembled; private final boolean motionOnOpen; diff --git a/src/main/java/forestry/core/items/ItemCrated.java b/src/main/java/forestry/core/items/ItemCrated.java index 1a20d8510..3a0650f5b 100755 --- a/src/main/java/forestry/core/items/ItemCrated.java +++ b/src/main/java/forestry/core/items/ItemCrated.java @@ -10,8 +10,13 @@ ******************************************************************************/ package forestry.core.items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.recipes.IGenericCrate; +import forestry.core.proxy.Proxies; +import forestry.core.render.TextureManager; +import forestry.core.utils.StringUtil; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -20,14 +25,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.api.recipes.IGenericCrate; -import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; -import forestry.core.utils.StringUtil; - public class ItemCrated extends Item implements IGenericCrate { private ItemStack contained; diff --git a/src/main/java/forestry/core/items/ItemForestry.java b/src/main/java/forestry/core/items/ItemForestry.java index 86720698b..a97d79330 100755 --- a/src/main/java/forestry/core/items/ItemForestry.java +++ b/src/main/java/forestry/core/items/ItemForestry.java @@ -10,6 +10,12 @@ ******************************************************************************/ package forestry.core.items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.CreativeTabForestry; +import forestry.core.proxy.Proxies; +import forestry.core.render.TextureManager; +import forestry.core.utils.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -17,14 +23,6 @@ import net.minecraft.item.ItemDye; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.CreativeTabForestry; -import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; -import forestry.core.utils.StringUtil; - public class ItemForestry extends Item { private boolean isBonemeal = false; diff --git a/src/main/java/forestry/core/items/ItemForestryFood.java b/src/main/java/forestry/core/items/ItemForestryFood.java index d490402ac..7acaf4fba 100755 --- a/src/main/java/forestry/core/items/ItemForestryFood.java +++ b/src/main/java/forestry/core/items/ItemForestryFood.java @@ -12,6 +12,7 @@ package forestry.core.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.CreativeTabForestry; import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,9 +20,6 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; - -import forestry.core.CreativeTabForestry; - public class ItemForestryFood extends ItemFood { private boolean isDrink = false; diff --git a/src/main/java/forestry/core/items/ItemForestryMultiPass.java b/src/main/java/forestry/core/items/ItemForestryMultiPass.java index 5b8d28cae..2dd577742 100644 --- a/src/main/java/forestry/core/items/ItemForestryMultiPass.java +++ b/src/main/java/forestry/core/items/ItemForestryMultiPass.java @@ -10,13 +10,11 @@ ******************************************************************************/ package forestry.core.items; -import net.minecraft.client.renderer.texture.IIconRegister; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; public class ItemForestryMultiPass extends ItemForestry { diff --git a/src/main/java/forestry/core/items/ItemForestryPickaxe.java b/src/main/java/forestry/core/items/ItemForestryPickaxe.java index 992bb7ca9..f4f996028 100755 --- a/src/main/java/forestry/core/items/ItemForestryPickaxe.java +++ b/src/main/java/forestry/core/items/ItemForestryPickaxe.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.core.items; +import forestry.core.config.ForestryBlock; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import forestry.core.config.ForestryBlock; - public class ItemForestryPickaxe extends ItemForestryTool { private static final Block blocksEffectiveAgainst[]; diff --git a/src/main/java/forestry/core/items/ItemForestryShovel.java b/src/main/java/forestry/core/items/ItemForestryShovel.java index e0076734f..ee82a3987 100755 --- a/src/main/java/forestry/core/items/ItemForestryShovel.java +++ b/src/main/java/forestry/core/items/ItemForestryShovel.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.core.items; +import forestry.core.config.ForestryBlock; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import forestry.core.config.ForestryBlock; - public class ItemForestryShovel extends ItemForestryTool { private static final Block blocksEffectiveAgainst[]; diff --git a/src/main/java/forestry/core/items/ItemForestryTool.java b/src/main/java/forestry/core/items/ItemForestryTool.java index 866bcc48e..16a5f4f6e 100755 --- a/src/main/java/forestry/core/items/ItemForestryTool.java +++ b/src/main/java/forestry/core/items/ItemForestryTool.java @@ -12,6 +12,8 @@ package forestry.core.items; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import forestry.core.proxy.Proxies; +import java.util.Arrays; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -20,9 +22,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; -import java.util.Arrays; -import java.util.List; - public class ItemForestryTool extends ItemForestry { private final ItemStack remnants; diff --git a/src/main/java/forestry/core/items/ItemFruit.java b/src/main/java/forestry/core/items/ItemFruit.java index 15591a8a5..66b6f0bc9 100755 --- a/src/main/java/forestry/core/items/ItemFruit.java +++ b/src/main/java/forestry/core/items/ItemFruit.java @@ -10,23 +10,19 @@ ******************************************************************************/ package forestry.core.items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.config.ForestryItem; +import forestry.core.render.TextureManager; import java.util.List; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; - import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.config.ForestryItem; -import forestry.core.render.TextureManager; - public class ItemFruit extends ItemForestryFood { public static enum EnumFruit { diff --git a/src/main/java/forestry/core/items/ItemInventoried.java b/src/main/java/forestry/core/items/ItemInventoried.java index 936027863..8c31da6d6 100755 --- a/src/main/java/forestry/core/items/ItemInventoried.java +++ b/src/main/java/forestry/core/items/ItemInventoried.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.core.items; +import forestry.core.gui.ContainerItemInventory; +import forestry.core.interfaces.IInventoriedItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; -import forestry.core.gui.ContainerItemInventory; -import forestry.core.interfaces.IInventoriedItem; - public abstract class ItemInventoried extends ItemForestry implements IInventoriedItem { public ItemInventoried() { diff --git a/src/main/java/forestry/core/items/ItemLiquidContainer.java b/src/main/java/forestry/core/items/ItemLiquidContainer.java index 61254b4a9..0b2056840 100755 --- a/src/main/java/forestry/core/items/ItemLiquidContainer.java +++ b/src/main/java/forestry/core/items/ItemLiquidContainer.java @@ -10,8 +10,13 @@ ******************************************************************************/ package forestry.core.items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.CreativeTabForestry; +import forestry.core.fluids.FluidHelper; +import forestry.core.proxy.Proxies; +import forestry.core.render.TextureManager; import java.util.Locale; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -23,21 +28,10 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; -import forestry.core.CreativeTabForestry; -import forestry.core.fluids.FluidHelper; -import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; -import forestry.core.utils.LiquidHelper; - public class ItemLiquidContainer extends Item { public static enum EnumContainerType { diff --git a/src/main/java/forestry/core/items/ItemMisc.java b/src/main/java/forestry/core/items/ItemMisc.java index f166f60b8..ff6b34593 100755 --- a/src/main/java/forestry/core/items/ItemMisc.java +++ b/src/main/java/forestry/core/items/ItemMisc.java @@ -13,14 +13,13 @@ package forestry.core.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.core.render.TextureManager; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import java.util.List; - public class ItemMisc extends ItemForestry { private final String[] definition = new String[]{"pulsatingDust", "pulsatingMesh", "silkWisp", "wovenSilk", "dissipationCharge", "iceShard", "scentedPaneling"}; diff --git a/src/main/java/forestry/core/items/ItemNBTTile.java b/src/main/java/forestry/core/items/ItemNBTTile.java index b3e6f1e66..902e34732 100755 --- a/src/main/java/forestry/core/items/ItemNBTTile.java +++ b/src/main/java/forestry/core/items/ItemNBTTile.java @@ -11,7 +11,6 @@ package forestry.core.items; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/core/items/ItemOverlay.java b/src/main/java/forestry/core/items/ItemOverlay.java index 910835fdc..4c3df94ed 100755 --- a/src/main/java/forestry/core/items/ItemOverlay.java +++ b/src/main/java/forestry/core/items/ItemOverlay.java @@ -10,21 +10,18 @@ ******************************************************************************/ package forestry.core.items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.config.Config; +import forestry.core.render.TextureManager; +import forestry.core.utils.StringUtil; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.config.Config; -import forestry.core.render.TextureManager; -import forestry.core.utils.StringUtil; - public class ItemOverlay extends ItemForestry { public static class OverlayInfo { diff --git a/src/main/java/forestry/core/items/ItemPipette.java b/src/main/java/forestry/core/items/ItemPipette.java index 473b0bacc..a284f834e 100755 --- a/src/main/java/forestry/core/items/ItemPipette.java +++ b/src/main/java/forestry/core/items/ItemPipette.java @@ -10,25 +10,21 @@ ******************************************************************************/ package forestry.core.items; -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraftforge.fluids.FluidStack; - import forestry.api.core.INBTTagable; import forestry.api.core.IToolPipette; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; +import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidStack; public class ItemPipette extends ItemForestry implements IToolPipette { diff --git a/src/main/java/forestry/core/items/ItemWrench.java b/src/main/java/forestry/core/items/ItemWrench.java index efb993dc2..a863758dd 100755 --- a/src/main/java/forestry/core/items/ItemWrench.java +++ b/src/main/java/forestry/core/items/ItemWrench.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.core.items; +import buildcraft.api.tools.IToolWrench; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.tools.IToolWrench; - public class ItemWrench extends ItemForestry implements IToolWrench { public ItemWrench() { diff --git a/src/main/java/forestry/core/network/ForestryPacket.java b/src/main/java/forestry/core/network/ForestryPacket.java index 2e527f2f5..7e741ea0a 100755 --- a/src/main/java/forestry/core/network/ForestryPacket.java +++ b/src/main/java/forestry/core/network/ForestryPacket.java @@ -10,24 +10,20 @@ ******************************************************************************/ package forestry.core.network; +import cpw.mods.fml.common.network.internal.FMLProxyPacket; +import cpw.mods.fml.common.registry.GameData; +import forestry.core.proxy.Proxies; +import io.netty.buffer.Unpooled; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import cpw.mods.fml.common.registry.GameData; - -import io.netty.buffer.Unpooled; - -import forestry.core.proxy.Proxies; - public class ForestryPacket { protected int id; diff --git a/src/main/java/forestry/core/network/PacketCoordinates.java b/src/main/java/forestry/core/network/PacketCoordinates.java index 16cd80d0e..daca65865 100755 --- a/src/main/java/forestry/core/network/PacketCoordinates.java +++ b/src/main/java/forestry/core/network/PacketCoordinates.java @@ -13,7 +13,6 @@ package forestry.core.network; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; diff --git a/src/main/java/forestry/core/network/PacketFXSignal.java b/src/main/java/forestry/core/network/PacketFXSignal.java index a41f76e5b..02d9d2187 100755 --- a/src/main/java/forestry/core/network/PacketFXSignal.java +++ b/src/main/java/forestry/core/network/PacketFXSignal.java @@ -10,16 +10,13 @@ ******************************************************************************/ package forestry.core.network; +import cpw.mods.fml.common.registry.GameData; +import forestry.core.proxy.Proxies; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; - import net.minecraft.block.Block; -import cpw.mods.fml.common.registry.GameData; - -import forestry.core.proxy.Proxies; - public class PacketFXSignal extends ForestryPacket { public static enum VisualFXType { diff --git a/src/main/java/forestry/core/network/PacketGuiInteger.java b/src/main/java/forestry/core/network/PacketGuiInteger.java index 7b7ff9eb7..673e3d36d 100644 --- a/src/main/java/forestry/core/network/PacketGuiInteger.java +++ b/src/main/java/forestry/core/network/PacketGuiInteger.java @@ -14,7 +14,6 @@ import cpw.mods.fml.client.FMLClientHandler; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; - import net.minecraft.client.entity.EntityClientPlayerMP; /** diff --git a/src/main/java/forestry/core/network/PacketHandler.java b/src/main/java/forestry/core/network/PacketHandler.java index 0a796444e..fb7014aa5 100755 --- a/src/main/java/forestry/core/network/PacketHandler.java +++ b/src/main/java/forestry/core/network/PacketHandler.java @@ -10,17 +10,6 @@ ******************************************************************************/ package forestry.core.network; -import java.io.DataInputStream; -import java.io.InputStream; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.network.NetHandlerPlayServer; -import net.minecraft.tileentity.TileEntity; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.FMLEventChannel; @@ -28,24 +17,29 @@ import cpw.mods.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.internal.FMLProxyPacket; - -import net.minecraftforge.common.MinecraftForge; - -import io.netty.buffer.ByteBufInputStream; - import forestry.api.core.ForestryEvent; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.ISpeciesRoot; import forestry.core.circuits.ItemCircuitBoard; import forestry.core.gadgets.TileForestry; -import forestry.core.gui.ContainerForestry; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.ContainerSocketed; import forestry.core.gui.IGuiSelectable; import forestry.core.interfaces.ISocketable; import forestry.core.proxy.Proxies; import forestry.plugins.PluginManager; +import io.netty.buffer.ByteBufInputStream; +import java.io.DataInputStream; +import java.io.InputStream; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.MinecraftForge; public class PacketHandler { public PacketHandler() { diff --git a/src/main/java/forestry/core/network/PacketInventoryStack.java b/src/main/java/forestry/core/network/PacketInventoryStack.java index 6a4ee5358..721ea9150 100755 --- a/src/main/java/forestry/core/network/PacketInventoryStack.java +++ b/src/main/java/forestry/core/network/PacketInventoryStack.java @@ -13,7 +13,6 @@ package forestry.core.network; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; - import net.minecraft.item.ItemStack; public class PacketInventoryStack extends PacketCoordinates { diff --git a/src/main/java/forestry/core/network/PacketNBT.java b/src/main/java/forestry/core/network/PacketNBT.java index 5e6851d6b..f0da32597 100755 --- a/src/main/java/forestry/core/network/PacketNBT.java +++ b/src/main/java/forestry/core/network/PacketNBT.java @@ -14,7 +14,6 @@ import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/forestry/core/network/PacketSocketUpdate.java b/src/main/java/forestry/core/network/PacketSocketUpdate.java index 0a8991727..ddb095c86 100755 --- a/src/main/java/forestry/core/network/PacketSocketUpdate.java +++ b/src/main/java/forestry/core/network/PacketSocketUpdate.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.core.network; +import forestry.core.interfaces.ISocketable; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; - import net.minecraft.item.ItemStack; -import forestry.core.interfaces.ISocketable; - public class PacketSocketUpdate extends PacketCoordinates { public ItemStack[] itemstacks; diff --git a/src/main/java/forestry/core/network/PacketTileNBT.java b/src/main/java/forestry/core/network/PacketTileNBT.java index a502f5afe..7805e8daf 100755 --- a/src/main/java/forestry/core/network/PacketTileNBT.java +++ b/src/main/java/forestry/core/network/PacketTileNBT.java @@ -13,7 +13,6 @@ package forestry.core.network; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/forestry/core/network/PacketTileUpdate.java b/src/main/java/forestry/core/network/PacketTileUpdate.java index 2935c4479..ede729579 100755 --- a/src/main/java/forestry/core/network/PacketTileUpdate.java +++ b/src/main/java/forestry/core/network/PacketTileUpdate.java @@ -10,21 +10,18 @@ ******************************************************************************/ package forestry.core.network; +import com.mojang.authlib.GameProfile; +import forestry.api.core.ErrorStateRegistry; +import forestry.api.core.IErrorState; +import forestry.core.EnumErrorCode; +import forestry.core.gadgets.TileForestry; +import forestry.core.utils.EnumAccess; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.UUID; - import net.minecraftforge.common.util.ForgeDirection; -import com.mojang.authlib.GameProfile; -import forestry.api.core.ErrorStateRegistry; -import forestry.api.core.IErrorState; - -import forestry.core.EnumErrorCode; -import forestry.core.gadgets.TileForestry; -import forestry.core.utils.EnumAccess; - public class PacketTileUpdate extends PacketUpdate { private ForgeDirection orientation = ForgeDirection.WEST; diff --git a/src/main/java/forestry/core/proxy/ClientProxyCommon.java b/src/main/java/forestry/core/proxy/ClientProxyCommon.java index fe48e0ded..c98a7a3c8 100755 --- a/src/main/java/forestry/core/proxy/ClientProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ClientProxyCommon.java @@ -10,10 +10,13 @@ ******************************************************************************/ package forestry.core.proxy; -import java.io.File; - import com.mojang.authlib.GameProfile; - +import forestry.apiculture.render.TextureBiomefinder; +import forestry.core.ForestryClient; +import forestry.core.TickHandlerCoreClient; +import forestry.core.config.Config; +import forestry.core.render.SpriteSheet; +import java.io.File; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; @@ -25,18 +28,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; - -import net.minecraftforge.common.util.FakePlayerFactory; - import org.lwjgl.input.Keyboard; -import forestry.apiculture.render.TextureBiomefinder; -import forestry.core.ForestryClient; -import forestry.core.TickHandlerCoreClient; -import forestry.core.config.Config; -import forestry.core.render.SpriteSheet; - public class ClientProxyCommon extends ProxyCommon { @Override diff --git a/src/main/java/forestry/core/proxy/ClientProxyNetwork.java b/src/main/java/forestry/core/proxy/ClientProxyNetwork.java index b55ad8e65..196163796 100755 --- a/src/main/java/forestry/core/proxy/ClientProxyNetwork.java +++ b/src/main/java/forestry/core/proxy/ClientProxyNetwork.java @@ -10,9 +10,8 @@ ******************************************************************************/ package forestry.core.proxy; -import net.minecraft.client.network.NetHandlerPlayClient; - import forestry.core.network.ForestryPacket; +import net.minecraft.client.network.NetHandlerPlayClient; public class ClientProxyNetwork extends ProxyNetwork { diff --git a/src/main/java/forestry/core/proxy/ClientProxyRender.java b/src/main/java/forestry/core/proxy/ClientProxyRender.java index ee78420e9..8674cb7b2 100755 --- a/src/main/java/forestry/core/proxy/ClientProxyRender.java +++ b/src/main/java/forestry/core/proxy/ClientProxyRender.java @@ -10,16 +10,10 @@ ******************************************************************************/ package forestry.core.proxy; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.world.World; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.registry.VillagerRegistry; - import forestry.core.config.Config; import forestry.core.gadgets.MachineDefinition; import forestry.core.interfaces.IBlockRenderer; @@ -31,6 +25,10 @@ import forestry.core.render.RenderMill; import forestry.core.render.TextureManager; import forestry.core.render.TileRendererIndex; import forestry.core.utils.ForestryResource; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.world.World; public class ClientProxyRender extends ProxyRender { diff --git a/src/main/java/forestry/core/proxy/ProxyCommon.java b/src/main/java/forestry/core/proxy/ProxyCommon.java index 9e34c3563..cfad6e3ac 100755 --- a/src/main/java/forestry/core/proxy/ProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ProxyCommon.java @@ -31,6 +31,7 @@ import forestry.core.network.PacketFXSignal; import forestry.core.network.PacketIds; import forestry.core.render.SpriteSheet; import forestry.core.utils.StringUtil; +import java.io.File; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.IResourceManager; @@ -50,8 +51,6 @@ import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import java.io.File; - public class ProxyCommon { public String getMinecraftVersion() { diff --git a/src/main/java/forestry/core/proxy/ProxyLog.java b/src/main/java/forestry/core/proxy/ProxyLog.java index 7b4e168dc..1669a8e7f 100755 --- a/src/main/java/forestry/core/proxy/ProxyLog.java +++ b/src/main/java/forestry/core/proxy/ProxyLog.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.core.proxy; +import forestry.core.config.Defaults; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; - -import forestry.core.config.Defaults; import org.apache.logging.log4j.message.MessageFormatMessage; public class ProxyLog { diff --git a/src/main/java/forestry/core/proxy/ProxyNetwork.java b/src/main/java/forestry/core/proxy/ProxyNetwork.java index 29264c722..4d64755bc 100755 --- a/src/main/java/forestry/core/proxy/ProxyNetwork.java +++ b/src/main/java/forestry/core/proxy/ProxyNetwork.java @@ -10,16 +10,14 @@ ******************************************************************************/ package forestry.core.proxy; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.world.World; - -import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.common.util.FakePlayer; - import forestry.Forestry; import forestry.core.config.Defaults; import forestry.core.network.ForestryPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.world.World; +import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.util.FakePlayer; public class ProxyNetwork { diff --git a/src/main/java/forestry/core/proxy/ProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRender.java index 3a439e812..9eb5d5560 100755 --- a/src/main/java/forestry/core/proxy/ProxyRender.java +++ b/src/main/java/forestry/core/proxy/ProxyRender.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.core.proxy; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.world.World; - import forestry.core.gadgets.MachineDefinition; import forestry.core.interfaces.IBlockRenderer; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.world.World; public class ProxyRender { diff --git a/src/main/java/forestry/core/render/BlockRenderingHandler.java b/src/main/java/forestry/core/render/BlockRenderingHandler.java index 1993f8e65..1a26c2b12 100755 --- a/src/main/java/forestry/core/render/BlockRenderingHandler.java +++ b/src/main/java/forestry/core/render/BlockRenderingHandler.java @@ -10,17 +10,14 @@ ******************************************************************************/ package forestry.core.render; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import forestry.core.ForestryClient; +import forestry.core.interfaces.IBlockRenderer; import java.util.HashMap; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - -import forestry.core.ForestryClient; -import forestry.core.interfaces.IBlockRenderer; - public class BlockRenderingHandler implements ISimpleBlockRenderingHandler { public static final HashMap byBlockRenderer = new HashMap(); diff --git a/src/main/java/forestry/core/render/EntitySnowFX.java b/src/main/java/forestry/core/render/EntitySnowFX.java index 92ad917cb..65926c336 100755 --- a/src/main/java/forestry/core/render/EntitySnowFX.java +++ b/src/main/java/forestry/core/render/EntitySnowFX.java @@ -11,7 +11,6 @@ package forestry.core.render; import java.util.Random; - import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; diff --git a/src/main/java/forestry/core/render/OverlayRenderingHandler.java b/src/main/java/forestry/core/render/OverlayRenderingHandler.java index 5558c7d5d..066c0b7b0 100755 --- a/src/main/java/forestry/core/render/OverlayRenderingHandler.java +++ b/src/main/java/forestry/core/render/OverlayRenderingHandler.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.core.render; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - public abstract class OverlayRenderingHandler implements ISimpleBlockRenderingHandler { protected static final double OVERLAY_SHIFT = 0.001; diff --git a/src/main/java/forestry/core/render/RenderAnalyzer.java b/src/main/java/forestry/core/render/RenderAnalyzer.java index bd41cdc8d..a44b3eefa 100755 --- a/src/main/java/forestry/core/render/RenderAnalyzer.java +++ b/src/main/java/forestry/core/render/RenderAnalyzer.java @@ -10,6 +10,9 @@ ******************************************************************************/ package forestry.core.render; +import forestry.apiculture.render.ModelAnalyzer; +import forestry.core.gadgets.TileAnalyzer; +import forestry.core.interfaces.IBlockRenderer; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -17,15 +20,9 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; -import forestry.apiculture.render.ModelAnalyzer; -import forestry.core.gadgets.TileAnalyzer; -import forestry.core.interfaces.IBlockRenderer; - public class RenderAnalyzer extends TileEntitySpecialRenderer implements IBlockRenderer { private ModelAnalyzer model; diff --git a/src/main/java/forestry/core/render/RenderEscritoire.java b/src/main/java/forestry/core/render/RenderEscritoire.java index 64b8441fd..4a03a16ec 100755 --- a/src/main/java/forestry/core/render/RenderEscritoire.java +++ b/src/main/java/forestry/core/render/RenderEscritoire.java @@ -10,23 +10,20 @@ ******************************************************************************/ package forestry.core.render; +import forestry.core.config.Defaults; +import forestry.core.gadgets.TileEscritoire; +import forestry.core.interfaces.IBlockRenderer; +import forestry.core.proxy.Proxies; +import forestry.core.utils.ForestryResource; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; -import forestry.core.config.Defaults; -import forestry.core.gadgets.TileEscritoire; -import forestry.core.interfaces.IBlockRenderer; -import forestry.core.proxy.Proxies; -import forestry.core.utils.ForestryResource; - public class RenderEscritoire extends TileEntitySpecialRenderer implements IBlockRenderer { private final ModelEscritoire modelEscritoire; diff --git a/src/main/java/forestry/core/render/RenderMachine.java b/src/main/java/forestry/core/render/RenderMachine.java index 04f78a275..e4cad8d1d 100755 --- a/src/main/java/forestry/core/render/RenderMachine.java +++ b/src/main/java/forestry/core/render/RenderMachine.java @@ -10,21 +10,18 @@ ******************************************************************************/ package forestry.core.render; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - import forestry.core.interfaces.IBlockRenderer; import forestry.core.interfaces.IRenderableMachine; import forestry.core.proxy.Proxies; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.ForestryResource; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.util.ForgeDirection; +import org.lwjgl.opengl.GL11; public class RenderMachine extends TileEntitySpecialRenderer implements IBlockRenderer { diff --git a/src/main/java/forestry/core/render/RenderMill.java b/src/main/java/forestry/core/render/RenderMill.java index d4ce46d9d..710d3f6ef 100755 --- a/src/main/java/forestry/core/render/RenderMill.java +++ b/src/main/java/forestry/core/render/RenderMill.java @@ -10,21 +10,18 @@ ******************************************************************************/ package forestry.core.render; +import forestry.core.gadgets.Mill; +import forestry.core.interfaces.IBlockRenderer; +import forestry.core.proxy.Proxies; +import forestry.core.utils.ForestryResource; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; -import forestry.core.gadgets.Mill; -import forestry.core.interfaces.IBlockRenderer; -import forestry.core.proxy.Proxies; -import forestry.core.utils.ForestryResource; - public class RenderMill extends TileEntitySpecialRenderer implements IBlockRenderer { private final ModelBase model = new ModelBase() { diff --git a/src/main/java/forestry/core/render/TextureManager.java b/src/main/java/forestry/core/render/TextureManager.java index 66b5e09dc..a47334ddf 100755 --- a/src/main/java/forestry/core/render/TextureManager.java +++ b/src/main/java/forestry/core/render/TextureManager.java @@ -10,18 +10,15 @@ ******************************************************************************/ package forestry.core.render; -import java.util.ArrayList; -import java.util.HashMap; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.core.ForestryAPI; import forestry.api.core.IIconProvider; import forestry.api.core.ITextureManager; +import java.util.ArrayList; +import java.util.HashMap; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; @SideOnly(Side.CLIENT) public class TextureManager implements ITextureManager { diff --git a/src/main/java/forestry/core/utils/BlockUtil.java b/src/main/java/forestry/core/utils/BlockUtil.java index f015c1b07..a6b504ce9 100644 --- a/src/main/java/forestry/core/utils/BlockUtil.java +++ b/src/main/java/forestry/core/utils/BlockUtil.java @@ -17,6 +17,9 @@ import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipeTile.PipeType; import cofh.api.energy.IEnergyHandler; import forestry.core.config.Defaults; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedList; import net.minecraft.block.Block; import net.minecraft.block.BlockCocoa; import net.minecraft.block.BlockLog; @@ -29,10 +32,6 @@ import net.minecraft.util.Direction; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedList; - public class BlockUtil { public static ArrayList getBlockItemStack(World world, Vect posBlock) { diff --git a/src/main/java/forestry/core/utils/EnumAccess.java b/src/main/java/forestry/core/utils/EnumAccess.java index 30f983b7b..dde751fda 100755 --- a/src/main/java/forestry/core/utils/EnumAccess.java +++ b/src/main/java/forestry/core/utils/EnumAccess.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.core.utils; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.IIcon; public enum EnumAccess { SHARED("gui.rule.shared"), VIEWABLE("gui.rule.restricted"), PRIVATE("gui.rule.private"); diff --git a/src/main/java/forestry/core/utils/FontColour.java b/src/main/java/forestry/core/utils/FontColour.java index ded493d51..9d5e50ffe 100755 --- a/src/main/java/forestry/core/utils/FontColour.java +++ b/src/main/java/forestry/core/utils/FontColour.java @@ -12,7 +12,6 @@ package forestry.core.utils; import java.io.InputStream; import java.util.Properties; - import net.minecraft.client.resources.IResourceManager; public class FontColour { diff --git a/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java b/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java index f6ad50df2..b62cd4dc8 100755 --- a/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java +++ b/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java @@ -10,16 +10,14 @@ ******************************************************************************/ package forestry.core.utils; -import java.util.ArrayList; -import java.util.List; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.ICrashCallable; import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.Side; - import forestry.core.config.Defaults; +import java.util.ArrayList; +import java.util.List; public class ForestryModEnvWarningCallable implements ICrashCallable { diff --git a/src/main/java/forestry/core/utils/ForestryResource.java b/src/main/java/forestry/core/utils/ForestryResource.java index 00e301d25..a6947e7cb 100755 --- a/src/main/java/forestry/core/utils/ForestryResource.java +++ b/src/main/java/forestry/core/utils/ForestryResource.java @@ -10,9 +10,8 @@ ******************************************************************************/ package forestry.core.utils; -import net.minecraft.util.ResourceLocation; - import forestry.core.config.Defaults; +import net.minecraft.util.ResourceLocation; public class ForestryResource extends ResourceLocation { diff --git a/src/main/java/forestry/core/utils/ItemStackMap.java b/src/main/java/forestry/core/utils/ItemStackMap.java index 2cecc37d4..440f58a3f 100755 --- a/src/main/java/forestry/core/utils/ItemStackMap.java +++ b/src/main/java/forestry/core/utils/ItemStackMap.java @@ -13,7 +13,6 @@ package forestry.core.utils; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - import net.minecraftforge.oredict.OreDictionary; public class ItemStackMap extends StackMap { diff --git a/src/main/java/forestry/core/utils/LiquidHelper.java b/src/main/java/forestry/core/utils/LiquidHelper.java index e6ec5a3a7..fda0feff9 100755 --- a/src/main/java/forestry/core/utils/LiquidHelper.java +++ b/src/main/java/forestry/core/utils/LiquidHelper.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.core.utils; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidStack; - import forestry.api.recipes.RecipeManagers; import forestry.core.config.ForestryItem; import forestry.core.fluids.Fluids; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.fluids.FluidStack; public class LiquidHelper { diff --git a/src/main/java/forestry/core/utils/NBTUtil.java b/src/main/java/forestry/core/utils/NBTUtil.java index 59cd1c1fc..5ad5089d7 100644 --- a/src/main/java/forestry/core/utils/NBTUtil.java +++ b/src/main/java/forestry/core/utils/NBTUtil.java @@ -12,11 +12,21 @@ package forestry.core.utils; import com.google.common.collect.ForwardingList; import cpw.mods.fml.common.ObfuscationReflectionHelper; - import java.util.ArrayList; import java.util.List; - -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagByte; +import net.minecraft.nbt.NBTTagByteArray; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagEnd; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagIntArray; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagLong; +import net.minecraft.nbt.NBTTagShort; +import net.minecraft.nbt.NBTTagString; /** * @author CovertJaguar diff --git a/src/main/java/forestry/core/utils/PlayerUtil.java b/src/main/java/forestry/core/utils/PlayerUtil.java index fc93320ea..4e70d19cf 100644 --- a/src/main/java/forestry/core/utils/PlayerUtil.java +++ b/src/main/java/forestry/core/utils/PlayerUtil.java @@ -1,7 +1,6 @@ package forestry.core.utils; import com.mojang.authlib.GameProfile; - import java.util.UUID; public class PlayerUtil { diff --git a/src/main/java/forestry/core/utils/RecipeUtil.java b/src/main/java/forestry/core/utils/RecipeUtil.java index fe1fb3d63..6804a3c3e 100755 --- a/src/main/java/forestry/core/utils/RecipeUtil.java +++ b/src/main/java/forestry/core/utils/RecipeUtil.java @@ -10,27 +10,22 @@ ******************************************************************************/ package forestry.core.utils; +import forestry.api.recipes.RecipeManagers; +import forestry.core.fluids.Fluids; +import forestry.core.gui.ContainerDummy; +import forestry.core.interfaces.IDescriptiveRecipe; +import forestry.core.proxy.Proxies; import java.util.ArrayList; import java.util.Collections; import java.util.List; - import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.world.World; - import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import forestry.api.recipes.RecipeManagers; -import forestry.core.config.Defaults; -import forestry.core.fluids.Fluids; -import forestry.core.gui.ContainerDummy; -import forestry.core.interfaces.IDescriptiveRecipe; -import forestry.core.proxy.Proxies; - public class RecipeUtil { private static final Container DUMMY_CONTAINER = new ContainerDummy(); diff --git a/src/main/java/forestry/core/utils/RevolvingList.java b/src/main/java/forestry/core/utils/RevolvingList.java index 7a5a385f2..8a89b9e83 100644 --- a/src/main/java/forestry/core/utils/RevolvingList.java +++ b/src/main/java/forestry/core/utils/RevolvingList.java @@ -11,7 +11,9 @@ package forestry.core.utils; import com.google.common.collect.ForwardingCollection; -import java.util.*; +import java.util.Collection; +import java.util.Deque; +import java.util.LinkedList; /** * diff --git a/src/main/java/forestry/core/utils/ShapedRecipeCustom.java b/src/main/java/forestry/core/utils/ShapedRecipeCustom.java index 0534f79a5..2e72e78d6 100755 --- a/src/main/java/forestry/core/utils/ShapedRecipeCustom.java +++ b/src/main/java/forestry/core/utils/ShapedRecipeCustom.java @@ -10,9 +10,12 @@ ******************************************************************************/ package forestry.core.utils; +import forestry.core.config.Defaults; +import forestry.core.config.ForestryBlock; +import forestry.core.config.ForestryItem; +import forestry.core.interfaces.IDescriptiveRecipe; import java.util.ArrayList; import java.util.HashMap; - import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -20,14 +23,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; - import net.minecraftforge.oredict.OreDictionary; -import forestry.core.config.Defaults; -import forestry.core.config.ForestryBlock; -import forestry.core.config.ForestryItem; -import forestry.core.interfaces.IDescriptiveRecipe; - public class ShapedRecipeCustom implements IDescriptiveRecipe { private final int width; diff --git a/src/main/java/forestry/core/utils/StackUtils.java b/src/main/java/forestry/core/utils/StackUtils.java index e6d04335b..edf75a91f 100755 --- a/src/main/java/forestry/core/utils/StackUtils.java +++ b/src/main/java/forestry/core/utils/StackUtils.java @@ -10,10 +10,10 @@ ******************************************************************************/ package forestry.core.utils; +import forestry.core.config.Defaults; import forestry.core.inventory.InventoryAdapter; import java.util.ArrayList; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -23,13 +23,10 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; - import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import net.minecraftforge.oredict.OreDictionary; -import forestry.core.config.Defaults; - public class StackUtils { public static final ItemStack[] EMPTY_STACK_ARRAY = new ItemStack[0]; diff --git a/src/main/java/forestry/core/utils/Utils.java b/src/main/java/forestry/core/utils/Utils.java index 179154b4b..3871bdf85 100755 --- a/src/main/java/forestry/core/utils/Utils.java +++ b/src/main/java/forestry/core/utils/Utils.java @@ -24,6 +24,11 @@ import forestry.api.genetics.IPollinatable; import forestry.core.gadgets.TileForestry; import forestry.core.proxy.Proxies; import forestry.plugins.PluginArboriculture; +import java.security.MessageDigest; +import java.security.cert.Certificate; +import java.util.Arrays; +import java.util.Map; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -40,12 +45,6 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import java.security.MessageDigest; -import java.security.cert.Certificate; -import java.util.Arrays; -import java.util.Map; -import java.util.Random; - public class Utils { private static Random rand; diff --git a/src/main/java/forestry/core/worldgen/BlockType.java b/src/main/java/forestry/core/worldgen/BlockType.java index 549a49498..222d65467 100755 --- a/src/main/java/forestry/core/worldgen/BlockType.java +++ b/src/main/java/forestry/core/worldgen/BlockType.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.core.worldgen; -import net.minecraft.block.Block; -import net.minecraft.world.World; - import forestry.api.world.ITreeGenData; import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; +import net.minecraft.block.Block; +import net.minecraft.world.World; public class BlockType { diff --git a/src/main/java/forestry/core/worldgen/WorldGenBase.java b/src/main/java/forestry/core/worldgen/WorldGenBase.java index 332e46770..867374d3d 100755 --- a/src/main/java/forestry/core/worldgen/WorldGenBase.java +++ b/src/main/java/forestry/core/worldgen/WorldGenBase.java @@ -11,7 +11,6 @@ package forestry.core.worldgen; import java.util.Random; - import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; diff --git a/src/main/java/forestry/core/worldgen/WorldGenMinableMeta.java b/src/main/java/forestry/core/worldgen/WorldGenMinableMeta.java index 810e499f4..89dca4851 100755 --- a/src/main/java/forestry/core/worldgen/WorldGenMinableMeta.java +++ b/src/main/java/forestry/core/worldgen/WorldGenMinableMeta.java @@ -10,17 +10,15 @@ ******************************************************************************/ package forestry.core.worldgen; +import forestry.core.config.Defaults; +import forestry.core.config.ForestryBlock; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import forestry.core.config.Defaults; -import forestry.core.config.ForestryBlock; - public class WorldGenMinableMeta extends WorldGenerator { private final Block mineableBlock; diff --git a/src/main/java/forestry/energy/GuiHandlerEnergy.java b/src/main/java/forestry/energy/GuiHandlerEnergy.java index 6da6891c8..b382f15e6 100755 --- a/src/main/java/forestry/energy/GuiHandlerEnergy.java +++ b/src/main/java/forestry/energy/GuiHandlerEnergy.java @@ -10,9 +10,6 @@ ******************************************************************************/ package forestry.energy; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - import forestry.core.GuiHandlerBase; import forestry.core.network.GuiId; import forestry.core.network.PacketIds; @@ -30,6 +27,8 @@ import forestry.energy.gui.GuiEngineBronze; import forestry.energy.gui.GuiEngineCopper; import forestry.energy.gui.GuiEngineTin; import forestry.energy.gui.GuiGenerator; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; public class GuiHandlerEnergy extends GuiHandlerBase { diff --git a/src/main/java/forestry/energy/circuits/CircuitElectricChange.java b/src/main/java/forestry/energy/circuits/CircuitElectricChange.java index 9b9ac78fa..370da2a20 100755 --- a/src/main/java/forestry/energy/circuits/CircuitElectricChange.java +++ b/src/main/java/forestry/energy/circuits/CircuitElectricChange.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.energy.circuits; -import net.minecraft.tileentity.TileEntity; - import forestry.core.circuits.Circuit; import forestry.energy.gadgets.EngineTin; +import net.minecraft.tileentity.TileEntity; public abstract class CircuitElectricChange extends Circuit { diff --git a/src/main/java/forestry/energy/circuits/CircuitFireDampener.java b/src/main/java/forestry/energy/circuits/CircuitFireDampener.java index f8fe35a4e..5c436eb74 100755 --- a/src/main/java/forestry/energy/circuits/CircuitFireDampener.java +++ b/src/main/java/forestry/energy/circuits/CircuitFireDampener.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.energy.circuits; -import net.minecraft.tileentity.TileEntity; - import forestry.core.circuits.Circuit; import forestry.energy.gadgets.EngineCopper; +import net.minecraft.tileentity.TileEntity; public class CircuitFireDampener extends Circuit { diff --git a/src/main/java/forestry/energy/gadgets/EngineClockwork.java b/src/main/java/forestry/energy/gadgets/EngineClockwork.java index 4a3ceb903..c2675bdd6 100755 --- a/src/main/java/forestry/energy/gadgets/EngineClockwork.java +++ b/src/main/java/forestry/energy/gadgets/EngineClockwork.java @@ -10,17 +10,16 @@ ******************************************************************************/ package forestry.energy.gadgets; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.nbt.NBTTagCompound; - import forestry.core.TemperatureState; import forestry.core.config.Defaults; import forestry.core.gadgets.Engine; import forestry.core.gadgets.TileBase; import forestry.core.utils.DamageSourceForestry; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.FakePlayer; public class EngineClockwork extends Engine { diff --git a/src/main/java/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/gadgets/EngineCopper.java index 98cbf01b3..5d97b19a4 100755 --- a/src/main/java/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/gadgets/EngineCopper.java @@ -13,19 +13,22 @@ package forestry.energy.gadgets; import buildcraft.api.statements.ITriggerExternal; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameData; -import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.fuels.FuelManager; +import forestry.core.EnumErrorCode; import forestry.core.TemperatureState; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.gadgets.Engine; import forestry.core.gadgets.TileBase; +import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.utils.BlockUtil; -import forestry.core.inventory.TileInventoryAdapter; import forestry.factory.triggers.FactoryTriggers; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -36,10 +39,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedList; - public class EngineCopper extends Engine implements ISidedInventory { /* CONSTANTS */ diff --git a/src/main/java/forestry/energy/gadgets/EngineDefinition.java b/src/main/java/forestry/energy/gadgets/EngineDefinition.java index 271f7e1ad..f91f18890 100755 --- a/src/main/java/forestry/energy/gadgets/EngineDefinition.java +++ b/src/main/java/forestry/energy/gadgets/EngineDefinition.java @@ -10,19 +10,17 @@ ******************************************************************************/ package forestry.energy.gadgets; +import forestry.core.gadgets.Engine; +import forestry.core.gadgets.MachineDefinition; +import forestry.core.interfaces.IBlockRenderer; +import forestry.core.utils.Utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; -import forestry.core.gadgets.Engine; -import forestry.core.gadgets.MachineDefinition; -import forestry.core.interfaces.IBlockRenderer; -import forestry.core.utils.Utils; - public class EngineDefinition extends MachineDefinition { public EngineDefinition(int meta, String teIdent, Class teClass, IBlockRenderer renderer, IRecipe... recipes) { diff --git a/src/main/java/forestry/energy/gadgets/EngineTin.java b/src/main/java/forestry/energy/gadgets/EngineTin.java index 204f3140d..fe5e76bb1 100755 --- a/src/main/java/forestry/energy/gadgets/EngineTin.java +++ b/src/main/java/forestry/energy/gadgets/EngineTin.java @@ -10,15 +10,6 @@ ******************************************************************************/ package forestry.energy.gadgets; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import ic2.api.energy.prefab.BasicSink; - import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitBoard; import forestry.api.core.ForestryAPI; @@ -29,12 +20,19 @@ import forestry.core.config.Defaults; import forestry.core.gadgets.Engine; import forestry.core.gadgets.TileBase; import forestry.core.interfaces.ISocketable; +import forestry.core.inventory.InventoryAdapter; +import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.utils.DelayTimer; import forestry.core.utils.EnumTankLevel; -import forestry.core.inventory.InventoryAdapter; -import forestry.core.inventory.TileInventoryAdapter; import forestry.plugins.PluginIC2; +import ic2.api.energy.prefab.BasicSink; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class EngineTin extends Engine implements ISocketable, IInventory { diff --git a/src/main/java/forestry/energy/gui/ContainerEngineCopper.java b/src/main/java/forestry/energy/gui/ContainerEngineCopper.java index f73280ee4..ecb09027c 100755 --- a/src/main/java/forestry/energy/gui/ContainerEngineCopper.java +++ b/src/main/java/forestry/energy/gui/ContainerEngineCopper.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.energy.gui; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.Slot; - import forestry.core.gui.ContainerForestry; import forestry.core.gui.slots.SlotClosed; import forestry.energy.gadgets.EngineCopper; -import scala.collection.parallel.ParSeqLike.Updated; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.Slot; public class ContainerEngineCopper extends ContainerForestry { diff --git a/src/main/java/forestry/energy/gui/ContainerEngineTin.java b/src/main/java/forestry/energy/gui/ContainerEngineTin.java index d026931ce..f2887abdb 100755 --- a/src/main/java/forestry/energy/gui/ContainerEngineTin.java +++ b/src/main/java/forestry/energy/gui/ContainerEngineTin.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.energy.gui; +import forestry.core.gui.ContainerSocketed; +import forestry.energy.gadgets.EngineTin; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; -import forestry.core.gui.ContainerSocketed; -import forestry.energy.gadgets.EngineTin; - public class ContainerEngineTin extends ContainerSocketed { protected final EngineTin tile; diff --git a/src/main/java/forestry/energy/gui/GuiEngineBronze.java b/src/main/java/forestry/energy/gui/GuiEngineBronze.java index c73d78556..b867fe27c 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineBronze.java +++ b/src/main/java/forestry/energy/gui/GuiEngineBronze.java @@ -10,16 +10,6 @@ ******************************************************************************/ package forestry.energy.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.IIcon; - -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - import forestry.core.config.Defaults; import forestry.core.gui.WidgetManager; import forestry.core.gui.widgets.TankWidget; @@ -28,6 +18,13 @@ import forestry.core.proxy.Proxies; import forestry.core.render.SpriteSheet; import forestry.core.utils.StringUtil; import forestry.energy.gadgets.EngineBronze; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import org.lwjgl.opengl.GL11; public class GuiEngineBronze extends GuiEngine { diff --git a/src/main/java/forestry/energy/gui/GuiEngineCopper.java b/src/main/java/forestry/energy/gui/GuiEngineCopper.java index 304746688..d2d33f815 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineCopper.java +++ b/src/main/java/forestry/energy/gui/GuiEngineCopper.java @@ -10,11 +10,9 @@ ******************************************************************************/ package forestry.energy.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.core.config.Defaults; -import forestry.core.utils.StringUtil; import forestry.energy.gadgets.EngineCopper; +import net.minecraft.entity.player.InventoryPlayer; public class GuiEngineCopper extends GuiEngine { diff --git a/src/main/java/forestry/energy/gui/GuiEngineTin.java b/src/main/java/forestry/energy/gui/GuiEngineTin.java index f1942c073..1aac72cea 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineTin.java +++ b/src/main/java/forestry/energy/gui/GuiEngineTin.java @@ -10,13 +10,11 @@ ******************************************************************************/ package forestry.energy.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.core.config.Defaults; import forestry.core.gui.widgets.SocketWidget; import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.StringUtil; import forestry.energy.gadgets.EngineTin; +import net.minecraft.entity.player.InventoryPlayer; public class GuiEngineTin extends GuiEngine { diff --git a/src/main/java/forestry/energy/gui/GuiGenerator.java b/src/main/java/forestry/energy/gui/GuiGenerator.java index 673f10fd4..8f534bd9b 100755 --- a/src/main/java/forestry/energy/gui/GuiGenerator.java +++ b/src/main/java/forestry/energy/gui/GuiGenerator.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.energy.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.core.config.Defaults; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; import forestry.energy.gadgets.MachineGenerator; +import net.minecraft.entity.player.InventoryPlayer; public class GuiGenerator extends GuiForestryTitled { diff --git a/src/main/java/forestry/energy/render/RenderEngine.java b/src/main/java/forestry/energy/render/RenderEngine.java index 910709249..0a2ab054d 100755 --- a/src/main/java/forestry/energy/render/RenderEngine.java +++ b/src/main/java/forestry/energy/render/RenderEngine.java @@ -10,22 +10,19 @@ ******************************************************************************/ package forestry.energy.render; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - import forestry.core.TemperatureState; import forestry.core.config.Defaults; import forestry.core.gadgets.Engine; import forestry.core.interfaces.IBlockRenderer; import forestry.core.proxy.Proxies; import forestry.core.utils.ForestryResource; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.util.ForgeDirection; +import org.lwjgl.opengl.GL11; public class RenderEngine extends TileEntitySpecialRenderer implements IBlockRenderer { diff --git a/src/main/java/forestry/factory/GuiHandlerFactory.java b/src/main/java/forestry/factory/GuiHandlerFactory.java index 59a41f147..d639f15ba 100755 --- a/src/main/java/forestry/factory/GuiHandlerFactory.java +++ b/src/main/java/forestry/factory/GuiHandlerFactory.java @@ -10,9 +10,6 @@ ******************************************************************************/ package forestry.factory; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - import forestry.core.GuiHandlerBase; import forestry.core.network.GuiId; import forestry.factory.gadgets.MachineBottler; @@ -45,6 +42,8 @@ import forestry.factory.gui.GuiRaintank; import forestry.factory.gui.GuiSqueezer; import forestry.factory.gui.GuiStill; import forestry.factory.gui.GuiWorktable; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; public class GuiHandlerFactory extends GuiHandlerBase { diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index 2b16f0284..8ab5f23a5 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -10,31 +10,9 @@ ******************************************************************************/ package forestry.factory.gadgets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.world.World; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; - -import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.recipes.ICarpenterManager; +import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; @@ -46,16 +24,33 @@ import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.inventory.InventoryAdapter; +import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.ShapedRecipeCustom; import forestry.core.utils.StackUtils; -import forestry.core.inventory.TileInventoryAdapter; -import forestry.core.utils.LiquidHelper; import forestry.core.utils.Utils; import forestry.factory.gui.ContainerCarpenter; -import net.minecraftforge.fluids.FluidRegistry; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; public class MachineCarpenter extends TilePowered implements ISidedInventory, ILiquidTankContainer { diff --git a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java index eb3aea99b..15d7568e5 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java +++ b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java @@ -19,12 +19,17 @@ import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; -import forestry.core.network.GuiId; -import forestry.core.inventory.InventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; -import forestry.core.utils.StackUtils; +import forestry.core.network.GuiId; import forestry.core.utils.Utils; import forestry.factory.triggers.FactoryTriggers; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; +import java.util.Set; +import java.util.Stack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -35,14 +40,6 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; -import java.util.Set; -import java.util.Stack; - public class MachineCentrifuge extends TilePowered implements ISidedInventory { /* CONSTANTS */ diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index 461b27435..66727aa10 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -45,7 +45,6 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index 8859f197d..1bad21ddb 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -10,33 +10,13 @@ ******************************************************************************/ package forestry.factory.gadgets; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.Map; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; - +import buildcraft.api.statements.ITriggerExternal; import cpw.mods.fml.common.Optional; - -import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.fuels.FuelManager; import forestry.api.recipes.IFermenterManager; import forestry.api.recipes.IVariableFermentable; +import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.FluidHelper; @@ -47,13 +27,28 @@ import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; +import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.Utils; import forestry.factory.triggers.FactoryTriggers; - -import buildcraft.api.statements.ITriggerExternal; -import forestry.core.inventory.TileInventoryAdapter; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.Map; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; public class MachineFermenter extends TilePowered implements ISidedInventory, ILiquidTankContainer { diff --git a/src/main/java/forestry/factory/gadgets/MillRainmaker.java b/src/main/java/forestry/factory/gadgets/MillRainmaker.java index 436b3156e..12098ae3b 100755 --- a/src/main/java/forestry/factory/gadgets/MillRainmaker.java +++ b/src/main/java/forestry/factory/gadgets/MillRainmaker.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.factory.gadgets; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; - import forestry.api.fuels.FuelManager; import forestry.api.fuels.RainSubstrate; import forestry.core.gadgets.Mill; import forestry.core.gadgets.TileBase; import forestry.core.proxy.Proxies; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; public class MillRainmaker extends Mill { diff --git a/src/main/java/forestry/factory/gui/ContainerCarpenter.java b/src/main/java/forestry/factory/gui/ContainerCarpenter.java index a418c847c..41c5db9f4 100755 --- a/src/main/java/forestry/factory/gui/ContainerCarpenter.java +++ b/src/main/java/forestry/factory/gui/ContainerCarpenter.java @@ -10,13 +10,6 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCraftResult; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotCraftAuto; import forestry.core.gui.slots.SlotLiquidContainer; @@ -25,6 +18,12 @@ import forestry.core.gui.slots.SlotOutput; import forestry.core.interfaces.IContainerCrafting; import forestry.core.proxy.Proxies; import forestry.factory.gadgets.MachineCarpenter; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCraftResult; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; public class ContainerCarpenter extends ContainerLiquidTanks implements IContainerCrafting { diff --git a/src/main/java/forestry/factory/gui/ContainerCentrifuge.java b/src/main/java/forestry/factory/gui/ContainerCentrifuge.java index bdf321b41..dcbfbcdc8 100755 --- a/src/main/java/forestry/factory/gui/ContainerCentrifuge.java +++ b/src/main/java/forestry/factory/gui/ContainerCentrifuge.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.Slot; - import forestry.core.gui.ContainerForestry; import forestry.core.gui.slots.SlotClosed; import forestry.factory.gadgets.MachineCentrifuge; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.Slot; public class ContainerCentrifuge extends ContainerForestry { diff --git a/src/main/java/forestry/factory/gui/ContainerMoistener.java b/src/main/java/forestry/factory/gui/ContainerMoistener.java index b94d3152d..5070b8b26 100755 --- a/src/main/java/forestry/factory/gui/ContainerMoistener.java +++ b/src/main/java/forestry/factory/gui/ContainerMoistener.java @@ -10,15 +10,14 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; - import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotCraftAuto; import forestry.core.gui.slots.SlotWorking; import forestry.core.interfaces.IContainerCrafting; import forestry.factory.gadgets.MachineMoistener; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; public class ContainerMoistener extends ContainerLiquidTanks implements IContainerCrafting { diff --git a/src/main/java/forestry/factory/gui/ContainerRaintank.java b/src/main/java/forestry/factory/gui/ContainerRaintank.java index b3ade0028..e21be8b92 100755 --- a/src/main/java/forestry/factory/gui/ContainerRaintank.java +++ b/src/main/java/forestry/factory/gui/ContainerRaintank.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; - import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotClosed; import forestry.core.gui.slots.SlotLiquidContainer; import forestry.factory.gadgets.MachineRaintank; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; public class ContainerRaintank extends ContainerLiquidTanks { diff --git a/src/main/java/forestry/factory/gui/ContainerSqueezer.java b/src/main/java/forestry/factory/gui/ContainerSqueezer.java index 7c236ca59..b542da864 100755 --- a/src/main/java/forestry/factory/gui/ContainerSqueezer.java +++ b/src/main/java/forestry/factory/gui/ContainerSqueezer.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.Slot; - import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotClosed; import forestry.core.gui.slots.SlotLiquidContainer; import forestry.factory.gadgets.MachineSqueezer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; public class ContainerSqueezer extends ContainerLiquidTanks { diff --git a/src/main/java/forestry/factory/gui/ContainerStill.java b/src/main/java/forestry/factory/gui/ContainerStill.java index 41dcb6217..19f47f3fd 100755 --- a/src/main/java/forestry/factory/gui/ContainerStill.java +++ b/src/main/java/forestry/factory/gui/ContainerStill.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; - import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotLiquidContainer; import forestry.factory.gadgets.MachineStill; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; public class ContainerStill extends ContainerLiquidTanks { diff --git a/src/main/java/forestry/factory/gui/ContainerWorktable.java b/src/main/java/forestry/factory/gui/ContainerWorktable.java index 472064ebe..1395912f3 100755 --- a/src/main/java/forestry/factory/gui/ContainerWorktable.java +++ b/src/main/java/forestry/factory/gui/ContainerWorktable.java @@ -10,13 +10,6 @@ ******************************************************************************/ package forestry.factory.gui; -import forestry.core.utils.StackUtils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCraftResult; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.inventory.Slot; - import forestry.core.gui.ContainerForestry; import forestry.core.gui.IGuiSelectable; import forestry.core.gui.slots.SlotCrafter; @@ -25,7 +18,13 @@ import forestry.core.network.PacketIds; import forestry.core.network.PacketPayload; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; +import forestry.core.utils.StackUtils; import forestry.factory.gadgets.TileWorktable; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCraftResult; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; public class ContainerWorktable extends ContainerForestry implements IContainerCrafting, IGuiSelectable { diff --git a/src/main/java/forestry/factory/gui/GuiBottler.java b/src/main/java/forestry/factory/gui/GuiBottler.java index fd24dc271..6d0293689 100755 --- a/src/main/java/forestry/factory/gui/GuiBottler.java +++ b/src/main/java/forestry/factory/gui/GuiBottler.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.core.config.Defaults; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; import forestry.factory.gadgets.MachineBottler; +import net.minecraft.entity.player.InventoryPlayer; public class GuiBottler extends GuiForestryTitled { diff --git a/src/main/java/forestry/factory/gui/GuiCarpenter.java b/src/main/java/forestry/factory/gui/GuiCarpenter.java index 655e8df89..a6bb17de7 100755 --- a/src/main/java/forestry/factory/gui/GuiCarpenter.java +++ b/src/main/java/forestry/factory/gui/GuiCarpenter.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.core.config.Defaults; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; import forestry.factory.gadgets.MachineCarpenter; +import net.minecraft.entity.player.InventoryPlayer; public class GuiCarpenter extends GuiForestryTitled { diff --git a/src/main/java/forestry/factory/gui/GuiCentrifuge.java b/src/main/java/forestry/factory/gui/GuiCentrifuge.java index dde1b62c8..a81cf5470 100755 --- a/src/main/java/forestry/factory/gui/GuiCentrifuge.java +++ b/src/main/java/forestry/factory/gui/GuiCentrifuge.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.core.config.Defaults; import forestry.core.gui.GuiForestryTitled; import forestry.factory.gadgets.MachineCentrifuge; +import net.minecraft.entity.player.InventoryPlayer; public class GuiCentrifuge extends GuiForestryTitled { diff --git a/src/main/java/forestry/factory/gui/GuiFabricator.java b/src/main/java/forestry/factory/gui/GuiFabricator.java index f2b48da1c..21cb5f40e 100755 --- a/src/main/java/forestry/factory/gui/GuiFabricator.java +++ b/src/main/java/forestry/factory/gui/GuiFabricator.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.core.config.Defaults; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.ReservoirWidget; import forestry.factory.gadgets.MachineFabricator; +import net.minecraft.entity.player.InventoryPlayer; public class GuiFabricator extends GuiForestryTitled { diff --git a/src/main/java/forestry/factory/gui/GuiFermenter.java b/src/main/java/forestry/factory/gui/GuiFermenter.java index 1d51ba00b..752659428 100755 --- a/src/main/java/forestry/factory/gui/GuiFermenter.java +++ b/src/main/java/forestry/factory/gui/GuiFermenter.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.core.config.Defaults; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; import forestry.factory.gadgets.MachineFermenter; +import net.minecraft.entity.player.InventoryPlayer; public class GuiFermenter extends GuiForestryTitled { diff --git a/src/main/java/forestry/factory/gui/GuiMoistener.java b/src/main/java/forestry/factory/gui/GuiMoistener.java index e4fbd864d..22b0ed895 100755 --- a/src/main/java/forestry/factory/gui/GuiMoistener.java +++ b/src/main/java/forestry/factory/gui/GuiMoistener.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.core.config.Defaults; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; import forestry.factory.gadgets.MachineMoistener; +import net.minecraft.entity.player.InventoryPlayer; public class GuiMoistener extends GuiForestryTitled { diff --git a/src/main/java/forestry/factory/gui/GuiRaintank.java b/src/main/java/forestry/factory/gui/GuiRaintank.java index 02a93a01c..457d2b534 100755 --- a/src/main/java/forestry/factory/gui/GuiRaintank.java +++ b/src/main/java/forestry/factory/gui/GuiRaintank.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.core.config.Defaults; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; import forestry.factory.gadgets.MachineRaintank; +import net.minecraft.entity.player.InventoryPlayer; public class GuiRaintank extends GuiForestryTitled { diff --git a/src/main/java/forestry/factory/gui/GuiStill.java b/src/main/java/forestry/factory/gui/GuiStill.java index 2fcb8cd1f..cbfc65c0f 100755 --- a/src/main/java/forestry/factory/gui/GuiStill.java +++ b/src/main/java/forestry/factory/gui/GuiStill.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.core.config.Defaults; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; import forestry.factory.gadgets.MachineStill; +import net.minecraft.entity.player.InventoryPlayer; public class GuiStill extends GuiForestryTitled { diff --git a/src/main/java/forestry/factory/gui/SlotCraftMatrix.java b/src/main/java/forestry/factory/gui/SlotCraftMatrix.java index e627b984b..39ed2820f 100755 --- a/src/main/java/forestry/factory/gui/SlotCraftMatrix.java +++ b/src/main/java/forestry/factory/gui/SlotCraftMatrix.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.inventory.IInventory; - import forestry.core.gui.slots.SlotForestry; import forestry.core.interfaces.IContainerCrafting; +import net.minecraft.inventory.IInventory; /** * Informs the passed container of slot changes. Contains a dummy itemstack. diff --git a/src/main/java/forestry/factory/recipes/CraftGuideBottler.java b/src/main/java/forestry/factory/recipes/CraftGuideBottler.java index b430f0623..70d426fda 100755 --- a/src/main/java/forestry/factory/recipes/CraftGuideBottler.java +++ b/src/main/java/forestry/factory/recipes/CraftGuideBottler.java @@ -10,8 +10,10 @@ ******************************************************************************/ package forestry.factory.recipes; +import forestry.core.config.Defaults; +import forestry.core.config.ForestryBlock; +import forestry.factory.gadgets.MachineBottler; import net.minecraft.item.ItemStack; - import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.LiquidSlot; import uristqwerty.CraftGuide.api.RecipeGenerator; @@ -20,10 +22,6 @@ import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.Slot; import uristqwerty.CraftGuide.api.SlotType; -import forestry.core.config.Defaults; -import forestry.core.config.ForestryBlock; -import forestry.factory.gadgets.MachineBottler; - public class CraftGuideBottler implements RecipeProvider { private final Slot[] slots = new Slot[4]; diff --git a/src/main/java/forestry/factory/recipes/CraftGuideCarpenter.java b/src/main/java/forestry/factory/recipes/CraftGuideCarpenter.java index df737e54c..ecf5213cd 100755 --- a/src/main/java/forestry/factory/recipes/CraftGuideCarpenter.java +++ b/src/main/java/forestry/factory/recipes/CraftGuideCarpenter.java @@ -10,8 +10,11 @@ ******************************************************************************/ package forestry.factory.recipes; +import forestry.core.config.Defaults; +import forestry.core.config.ForestryBlock; +import forestry.core.utils.RecipeUtil; +import forestry.factory.gadgets.MachineCarpenter; import net.minecraft.item.ItemStack; - import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.LiquidSlot; import uristqwerty.CraftGuide.api.RecipeGenerator; @@ -20,11 +23,6 @@ import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.Slot; import uristqwerty.CraftGuide.api.SlotType; -import forestry.core.config.Defaults; -import forestry.core.config.ForestryBlock; -import forestry.core.utils.RecipeUtil; -import forestry.factory.gadgets.MachineCarpenter; - public class CraftGuideCarpenter implements RecipeProvider { private final Slot[] slots = new Slot[12]; diff --git a/src/main/java/forestry/factory/recipes/CraftGuideCentrifuge.java b/src/main/java/forestry/factory/recipes/CraftGuideCentrifuge.java index 243bdba52..f24659aaa 100755 --- a/src/main/java/forestry/factory/recipes/CraftGuideCentrifuge.java +++ b/src/main/java/forestry/factory/recipes/CraftGuideCentrifuge.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.factory.recipes; +import forestry.core.config.Defaults; +import forestry.core.config.ForestryBlock; +import forestry.factory.gadgets.MachineCentrifuge; import java.util.ArrayList; import java.util.Map.Entry; - import net.minecraft.item.ItemStack; - import uristqwerty.CraftGuide.api.ChanceSlot; import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.RecipeGenerator; @@ -23,10 +24,6 @@ import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.Slot; import uristqwerty.CraftGuide.api.SlotType; -import forestry.core.config.Defaults; -import forestry.core.config.ForestryBlock; -import forestry.factory.gadgets.MachineCentrifuge; - public class CraftGuideCentrifuge implements RecipeProvider { private final Slot[] slots = new Slot[11]; diff --git a/src/main/java/forestry/factory/recipes/CraftGuideCustomRecipes.java b/src/main/java/forestry/factory/recipes/CraftGuideCustomRecipes.java index e1309171c..e1ed7c04d 100755 --- a/src/main/java/forestry/factory/recipes/CraftGuideCustomRecipes.java +++ b/src/main/java/forestry/factory/recipes/CraftGuideCustomRecipes.java @@ -10,19 +10,17 @@ ******************************************************************************/ package forestry.factory.recipes; +import forestry.core.interfaces.IDescriptiveRecipe; +import forestry.core.utils.RecipeUtil; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; - import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.RecipeGenerator; import uristqwerty.CraftGuide.api.RecipeProvider; import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.SlotType; -import forestry.core.interfaces.IDescriptiveRecipe; -import forestry.core.utils.RecipeUtil; - public class CraftGuideCustomRecipes implements RecipeProvider { private final ItemSlot[] slots = new ItemSlot[10]; diff --git a/src/main/java/forestry/factory/recipes/CraftGuideFabricator.java b/src/main/java/forestry/factory/recipes/CraftGuideFabricator.java index f193a0a59..67b48c5b6 100755 --- a/src/main/java/forestry/factory/recipes/CraftGuideFabricator.java +++ b/src/main/java/forestry/factory/recipes/CraftGuideFabricator.java @@ -10,8 +10,11 @@ ******************************************************************************/ package forestry.factory.recipes; +import forestry.core.config.Defaults; +import forestry.core.config.ForestryBlock; +import forestry.core.utils.RecipeUtil; +import forestry.factory.gadgets.MachineFabricator; import net.minecraft.item.ItemStack; - import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.LiquidSlot; import uristqwerty.CraftGuide.api.RecipeGenerator; @@ -20,11 +23,6 @@ import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.Slot; import uristqwerty.CraftGuide.api.SlotType; -import forestry.core.config.Defaults; -import forestry.core.config.ForestryBlock; -import forestry.core.utils.RecipeUtil; -import forestry.factory.gadgets.MachineFabricator; - public class CraftGuideFabricator implements RecipeProvider { private final Slot[] slots = new Slot[12]; diff --git a/src/main/java/forestry/factory/recipes/CraftGuideFermenter.java b/src/main/java/forestry/factory/recipes/CraftGuideFermenter.java index 970966bca..60c8b403f 100755 --- a/src/main/java/forestry/factory/recipes/CraftGuideFermenter.java +++ b/src/main/java/forestry/factory/recipes/CraftGuideFermenter.java @@ -10,13 +10,14 @@ ******************************************************************************/ package forestry.factory.recipes; +import forestry.api.fuels.FuelManager; +import forestry.core.config.Defaults; +import forestry.core.config.ForestryBlock; +import forestry.factory.gadgets.MachineFermenter; import java.util.ArrayList; import java.util.List; - import net.minecraft.item.ItemStack; - import net.minecraftforge.fluids.FluidStack; - import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.LiquidSlot; import uristqwerty.CraftGuide.api.RecipeGenerator; @@ -25,11 +26,6 @@ import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.Slot; import uristqwerty.CraftGuide.api.SlotType; -import forestry.api.fuels.FuelManager; -import forestry.core.config.Defaults; -import forestry.core.config.ForestryBlock; -import forestry.factory.gadgets.MachineFermenter; - public class CraftGuideFermenter implements RecipeProvider { private final Slot[] slots = new Slot[5]; diff --git a/src/main/java/forestry/factory/recipes/CraftGuideIntegration.java b/src/main/java/forestry/factory/recipes/CraftGuideIntegration.java index ed00830e9..9ead8d2f4 100755 --- a/src/main/java/forestry/factory/recipes/CraftGuideIntegration.java +++ b/src/main/java/forestry/factory/recipes/CraftGuideIntegration.java @@ -10,9 +10,8 @@ ******************************************************************************/ package forestry.factory.recipes; -import java.lang.reflect.Method; - import forestry.core.proxy.Proxies; +import java.lang.reflect.Method; public class CraftGuideIntegration { diff --git a/src/main/java/forestry/factory/recipes/CraftGuideSqueezer.java b/src/main/java/forestry/factory/recipes/CraftGuideSqueezer.java index e7a1286dc..0fcc8ca10 100755 --- a/src/main/java/forestry/factory/recipes/CraftGuideSqueezer.java +++ b/src/main/java/forestry/factory/recipes/CraftGuideSqueezer.java @@ -10,8 +10,10 @@ ******************************************************************************/ package forestry.factory.recipes; +import forestry.core.config.Defaults; +import forestry.core.config.ForestryBlock; +import forestry.factory.gadgets.MachineSqueezer; import net.minecraft.item.ItemStack; - import uristqwerty.CraftGuide.api.ChanceSlot; import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.LiquidSlot; @@ -21,10 +23,6 @@ import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.Slot; import uristqwerty.CraftGuide.api.SlotType; -import forestry.core.config.Defaults; -import forestry.core.config.ForestryBlock; -import forestry.factory.gadgets.MachineSqueezer; - public class CraftGuideSqueezer implements RecipeProvider { private final Slot[] slots = new Slot[12]; diff --git a/src/main/java/forestry/factory/recipes/CraftGuideStill.java b/src/main/java/forestry/factory/recipes/CraftGuideStill.java index 5384e84ad..2bce6fff2 100755 --- a/src/main/java/forestry/factory/recipes/CraftGuideStill.java +++ b/src/main/java/forestry/factory/recipes/CraftGuideStill.java @@ -10,8 +10,10 @@ ******************************************************************************/ package forestry.factory.recipes; +import forestry.core.config.Defaults; +import forestry.core.config.ForestryBlock; +import forestry.factory.gadgets.MachineStill; import net.minecraft.item.ItemStack; - import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.LiquidSlot; import uristqwerty.CraftGuide.api.RecipeGenerator; @@ -20,10 +22,6 @@ import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.Slot; import uristqwerty.CraftGuide.api.SlotType; -import forestry.core.config.Defaults; -import forestry.core.config.ForestryBlock; -import forestry.factory.gadgets.MachineStill; - public class CraftGuideStill implements RecipeProvider { private final Slot[] slots = new Slot[3]; diff --git a/src/main/java/forestry/factory/recipes/RecipeMemory.java b/src/main/java/forestry/factory/recipes/RecipeMemory.java index fd7d1c2c2..3a5cdf560 100644 --- a/src/main/java/forestry/factory/recipes/RecipeMemory.java +++ b/src/main/java/forestry/factory/recipes/RecipeMemory.java @@ -14,6 +14,9 @@ import forestry.api.core.INBTTagable; import forestry.core.gui.ContainerDummy; import forestry.core.inventory.InventoryAdapter; import forestry.core.utils.PlainInventory; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; @@ -25,10 +28,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - public class RecipeMemory implements INBTTagable { public static final class Recipe implements INBTTagable { diff --git a/src/main/java/forestry/farming/EventHandlerFarming.java b/src/main/java/forestry/farming/EventHandlerFarming.java index b0049dba9..a2ed61201 100755 --- a/src/main/java/forestry/farming/EventHandlerFarming.java +++ b/src/main/java/forestry/farming/EventHandlerFarming.java @@ -10,16 +10,13 @@ ******************************************************************************/ package forestry.farming; -import net.minecraft.block.Block; - import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -import net.minecraftforge.event.entity.player.BonemealEvent; - import forestry.core.config.ForestryBlock; import forestry.core.proxy.Proxies; import forestry.farming.gadgets.BlockMushroom; +import net.minecraft.block.Block; +import net.minecraftforge.event.entity.player.BonemealEvent; public class EventHandlerFarming { diff --git a/src/main/java/forestry/farming/GuiHandlerFarming.java b/src/main/java/forestry/farming/GuiHandlerFarming.java index 88456e447..4f4538a4d 100755 --- a/src/main/java/forestry/farming/GuiHandlerFarming.java +++ b/src/main/java/forestry/farming/GuiHandlerFarming.java @@ -10,9 +10,6 @@ ******************************************************************************/ package forestry.farming; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - import forestry.core.GuiHandlerBase; import forestry.core.network.GuiId; import forestry.core.network.PacketIds; @@ -21,6 +18,8 @@ import forestry.core.proxy.Proxies; import forestry.farming.gadgets.TileFarmPlain; import forestry.farming.gui.ContainerFarm; import forestry.farming.gui.GuiFarm; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; public class GuiHandlerFarming extends GuiHandlerBase { diff --git a/src/main/java/forestry/farming/gadgets/BlockFarm.java b/src/main/java/forestry/farming/gadgets/BlockFarm.java index 4a156aaca..b0e368b97 100755 --- a/src/main/java/forestry/farming/gadgets/BlockFarm.java +++ b/src/main/java/forestry/farming/gadgets/BlockFarm.java @@ -10,9 +10,15 @@ ******************************************************************************/ package forestry.farming.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.gadgets.BlockStructure; +import forestry.core.proxy.Proxies; +import forestry.core.utils.StackUtils; +import forestry.farming.gadgets.TileFarm.EnumFarmBlock; +import forestry.plugins.PluginFarming; import java.util.ArrayList; import java.util.List; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -27,15 +33,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.gadgets.BlockStructure; -import forestry.core.proxy.Proxies; -import forestry.core.utils.StackUtils; -import forestry.farming.gadgets.TileFarm.EnumFarmBlock; -import forestry.plugins.PluginFarming; - public class BlockFarm extends BlockStructure { public BlockFarm() { diff --git a/src/main/java/forestry/farming/gadgets/BlockMushroom.java b/src/main/java/forestry/farming/gadgets/BlockMushroom.java index b61eff722..40a56e8f8 100755 --- a/src/main/java/forestry/farming/gadgets/BlockMushroom.java +++ b/src/main/java/forestry/farming/gadgets/BlockMushroom.java @@ -10,11 +10,15 @@ ******************************************************************************/ package forestry.farming.gadgets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.IItemTyped; +import forestry.core.config.Defaults; +import forestry.core.proxy.Proxies; +import forestry.farming.worldgen.WorldGenBigMushroom; import java.util.ArrayList; import java.util.List; import java.util.Random; - -import forestry.core.IItemTyped; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.client.renderer.texture.IIconRegister; @@ -26,13 +30,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.config.Defaults; -import forestry.core.proxy.Proxies; -import forestry.farming.worldgen.WorldGenBigMushroom; - public class BlockMushroom extends BlockSapling implements IItemTyped { public enum MushroomType { diff --git a/src/main/java/forestry/farming/gadgets/StructureLogicFarm.java b/src/main/java/forestry/farming/gadgets/StructureLogicFarm.java index 88036724b..ce6371ba7 100755 --- a/src/main/java/forestry/farming/gadgets/StructureLogicFarm.java +++ b/src/main/java/forestry/farming/gadgets/StructureLogicFarm.java @@ -10,12 +10,6 @@ ******************************************************************************/ package forestry.farming.gadgets; -import java.util.HashSet; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.tileentity.TileEntity; - import forestry.api.core.ITileStructure; import forestry.api.farming.IFarmComponent; import forestry.core.gadgets.BlockStructure.EnumStructureState; @@ -23,7 +17,11 @@ import forestry.core.gadgets.StructureLogic; import forestry.core.utils.Schemata; import forestry.core.utils.Schemata.EnumStructureBlock; import forestry.core.utils.Vect; +import java.util.HashSet; import java.util.Set; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.tileentity.TileEntity; public class StructureLogicFarm extends StructureLogic { diff --git a/src/main/java/forestry/farming/gadgets/TileControl.java b/src/main/java/forestry/farming/gadgets/TileControl.java index c0493fe78..54b90f082 100755 --- a/src/main/java/forestry/farming/gadgets/TileControl.java +++ b/src/main/java/forestry/farming/gadgets/TileControl.java @@ -10,19 +10,16 @@ ******************************************************************************/ package forestry.farming.gadgets; -import java.util.Collection; - -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.core.ITileStructure; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmComponent; import forestry.api.farming.IFarmListener; import forestry.api.farming.IFarmLogic; import forestry.core.utils.Vect; +import java.util.Collection; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TileControl extends TileFarm implements IFarmListener { diff --git a/src/main/java/forestry/farming/gadgets/TileFarm.java b/src/main/java/forestry/farming/gadgets/TileFarm.java index 8f9dedaaf..479b342e8 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarm.java +++ b/src/main/java/forestry/farming/gadgets/TileFarm.java @@ -10,18 +10,8 @@ ******************************************************************************/ package forestry.farming.gadgets; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.core.ForestryAPI; import forestry.api.core.IStructureLogic; import forestry.api.core.ITileStructure; @@ -33,8 +23,14 @@ import forestry.core.network.GuiId; import forestry.core.network.PacketPayload; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; -import forestry.core.inventory.TileInventoryAdapter; -import forestry.core.utils.Utils; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; public abstract class TileFarm extends TileForestry implements IFarmComponent { diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index b5d5a1c16..884071ab9 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -10,32 +10,9 @@ ******************************************************************************/ package forestry.farming.gadgets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; -import java.util.Stack; -import java.util.TreeMap; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitBoard; import forestry.api.core.BiomeHelper; -import forestry.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.farming.ICrop; @@ -44,6 +21,7 @@ import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmListener; import forestry.api.farming.IFarmLogic; import forestry.api.farming.IFarmable; +import forestry.core.EnumErrorCode; import forestry.core.GameMode; import forestry.core.config.Config; import forestry.core.config.Defaults; @@ -64,6 +42,25 @@ import forestry.core.utils.Vect; import forestry.farming.FarmTarget; import forestry.farming.logic.FarmLogicArboreal; import forestry.plugins.PluginFarming; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; +import java.util.Stack; +import java.util.TreeMap; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable, IClimatised, IHintSource { diff --git a/src/main/java/forestry/farming/gadgets/TileHatch.java b/src/main/java/forestry/farming/gadgets/TileHatch.java index eb94e4fab..9cede7c5e 100755 --- a/src/main/java/forestry/farming/gadgets/TileHatch.java +++ b/src/main/java/forestry/farming/gadgets/TileHatch.java @@ -17,6 +17,10 @@ import forestry.core.utils.BlockUtil; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; import forestry.farming.triggers.FarmingTriggers; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -25,11 +29,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedList; - public class TileHatch extends TileFarm implements ISidedInventory { public TileHatch() { diff --git a/src/main/java/forestry/farming/gadgets/TileValve.java b/src/main/java/forestry/farming/gadgets/TileValve.java index d51fce0a1..318a5e92d 100755 --- a/src/main/java/forestry/farming/gadgets/TileValve.java +++ b/src/main/java/forestry/farming/gadgets/TileValve.java @@ -10,15 +10,14 @@ ******************************************************************************/ package forestry.farming.gadgets; +import forestry.core.fluids.TankManager; +import forestry.core.fluids.tanks.FakeTank; +import forestry.core.interfaces.ILiquidTankContainer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; - -import forestry.core.interfaces.ILiquidTankContainer; -import forestry.core.fluids.TankManager; -import forestry.core.fluids.tanks.FakeTank; import net.minecraftforge.fluids.FluidTankInfo; public class TileValve extends TileFarm implements ILiquidTankContainer { diff --git a/src/main/java/forestry/farming/gui/ContainerFarm.java b/src/main/java/forestry/farming/gui/ContainerFarm.java index 396727d2f..1f1c30d41 100755 --- a/src/main/java/forestry/farming/gui/ContainerFarm.java +++ b/src/main/java/forestry/farming/gui/ContainerFarm.java @@ -10,12 +10,6 @@ ******************************************************************************/ package forestry.farming.gui; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - import forestry.api.farming.IFarmLogic; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.StandardTank; @@ -26,6 +20,11 @@ import forestry.core.gui.slots.SlotLiquidContainer; import forestry.core.gui.slots.SlotOutput; import forestry.farming.gadgets.TileFarmPlain; import forestry.plugins.PluginFarming; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; public class ContainerFarm extends ContainerSocketed { diff --git a/src/main/java/forestry/farming/gui/GuiFarm.java b/src/main/java/forestry/farming/gui/GuiFarm.java index 6220f0cdc..652c5709b 100755 --- a/src/main/java/forestry/farming/gui/GuiFarm.java +++ b/src/main/java/forestry/farming/gui/GuiFarm.java @@ -10,12 +10,6 @@ ******************************************************************************/ package forestry.farming.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.util.IIcon; - -import org.lwjgl.opengl.GL11; - import forestry.api.farming.IFarmLogic; import forestry.core.config.Defaults; import forestry.core.gui.GuiForestry; @@ -28,6 +22,10 @@ import forestry.core.gui.widgets.Widget; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; import forestry.farming.gadgets.TileFarmPlain; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.util.IIcon; +import org.lwjgl.opengl.GL11; public class GuiFarm extends GuiForestry { diff --git a/src/main/java/forestry/farming/items/ItemFarmBlock.java b/src/main/java/forestry/farming/items/ItemFarmBlock.java index 875840447..09ceb6b7b 100755 --- a/src/main/java/forestry/farming/items/ItemFarmBlock.java +++ b/src/main/java/forestry/farming/items/ItemFarmBlock.java @@ -10,16 +10,14 @@ ******************************************************************************/ package forestry.farming.items; +import forestry.core.gadgets.IStructureBlockItem; +import forestry.farming.gadgets.TileFarm.EnumFarmBlock; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import forestry.core.gadgets.IStructureBlockItem; -import forestry.farming.gadgets.TileFarm.EnumFarmBlock; - public class ItemFarmBlock extends ItemBlock implements IStructureBlockItem { public ItemFarmBlock(Block block) { diff --git a/src/main/java/forestry/farming/logic/Crop.java b/src/main/java/forestry/farming/logic/Crop.java index 06985d5d6..2262e944c 100755 --- a/src/main/java/forestry/farming/logic/Crop.java +++ b/src/main/java/forestry/farming/logic/Crop.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.farming.logic; -import java.util.Collection; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.api.farming.ICrop; import forestry.core.config.Defaults; import forestry.core.utils.Vect; +import java.util.Collection; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public abstract class Crop implements ICrop { diff --git a/src/main/java/forestry/farming/logic/CropBlock.java b/src/main/java/forestry/farming/logic/CropBlock.java index b7990157f..82e555ca9 100755 --- a/src/main/java/forestry/farming/logic/CropBlock.java +++ b/src/main/java/forestry/farming/logic/CropBlock.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.farming.logic; +import forestry.core.proxy.Proxies; +import forestry.core.utils.Vect; import java.util.Collection; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import forestry.core.proxy.Proxies; -import forestry.core.utils.Vect; - public class CropBlock extends Crop { Block block; diff --git a/src/main/java/forestry/farming/logic/CropFruit.java b/src/main/java/forestry/farming/logic/CropFruit.java index 82538f73d..ffc199471 100755 --- a/src/main/java/forestry/farming/logic/CropFruit.java +++ b/src/main/java/forestry/farming/logic/CropFruit.java @@ -10,18 +10,16 @@ ******************************************************************************/ package forestry.farming.logic; -import java.util.ArrayList; -import java.util.Collection; - -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - import forestry.api.genetics.IFruitBearer; import forestry.api.genetics.IFruitFamily; import forestry.core.network.PacketFXSignal; import forestry.core.proxy.Proxies; import forestry.core.utils.Vect; +import java.util.ArrayList; +import java.util.Collection; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class CropFruit extends Crop { diff --git a/src/main/java/forestry/farming/logic/CropPeat.java b/src/main/java/forestry/farming/logic/CropPeat.java index 9c180b115..949deefec 100755 --- a/src/main/java/forestry/farming/logic/CropPeat.java +++ b/src/main/java/forestry/farming/logic/CropPeat.java @@ -14,14 +14,13 @@ import forestry.core.gadgets.BlockSoil; import forestry.core.proxy.Proxies; import forestry.core.utils.BlockUtil; import forestry.core.utils.Vect; +import java.util.ArrayList; +import java.util.Collection; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import java.util.ArrayList; -import java.util.Collection; - public class CropPeat extends Crop { public CropPeat(World world, Vect position) { diff --git a/src/main/java/forestry/farming/logic/CropRubber.java b/src/main/java/forestry/farming/logic/CropRubber.java index 21906120e..ac7dfc885 100755 --- a/src/main/java/forestry/farming/logic/CropRubber.java +++ b/src/main/java/forestry/farming/logic/CropRubber.java @@ -10,17 +10,15 @@ ******************************************************************************/ package forestry.farming.logic; -import java.util.ArrayList; -import java.util.Collection; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.core.config.Defaults; import forestry.core.proxy.Proxies; import forestry.core.utils.Vect; import forestry.plugins.PluginIC2; +import java.util.ArrayList; +import java.util.Collection; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class CropRubber extends CropBlock { diff --git a/src/main/java/forestry/farming/logic/FarmLogic.java b/src/main/java/forestry/farming/logic/FarmLogic.java index e054c7389..97e1419f4 100755 --- a/src/main/java/forestry/farming/logic/FarmLogic.java +++ b/src/main/java/forestry/farming/logic/FarmLogic.java @@ -16,6 +16,7 @@ import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.render.SpriteSheet; import forestry.core.utils.Vect; +import java.util.HashSet; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -24,8 +25,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.HashSet; - public abstract class FarmLogic implements IFarmLogic { IFarmHousing housing; diff --git a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java index f7f623ed8..00352ab7c 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java @@ -20,6 +20,13 @@ import forestry.core.config.ForestryBlock; import forestry.core.gadgets.BlockSoil; import forestry.core.render.SpriteSheet; import forestry.core.utils.Vect; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.Stack; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -31,14 +38,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.Stack; - public class FarmLogicArboreal extends FarmLogicHomogeneous { public FarmLogicArboreal(IFarmHousing housing, ItemStack[] resource, ItemStack ground, IFarmable[] germlings) { diff --git a/src/main/java/forestry/farming/logic/FarmLogicCereal.java b/src/main/java/forestry/farming/logic/FarmLogicCereal.java index 1d06d7f02..2880c647c 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCereal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCereal.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.farming.logic; -import net.minecraft.init.Items; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.farming.Farmables; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; +import net.minecraft.init.Items; +import net.minecraft.util.IIcon; public class FarmLogicCereal extends FarmLogicCrops { diff --git a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java index 8cfec943f..5a1c4eedb 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java @@ -10,30 +10,26 @@ ******************************************************************************/ package forestry.farming.logic; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmHousing; +import forestry.api.farming.IFarmable; +import forestry.core.utils.Vect; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; +import java.util.Set; import java.util.Stack; - import net.minecraft.block.Block; import net.minecraft.block.BlockLog; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmHousing; -import forestry.api.farming.IFarmable; -import forestry.core.utils.Vect; -import java.util.HashSet; -import java.util.Set; - public class FarmLogicCocoa extends FarmLogic { private final IFarmable cocoa = new FarmableCocoa(); diff --git a/src/main/java/forestry/farming/logic/FarmLogicCrops.java b/src/main/java/forestry/farming/logic/FarmLogicCrops.java index 9baa9f173..29e9a2b95 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCrops.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCrops.java @@ -17,6 +17,10 @@ import forestry.core.config.Defaults; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; import forestry.core.utils.Vect; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Stack; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; @@ -25,11 +29,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Stack; - public abstract class FarmLogicCrops extends FarmLogicWatered { private final IFarmable[] seeds; diff --git a/src/main/java/forestry/farming/logic/FarmLogicGourd.java b/src/main/java/forestry/farming/logic/FarmLogicGourd.java index 8fcb2d31a..4af434431 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicGourd.java +++ b/src/main/java/forestry/farming/logic/FarmLogicGourd.java @@ -10,24 +10,20 @@ ******************************************************************************/ package forestry.farming.logic; -import java.util.Collection; -import java.util.Stack; - -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; import forestry.core.utils.Vect; +import java.util.Collection; +import java.util.Stack; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class FarmLogicGourd extends FarmLogic { diff --git a/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java b/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java index b832d8970..5fa931400 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java +++ b/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java @@ -15,11 +15,10 @@ import forestry.api.farming.IFarmable; import forestry.core.utils.BlockUtil; import forestry.core.utils.StackUtils; import forestry.core.utils.Vect; +import java.util.ArrayList; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; - public abstract class FarmLogicHomogeneous extends FarmLogic { protected final ItemStack[] resource; diff --git a/src/main/java/forestry/farming/logic/FarmLogicInfernal.java b/src/main/java/forestry/farming/logic/FarmLogicInfernal.java index 218e2fc25..2eb3af892 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicInfernal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicInfernal.java @@ -10,26 +10,22 @@ ******************************************************************************/ package forestry.farming.logic; -import java.util.Collection; -import java.util.Stack; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; import forestry.core.utils.Utils; import forestry.core.utils.Vect; +import java.util.Collection; +import java.util.Stack; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class FarmLogicInfernal extends FarmLogicHomogeneous { diff --git a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java index 3aa2f21bc..642b930ed 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java +++ b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java @@ -10,29 +10,25 @@ ******************************************************************************/ package forestry.farming.logic; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Stack; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.genetics.IFruitBearer; import forestry.core.config.ForestryItem; import forestry.core.utils.Vect; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; import java.util.HashSet; import java.util.Set; +import java.util.Stack; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class FarmLogicOrchard extends FarmLogic { diff --git a/src/main/java/forestry/farming/logic/FarmLogicPeat.java b/src/main/java/forestry/farming/logic/FarmLogicPeat.java index 7b9eb0326..f37cf7575 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicPeat.java +++ b/src/main/java/forestry/farming/logic/FarmLogicPeat.java @@ -14,22 +14,18 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; -import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.gadgets.BlockSoil; -import forestry.core.utils.StackUtils; import forestry.core.utils.Vect; +import java.util.Collection; +import java.util.Stack; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.Collection; -import java.util.Stack; - public class FarmLogicPeat extends FarmLogicWatered { public FarmLogicPeat(IFarmHousing housing) { diff --git a/src/main/java/forestry/farming/logic/FarmLogicPoale.java b/src/main/java/forestry/farming/logic/FarmLogicPoale.java index c4546de0f..cca789b17 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicPoale.java +++ b/src/main/java/forestry/farming/logic/FarmLogicPoale.java @@ -10,26 +10,22 @@ ******************************************************************************/ package forestry.farming.logic; -import java.util.Collection; -import java.util.Stack; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; import forestry.core.utils.StackUtils; import forestry.core.utils.Vect; +import java.util.Collection; +import java.util.Stack; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class FarmLogicPoale extends FarmLogic { diff --git a/src/main/java/forestry/farming/logic/FarmLogicRubber.java b/src/main/java/forestry/farming/logic/FarmLogicRubber.java index 7dcc81f01..53fc99782 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicRubber.java +++ b/src/main/java/forestry/farming/logic/FarmLogicRubber.java @@ -10,30 +10,26 @@ ******************************************************************************/ package forestry.farming.logic; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Stack; - -import net.minecraft.block.Block; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.core.proxy.Proxies; import forestry.core.utils.StackUtils; import forestry.core.utils.Vect; import forestry.plugins.PluginIC2; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; import java.util.HashSet; import java.util.Set; +import java.util.Stack; +import net.minecraft.block.Block; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class FarmLogicRubber extends FarmLogic { diff --git a/src/main/java/forestry/farming/logic/FarmLogicShroom.java b/src/main/java/forestry/farming/logic/FarmLogicShroom.java index 9126b4df5..0fae43117 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicShroom.java +++ b/src/main/java/forestry/farming/logic/FarmLogicShroom.java @@ -10,19 +10,16 @@ ******************************************************************************/ package forestry.farming.logic; -import java.util.ArrayList; -import java.util.Collection; - -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.farming.Farmables; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; +import java.util.ArrayList; +import java.util.Collection; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; public class FarmLogicShroom extends FarmLogicArboreal { diff --git a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java index e87c7da8b..68a2ec2fb 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java +++ b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java @@ -10,26 +10,22 @@ ******************************************************************************/ package forestry.farming.logic; -import java.util.Collection; -import java.util.Stack; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; import forestry.core.utils.StackUtils; import forestry.core.utils.Vect; +import java.util.Collection; +import java.util.Stack; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class FarmLogicSucculent extends FarmLogic { diff --git a/src/main/java/forestry/farming/logic/FarmLogicVegetable.java b/src/main/java/forestry/farming/logic/FarmLogicVegetable.java index 1116fadac..73d12aeca 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicVegetable.java +++ b/src/main/java/forestry/farming/logic/FarmLogicVegetable.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.farming.logic; -import net.minecraft.init.Items; -import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.farming.Farmables; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; +import net.minecraft.init.Items; +import net.minecraft.util.IIcon; public class FarmLogicVegetable extends FarmLogicCrops { diff --git a/src/main/java/forestry/farming/logic/FarmLogicWatered.java b/src/main/java/forestry/farming/logic/FarmLogicWatered.java index 9899b59fb..7dd55ac91 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicWatered.java +++ b/src/main/java/forestry/farming/logic/FarmLogicWatered.java @@ -10,23 +10,20 @@ ******************************************************************************/ package forestry.farming.logic; -import java.util.ArrayList; -import java.util.Collection; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; - import forestry.api.farming.IFarmHousing; import forestry.core.fluids.Fluids; import forestry.core.utils.BlockUtil; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; import forestry.core.utils.Vect; +import java.util.ArrayList; +import java.util.Collection; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; public abstract class FarmLogicWatered extends FarmLogic { diff --git a/src/main/java/forestry/farming/logic/FarmableCocoa.java b/src/main/java/forestry/farming/logic/FarmableCocoa.java index 47d0a380b..a5874201b 100755 --- a/src/main/java/forestry/farming/logic/FarmableCocoa.java +++ b/src/main/java/forestry/farming/logic/FarmableCocoa.java @@ -10,6 +10,10 @@ ******************************************************************************/ package forestry.farming.logic; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmable; +import forestry.core.utils.BlockUtil; +import forestry.core.utils.Vect; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -18,11 +22,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmable; -import forestry.core.utils.BlockUtil; -import forestry.core.utils.Vect; - public class FarmableCocoa implements IFarmable { public static final Block COCOA_PLANT = Blocks.cocoa; diff --git a/src/main/java/forestry/farming/logic/FarmableFarmCraftory.java b/src/main/java/forestry/farming/logic/FarmableFarmCraftory.java index bf8fa7cf2..ce13c3ca7 100755 --- a/src/main/java/forestry/farming/logic/FarmableFarmCraftory.java +++ b/src/main/java/forestry/farming/logic/FarmableFarmCraftory.java @@ -10,19 +10,17 @@ ******************************************************************************/ package forestry.farming.logic; -import java.util.Collection; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.core.utils.StackUtils; import forestry.core.utils.Vect; import forestry.plugins.PluginFarmCraftory; +import java.util.Collection; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class FarmableFarmCraftory implements IFarmable { diff --git a/src/main/java/forestry/farming/logic/FarmableGenericCrop.java b/src/main/java/forestry/farming/logic/FarmableGenericCrop.java index 60c7c7d55..632ce5344 100755 --- a/src/main/java/forestry/farming/logic/FarmableGenericCrop.java +++ b/src/main/java/forestry/farming/logic/FarmableGenericCrop.java @@ -10,15 +10,14 @@ ******************************************************************************/ package forestry.farming.logic; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmable; +import forestry.core.utils.Vect; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmable; -import forestry.core.utils.Vect; - public class FarmableGenericCrop implements IFarmable { private final ItemStack seed; diff --git a/src/main/java/forestry/farming/logic/FarmableGenericSapling.java b/src/main/java/forestry/farming/logic/FarmableGenericSapling.java index d75de37c5..f49c16760 100755 --- a/src/main/java/forestry/farming/logic/FarmableGenericSapling.java +++ b/src/main/java/forestry/farming/logic/FarmableGenericSapling.java @@ -10,15 +10,14 @@ ******************************************************************************/ package forestry.farming.logic; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.core.utils.StackUtils; import forestry.core.utils.Vect; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class FarmableGenericSapling implements IFarmable { diff --git a/src/main/java/forestry/farming/logic/FarmableGourd.java b/src/main/java/forestry/farming/logic/FarmableGourd.java index 989fedc80..7d340265d 100755 --- a/src/main/java/forestry/farming/logic/FarmableGourd.java +++ b/src/main/java/forestry/farming/logic/FarmableGourd.java @@ -10,15 +10,14 @@ ******************************************************************************/ package forestry.farming.logic; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.core.config.Defaults; import forestry.core.utils.StackUtils; import forestry.core.utils.Vect; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class FarmableGourd implements IFarmable { diff --git a/src/main/java/forestry/farming/logic/FarmableStacked.java b/src/main/java/forestry/farming/logic/FarmableStacked.java index 6b22e542f..50311afeb 100755 --- a/src/main/java/forestry/farming/logic/FarmableStacked.java +++ b/src/main/java/forestry/farming/logic/FarmableStacked.java @@ -10,16 +10,15 @@ ******************************************************************************/ package forestry.farming.logic; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.core.config.Defaults; import forestry.core.utils.StackUtils; import forestry.core.utils.Vect; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class FarmableStacked implements IFarmable { diff --git a/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java b/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java index 83b810b17..ab4168aaa 100755 --- a/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java +++ b/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java @@ -10,19 +10,17 @@ ******************************************************************************/ package forestry.farming.logic; +import forestry.api.arboriculture.ITree; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IIndividual; +import forestry.plugins.PluginArboriculture; import java.util.Map; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import forestry.api.arboriculture.ITree; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IIndividual; -import forestry.plugins.PluginArboriculture; - public class FarmableVanillaSapling extends FarmableGenericSapling { public FarmableVanillaSapling() { diff --git a/src/main/java/forestry/farming/logic/FarmableVanillaShroom.java b/src/main/java/forestry/farming/logic/FarmableVanillaShroom.java index 4754ebf3a..0b739124b 100755 --- a/src/main/java/forestry/farming/logic/FarmableVanillaShroom.java +++ b/src/main/java/forestry/farming/logic/FarmableVanillaShroom.java @@ -10,18 +10,17 @@ ******************************************************************************/ package forestry.farming.logic; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.api.farming.ICrop; import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.proxy.Proxies; import forestry.core.utils.StackUtils; import forestry.core.utils.Vect; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class FarmableVanillaShroom extends FarmableGenericSapling { diff --git a/src/main/java/forestry/farming/proxy/ClientProxyFarming.java b/src/main/java/forestry/farming/proxy/ClientProxyFarming.java index a7da85f32..db427229a 100755 --- a/src/main/java/forestry/farming/proxy/ClientProxyFarming.java +++ b/src/main/java/forestry/farming/proxy/ClientProxyFarming.java @@ -12,13 +12,11 @@ package forestry.farming.proxy; import cpw.mods.fml.client.registry.RenderingRegistry; - -import net.minecraftforge.client.MinecraftForgeClient; - import forestry.core.config.ForestryBlock; import forestry.farming.render.FarmItemRenderer; import forestry.farming.render.FarmRenderingHandler; import forestry.plugins.PluginFarming; +import net.minecraftforge.client.MinecraftForgeClient; public class ClientProxyFarming extends ProxyFarming { diff --git a/src/main/java/forestry/farming/render/FarmItemRenderer.java b/src/main/java/forestry/farming/render/FarmItemRenderer.java index 21b94dbe2..215a346a2 100755 --- a/src/main/java/forestry/farming/render/FarmItemRenderer.java +++ b/src/main/java/forestry/farming/render/FarmItemRenderer.java @@ -10,17 +10,14 @@ ******************************************************************************/ package forestry.farming.render; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - import forestry.core.utils.StackUtils; import forestry.farming.gadgets.BlockFarm; import forestry.farming.gadgets.TileFarm.EnumFarmBlock; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; +import org.lwjgl.opengl.GL11; public class FarmItemRenderer implements IItemRenderer { diff --git a/src/main/java/forestry/farming/render/FarmRenderingHandler.java b/src/main/java/forestry/farming/render/FarmRenderingHandler.java index 4d703ae35..46487c7d9 100755 --- a/src/main/java/forestry/farming/render/FarmRenderingHandler.java +++ b/src/main/java/forestry/farming/render/FarmRenderingHandler.java @@ -10,15 +10,14 @@ ******************************************************************************/ package forestry.farming.render; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.EntityRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.world.IBlockAccess; - import forestry.core.config.ForestryBlock; import forestry.core.render.OverlayRenderingHandler; import forestry.farming.gadgets.BlockFarm; import forestry.plugins.PluginFarming; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.EntityRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.world.IBlockAccess; public class FarmRenderingHandler extends OverlayRenderingHandler { diff --git a/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java b/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java index 755dbd358..1c833a2b0 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java @@ -16,7 +16,6 @@ import forestry.api.core.ITileStructure; import forestry.core.triggers.Trigger; import forestry.farming.gadgets.TileFarmPlain; import forestry.farming.gadgets.TileHatch; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/forestry/farming/worldgen/WorldGenBigMushroom.java b/src/main/java/forestry/farming/worldgen/WorldGenBigMushroom.java index a46b69ea8..5494ab277 100755 --- a/src/main/java/forestry/farming/worldgen/WorldGenBigMushroom.java +++ b/src/main/java/forestry/farming/worldgen/WorldGenBigMushroom.java @@ -14,15 +14,13 @@ package forestry.farming.worldgen; +import forestry.core.config.Defaults; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import forestry.core.config.Defaults; - // Referenced classes of package net.minecraft.src: // WorldGenerator, World, Block, BlockLeaves, // BlockGrass, BlockMycelium, BlockFlower diff --git a/src/main/java/forestry/food/BeverageEffectAntidote.java b/src/main/java/forestry/food/BeverageEffectAntidote.java index c8648fb86..892bad0a6 100755 --- a/src/main/java/forestry/food/BeverageEffectAntidote.java +++ b/src/main/java/forestry/food/BeverageEffectAntidote.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.food; +import forestry.core.proxy.Proxies; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.world.World; -import forestry.core.proxy.Proxies; - public class BeverageEffectAntidote extends BeverageEffect { private float chance = 0.2f; diff --git a/src/main/java/forestry/food/GuiHandlerFood.java b/src/main/java/forestry/food/GuiHandlerFood.java index 826ef6a2a..0fe74e5d5 100755 --- a/src/main/java/forestry/food/GuiHandlerFood.java +++ b/src/main/java/forestry/food/GuiHandlerFood.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.food; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - import forestry.core.GuiHandlerBase; import forestry.core.network.GuiId; import forestry.food.gui.ContainerInfuser; import forestry.food.gui.GuiInfuser; import forestry.food.items.ItemInfuser.InfuserInventory; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; public class GuiHandlerFood extends GuiHandlerBase { @Override diff --git a/src/main/java/forestry/food/gui/ContainerInfuser.java b/src/main/java/forestry/food/gui/ContainerInfuser.java index 4935d518d..70991252e 100755 --- a/src/main/java/forestry/food/gui/ContainerInfuser.java +++ b/src/main/java/forestry/food/gui/ContainerInfuser.java @@ -10,17 +10,16 @@ ******************************************************************************/ package forestry.food.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - import forestry.core.config.ForestryItem; import forestry.core.gui.ContainerForestry; import forestry.core.gui.slots.SlotCustom; import forestry.core.proxy.Proxies; import forestry.food.items.ItemBeverage; import forestry.food.items.ItemInfuser.InfuserInventory; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; public class ContainerInfuser extends ContainerForestry { diff --git a/src/main/java/forestry/food/gui/GuiInfuser.java b/src/main/java/forestry/food/gui/GuiInfuser.java index 6178e44b7..4bd839eb1 100755 --- a/src/main/java/forestry/food/gui/GuiInfuser.java +++ b/src/main/java/forestry/food/gui/GuiInfuser.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.food.gui; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; - import forestry.api.food.BeverageManager; import forestry.core.config.Defaults; import forestry.core.gadgets.TileForestry; import forestry.core.gui.GuiForestry; import forestry.food.items.ItemInfuser.InfuserInventory; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; public class GuiInfuser extends GuiForestry { diff --git a/src/main/java/forestry/food/items/ItemAmbrosia.java b/src/main/java/forestry/food/items/ItemAmbrosia.java index 5c9acb1d8..3e27ee04f 100755 --- a/src/main/java/forestry/food/items/ItemAmbrosia.java +++ b/src/main/java/forestry/food/items/ItemAmbrosia.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.food.items; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; - import forestry.core.config.Defaults; import forestry.core.items.ItemForestryFood; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; public class ItemAmbrosia extends ItemForestryFood { diff --git a/src/main/java/forestry/food/items/ItemBeverage.java b/src/main/java/forestry/food/items/ItemBeverage.java index 1e69a1a9a..c5c965164 100755 --- a/src/main/java/forestry/food/items/ItemBeverage.java +++ b/src/main/java/forestry/food/items/ItemBeverage.java @@ -10,9 +10,15 @@ ******************************************************************************/ package forestry.food.items; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.food.BeverageManager; +import forestry.api.food.IBeverageEffect; +import forestry.core.config.Config; import forestry.core.items.ItemForestryFood; +import forestry.core.proxy.Proxies; +import forestry.core.render.TextureManager; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -24,15 +30,6 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.api.food.BeverageManager; -import forestry.api.food.IBeverageEffect; -import forestry.core.config.Config; -import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; - public class ItemBeverage extends ItemForestryFood { public static class BeverageInfo { diff --git a/src/main/java/forestry/food/items/ItemInfuser.java b/src/main/java/forestry/food/items/ItemInfuser.java index a4518c939..f8bd67405 100755 --- a/src/main/java/forestry/food/items/ItemInfuser.java +++ b/src/main/java/forestry/food/items/ItemInfuser.java @@ -10,14 +10,6 @@ ******************************************************************************/ package forestry.food.items; -import java.util.ArrayList; -import java.util.Arrays; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.api.core.ForestryAPI; import forestry.api.food.BeverageManager; import forestry.api.food.IBeverageEffect; @@ -30,6 +22,12 @@ import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.food.BeverageEffect; import forestry.plugins.PluginManager; +import java.util.ArrayList; +import java.util.Arrays; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class ItemInfuser extends ItemForestry { diff --git a/src/main/java/forestry/lepidopterology/ButterflySpawner.java b/src/main/java/forestry/lepidopterology/ButterflySpawner.java index 0fd991a00..8e9e9f505 100755 --- a/src/main/java/forestry/lepidopterology/ButterflySpawner.java +++ b/src/main/java/forestry/lepidopterology/ButterflySpawner.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.lepidopterology; -import net.minecraft.world.World; - import forestry.api.arboriculture.ILeafTickHandler; import forestry.api.arboriculture.ITree; import forestry.api.lepidopterology.IButterfly; import forestry.core.proxy.Proxies; import forestry.lepidopterology.entities.EntityButterfly; import forestry.plugins.PluginLepidopterology; +import net.minecraft.world.World; public class ButterflySpawner implements ILeafTickHandler { diff --git a/src/main/java/forestry/lepidopterology/GuiHandlerLepidopterology.java b/src/main/java/forestry/lepidopterology/GuiHandlerLepidopterology.java index 0e9167c05..687af84fd 100755 --- a/src/main/java/forestry/lepidopterology/GuiHandlerLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/GuiHandlerLepidopterology.java @@ -10,16 +10,15 @@ ******************************************************************************/ package forestry.lepidopterology; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.core.GuiHandlerBase; import forestry.core.network.GuiId; import forestry.lepidopterology.genetics.ButterflyHelper; import forestry.lepidopterology.gui.ContainerFlutterlyzer; import forestry.lepidopterology.gui.GuiFlutterlyzer; import forestry.lepidopterology.items.ItemFlutterlyzer.FlutterlyzerInventory; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class GuiHandlerLepidopterology extends GuiHandlerBase { diff --git a/src/main/java/forestry/lepidopterology/MatingRecipe.java b/src/main/java/forestry/lepidopterology/MatingRecipe.java index 51572ce42..518f42678 100755 --- a/src/main/java/forestry/lepidopterology/MatingRecipe.java +++ b/src/main/java/forestry/lepidopterology/MatingRecipe.java @@ -10,15 +10,14 @@ ******************************************************************************/ package forestry.lepidopterology; +import forestry.api.lepidopterology.EnumFlutterType; +import forestry.api.lepidopterology.IButterfly; +import forestry.plugins.PluginLepidopterology; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; -import forestry.api.lepidopterology.EnumFlutterType; -import forestry.api.lepidopterology.IButterfly; -import forestry.plugins.PluginLepidopterology; - public class MatingRecipe implements IRecipe { private final ItemStack unknown; diff --git a/src/main/java/forestry/lepidopterology/commands/CommandButterfly.java b/src/main/java/forestry/lepidopterology/commands/CommandButterfly.java index 6c9fb9288..26d9c9c56 100644 --- a/src/main/java/forestry/lepidopterology/commands/CommandButterfly.java +++ b/src/main/java/forestry/lepidopterology/commands/CommandButterfly.java @@ -10,7 +10,8 @@ ******************************************************************************/ package forestry.lepidopterology.commands; -import forestry.core.commands.*; +import forestry.core.commands.CommandHelpers; +import forestry.core.commands.SubCommand; import forestry.lepidopterology.entities.EntityButterfly; import net.minecraft.command.ICommandSender; import net.minecraft.world.World; diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyFlee.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyFlee.java index d968b5aaa..bc3db0eb0 100755 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyFlee.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyFlee.java @@ -10,8 +10,8 @@ ******************************************************************************/ package forestry.lepidopterology.entities; -import net.minecraft.entity.player.EntityPlayer; import forestry.lepidopterology.entities.EntityButterfly.EnumButterflyState; +import net.minecraft.entity.player.EntityPlayer; public class AIButterflyFlee extends AIButterflyMovement { diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyInteract.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyInteract.java index 9ad6ea3e3..bc4056294 100755 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyInteract.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyInteract.java @@ -10,9 +10,8 @@ ******************************************************************************/ package forestry.lepidopterology.entities; -import net.minecraft.util.ChunkCoordinates; - import forestry.lepidopterology.entities.EntityButterfly.EnumButterflyState; +import net.minecraft.util.ChunkCoordinates; public abstract class AIButterflyInteract extends AIButterflyBase { diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java index a585e1982..099924a8b 100644 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java @@ -10,17 +10,15 @@ ******************************************************************************/ package forestry.lepidopterology.entities; -import java.util.Map; - -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - import forestry.api.arboriculture.ITreeRoot; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.IButterflyNursery; import forestry.core.utils.StackUtils; +import java.util.Map; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; public class AIButterflyMate extends AIButterflyInteract { diff --git a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java index 9656b22ea..f922e3ae4 100755 --- a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java +++ b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java @@ -10,21 +10,8 @@ ******************************************************************************/ package forestry.lepidopterology.entities; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityCreature; -import net.minecraft.entity.IEntityLivingData; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.arboriculture.EnumGermlingType; import forestry.api.core.IToolScoop; import forestry.api.genetics.AlleleManager; @@ -45,7 +32,18 @@ import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockWall; import net.minecraft.block.IGrowable; import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityCreature; +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.IPlantable; diff --git a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java index 2b057c0a9..4320c48ad 100755 --- a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java +++ b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java @@ -10,22 +10,9 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; - -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - +import com.mojang.authlib.GameProfile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraftforge.common.BiomeDictionary; - -import com.mojang.authlib.GameProfile; - import forestry.api.core.IIconProvider; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; @@ -35,6 +22,14 @@ import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterflyRoot; import forestry.core.config.Defaults; import forestry.core.genetics.AlleleSpecies; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.BiomeDictionary; public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButterflySpecies { diff --git a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java index 6ce4fcf00..b4a5c4959 100755 --- a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java +++ b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java @@ -28,10 +28,13 @@ import forestry.api.lepidopterology.IEntityButterfly; import forestry.core.genetics.Chromosome; import forestry.core.genetics.GenericRatings; import forestry.core.genetics.IndividualLiving; -import forestry.core.utils.StackUtils; import forestry.core.utils.StringUtil; import forestry.core.utils.Utils; import forestry.plugins.PluginLepidopterology; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Map; import net.minecraft.entity.EntityCreature; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -39,11 +42,6 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeDictionary; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Map; - public class Butterfly extends IndividualLiving implements IButterfly { public IButterflyGenome genome; diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java index 88eee4880..6426fb66b 100755 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java @@ -10,19 +10,7 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Map.Entry; - -import net.minecraft.entity.EntityLiving; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - import com.mojang.authlib.GameProfile; - import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; @@ -41,6 +29,15 @@ import forestry.core.genetics.SpeciesRoot; import forestry.core.utils.Utils; import forestry.lepidopterology.entities.EntityButterfly; import forestry.plugins.PluginLepidopterology; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Map.Entry; +import net.minecraft.entity.EntityLiving; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class ButterflyHelper extends SpeciesRoot implements IButterflyRoot { diff --git a/src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java b/src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java index 3716a0ab6..0afe9bf8a 100755 --- a/src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java +++ b/src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java @@ -10,16 +10,14 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; -import net.minecraft.entity.player.EntityPlayer; - import com.mojang.authlib.GameProfile; - import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.ILepidopteristTracker; import forestry.core.genetics.BreedingTracker; import forestry.plugins.PluginLepidopterology; +import net.minecraft.entity.player.EntityPlayer; public class LepidopteristTracker extends BreedingTracker implements ILepidopteristTracker { diff --git a/src/main/java/forestry/lepidopterology/gui/ContainerFlutterlyzer.java b/src/main/java/forestry/lepidopterology/gui/ContainerFlutterlyzer.java index 2c2e3d7cd..5c23e09ff 100755 --- a/src/main/java/forestry/lepidopterology/gui/ContainerFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/gui/ContainerFlutterlyzer.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.lepidopterology.gui; -import forestry.core.gui.ContainerAlyzer; import forestry.core.config.ForestryItem; +import forestry.core.gui.ContainerAlyzer; import forestry.lepidopterology.items.ItemButterflyGE; import forestry.lepidopterology.items.ItemFlutterlyzer.FlutterlyzerInventory; - import net.minecraft.entity.player.InventoryPlayer; public class ContainerFlutterlyzer extends ContainerAlyzer { diff --git a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java index 3d9f1acfe..e04b5ebea 100755 --- a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java @@ -27,13 +27,12 @@ import forestry.lepidopterology.genetics.ButterflyGenome; import forestry.lepidopterology.items.ItemButterflyGE; import forestry.lepidopterology.items.ItemFlutterlyzer.FlutterlyzerInventory; import forestry.plugins.PluginLepidopterology; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class GuiFlutterlyzer extends GuiAlyzer { diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index 520258050..41beb4bad 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -28,6 +28,7 @@ import forestry.core.utils.Utils; import forestry.lepidopterology.entities.EntityButterfly; import forestry.lepidopterology.genetics.ButterflyGenome; import forestry.plugins.PluginLepidopterology; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; @@ -38,8 +39,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import java.util.List; - public class ItemButterflyGE extends ItemGE { private final EnumFlutterType type; diff --git a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java index 4f355bb74..7b879591c 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java @@ -10,12 +10,6 @@ ******************************************************************************/ package forestry.lepidopterology.items; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - -import forestry.core.inventory.AlyzerInventory; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; import forestry.api.lepidopterology.IButterfly; @@ -24,10 +18,15 @@ import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.interfaces.IErrorSource; import forestry.core.interfaces.IHintSource; +import forestry.core.inventory.AlyzerInventory; import forestry.core.items.ItemInventoried; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.plugins.PluginLepidopterology; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class ItemFlutterlyzer extends ItemInventoried { diff --git a/src/main/java/forestry/lepidopterology/proxy/ClientProxyLepidopterology.java b/src/main/java/forestry/lepidopterology/proxy/ClientProxyLepidopterology.java index d2b1f94da..72426cac4 100755 --- a/src/main/java/forestry/lepidopterology/proxy/ClientProxyLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/proxy/ClientProxyLepidopterology.java @@ -11,13 +11,11 @@ package forestry.lepidopterology.proxy; import cpw.mods.fml.client.registry.RenderingRegistry; - -import net.minecraftforge.client.MinecraftForgeClient; - import forestry.core.config.ForestryItem; import forestry.lepidopterology.entities.EntityButterfly; import forestry.lepidopterology.render.ButterflyItemRenderer; import forestry.lepidopterology.render.RenderButterfly; +import net.minecraftforge.client.MinecraftForgeClient; public class ClientProxyLepidopterology extends ProxyLepidopterology { diff --git a/src/main/java/forestry/lepidopterology/render/ButterflyItemRenderer.java b/src/main/java/forestry/lepidopterology/render/ButterflyItemRenderer.java index 531e21195..67fb890b8 100755 --- a/src/main/java/forestry/lepidopterology/render/ButterflyItemRenderer.java +++ b/src/main/java/forestry/lepidopterology/render/ButterflyItemRenderer.java @@ -10,22 +10,19 @@ ******************************************************************************/ package forestry.lepidopterology.render; +import forestry.api.lepidopterology.IButterfly; +import forestry.core.proxy.Proxies; +import forestry.lepidopterology.entities.EntityButterfly; +import forestry.plugins.PluginLepidopterology; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.item.ItemStack; - import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import forestry.api.lepidopterology.IButterfly; -import forestry.core.proxy.Proxies; -import forestry.lepidopterology.entities.EntityButterfly; -import forestry.plugins.PluginLepidopterology; - public class ButterflyItemRenderer implements IItemRenderer { private final ModelButterfly model; diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterfly.java b/src/main/java/forestry/lepidopterology/render/ModelButterfly.java index 48dffa992..2c0457100 100755 --- a/src/main/java/forestry/lepidopterology/render/ModelButterfly.java +++ b/src/main/java/forestry/lepidopterology/render/ModelButterfly.java @@ -14,7 +14,6 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; - import org.lwjgl.opengl.GL11; public class ModelButterfly extends ModelBase { diff --git a/src/main/java/forestry/lepidopterology/render/RenderButterfly.java b/src/main/java/forestry/lepidopterology/render/RenderButterfly.java index b2083ac86..8f93636b5 100755 --- a/src/main/java/forestry/lepidopterology/render/RenderButterfly.java +++ b/src/main/java/forestry/lepidopterology/render/RenderButterfly.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.lepidopterology.render; +import forestry.lepidopterology.entities.EntityButterfly; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; - -import forestry.lepidopterology.entities.EntityButterfly; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.ResourceLocation; public class RenderButterfly extends RenderLiving { diff --git a/src/main/java/forestry/mail/EnumDeliveryState.java b/src/main/java/forestry/mail/EnumDeliveryState.java index 776192db6..1165837b9 100755 --- a/src/main/java/forestry/mail/EnumDeliveryState.java +++ b/src/main/java/forestry/mail/EnumDeliveryState.java @@ -10,9 +10,8 @@ ******************************************************************************/ package forestry.mail; -import java.util.Locale; - import forestry.api.mail.IPostalState; +import java.util.Locale; public enum EnumDeliveryState implements IPostalState { OK, NO_MAILBOX, NOT_MAILABLE, ALREADY_MAILED, NOT_POSTPAID, MAILBOX_FULL, RESPONSE_NOT_MAILABLE; diff --git a/src/main/java/forestry/mail/EnumStationState.java b/src/main/java/forestry/mail/EnumStationState.java index 8402fe4bf..3dfa094d8 100755 --- a/src/main/java/forestry/mail/EnumStationState.java +++ b/src/main/java/forestry/mail/EnumStationState.java @@ -10,9 +10,8 @@ ******************************************************************************/ package forestry.mail; -import java.util.Locale; - import forestry.api.mail.IPostalState; +import java.util.Locale; public enum EnumStationState implements IPostalState { OK, INSUFFICIENT_OFFER, INSUFFICIENT_TRADE_GOOD, INSUFFICIENT_BUFFER, INSUFFICIENT_PAPER, INSUFFICIENT_STAMPS; diff --git a/src/main/java/forestry/mail/GuiHandlerMail.java b/src/main/java/forestry/mail/GuiHandlerMail.java index a360f14d8..eee2a1c7f 100755 --- a/src/main/java/forestry/mail/GuiHandlerMail.java +++ b/src/main/java/forestry/mail/GuiHandlerMail.java @@ -10,10 +10,6 @@ ******************************************************************************/ package forestry.mail; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.core.GuiHandlerBase; import forestry.core.network.GuiId; import forestry.mail.gadgets.MachineMailbox; @@ -34,6 +30,9 @@ import forestry.mail.gui.GuiTrader; import forestry.mail.items.ItemCatalogue; import forestry.mail.items.ItemLetter; import forestry.mail.items.ItemLetter.LetterInventory; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class GuiHandlerMail extends GuiHandlerBase { diff --git a/src/main/java/forestry/mail/Letter.java b/src/main/java/forestry/mail/Letter.java index 05f5610c9..803a02127 100755 --- a/src/main/java/forestry/mail/Letter.java +++ b/src/main/java/forestry/mail/Letter.java @@ -10,18 +10,16 @@ ******************************************************************************/ package forestry.mail; +import forestry.api.core.INBTTagable; +import forestry.api.mail.ILetter; +import forestry.api.mail.IMailAddress; +import forestry.api.mail.IStamps; +import forestry.core.inventory.InventoryAdapter; +import forestry.core.utils.StringUtil; import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - -import forestry.api.core.INBTTagable; -import forestry.api.mail.ILetter; -import forestry.api.mail.IStamps; -import forestry.api.mail.IMailAddress; -import forestry.core.inventory.InventoryAdapter; -import forestry.core.utils.StringUtil; import org.apache.commons.lang3.StringUtils; public class Letter implements ILetter, INBTTagable { diff --git a/src/main/java/forestry/mail/MailAddress.java b/src/main/java/forestry/mail/MailAddress.java index c78e63091..c4a22fa4a 100644 --- a/src/main/java/forestry/mail/MailAddress.java +++ b/src/main/java/forestry/mail/MailAddress.java @@ -10,19 +10,15 @@ ******************************************************************************/ package forestry.mail; -import java.util.Locale; -import java.util.UUID; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTUtil; - import com.mojang.authlib.GameProfile; - import forestry.api.core.INBTTagable; import forestry.api.mail.EnumAddressee; import forestry.api.mail.IMailAddress; -import forestry.core.network.PacketPayload; import forestry.core.utils.PlayerUtil; +import java.util.Locale; +import java.util.UUID; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; public class MailAddress implements INBTTagable, IMailAddress { diff --git a/src/main/java/forestry/mail/POBox.java b/src/main/java/forestry/mail/POBox.java index a229d5308..851cf1b3e 100755 --- a/src/main/java/forestry/mail/POBox.java +++ b/src/main/java/forestry/mail/POBox.java @@ -10,17 +10,16 @@ ******************************************************************************/ package forestry.mail; +import forestry.api.mail.ILetter; +import forestry.api.mail.IMailAddress; +import forestry.api.mail.PostManager; +import forestry.core.inventory.InventoryAdapter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.WorldSavedData; -import forestry.api.mail.ILetter; -import forestry.api.mail.PostManager; -import forestry.api.mail.IMailAddress; -import forestry.core.inventory.InventoryAdapter; - public class POBox extends WorldSavedData implements IInventory { public static final String SAVE_NAME = "POBox_"; diff --git a/src/main/java/forestry/mail/PacketHandlerMail.java b/src/main/java/forestry/mail/PacketHandlerMail.java index d971f9446..3df5b6e8e 100755 --- a/src/main/java/forestry/mail/PacketHandlerMail.java +++ b/src/main/java/forestry/mail/PacketHandlerMail.java @@ -10,11 +10,6 @@ ******************************************************************************/ package forestry.mail; -import java.io.DataInputStream; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; - import forestry.core.interfaces.IPacketHandler; import forestry.core.network.PacketIds; import forestry.core.network.PacketUpdate; @@ -22,9 +17,12 @@ import forestry.core.proxy.Proxies; import forestry.mail.gui.ContainerCatalogue; import forestry.mail.gui.ContainerLetter; import forestry.mail.gui.ContainerTradeName; -import forestry.mail.network.PacketPOBoxInfo; import forestry.mail.network.PacketLetterInfo; +import forestry.mail.network.PacketPOBoxInfo; import forestry.plugins.PluginMail; +import java.io.DataInputStream; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; public class PacketHandlerMail implements IPacketHandler { diff --git a/src/main/java/forestry/mail/PostOffice.java b/src/main/java/forestry/mail/PostOffice.java index 611765e40..a89507cc6 100755 --- a/src/main/java/forestry/mail/PostOffice.java +++ b/src/main/java/forestry/mail/PostOffice.java @@ -10,24 +10,22 @@ ******************************************************************************/ package forestry.mail; -import java.io.File; -import java.util.LinkedHashMap; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraft.world.WorldSavedData; - import forestry.api.mail.EnumPostage; import forestry.api.mail.ILetter; +import forestry.api.mail.IMailAddress; import forestry.api.mail.IPostOffice; import forestry.api.mail.IPostalCarrier; import forestry.api.mail.IPostalState; import forestry.api.mail.IStamps; import forestry.api.mail.ITradeStation; import forestry.api.mail.PostManager; -import forestry.api.mail.IMailAddress; import forestry.core.config.ForestryItem; +import java.io.File; +import java.util.LinkedHashMap; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import net.minecraft.world.WorldSavedData; public class PostOffice extends WorldSavedData implements IPostOffice { diff --git a/src/main/java/forestry/mail/PostRegistry.java b/src/main/java/forestry/mail/PostRegistry.java index e52783c12..0b814ea80 100755 --- a/src/main/java/forestry/mail/PostRegistry.java +++ b/src/main/java/forestry/mail/PostRegistry.java @@ -10,28 +10,24 @@ ******************************************************************************/ package forestry.mail; -import java.io.File; -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.World; - import com.mojang.authlib.GameProfile; - +import forestry.api.mail.EnumAddressee; import forestry.api.mail.ILetter; +import forestry.api.mail.IMailAddress; import forestry.api.mail.IPostOffice; import forestry.api.mail.IPostRegistry; import forestry.api.mail.IPostalCarrier; import forestry.api.mail.ITradeStation; import forestry.api.mail.PostManager; -import forestry.api.mail.IMailAddress; -import forestry.api.mail.EnumAddressee; import forestry.core.config.ForestryItem; import forestry.mail.items.ItemLetter; import forestry.plugins.PluginMail; +import java.io.File; +import java.util.HashMap; +import java.util.Map; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class PostRegistry implements IPostRegistry { diff --git a/src/main/java/forestry/mail/PostalCarrier.java b/src/main/java/forestry/mail/PostalCarrier.java index ca0301eaf..dddc710e4 100755 --- a/src/main/java/forestry/mail/PostalCarrier.java +++ b/src/main/java/forestry/mail/PostalCarrier.java @@ -10,19 +10,21 @@ ******************************************************************************/ package forestry.mail; -import java.util.Locale; - -import forestry.api.mail.*; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - +import forestry.api.mail.EnumAddressee; +import forestry.api.mail.IMailAddress; +import forestry.api.mail.IPostOffice; +import forestry.api.mail.IPostalCarrier; +import forestry.api.mail.IPostalState; +import forestry.api.mail.ITradeStation; +import forestry.api.mail.PostManager; import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; import forestry.plugins.PluginMail; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; public class PostalCarrier implements IPostalCarrier { diff --git a/src/main/java/forestry/mail/SaveEventHandlerMail.java b/src/main/java/forestry/mail/SaveEventHandlerMail.java index 906b63f37..e3bd96af7 100755 --- a/src/main/java/forestry/mail/SaveEventHandlerMail.java +++ b/src/main/java/forestry/mail/SaveEventHandlerMail.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.mail; -import net.minecraft.world.World; - import forestry.core.interfaces.ISaveEventHandler; import forestry.plugins.PluginMail; +import net.minecraft.world.World; public class SaveEventHandlerMail implements ISaveEventHandler { diff --git a/src/main/java/forestry/mail/TickHandlerMailClient.java b/src/main/java/forestry/mail/TickHandlerMailClient.java index ebb367494..cc65cfb8c 100755 --- a/src/main/java/forestry/mail/TickHandlerMailClient.java +++ b/src/main/java/forestry/mail/TickHandlerMailClient.java @@ -14,7 +14,6 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent; - import forestry.mail.gui.GuiMailboxInfo; import forestry.plugins.PluginMail; diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index 002014b2f..f7a5b7d3a 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -24,6 +24,7 @@ import forestry.core.inventory.InventoryAdapter; import forestry.core.utils.PlayerUtil; import forestry.core.utils.StackUtils; import forestry.mail.items.ItemLetter; +import java.util.ArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; @@ -33,8 +34,6 @@ import net.minecraft.nbt.NBTUtil; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; -import java.util.ArrayList; - public class TradeStation extends WorldSavedData implements ITradeStation, ISidedInventory { // / CONSTANTS diff --git a/src/main/java/forestry/mail/gadgets/MachineMailbox.java b/src/main/java/forestry/mail/gadgets/MachineMailbox.java index 6a34a372d..320a59123 100755 --- a/src/main/java/forestry/mail/gadgets/MachineMailbox.java +++ b/src/main/java/forestry/mail/gadgets/MachineMailbox.java @@ -20,14 +20,16 @@ import forestry.api.mail.IPostalState; import forestry.api.mail.PostManager; import forestry.core.config.Config; import forestry.core.gadgets.TileBase; +import forestry.core.inventory.InventoryAdapter; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; -import forestry.core.inventory.InventoryAdapter; import forestry.mail.EnumDeliveryState; import forestry.mail.IMailContainer; import forestry.mail.POBox; import forestry.mail.PostRegistry; import forestry.plugins.PluginMail; +import java.util.Collection; +import java.util.LinkedList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -36,9 +38,6 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.Collection; -import java.util.LinkedList; - public class MachineMailbox extends TileBase implements IMailContainer { private boolean isLinked = false; diff --git a/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java b/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java index 6d45de2ff..c317533d2 100755 --- a/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java +++ b/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java @@ -10,18 +10,17 @@ ******************************************************************************/ package forestry.mail.gadgets; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - import forestry.api.core.ForestryAPI; import forestry.api.mail.IStamps; import forestry.api.mail.PostManager; import forestry.core.gadgets.TileBase; -import forestry.core.network.GuiId; import forestry.core.inventory.TileInventoryAdapter; +import forestry.core.network.GuiId; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; public class MachinePhilatelist extends TileBase implements IInventory { diff --git a/src/main/java/forestry/mail/gui/ContainerCatalogue.java b/src/main/java/forestry/mail/gui/ContainerCatalogue.java index 4d6728c2c..939592dbe 100755 --- a/src/main/java/forestry/mail/gui/ContainerCatalogue.java +++ b/src/main/java/forestry/mail/gui/ContainerCatalogue.java @@ -24,13 +24,12 @@ import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; import forestry.mail.EnumStationState; import forestry.mail.network.PacketLetterInfo; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ICrafting; - import java.util.EnumSet; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Set; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ICrafting; public class ContainerCatalogue extends ContainerForestry implements IGuiSelectable { diff --git a/src/main/java/forestry/mail/gui/ContainerLetter.java b/src/main/java/forestry/mail/gui/ContainerLetter.java index 16252c599..f5798f318 100755 --- a/src/main/java/forestry/mail/gui/ContainerLetter.java +++ b/src/main/java/forestry/mail/gui/ContainerLetter.java @@ -10,24 +10,14 @@ ******************************************************************************/ package forestry.mail.gui; -import java.util.Iterator; -import java.util.UUID; - -import org.apache.commons.lang3.StringUtils; - import com.mojang.authlib.GameProfile; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.World; - +import forestry.api.mail.EnumAddressee; import forestry.api.mail.ILetter; +import forestry.api.mail.IMailAddress; import forestry.api.mail.IPostalCarrier; import forestry.api.mail.ITradeStation; -import forestry.api.mail.IMailAddress; import forestry.api.mail.PostManager; import forestry.api.mail.TradeStationInfo; -import forestry.api.mail.EnumAddressee; import forestry.core.gui.ContainerItemInventory; import forestry.core.gui.slots.SlotClosed; import forestry.core.gui.slots.SlotCustom; @@ -40,6 +30,13 @@ import forestry.mail.items.ItemLetter; import forestry.mail.items.ItemLetter.LetterInventory; import forestry.mail.items.ItemStamps; import forestry.mail.network.PacketLetterInfo; +import java.util.Iterator; +import java.util.UUID; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; +import org.apache.commons.lang3.StringUtils; public class ContainerLetter extends ContainerItemInventory { diff --git a/src/main/java/forestry/mail/gui/ContainerPhilatelist.java b/src/main/java/forestry/mail/gui/ContainerPhilatelist.java index ed4b671f3..155d708b6 100755 --- a/src/main/java/forestry/mail/gui/ContainerPhilatelist.java +++ b/src/main/java/forestry/mail/gui/ContainerPhilatelist.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.mail.gui; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; - import forestry.core.gui.ContainerForestry; import forestry.core.gui.slots.SlotClosed; import forestry.core.gui.slots.SlotCustom; import forestry.mail.gadgets.MachinePhilatelist; import forestry.mail.items.ItemStamps; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; public class ContainerPhilatelist extends ContainerForestry { diff --git a/src/main/java/forestry/mail/gui/ContainerTradeName.java b/src/main/java/forestry/mail/gui/ContainerTradeName.java index 869a77edb..da5b8db84 100755 --- a/src/main/java/forestry/mail/gui/ContainerTradeName.java +++ b/src/main/java/forestry/mail/gui/ContainerTradeName.java @@ -10,18 +10,16 @@ ******************************************************************************/ package forestry.mail.gui; -import net.minecraft.entity.player.InventoryPlayer; - +import forestry.api.mail.IMailAddress; +import forestry.api.mail.PostManager; import forestry.core.gui.ContainerForestry; +import forestry.core.inventory.InventoryAdapter; import forestry.core.network.PacketIds; import forestry.core.network.PacketPayload; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; -import forestry.core.inventory.InventoryAdapter; import forestry.mail.gadgets.MachineTrader; -import forestry.api.mail.PostManager; -import forestry.api.mail.IMailAddress; - +import net.minecraft.entity.player.InventoryPlayer; import org.apache.commons.lang3.StringUtils; public class ContainerTradeName extends ContainerForestry { diff --git a/src/main/java/forestry/mail/gui/ContainerTrader.java b/src/main/java/forestry/mail/gui/ContainerTrader.java index eee985f89..8401aaba0 100755 --- a/src/main/java/forestry/mail/gui/ContainerTrader.java +++ b/src/main/java/forestry/mail/gui/ContainerTrader.java @@ -10,17 +10,16 @@ ******************************************************************************/ package forestry.mail.gui; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; - +import forestry.api.mail.IMailAddress; import forestry.core.gui.ContainerForestry; import forestry.core.gui.slots.SlotCustom; import forestry.mail.TradeStation; import forestry.mail.gadgets.MachineTrader; import forestry.mail.items.ItemStamps; -import forestry.api.mail.IMailAddress; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.Items; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; public class ContainerTrader extends ContainerForestry { diff --git a/src/main/java/forestry/mail/gui/GuiCatalogue.java b/src/main/java/forestry/mail/gui/GuiCatalogue.java index 4c380ebb1..40ea3a7bb 100755 --- a/src/main/java/forestry/mail/gui/GuiCatalogue.java +++ b/src/main/java/forestry/mail/gui/GuiCatalogue.java @@ -10,20 +10,17 @@ ******************************************************************************/ package forestry.mail.gui; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - +import forestry.api.mail.EnumAddressee; import forestry.api.mail.TradeStationInfo; import forestry.core.config.SessionVars; import forestry.core.gadgets.TileForestry; import forestry.core.gui.GuiForestry; import forestry.core.utils.StringUtil; -import forestry.api.mail.EnumAddressee; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; public class GuiCatalogue extends GuiForestry { diff --git a/src/main/java/forestry/mail/gui/GuiLetter.java b/src/main/java/forestry/mail/gui/GuiLetter.java index f5af7a737..3135b6c1f 100755 --- a/src/main/java/forestry/mail/gui/GuiLetter.java +++ b/src/main/java/forestry/mail/gui/GuiLetter.java @@ -10,17 +10,9 @@ ******************************************************************************/ package forestry.mail.gui; -import java.util.ArrayList; - -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.entity.player.EntityPlayer; - -import org.apache.commons.lang3.StringUtils; -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - -import forestry.api.mail.IPostalCarrier; +import forestry.api.mail.EnumAddressee; import forestry.api.mail.IMailAddress; +import forestry.api.mail.IPostalCarrier; import forestry.api.mail.PostManager; import forestry.core.config.Defaults; import forestry.core.config.SessionVars; @@ -30,8 +22,13 @@ import forestry.core.gui.GuiTextBox; import forestry.core.gui.widgets.Widget; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; -import forestry.api.mail.EnumAddressee; import forestry.mail.items.ItemLetter.LetterInventory; +import java.util.ArrayList; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.entity.player.EntityPlayer; +import org.apache.commons.lang3.StringUtils; +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; public class GuiLetter extends GuiForestry { diff --git a/src/main/java/forestry/mail/gui/GuiMailbox.java b/src/main/java/forestry/mail/gui/GuiMailbox.java index 7a4682458..100e317a4 100755 --- a/src/main/java/forestry/mail/gui/GuiMailbox.java +++ b/src/main/java/forestry/mail/gui/GuiMailbox.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.mail.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.core.config.Defaults; import forestry.core.gui.GuiForestry; import forestry.mail.gadgets.MachineMailbox; +import net.minecraft.entity.player.InventoryPlayer; public class GuiMailbox extends GuiForestry { diff --git a/src/main/java/forestry/mail/gui/GuiMailboxInfo.java b/src/main/java/forestry/mail/gui/GuiMailboxInfo.java index d46c0f8de..612e37025 100755 --- a/src/main/java/forestry/mail/gui/GuiMailboxInfo.java +++ b/src/main/java/forestry/mail/gui/GuiMailboxInfo.java @@ -10,17 +10,15 @@ ******************************************************************************/ package forestry.mail.gui; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.Gui; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.proxy.Proxies; import forestry.core.utils.ForestryResource; import forestry.mail.POBoxInfo; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.Gui; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; public class GuiMailboxInfo extends Gui { diff --git a/src/main/java/forestry/mail/gui/GuiPhilatelist.java b/src/main/java/forestry/mail/gui/GuiPhilatelist.java index d02767d61..3b0a05445 100755 --- a/src/main/java/forestry/mail/gui/GuiPhilatelist.java +++ b/src/main/java/forestry/mail/gui/GuiPhilatelist.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.mail.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.core.config.Defaults; import forestry.core.gui.GuiForestry; import forestry.mail.gadgets.MachinePhilatelist; +import net.minecraft.entity.player.InventoryPlayer; public class GuiPhilatelist extends GuiForestry { diff --git a/src/main/java/forestry/mail/gui/GuiTradeName.java b/src/main/java/forestry/mail/gui/GuiTradeName.java index d660bc1ca..d8e8f4b47 100755 --- a/src/main/java/forestry/mail/gui/GuiTradeName.java +++ b/src/main/java/forestry/mail/gui/GuiTradeName.java @@ -10,17 +10,14 @@ ******************************************************************************/ package forestry.mail.gui; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.entity.player.InventoryPlayer; - -import org.apache.commons.lang3.StringUtils; -import org.lwjgl.input.Keyboard; - import forestry.core.config.Defaults; import forestry.core.gui.GuiForestry; import forestry.core.utils.StringUtil; import forestry.mail.gadgets.MachineTrader; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.entity.player.InventoryPlayer; +import org.apache.commons.lang3.StringUtils; +import org.lwjgl.input.Keyboard; public class GuiTradeName extends GuiForestry { diff --git a/src/main/java/forestry/mail/gui/GuiTrader.java b/src/main/java/forestry/mail/gui/GuiTrader.java index 5e9999436..c021cfb8c 100755 --- a/src/main/java/forestry/mail/gui/GuiTrader.java +++ b/src/main/java/forestry/mail/gui/GuiTrader.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.mail.gui; -import net.minecraft.entity.player.InventoryPlayer; - import forestry.core.config.Defaults; import forestry.core.gui.GuiForestry; import forestry.core.utils.StringUtil; import forestry.mail.gadgets.MachineTrader; +import net.minecraft.entity.player.InventoryPlayer; public class GuiTrader extends GuiForestry { diff --git a/src/main/java/forestry/mail/items/ItemCatalogue.java b/src/main/java/forestry/mail/items/ItemCatalogue.java index 9140f005e..a670049d5 100755 --- a/src/main/java/forestry/mail/items/ItemCatalogue.java +++ b/src/main/java/forestry/mail/items/ItemCatalogue.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.mail.items; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.api.core.ForestryAPI; import forestry.core.items.ItemForestry; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class ItemCatalogue extends ItemForestry { diff --git a/src/main/java/forestry/mail/items/ItemLetter.java b/src/main/java/forestry/mail/items/ItemLetter.java index deb9e9c73..26f8a6686 100755 --- a/src/main/java/forestry/mail/items/ItemLetter.java +++ b/src/main/java/forestry/mail/items/ItemLetter.java @@ -10,8 +10,22 @@ ******************************************************************************/ package forestry.mail.items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.ForestryAPI; +import forestry.api.mail.ILetter; +import forestry.core.EnumErrorCode; +import forestry.core.config.Config; +import forestry.core.interfaces.IErrorSource; +import forestry.core.interfaces.IHintSource; +import forestry.core.inventory.ItemInventory; +import forestry.core.items.ItemInventoried; +import forestry.core.network.GuiId; +import forestry.core.proxy.Proxies; +import forestry.core.render.TextureManager; +import forestry.core.utils.StringUtil; +import forestry.mail.Letter; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -20,23 +34,6 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.api.core.ForestryAPI; -import forestry.api.mail.ILetter; -import forestry.core.EnumErrorCode; -import forestry.core.config.Config; -import forestry.core.interfaces.IErrorSource; -import forestry.core.interfaces.IHintSource; -import forestry.core.items.ItemInventoried; -import forestry.core.network.GuiId; -import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; -import forestry.core.inventory.ItemInventory; -import forestry.core.utils.StringUtil; -import forestry.mail.Letter; - public class ItemLetter extends ItemInventoried { public static class LetterInventory extends ItemInventory implements IErrorSource, IHintSource { diff --git a/src/main/java/forestry/mail/items/ItemStamps.java b/src/main/java/forestry/mail/items/ItemStamps.java index 0315d5f81..f4029c064 100755 --- a/src/main/java/forestry/mail/items/ItemStamps.java +++ b/src/main/java/forestry/mail/items/ItemStamps.java @@ -10,13 +10,11 @@ ******************************************************************************/ package forestry.mail.items; -import net.minecraft.item.ItemStack; - import forestry.api.mail.EnumPostage; import forestry.api.mail.IStamps; import forestry.core.CreativeTabForestry; import forestry.core.items.ItemOverlay; -import forestry.core.utils.StringUtil; +import net.minecraft.item.ItemStack; public class ItemStamps extends ItemOverlay implements IStamps { diff --git a/src/main/java/forestry/mail/network/PacketLetterInfo.java b/src/main/java/forestry/mail/network/PacketLetterInfo.java index 857939524..92348d8e7 100644 --- a/src/main/java/forestry/mail/network/PacketLetterInfo.java +++ b/src/main/java/forestry/mail/network/PacketLetterInfo.java @@ -10,20 +10,18 @@ ******************************************************************************/ package forestry.mail.network; +import com.mojang.authlib.GameProfile; +import forestry.api.mail.EnumAddressee; +import forestry.api.mail.IMailAddress; +import forestry.api.mail.PostManager; +import forestry.api.mail.TradeStationInfo; +import forestry.core.network.ForestryPacket; +import forestry.mail.EnumStationState; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.UUID; - import net.minecraft.item.ItemStack; -import com.mojang.authlib.GameProfile; - -import forestry.api.mail.TradeStationInfo; -import forestry.api.mail.IMailAddress; -import forestry.api.mail.EnumAddressee; -import forestry.api.mail.PostManager; -import forestry.core.network.ForestryPacket; -import forestry.mail.EnumStationState; public class PacketLetterInfo extends ForestryPacket { diff --git a/src/main/java/forestry/mail/network/PacketPOBoxInfo.java b/src/main/java/forestry/mail/network/PacketPOBoxInfo.java index 2a8f22e1d..008fb6942 100755 --- a/src/main/java/forestry/mail/network/PacketPOBoxInfo.java +++ b/src/main/java/forestry/mail/network/PacketPOBoxInfo.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.mail.network; +import forestry.core.network.ForestryPacket; +import forestry.mail.POBoxInfo; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import forestry.core.network.ForestryPacket; -import forestry.mail.POBoxInfo; - public class PacketPOBoxInfo extends ForestryPacket { public POBoxInfo poboxInfo; diff --git a/src/main/java/forestry/mail/proxy/ProxyMail.java b/src/main/java/forestry/mail/proxy/ProxyMail.java index acb3221c5..53586dd28 100755 --- a/src/main/java/forestry/mail/proxy/ProxyMail.java +++ b/src/main/java/forestry/mail/proxy/ProxyMail.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.mail.proxy; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - +import forestry.api.mail.IMailAddress; import forestry.core.network.PacketIds; import forestry.core.proxy.Proxies; import forestry.mail.POBoxInfo; import forestry.mail.network.PacketPOBoxInfo; -import forestry.api.mail.IMailAddress; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; public class ProxyMail { diff --git a/src/main/java/forestry/pipes/EnumFilterType.java b/src/main/java/forestry/pipes/EnumFilterType.java index 677a4aca9..863367b5d 100755 --- a/src/main/java/forestry/pipes/EnumFilterType.java +++ b/src/main/java/forestry/pipes/EnumFilterType.java @@ -7,14 +7,13 @@ ******************************************************************************/ package forestry.pipes; -import java.util.Locale; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.core.config.ForestryItem; import forestry.core.render.TextureManager; +import java.util.Locale; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; public enum EnumFilterType { diff --git a/src/main/java/forestry/pipes/GuiHandlerPipes.java b/src/main/java/forestry/pipes/GuiHandlerPipes.java index 938319638..d8cf9d0df 100755 --- a/src/main/java/forestry/pipes/GuiHandlerPipes.java +++ b/src/main/java/forestry/pipes/GuiHandlerPipes.java @@ -7,9 +7,6 @@ ******************************************************************************/ package forestry.pipes; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import buildcraft.transport.Pipe; import buildcraft.transport.TileGenericPipe; import cpw.mods.fml.common.network.IGuiHandler; @@ -17,6 +14,9 @@ import forestry.core.network.GuiId; import forestry.pipes.gui.ContainerPropolisPipe; import forestry.pipes.gui.GuiPropolisPipe; import forestry.plugins.PluginApiculture; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class GuiHandlerPipes implements IGuiHandler { diff --git a/src/main/java/forestry/pipes/PipeIconProvider.java b/src/main/java/forestry/pipes/PipeIconProvider.java index bd5de5aac..088050708 100755 --- a/src/main/java/forestry/pipes/PipeIconProvider.java +++ b/src/main/java/forestry/pipes/PipeIconProvider.java @@ -7,12 +7,12 @@ ******************************************************************************/ package forestry.pipes; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.core.render.TextureManager; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; public class PipeIconProvider implements IIconProvider { diff --git a/src/main/java/forestry/pipes/PipeItemsPropolis.java b/src/main/java/forestry/pipes/PipeItemsPropolis.java index 6f4f7a1b9..c77c59175 100755 --- a/src/main/java/forestry/pipes/PipeItemsPropolis.java +++ b/src/main/java/forestry/pipes/PipeItemsPropolis.java @@ -7,14 +7,6 @@ ******************************************************************************/ package forestry.pipes; -import java.util.ArrayList; -import java.util.LinkedList; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IIconProvider; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.Pipe; @@ -29,6 +21,13 @@ import forestry.api.genetics.IAllele; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.plugins.PluginApiculture; +import java.util.ArrayList; +import java.util.LinkedList; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; public class PipeItemsPropolis extends Pipe { diff --git a/src/main/java/forestry/pipes/PipeLogicPropolis.java b/src/main/java/forestry/pipes/PipeLogicPropolis.java index 86a5d79d8..7a5dc9cd6 100755 --- a/src/main/java/forestry/pipes/PipeLogicPropolis.java +++ b/src/main/java/forestry/pipes/PipeLogicPropolis.java @@ -7,27 +7,22 @@ ******************************************************************************/ package forestry.pipes; -import java.util.ArrayList; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.Pipe; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IBee; -import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; -import forestry.core.network.GuiId; import forestry.core.network.PacketCoordinates; import forestry.core.network.PacketIds; import forestry.core.network.PacketNBT; import forestry.core.network.PacketPayload; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; +import java.util.ArrayList; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; public class PipeLogicPropolis { diff --git a/src/main/java/forestry/pipes/gui/ContainerPropolisPipe.java b/src/main/java/forestry/pipes/gui/ContainerPropolisPipe.java index 8af254003..a071a9583 100755 --- a/src/main/java/forestry/pipes/gui/ContainerPropolisPipe.java +++ b/src/main/java/forestry/pipes/gui/ContainerPropolisPipe.java @@ -8,12 +8,12 @@ */ package forestry.pipes.gui; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; import forestry.core.gui.ContainerForestry; import forestry.core.inventory.InventoryAdapter; import forestry.pipes.PipeItemsPropolis; import forestry.pipes.PipeLogicPropolis; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; public class ContainerPropolisPipe extends ContainerForestry { diff --git a/src/main/java/forestry/pipes/gui/GuiPropolisPipe.java b/src/main/java/forestry/pipes/gui/GuiPropolisPipe.java index f133b482e..3dbdd2c1a 100755 --- a/src/main/java/forestry/pipes/gui/GuiPropolisPipe.java +++ b/src/main/java/forestry/pipes/gui/GuiPropolisPipe.java @@ -7,16 +7,6 @@ ******************************************************************************/ package forestry.pipes.gui; -import java.util.Iterator; -import java.util.Locale; -import java.util.Map.Entry; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IApiaristTracker; import forestry.api.genetics.AlleleManager; @@ -28,8 +18,8 @@ import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.gadgets.TileForestry; import forestry.core.genetics.ItemGE; -import forestry.core.gui.widgets.Widget; import forestry.core.gui.GuiForestry; +import forestry.core.gui.widgets.Widget; import forestry.core.proxy.Proxies; import forestry.core.render.SpriteSheet; import forestry.core.utils.StringUtil; @@ -37,6 +27,13 @@ import forestry.pipes.EnumFilterType; import forestry.pipes.PipeItemsPropolis; import forestry.pipes.PipeLogicPropolis; import forestry.plugins.PluginApiculture; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map.Entry; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; +import org.lwjgl.opengl.GL11; /** * GuiScreen for propolis pipes. diff --git a/src/main/java/forestry/pipes/network/PacketHandlerPipes.java b/src/main/java/forestry/pipes/network/PacketHandlerPipes.java index 8d08d8d57..bbd0ace57 100755 --- a/src/main/java/forestry/pipes/network/PacketHandlerPipes.java +++ b/src/main/java/forestry/pipes/network/PacketHandlerPipes.java @@ -7,12 +7,6 @@ ******************************************************************************/ package forestry.pipes.network; -import java.io.DataInputStream; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import buildcraft.transport.Pipe; import buildcraft.transport.TileGenericPipe; import forestry.core.interfaces.IPacketHandler; @@ -24,6 +18,11 @@ import forestry.core.proxy.Proxies; import forestry.pipes.PipeItemsPropolis; import forestry.pipes.PipeLogicPropolis; import forestry.pipes.gui.ContainerPropolisPipe; +import java.io.DataInputStream; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class PacketHandlerPipes implements IPacketHandler { diff --git a/src/main/java/forestry/pipes/proxy/ClientProxyPipes.java b/src/main/java/forestry/pipes/proxy/ClientProxyPipes.java index b2996274a..f66305bb1 100755 --- a/src/main/java/forestry/pipes/proxy/ClientProxyPipes.java +++ b/src/main/java/forestry/pipes/proxy/ClientProxyPipes.java @@ -7,11 +7,11 @@ ******************************************************************************/ package forestry.pipes.proxy; +import buildcraft.transport.TransportProxyClient; +import forestry.plugins.PluginPropolisPipe; import net.minecraft.item.Item; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; -import buildcraft.transport.TransportProxyClient; -import forestry.plugins.PluginPropolisPipe; public class ClientProxyPipes extends ProxyPipes { diff --git a/src/main/java/forestry/pipes/proxy/ProxyPipes.java b/src/main/java/forestry/pipes/proxy/ProxyPipes.java index 1c6f1a424..3024428fb 100755 --- a/src/main/java/forestry/pipes/proxy/ProxyPipes.java +++ b/src/main/java/forestry/pipes/proxy/ProxyPipes.java @@ -7,11 +7,6 @@ ******************************************************************************/ package forestry.pipes.proxy; -import java.lang.reflect.Constructor; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; import buildcraft.BuildCraftTransport; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.transport.BlockGenericPipe; @@ -21,6 +16,10 @@ import buildcraft.transport.TransportProxy; import cpw.mods.fml.common.registry.GameRegistry; import forestry.pipes.PipeItemsPropolis; import forestry.plugins.PluginPropolisPipe; +import java.lang.reflect.Constructor; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; public class ProxyPipes { diff --git a/src/main/java/forestry/plugins/ForestryPlugin.java b/src/main/java/forestry/plugins/ForestryPlugin.java index c1027b777..e5b8577f0 100755 --- a/src/main/java/forestry/plugins/ForestryPlugin.java +++ b/src/main/java/forestry/plugins/ForestryPlugin.java @@ -11,20 +11,17 @@ package forestry.plugins; import cpw.mods.fml.common.IFuelHandler; -import java.util.Random; - -import net.minecraft.command.ICommand; -import net.minecraft.world.World; - import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; import cpw.mods.fml.common.network.IGuiHandler; - import forestry.core.interfaces.IOreDictionaryHandler; import forestry.core.interfaces.IPacketHandler; import forestry.core.interfaces.IPickupHandler; import forestry.core.interfaces.IResupplyHandler; import forestry.core.interfaces.ISaveEventHandler; import java.util.EnumSet; +import java.util.Random; +import net.minecraft.command.ICommand; +import net.minecraft.world.World; public abstract class ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 4a6d187a8..d660a22d2 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -10,28 +10,6 @@ ******************************************************************************/ package forestry.plugins; -import java.util.ArrayList; -import java.util.logging.Level; -import java.util.logging.Logger; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.util.IIcon; -import net.minecraft.util.WeightedRandomChestContent; - -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.BiomeDictionary; -import net.minecraftforge.common.ChestGenHooks; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.oredict.OreDictionary; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; @@ -42,7 +20,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.VillagerRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.FlowerManager; @@ -161,6 +138,25 @@ import forestry.core.items.ItemScoop; import forestry.core.proxy.Proxies; import forestry.core.render.EntitySnowFX; import forestry.core.utils.ShapedRecipeCustom; +import java.util.ArrayList; +import java.util.logging.Level; +import java.util.logging.Logger; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Potion; +import net.minecraft.util.IIcon; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.BiomeDictionary; +import net.minecraftforge.common.ChestGenHooks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.oredict.OreDictionary; @Plugin(pluginID = "Apiculture", name = "Apiculture", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.apiculture.description") public class PluginApiculture extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 1a3ad311b..b1428866f 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -10,22 +10,6 @@ ******************************************************************************/ package forestry.plugins; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.WeightedRandomChestContent; - -import net.minecraftforge.common.ChestGenHooks; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.oredict.OreDictionary; - import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; @@ -33,7 +17,6 @@ import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.VillagerRegistry; - import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeRoot; @@ -140,6 +123,19 @@ import forestry.core.items.ItemFruit.EnumFruit; import forestry.core.proxy.Proxies; import forestry.core.utils.RecipeUtil; import forestry.core.utils.ShapedRecipeCustom; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.common.ChestGenHooks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.oredict.OreDictionary; @Plugin(pluginID = "Arboriculture", name = "Arboriculture", author = "Binnie & SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.arboriculture.description") public class PluginArboriculture extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginBuildCraftFuels.java b/src/main/java/forestry/plugins/PluginBuildCraftFuels.java index 0e38ec085..eacab05c8 100644 --- a/src/main/java/forestry/plugins/PluginBuildCraftFuels.java +++ b/src/main/java/forestry/plugins/PluginBuildCraftFuels.java @@ -10,18 +10,15 @@ ******************************************************************************/ package forestry.plugins; -import net.minecraftforge.fluids.Fluid; - +import buildcraft.api.fuels.BuildcraftFuelRegistry; import cpw.mods.fml.common.Optional; - import forestry.core.GameMode; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; import forestry.core.utils.LiquidHelper; - -import buildcraft.api.fuels.BuildcraftFuelRegistry; +import net.minecraftforge.fluids.Fluid; @Plugin(pluginID = "BC6|Fuels", name = "BuildCraft 6 Fuels", author = "mezz", url = Defaults.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") public class PluginBuildCraftFuels extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java b/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java index 2f1ad1cb5..2fa56db8b 100644 --- a/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java +++ b/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.plugins; +import buildcraft.api.recipes.BuildcraftRecipeRegistry; import cpw.mods.fml.common.Optional; - import forestry.core.config.Defaults; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; -import buildcraft.api.recipes.BuildcraftRecipeRegistry; - @Plugin(pluginID = "BC6|Recipes", name = "BuildCraft 6 Recipes", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") public class PluginBuildCraftRecipes extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginBuildCraftStatements.java b/src/main/java/forestry/plugins/PluginBuildCraftStatements.java index 61c9ed4f3..089957562 100644 --- a/src/main/java/forestry/plugins/PluginBuildCraftStatements.java +++ b/src/main/java/forestry/plugins/PluginBuildCraftStatements.java @@ -18,11 +18,10 @@ import buildcraft.api.statements.StatementManager; import cpw.mods.fml.common.Optional; import forestry.core.config.Defaults; import forestry.core.proxy.Proxies; +import java.util.Collection; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import java.util.Collection; - @Plugin(pluginID = "BC6|Statements", name = "BuildCraft 6 Statements", author = "mezz", url = Defaults.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") @Optional.Interface(iface = "ITriggerProvider", modid = "BuildCraftAPI|statements") public class PluginBuildCraftStatements extends ForestryPlugin implements ITriggerProvider { diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index f904f8b00..ba033a27e 100755 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -10,14 +10,6 @@ ******************************************************************************/ package forestry.plugins; -import net.minecraft.block.material.Material; -import net.minecraft.command.ICommand; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.RecipeSorter; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.network.IGuiHandler; import forestry.api.circuits.ChipsetManager; @@ -69,8 +61,15 @@ import forestry.core.items.ItemWrench; import forestry.core.proxy.Proxies; import forestry.core.utils.ForestryModEnvWarningCallable; import forestry.core.utils.ShapedRecipeCustom; - import java.util.ArrayList; +import net.minecraft.block.material.Material; +import net.minecraft.command.ICommand; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.RecipeSorter; @Plugin(pluginID = "Core", name = "Core", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.core.description") public class PluginCore extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginEE.java b/src/main/java/forestry/plugins/PluginEE.java index c684ce36f..d68e343f0 100755 --- a/src/main/java/forestry/plugins/PluginEE.java +++ b/src/main/java/forestry/plugins/PluginEE.java @@ -10,13 +10,6 @@ ******************************************************************************/ package forestry.plugins; -import java.lang.reflect.Field; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.common.BiomeDictionary; - import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IMutation; import forestry.apiculture.genetics.AlleleBeeSpecies; @@ -27,6 +20,10 @@ import forestry.apiculture.genetics.MutationEMC; import forestry.core.config.Defaults; import forestry.core.genetics.Allele; import forestry.core.proxy.Proxies; +import java.lang.reflect.Field; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.BiomeDictionary; @Plugin(pluginID = "EqEx2", name = "Equivalent Exchange 2", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.ee2.description") public class PluginEE extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginEnergy.java b/src/main/java/forestry/plugins/PluginEnergy.java index 443578996..a9679a6d7 100755 --- a/src/main/java/forestry/plugins/PluginEnergy.java +++ b/src/main/java/forestry/plugins/PluginEnergy.java @@ -10,23 +10,9 @@ ******************************************************************************/ package forestry.plugins; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; - -import net.minecraftforge.fluids.FluidStack; - import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.network.IGuiHandler; - -import forestry.api.circuits.ChipsetManager; -import forestry.api.circuits.ICircuitLayout; -import forestry.api.fuels.FuelManager; -import forestry.api.fuels.GeneratorFuel; import forestry.core.GameMode; -import forestry.core.circuits.Circuit; -import forestry.core.circuits.CircuitId; -import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; @@ -35,21 +21,16 @@ import forestry.core.gadgets.MachineDefinition; import forestry.core.interfaces.IOreDictionaryHandler; import forestry.core.interfaces.ISaveEventHandler; import forestry.core.items.ItemForestryBlock; -import forestry.core.proxy.Proxies; -import forestry.core.utils.LiquidHelper; import forestry.core.utils.ShapedRecipeCustom; import forestry.energy.GuiHandlerEnergy; -import forestry.energy.circuits.CircuitElectricBoost; -import forestry.energy.circuits.CircuitElectricChoke; -import forestry.energy.circuits.CircuitElectricEfficiency; -import forestry.energy.circuits.CircuitFireDampener; import forestry.energy.gadgets.EngineBronze; import forestry.energy.gadgets.EngineClockwork; import forestry.energy.gadgets.EngineCopper; import forestry.energy.gadgets.EngineDefinition; -import forestry.energy.gadgets.EngineTin; -import forestry.energy.gadgets.MachineGenerator; import forestry.energy.proxy.ProxyEnergy; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; @Plugin(pluginID = "Energy", name = "Energy", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.energy.description") public class PluginEnergy extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java index d8306553d..8b974b6d4 100755 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/plugins/PluginFactory.java @@ -10,18 +10,7 @@ ******************************************************************************/ package forestry.plugins; -import java.util.ArrayList; - -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - import cpw.mods.fml.common.network.IGuiHandler; - import forestry.api.recipes.ICraftingProvider; import forestry.api.recipes.RecipeManagers; import forestry.core.GameMode; @@ -53,6 +42,12 @@ import forestry.factory.gadgets.MillRainmaker; import forestry.factory.gadgets.TileWorktable; import forestry.factory.recipes.CraftGuideIntegration; import forestry.factory.triggers.FactoryTriggers; +import java.util.ArrayList; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; @Plugin(pluginID = "Factory", name = "Factory", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.factory.description") public class PluginFactory extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginFarmCraftory.java b/src/main/java/forestry/plugins/PluginFarmCraftory.java index 5a785612d..ba527c9e1 100755 --- a/src/main/java/forestry/plugins/PluginFarmCraftory.java +++ b/src/main/java/forestry/plugins/PluginFarmCraftory.java @@ -10,19 +10,16 @@ ******************************************************************************/ package forestry.plugins; -import java.lang.reflect.Method; -import java.util.HashMap; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - - import forestry.api.farming.Farmables; import forestry.core.config.Defaults; import forestry.core.proxy.Proxies; import forestry.farming.logic.FarmableFarmCraftory; +import java.lang.reflect.Method; +import java.util.HashMap; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; @Plugin(pluginID = "FarmCraftory", name = "FarmCraftory", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.farmcraftory.description") public class PluginFarmCraftory extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginFarming.java b/src/main/java/forestry/plugins/PluginFarming.java index 0c9187319..12c8782c2 100755 --- a/src/main/java/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/plugins/PluginFarming.java @@ -62,6 +62,7 @@ import forestry.farming.logic.FarmableVanillaSapling; import forestry.farming.logic.FarmableVanillaShroom; import forestry.farming.proxy.ProxyFarming; import forestry.farming.triggers.FarmingTriggers; +import java.util.ArrayList; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -70,8 +71,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; -import java.util.ArrayList; - @Plugin(pluginID = "Farming", name = "Farming", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.farming.description") public class PluginFarming extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginFood.java b/src/main/java/forestry/plugins/PluginFood.java index 47426ea22..5bf4f5b29 100755 --- a/src/main/java/forestry/plugins/PluginFood.java +++ b/src/main/java/forestry/plugins/PluginFood.java @@ -10,14 +10,9 @@ ******************************************************************************/ package forestry.plugins; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - import cpw.mods.fml.common.network.IGuiHandler; - import forestry.api.food.BeverageManager; import forestry.api.food.IBeverageEffect; -import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.fluids.Fluids; @@ -32,6 +27,8 @@ import forestry.food.items.ItemAmbrosia; import forestry.food.items.ItemBeverage; import forestry.food.items.ItemBeverage.BeverageInfo; import forestry.food.items.ItemInfuser; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; @Plugin(pluginID = "Food", name = "Food", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.food.description") public class PluginFood extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginIC2.java b/src/main/java/forestry/plugins/PluginIC2.java index a0c9c382a..e8d6ca8df 100644 --- a/src/main/java/forestry/plugins/PluginIC2.java +++ b/src/main/java/forestry/plugins/PluginIC2.java @@ -10,19 +10,9 @@ ******************************************************************************/ package forestry.plugins; -import java.util.EnumSet; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameData; - import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitLayout; import forestry.api.fuels.FuelManager; @@ -56,10 +46,14 @@ import forestry.energy.gadgets.EngineTin; import forestry.energy.gadgets.MachineGenerator; import forestry.farming.circuits.CircuitFarmLogic; import forestry.farming.logic.FarmLogicRubber; - import ic2.api.item.IC2Items; import ic2.api.recipe.RecipeInputItemStack; import ic2.api.recipe.Recipes; +import java.util.EnumSet; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; @Plugin(pluginID = "IC2", name = "IndustrialCraft2", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.ic2.description") public class PluginIC2 extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java index 9f7eff777..e5df08f22 100755 --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -10,19 +10,8 @@ ******************************************************************************/ package forestry.plugins; -import java.util.EnumSet; -import java.util.Locale; - -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.crafting.CraftingManager; - -import net.minecraftforge.oredict.RecipeSorter; - import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.network.IGuiHandler; - import forestry.api.arboriculture.ITreeRoot; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; @@ -59,6 +48,13 @@ import forestry.lepidopterology.genetics.ButterflyTemplates; import forestry.lepidopterology.items.ItemButterflyGE; import forestry.lepidopterology.items.ItemFlutterlyzer; import forestry.lepidopterology.proxy.ProxyLepidopterology; +import java.util.EnumSet; +import java.util.Locale; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraftforge.oredict.RecipeSorter; @Plugin(pluginID = "Lepidopterology", name = "Lepidopterology", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.lepidopterology.description") public class PluginLepidopterology extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginMail.java b/src/main/java/forestry/plugins/PluginMail.java index 0a81a1899..ac6715446 100755 --- a/src/main/java/forestry/plugins/PluginMail.java +++ b/src/main/java/forestry/plugins/PluginMail.java @@ -10,15 +10,8 @@ ******************************************************************************/ package forestry.plugins; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.network.IGuiHandler; - import forestry.api.mail.EnumAddressee; import forestry.api.mail.EnumPostage; import forestry.api.mail.PostManager; @@ -57,6 +50,11 @@ import forestry.mail.triggers.TriggerHasMail; import forestry.mail.triggers.TriggerLowInput; import forestry.mail.triggers.TriggerLowPaper; import forestry.mail.triggers.TriggerLowStamps; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; @Plugin(pluginID = "Mail", name = "Mail", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.mail.description") public class PluginMail extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java index cc5628a8f..3de650512 100755 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -11,16 +11,12 @@ package forestry.plugins; import com.google.common.collect.ImmutableList; -import java.util.ArrayList; - import com.google.common.collect.Lists; - import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; import forestry.Forestry; - import forestry.core.interfaces.IOreDictionaryHandler; import forestry.core.interfaces.IPacketHandler; import forestry.core.interfaces.IPickupHandler; @@ -28,6 +24,7 @@ import forestry.core.interfaces.IResupplyHandler; import forestry.core.interfaces.ISaveEventHandler; import forestry.core.proxy.Proxies; import java.io.File; +import java.util.ArrayList; import java.util.EnumSet; import java.util.Iterator; import java.util.Locale; diff --git a/src/main/java/forestry/plugins/PluginNatura.java b/src/main/java/forestry/plugins/PluginNatura.java index 5d2270cae..0cc9b89ca 100755 --- a/src/main/java/forestry/plugins/PluginNatura.java +++ b/src/main/java/forestry/plugins/PluginNatura.java @@ -10,21 +10,18 @@ ******************************************************************************/ package forestry.plugins; -import java.util.ArrayList; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; - import forestry.api.recipes.RecipeManagers; import forestry.core.GameMode; import forestry.core.config.Defaults; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; +import java.util.ArrayList; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; @Plugin(pluginID = "Natura", name = "Natura", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.natura.description") public class PluginNatura extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginPropolisPipe.java b/src/main/java/forestry/plugins/PluginPropolisPipe.java index 5e3f45715..13fe70503 100755 --- a/src/main/java/forestry/plugins/PluginPropolisPipe.java +++ b/src/main/java/forestry/plugins/PluginPropolisPipe.java @@ -16,9 +16,8 @@ import forestry.core.proxy.Proxies; import forestry.pipes.GuiHandlerPipes; import forestry.pipes.network.PacketHandlerPipes; import forestry.pipes.proxy.ProxyPipes; -import net.minecraft.item.Item; - import java.util.EnumSet; +import net.minecraft.item.Item; @Plugin(pluginID = "Pipes", name = "Pipes", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.pipes.description") public class PluginPropolisPipe extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java index 0888e78c4..9f9a99262 100755 --- a/src/main/java/forestry/plugins/PluginStorage.java +++ b/src/main/java/forestry/plugins/PluginStorage.java @@ -10,45 +10,9 @@ ******************************************************************************/ package forestry.plugins; -import java.text.NumberFormat; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.logging.Level; -import java.util.logging.Logger; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockBasePressurePlate; -import net.minecraft.block.BlockButton; -import net.minecraft.block.BlockChest; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockFurnace; -import net.minecraft.block.BlockLadder; -import net.minecraft.block.BlockLever; -import net.minecraft.block.BlockLog; -import net.minecraft.block.BlockMelon; -import net.minecraft.block.BlockPumpkin; -import net.minecraft.block.BlockRedstoneDiode; -import net.minecraft.block.BlockStairs; -import net.minecraft.block.BlockTorch; -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.BlockWall; -import net.minecraft.block.BlockWorkbench; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemDoor; -import net.minecraft.item.ItemFood; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.IShearable; -import net.minecraftforge.oredict.OreDictionary; - import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameData; - import forestry.api.core.Tabs; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.BackpackManager; @@ -75,6 +39,38 @@ import forestry.storage.ResupplyHandler; import forestry.storage.items.ItemNaturalistBackpack; import forestry.storage.items.ItemNaturalistBackpack.BackpackDefinitionApiarist; import forestry.storage.items.ItemNaturalistBackpack.BackpackDefinitionLepidopterist; +import java.text.NumberFormat; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.logging.Level; +import java.util.logging.Logger; +import net.minecraft.block.Block; +import net.minecraft.block.BlockBasePressurePlate; +import net.minecraft.block.BlockButton; +import net.minecraft.block.BlockChest; +import net.minecraft.block.BlockFence; +import net.minecraft.block.BlockFenceGate; +import net.minecraft.block.BlockFurnace; +import net.minecraft.block.BlockLadder; +import net.minecraft.block.BlockLever; +import net.minecraft.block.BlockLog; +import net.minecraft.block.BlockMelon; +import net.minecraft.block.BlockPumpkin; +import net.minecraft.block.BlockRedstoneDiode; +import net.minecraft.block.BlockStairs; +import net.minecraft.block.BlockTorch; +import net.minecraft.block.BlockTrapDoor; +import net.minecraft.block.BlockWall; +import net.minecraft.block.BlockWorkbench; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemDoor; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.IPlantable; +import net.minecraftforge.common.IShearable; +import net.minecraftforge.oredict.OreDictionary; @Plugin(pluginID = "Storage", name = "Storage", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.storage.description") public class PluginStorage extends ForestryPlugin implements IOreDictionaryHandler { diff --git a/src/main/java/forestry/storage/BackpackDefinition.java b/src/main/java/forestry/storage/BackpackDefinition.java index a17d205e1..b46a1cb64 100755 --- a/src/main/java/forestry/storage/BackpackDefinition.java +++ b/src/main/java/forestry/storage/BackpackDefinition.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.storage; +import forestry.api.storage.IBackpackDefinition; +import forestry.core.utils.StackUtils; import java.util.ArrayList; import java.util.List; - -import forestry.core.utils.StackUtils; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import forestry.api.storage.IBackpackDefinition; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; diff --git a/src/main/java/forestry/storage/BackpackHelper.java b/src/main/java/forestry/storage/BackpackHelper.java index 6fdb5b07c..19573b5d7 100755 --- a/src/main/java/forestry/storage/BackpackHelper.java +++ b/src/main/java/forestry/storage/BackpackHelper.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.storage; -import net.minecraft.item.Item; - import forestry.api.storage.BackpackManager; import forestry.api.storage.EnumBackpackType; import forestry.api.storage.IBackpackDefinition; import forestry.api.storage.IBackpackInterface; import forestry.storage.items.ItemBackpack; +import net.minecraft.item.Item; public class BackpackHelper implements IBackpackInterface { diff --git a/src/main/java/forestry/storage/GuiHandlerStorage.java b/src/main/java/forestry/storage/GuiHandlerStorage.java index 835145b0c..8624dc305 100755 --- a/src/main/java/forestry/storage/GuiHandlerStorage.java +++ b/src/main/java/forestry/storage/GuiHandlerStorage.java @@ -10,11 +10,6 @@ ******************************************************************************/ package forestry.storage; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; @@ -22,13 +17,17 @@ import forestry.core.GuiHandlerBase; import forestry.core.config.Defaults; import forestry.core.gui.GuiNaturalistInventory; import forestry.core.gui.IPagedInventory; -import forestry.core.network.GuiId; import forestry.core.inventory.ItemInventory; +import forestry.core.network.GuiId; import forestry.storage.gui.ContainerBackpack; import forestry.storage.gui.ContainerNaturalistBackpack; import forestry.storage.gui.GuiBackpack; import forestry.storage.gui.GuiBackpackT2; import forestry.storage.items.ItemBackpack; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class GuiHandlerStorage extends GuiHandlerBase { diff --git a/src/main/java/forestry/storage/PickupHandlerStorage.java b/src/main/java/forestry/storage/PickupHandlerStorage.java index 766f9ae4d..81380ffb9 100755 --- a/src/main/java/forestry/storage/PickupHandlerStorage.java +++ b/src/main/java/forestry/storage/PickupHandlerStorage.java @@ -10,15 +10,14 @@ ******************************************************************************/ package forestry.storage; +import forestry.core.interfaces.IPickupHandler; +import forestry.storage.gui.ContainerBackpack; +import forestry.storage.gui.ContainerNaturalistBackpack; +import forestry.storage.items.ItemBackpack; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import forestry.storage.gui.ContainerNaturalistBackpack; -import forestry.core.interfaces.IPickupHandler; -import forestry.storage.gui.ContainerBackpack; -import forestry.storage.items.ItemBackpack; - public class PickupHandlerStorage implements IPickupHandler { @Override diff --git a/src/main/java/forestry/storage/ResupplyHandler.java b/src/main/java/forestry/storage/ResupplyHandler.java index aefbf8ba7..b94471da8 100755 --- a/src/main/java/forestry/storage/ResupplyHandler.java +++ b/src/main/java/forestry/storage/ResupplyHandler.java @@ -10,20 +10,17 @@ ******************************************************************************/ package forestry.storage; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ContainerPlayer; -import net.minecraft.item.ItemStack; - import cpw.mods.fml.common.eventhandler.Event; - -import net.minecraftforge.common.MinecraftForge; - import forestry.api.storage.BackpackManager; import forestry.api.storage.BackpackResupplyEvent; import forestry.api.storage.IBackpackDefinition; import forestry.core.interfaces.IResupplyHandler; import forestry.core.inventory.ItemInventory; import forestry.storage.items.ItemBackpack; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ContainerPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; public class ResupplyHandler implements IResupplyHandler { diff --git a/src/main/java/forestry/storage/gui/ContainerBackpack.java b/src/main/java/forestry/storage/gui/ContainerBackpack.java index 0ce3de1f5..f64acf725 100755 --- a/src/main/java/forestry/storage/gui/ContainerBackpack.java +++ b/src/main/java/forestry/storage/gui/ContainerBackpack.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.storage.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - import forestry.core.config.Defaults; import forestry.core.gui.ContainerItemInventory; import forestry.core.gui.slots.SlotForestry; import forestry.core.inventory.ItemInventory; import forestry.storage.items.ItemBackpack; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class ContainerBackpack extends ContainerItemInventory { diff --git a/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java b/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java index d0322062d..8f140a334 100755 --- a/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java +++ b/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java @@ -10,10 +10,6 @@ ******************************************************************************/ package forestry.storage.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; - import forestry.api.genetics.ISpeciesRoot; import forestry.core.gui.ContainerItemInventory; import forestry.core.gui.IGuiSelectable; @@ -21,6 +17,9 @@ import forestry.core.gui.slots.SlotCustom; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; import forestry.storage.GuiHandlerStorage.PagedInventory; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; public class ContainerNaturalistBackpack extends ContainerItemInventory implements IGuiSelectable { diff --git a/src/main/java/forestry/storage/items/ItemBackpack.java b/src/main/java/forestry/storage/items/ItemBackpack.java index 0b8e6f18e..dc99247a2 100755 --- a/src/main/java/forestry/storage/items/ItemBackpack.java +++ b/src/main/java/forestry/storage/items/ItemBackpack.java @@ -10,9 +10,26 @@ ******************************************************************************/ package forestry.storage.items; +import cpw.mods.fml.common.eventhandler.Event; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.ForestryAPI; +import forestry.api.storage.BackpackStowEvent; +import forestry.api.storage.EnumBackpackType; +import forestry.api.storage.IBackpackDefinition; +import forestry.core.config.Defaults; +import forestry.core.inventory.InvTools; +import forestry.core.inventory.ItemInventory; +import forestry.core.inventory.wrappers.IInvSlot; +import forestry.core.inventory.wrappers.InventoryIterator; +import forestry.core.items.ItemInventoried; +import forestry.core.network.GuiId; +import forestry.core.proxy.Proxies; +import forestry.core.render.TextureManager; +import forestry.core.utils.StringUtil; +import forestry.storage.BackpackMode; import java.util.List; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -20,30 +37,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; - -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; -import forestry.api.core.ForestryAPI; -import forestry.api.storage.BackpackStowEvent; -import forestry.api.storage.EnumBackpackType; -import forestry.api.storage.IBackpackDefinition; -import forestry.core.config.Defaults; -import forestry.core.inventory.InvTools; -import forestry.core.inventory.wrappers.IInvSlot; -import forestry.core.inventory.wrappers.InventoryIterator; -import forestry.core.items.ItemInventoried; -import forestry.core.network.GuiId; -import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; -import forestry.core.inventory.ItemInventory; -import forestry.core.utils.StringUtil; -import forestry.storage.BackpackMode; - public class ItemBackpack extends ItemInventoried { private final IBackpackDefinition info; diff --git a/src/main/java/forestry/storage/items/ItemNaturalistBackpack.java b/src/main/java/forestry/storage/items/ItemNaturalistBackpack.java index 281e7a4d2..3397e9fa1 100755 --- a/src/main/java/forestry/storage/items/ItemNaturalistBackpack.java +++ b/src/main/java/forestry/storage/items/ItemNaturalistBackpack.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.storage.items; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - import forestry.api.core.ForestryAPI; import forestry.api.storage.EnumBackpackType; import forestry.plugins.PluginApiculture; import forestry.plugins.PluginLepidopterology; import forestry.storage.BackpackDefinition; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class ItemNaturalistBackpack extends ItemBackpack {