diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 6e7e257b..4f134964 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -1,6 +1,5 @@ package binnie.botany.gardening; -import binnie.core.item.ItemMisc; import java.util.HashMap; import java.util.Map; @@ -37,6 +36,7 @@ import binnie.core.block.ItemMetadata; import binnie.core.block.ItemMetadataRenderer; import binnie.core.block.MultipassItemRenderer; import binnie.core.block.TileEntityMetadata; +import binnie.core.item.ItemMisc; import cpw.mods.fml.common.registry.GameRegistry; public class ModuleGardening implements IInitializable { diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index 25043fa9..dc3cb53d 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -1,5 +1,8 @@ package binnie.core; +import java.util.ArrayList; +import java.util.List; + import binnie.core.gui.IBinnieGUID; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; @@ -9,8 +12,6 @@ import binnie.core.proxy.IProxyCore; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; -import java.util.ArrayList; -import java.util.List; public abstract class AbstractMod implements IPacketProvider, IInitializable { diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 93e80e9f..16068484 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -1,5 +1,14 @@ package binnie.core; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item; +import net.minecraft.server.MinecraftServer; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; + import binnie.Binnie; import binnie.core.block.MultipassBlockRenderer; import binnie.core.block.TileEntityMetadata; @@ -34,13 +43,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.ForestryEvent; import forestry.plugins.PluginManager; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; -import net.minecraft.server.MinecraftServer; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; @Mod( modid = BinnieCore.CORE_MODID, diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index f8123548..b1816361 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -2,9 +2,8 @@ package binnie.core.item; import static cpw.mods.fml.common.registry.GameRegistry.registerItem; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -12,6 +11,9 @@ 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; + public class ItemMisc extends Item { private final IItemMisc[] items; diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index 4f6c1bb7..2da46ef8 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -1,5 +1,11 @@ package binnie.extrabees; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +import com.gtnewhorizon.gtnhlib.config.ConfigException; +import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.Tags; @@ -20,15 +26,11 @@ import binnie.extrabees.products.ItemPropolis; import binnie.extrabees.products.ModuleProducts; import binnie.extrabees.proxy.ExtraBeesProxy; import binnie.extrabees.worldgen.ModuleGeneration; -import com.gtnewhorizon.gtnhlib.config.ConfigException; -import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; @Mod( modid = ExtraBees.EB_MODID, diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java index 8cc10085..7e89cf38 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java +++ b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java @@ -2,13 +2,8 @@ package binnie.extrabees.genetics.items; import static cpw.mods.fml.common.registry.GameRegistry.registerItem; -import binnie.core.util.I18N; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.core.ExtraBeeGUID; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -17,6 +12,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import binnie.core.util.I18N; +import binnie.extrabees.ExtraBees; +import binnie.extrabees.core.ExtraBeeGUID; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class ItemDictionary extends Item { protected IIcon iconMaster; diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index cb0a0d16..2e4d65d1 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -3,6 +3,11 @@ package binnie.extratrees; import static binnie.extratrees.ExtraTrees.EB_MOD_NAME; import static binnie.extratrees.ExtraTrees.ET_MODID; +import net.minecraft.block.Block; + +import com.gtnewhorizon.gtnhlib.config.ConfigException; +import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.Tags; @@ -29,14 +34,11 @@ import binnie.extratrees.item.ModuleItems; import binnie.extratrees.machines.ModuleMachine; import binnie.extratrees.nei.IMCForNEI; import binnie.extratrees.proxy.Proxy; -import com.gtnewhorizon.gtnhlib.config.ConfigException; -import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import net.minecraft.block.Block; @Mod( modid = ET_MODID, diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index 43921e64..1546642c 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -1,6 +1,5 @@ package binnie.genetics.item; -import binnie.core.item.ItemMisc; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -13,6 +12,7 @@ import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; +import binnie.core.item.ItemMisc; import binnie.core.liquid.ItemFluidContainer; import binnie.core.resource.BinnieIcon; import binnie.extrabees.ExtraBees;