diff --git a/src/main/java/binnie/Binnie.java b/src/main/java/binnie/Binnie.java index 64be4788..d836e504 100644 --- a/src/main/java/binnie/Binnie.java +++ b/src/main/java/binnie/Binnie.java @@ -1,12 +1,13 @@ package binnie; +import java.util.ArrayList; +import java.util.List; + import binnie.core.ManagerBase; import binnie.core.genetics.ManagerGenetics; import binnie.core.liquid.ManagerLiquid; import binnie.core.machines.ManagerMachine; import binnie.core.resource.ManagerResource; -import java.util.ArrayList; -import java.util.List; public final class Binnie { diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index aeb7c17e..a6c26356 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -2,6 +2,15 @@ package binnie.botany; import static binnie.botany.items.BotanyItems.misc; +import net.minecraft.block.Block; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.event.entity.player.BonemealEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.world.BlockEvent; + import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumSoilType; import binnie.botany.api.IFlower; @@ -39,16 +48,13 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.event.entity.player.BonemealEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.world.BlockEvent; -@Mod(modid = Botany.BOTANY_MODID, name = Botany.BOTANY_MODNAME, version = Tags.VERSION, useMetadata = true, dependencies = "after:BinnieCore") +@Mod( + modid = Botany.BOTANY_MODID, + name = Botany.BOTANY_MODNAME, + version = Tags.VERSION, + useMetadata = true, + dependencies = "after:BinnieCore") public class Botany extends AbstractMod { public static final String BOTANY_MODID = "botany"; diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramic.java b/src/main/java/binnie/botany/ceramic/BlockCeramic.java index a112678b..a16d1569 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramic.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramic.java @@ -1,16 +1,8 @@ package binnie.botany.ceramic; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.botany.genetics.EnumFlowerColor; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.core.util.I18N; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; 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; @@ -25,6 +17,16 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.botany.genetics.EnumFlowerColor; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.core.util.I18N; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockCeramic extends Block implements IBlockMetadata { public BlockCeramic() { diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java index fb44a9b5..ab53db06 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java @@ -2,6 +2,23 @@ package binnie.botany.ceramic; import static binnie.botany.items.BotanyMisc.Items.Mortar; +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; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; @@ -15,21 +32,6 @@ import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -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; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipassBlock { diff --git a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java index d0335b08..969bebeb 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java +++ b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java @@ -2,6 +2,14 @@ package binnie.botany.ceramic; import static binnie.botany.items.BotanyMisc.Items.Mortar; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + import binnie.botany.Botany; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.AbstractMod; @@ -11,12 +19,6 @@ import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.IPattern; import binnie.extratrees.carpentry.DesignerManager; import binnie.extratrees.carpentry.EnumPattern; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; public class CeramicDesignSystem implements IDesignSystem { diff --git a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java index f0da0a6f..e42a3652 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java +++ b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java @@ -1,6 +1,5 @@ package binnie.botany.ceramic; -import binnie.botany.items.BotanyItems; import java.util.ArrayList; import java.util.List; @@ -11,6 +10,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import binnie.botany.Botany; +import binnie.botany.items.BotanyItems; public class CeramicTileRecipe implements IRecipe { diff --git a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java index e4dc2814..e2bf55f2 100644 --- a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java +++ b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java @@ -1,6 +1,5 @@ package binnie.botany.ceramic; -import binnie.botany.items.BotanyItems; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -8,6 +7,7 @@ import net.minecraft.world.World; import binnie.Binnie; import binnie.botany.api.IFlower; +import binnie.botany.items.BotanyItems; public class PigmentRecipe implements IRecipe { diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index a23c3fc9..1a0000e8 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -1,6 +1,5 @@ package binnie.botany.flower; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.block.Block; @@ -28,6 +27,7 @@ import binnie.botany.genetics.EnumFlowerType; import binnie.botany.genetics.Flower; import binnie.core.BinnieCore; import binnie.core.util.I18N; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.genetics.IIndividual; diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index 2a000bf0..63cf07a9 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -1,6 +1,5 @@ package binnie.botany.flower; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,6 +13,7 @@ import net.minecraft.util.IIcon; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.core.util.I18N; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/botany/gardening/Gardening.java b/src/main/java/binnie/botany/gardening/Gardening.java index 6712d926..2a896351 100644 --- a/src/main/java/binnie/botany/gardening/Gardening.java +++ b/src/main/java/binnie/botany/gardening/Gardening.java @@ -2,6 +2,21 @@ package binnie.botany.gardening; import static binnie.botany.items.BotanyMisc.Items.Weedkiller; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + +import com.mojang.authlib.GameProfile; + import binnie.botany.Botany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; @@ -10,19 +25,7 @@ import binnie.botany.api.IFlower; import binnie.botany.api.gardening.IBlockSoil; import binnie.botany.flower.TileEntityFlower; import binnie.core.BinnieCore; -import com.mojang.authlib.GameProfile; import forestry.api.core.EnumTemperature; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; public class Gardening { diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index 10a67946..c05b2c9c 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -1,6 +1,5 @@ package binnie.botany.gardening; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -20,6 +19,7 @@ import binnie.botany.api.gardening.IBlockSoil; import binnie.core.BinnieCore; import binnie.core.util.I18N; import binnie.genetics.genetics.AlleleHelper; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/botany/gardening/ItemTrowel.java b/src/main/java/binnie/botany/gardening/ItemTrowel.java index eaea490f..319cd550 100644 --- a/src/main/java/binnie/botany/gardening/ItemTrowel.java +++ b/src/main/java/binnie/botany/gardening/ItemTrowel.java @@ -1,6 +1,5 @@ package binnie.botany.gardening; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -14,6 +13,7 @@ import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index c72b8696..c0c76a41 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -9,6 +9,18 @@ import static binnie.botany.items.BotanyMisc.Items.PulpPowder; import static binnie.botany.items.BotanyMisc.Items.SulphurPowder; import static binnie.botany.items.BotanyMisc.Items.Weedkiller; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.RecipeSorter; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; + import binnie.botany.Botany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; @@ -31,16 +43,6 @@ import binnie.core.block.ItemMetadataRenderer; import binnie.core.block.MultipassItemRenderer; import binnie.core.block.TileEntityMetadata; import cpw.mods.fml.common.registry.GameRegistry; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; public class ModuleGardening implements IInitializable { @@ -208,8 +210,7 @@ public class ModuleGardening implements IInitializable { GameRegistry.addShapelessRecipe(CompostPowder.get(4), Mods.forestry.stack("fertilizerBio")); GameRegistry.addShapelessRecipe(FertiliserPowder.get(4), Mods.forestry.stack("fertilizerCompound")); GameRegistry.addShapelessRecipe(PulpPowder.get(4), Mods.forestry.stack("woodPulp")); - GameRegistry - .addRecipe(new ShapelessOreRecipe(SulphurPowder.get(4), new Object[] { "dustSulphur" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(SulphurPowder.get(4), new Object[] { "dustSulphur" })); GameRegistry.addRecipe( new ShapelessOreRecipe( @@ -247,8 +248,7 @@ public class ModuleGardening implements IInitializable { addNutrientFertiliser(entry.getKey(), entry.getValue()); } - GameRegistry - .addRecipe(Mortar.get(6), " c ", "cgc", " c ", 'c', Items.clay_ball, 'g', Blocks.gravel); + GameRegistry.addRecipe(Mortar.get(6), " c ", "cgc", " c ", 'c', Items.clay_ball, 'g', Blocks.gravel); for (EnumFlowerColor c : EnumFlowerColor.values()) { ItemStack clay = new ItemStack(BotanyItems.clay, 1, c.ordinal()); diff --git a/src/main/java/binnie/botany/genetics/FlowerHelper.java b/src/main/java/binnie/botany/genetics/FlowerHelper.java index a3bada6e..62578418 100644 --- a/src/main/java/binnie/botany/genetics/FlowerHelper.java +++ b/src/main/java/binnie/botany/genetics/FlowerHelper.java @@ -1,6 +1,5 @@ package binnie.botany.genetics; -import binnie.botany.items.BotanyItems; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -24,6 +23,7 @@ import binnie.botany.api.IFlower; import binnie.botany.api.IFlowerGenome; import binnie.botany.api.IFlowerMutation; import binnie.botany.api.IFlowerRoot; +import binnie.botany.items.BotanyItems; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; diff --git a/src/main/java/binnie/botany/genetics/ItemDictionary.java b/src/main/java/binnie/botany/genetics/ItemDictionary.java index 9c8e8711..3e05f3bf 100644 --- a/src/main/java/binnie/botany/genetics/ItemDictionary.java +++ b/src/main/java/binnie/botany/genetics/ItemDictionary.java @@ -1,6 +1,5 @@ package binnie.botany.genetics; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,6 +14,7 @@ import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.core.BotanyGUI; import binnie.core.util.I18N; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/botany/genetics/ModuleGenetics.java b/src/main/java/binnie/botany/genetics/ModuleGenetics.java index eeb2e615..85b8585a 100644 --- a/src/main/java/binnie/botany/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/botany/genetics/ModuleGenetics.java @@ -1,5 +1,9 @@ package binnie.botany.genetics; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.core.BotanyCore; @@ -15,9 +19,6 @@ import forestry.api.apiculture.FlowerManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.recipes.RecipeManagers; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ModuleGenetics implements IInitializable { diff --git a/src/main/java/binnie/botany/items/BotanyItems.java b/src/main/java/binnie/botany/items/BotanyItems.java index a5eef242..a51667de 100644 --- a/src/main/java/binnie/botany/items/BotanyItems.java +++ b/src/main/java/binnie/botany/items/BotanyItems.java @@ -1,5 +1,7 @@ package binnie.botany.items; +import net.minecraft.item.Item; + import binnie.botany.flower.ItemFlower; import binnie.botany.flower.ItemInsulatedTube; import binnie.botany.flower.ItemPollen; @@ -8,7 +10,6 @@ import binnie.botany.gardening.ItemSoilMeter; import binnie.botany.gardening.ItemTrowel; import binnie.botany.genetics.ItemDictionary; import binnie.core.item.DamageItems; -import net.minecraft.item.Item; public class BotanyItems { diff --git a/src/main/java/binnie/botany/items/BotanyMisc.java b/src/main/java/binnie/botany/items/BotanyMisc.java index 92314652..168b3e49 100644 --- a/src/main/java/binnie/botany/items/BotanyMisc.java +++ b/src/main/java/binnie/botany/items/BotanyMisc.java @@ -3,13 +3,17 @@ package binnie.botany.items; import static binnie.botany.Botany.BOTANY_MODID; import static binnie.botany.items.BotanyItems.misc; -import binnie.botany.CreativeTabBotany; -import binnie.core.item.DamageItems; import java.util.Arrays; + import net.minecraft.item.ItemStack; +import binnie.botany.CreativeTabBotany; +import binnie.core.item.DamageItems; + public class BotanyMisc extends DamageItems { + public enum Items { + AshPowder("powderAsh"), PulpPowder("powderPulp"), MulchPowder("powderMulch"), @@ -32,6 +36,9 @@ public class BotanyMisc extends DamageItems { } public BotanyMisc() { - super(CreativeTabBotany.instance, BOTANY_MODID, Arrays.stream(Items.VALUES).map(i -> i.name).toArray(String[]::new)); + super( + CreativeTabBotany.instance, + BOTANY_MODID, + Arrays.stream(Items.VALUES).map(i -> i.name).toArray(String[]::new)); } } diff --git a/src/main/java/binnie/botany/items/ItemClay.java b/src/main/java/binnie/botany/items/ItemClay.java index 638bb958..136c69eb 100644 --- a/src/main/java/binnie/botany/items/ItemClay.java +++ b/src/main/java/binnie/botany/items/ItemClay.java @@ -1,6 +1,5 @@ package binnie.botany.items; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,6 +13,7 @@ import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.util.I18N; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/botany/items/ItemPigment.java b/src/main/java/binnie/botany/items/ItemPigment.java index ca18fba3..213545ce 100644 --- a/src/main/java/binnie/botany/items/ItemPigment.java +++ b/src/main/java/binnie/botany/items/ItemPigment.java @@ -1,6 +1,5 @@ package binnie.botany.items; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,6 +13,7 @@ import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.util.I18N; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index 2ea7645a..11d2dbe9 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -1,5 +1,10 @@ package binnie.core; +import java.util.ArrayList; +import java.util.List; + +import net.minecraftforge.common.MinecraftForge; + import binnie.core.gui.IBinnieGUID; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; @@ -9,9 +14,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; -import net.minecraftforge.common.MinecraftForge; 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 7ad2dcc7..2de7e168 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.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraftforge.client.event.TextureStitchEvent; + import binnie.Binnie; import binnie.core.block.MultipassBlockRenderer; import binnie.core.block.TileEntityMetadata; @@ -32,13 +41,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.nbt.NBTTagCompound; -import net.minecraft.server.MinecraftServer; -import net.minecraftforge.client.event.TextureStitchEvent; @Mod( modid = BinnieCore.CORE_MODID, diff --git a/src/main/java/binnie/core/block/BlockMetadata.java b/src/main/java/binnie/core/block/BlockMetadata.java index 5bbe45b5..ba7a230f 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/src/main/java/binnie/core/block/BlockMetadata.java @@ -1,8 +1,8 @@ package binnie.core.block; -import binnie.core.BinnieCore; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -14,6 +14,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import binnie.core.BinnieCore; + public class BlockMetadata extends BlockContainer implements IBlockMetadata { public BlockMetadata(Material material) { diff --git a/src/main/java/binnie/core/craftgui/WindowFieldKit.java b/src/main/java/binnie/core/craftgui/WindowFieldKit.java index d60adb7e..9609c2eb 100644 --- a/src/main/java/binnie/core/craftgui/WindowFieldKit.java +++ b/src/main/java/binnie/core/craftgui/WindowFieldKit.java @@ -1,6 +1,5 @@ package binnie.core.craftgui; -import binnie.core.item.BinnieItems; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -33,6 +32,7 @@ import binnie.core.craftgui.resource.StyleSheet; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.craftgui.resource.minecraft.PaddedTexture; import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.item.BinnieItems; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import binnie.extrabees.core.ExtraBeeTexture; diff --git a/src/main/java/binnie/core/item/BinnieItems.java b/src/main/java/binnie/core/item/BinnieItems.java index 3d6a44d4..d2715059 100644 --- a/src/main/java/binnie/core/item/BinnieItems.java +++ b/src/main/java/binnie/core/item/BinnieItems.java @@ -3,6 +3,7 @@ package binnie.core.item; import binnie.genetics.item.ItemFieldKit; public class BinnieItems { + public static final ItemGenesis genesis = new ItemGenesis(); public static final ItemFieldKit fieldKit = new ItemFieldKit(); } diff --git a/src/main/java/binnie/core/item/DamageItems.java b/src/main/java/binnie/core/item/DamageItems.java index c693814a..07fb49d7 100644 --- a/src/main/java/binnie/core/item/DamageItems.java +++ b/src/main/java/binnie/core/item/DamageItems.java @@ -1,6 +1,5 @@ package binnie.core.item; -import binnie.core.util.I18N; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,6 +8,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import binnie.core.util.I18N; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -23,6 +23,7 @@ public abstract class DamageItems extends Item { protected DamageItems(CreativeTabs tab, String modid, String... names) { this(tab, modid, "misc", false, names); } + protected DamageItems(CreativeTabs tab, String modid, String name, boolean overrideIcons, String... names) { setCreativeTab(tab); setHasSubtypes(true); diff --git a/src/main/java/binnie/core/item/ItemGenesis.java b/src/main/java/binnie/core/item/ItemGenesis.java index 8a626314..89a9c30c 100644 --- a/src/main/java/binnie/core/item/ItemGenesis.java +++ b/src/main/java/binnie/core/item/ItemGenesis.java @@ -1,6 +1,5 @@ package binnie.core.item; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -10,6 +9,7 @@ import net.minecraft.world.World; import binnie.core.BinnieCore; import binnie.core.gui.BinnieCoreGUI; import binnie.core.util.I18N; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index 3e342100..78460293 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -2,6 +2,14 @@ package binnie.core.item; import static binnie.core.item.BinnieItems.fieldKit; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; + import binnie.botany.Botany; import binnie.botany.api.IFlower; import binnie.botany.flower.TileEntityFlower; @@ -10,13 +18,6 @@ import binnie.core.IInitializable; import binnie.core.network.packet.MessageNBT; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; public class ModuleItems implements IInitializable { diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index 4da6932e..3ef26db9 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -1,5 +1,13 @@ package binnie.extrabees; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.init.Items; +import net.minecraftforge.oredict.OreDictionary; + +import com.gtnewhorizon.gtnhlib.config.ConfigException; +import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.Tags; @@ -16,8 +24,6 @@ import binnie.extrabees.products.CombItems; 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; @@ -25,10 +31,6 @@ import cpw.mods.fml.common.event.FMLMissingMappingsEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.init.Items; -import net.minecraftforge.oredict.OreDictionary; @Mod( modid = ExtraBees.EB_MODID, @@ -101,10 +103,8 @@ public class ExtraBees extends AbstractMod { if (name.length < 2) continue; if (name[0].equals("ExtraBees")) { - if (m.type == GameRegistry.Type.BLOCK) - m.remap(GameRegistry.findBlock(EB_MODID, name[1])); - else - m.remap(GameRegistry.findItem(EB_MODID, name[1])); + if (m.type == GameRegistry.Type.BLOCK) m.remap(GameRegistry.findBlock(EB_MODID, name[1])); + else m.remap(GameRegistry.findItem(EB_MODID, name[1])); } } } diff --git a/src/main/java/binnie/extrabees/core/ModuleCore.java b/src/main/java/binnie/extrabees/core/ModuleCore.java index cecdce63..823afd8c 100644 --- a/src/main/java/binnie/extrabees/core/ModuleCore.java +++ b/src/main/java/binnie/extrabees/core/ModuleCore.java @@ -1,6 +1,5 @@ package binnie.extrabees.core; - import static binnie.extrabees.item.EBItems.itemMisc; import binnie.core.IInitializable; diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java index d7c19bb0..37f1ebb4 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java @@ -1,5 +1,16 @@ package binnie.extrabees.genetics; +import java.awt.Color; +import java.util.Arrays; +import java.util.EnumSet; +import java.util.Locale; +import java.util.Map; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.BiomeDictionary; + import binnie.core.Mods; import binnie.extrabees.genetics.effect.ExtraBeesEffect; import binnie.extrabees.genetics.requirements.RequirementPerson; @@ -22,15 +33,6 @@ import forestry.apiculture.genetics.IBeeDefinition; import forestry.apiculture.genetics.alleles.AlleleEffect; import forestry.core.genetics.IBranchDefinition; import forestry.core.genetics.alleles.EnumAllele; -import java.awt.Color; -import java.util.Arrays; -import java.util.EnumSet; -import java.util.Locale; -import java.util.Map; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.BiomeDictionary; public enum ExtraBeeDefinition implements IBeeDefinition { @@ -91,8 +93,9 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.30f).addSpecialty(CombItems.Items.COMPOST.get(1), 0.08f) - .setTemperature(EnumTemperature.HOT).setHumidity(EnumHumidity.ARID); + beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.30f) + .addSpecialty(CombItems.Items.COMPOST.get(1), 0.08f).setTemperature(EnumTemperature.HOT) + .setHumidity(EnumHumidity.ARID); } @Override @@ -104,8 +107,9 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.25f).addSpecialty(CombItems.Items.SAWDUST.get(1), 0.25f) - .setTemperature(EnumTemperature.HOT).setHumidity(EnumHumidity.ARID); + beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.25f) + .addSpecialty(CombItems.Items.SAWDUST.get(1), 0.25f).setTemperature(EnumTemperature.HOT) + .setHumidity(EnumHumidity.ARID); } @Override @@ -127,8 +131,9 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.30f).addSpecialty(CombItems.Items.ROTTEN.get(1), 0.10f) - .setTemperature(EnumTemperature.HOT).setHumidity(EnumHumidity.ARID); + beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.30f) + .addSpecialty(CombItems.Items.ROTTEN.get(1), 0.10f).setTemperature(EnumTemperature.HOT) + .setHumidity(EnumHumidity.ARID); } @Override @@ -250,7 +255,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.COPPER.get(1), 0.06f); + beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f) + .addSpecialty(CombItems.Items.COPPER.get(1), 0.06f); } @Override @@ -317,7 +323,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.TITANIUM.get(1), 0.02f); + beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f) + .addSpecialty(CombItems.Items.TITANIUM.get(1), 0.02f); } @Override @@ -329,7 +336,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.TUNGSTEN.get(1), 0.01f); + beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f) + .addSpecialty(CombItems.Items.TUNGSTEN.get(1), 0.01f); } @Override @@ -341,7 +349,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.NICKEL.get(1), 0.05f); + beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f) + .addSpecialty(CombItems.Items.NICKEL.get(1), 0.05f); } @Override @@ -371,7 +380,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.SILVER.get(1), 0.02f); + beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f) + .addSpecialty(CombItems.Items.SILVER.get(1), 0.02f); } @Override @@ -387,7 +397,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.PLATINUM.get(1), 0.01f); + beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f) + .addSpecialty(CombItems.Items.PLATINUM.get(1), 0.01f); } @Override @@ -401,7 +412,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.LAPIS.get(1), 0.05f); + beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f) + .addSpecialty(CombItems.Items.LAPIS.get(1), 0.05f); } @Override @@ -420,7 +432,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.EMERALD.get(1), 0.04f); + beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f) + .addSpecialty(CombItems.Items.EMERALD.get(1), 0.04f); } @Override @@ -444,7 +457,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.SAPPHIRE.get(1), 0.03f); + beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f) + .addSpecialty(CombItems.Items.SAPPHIRE.get(1), 0.03f); } @Override @@ -457,7 +471,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.DIAMOND.get(1), 0.01f); + beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f) + .addSpecialty(CombItems.Items.DIAMOND.get(1), 0.01f); } @Override @@ -500,8 +515,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.20f).addSpecialty(CombItems.Items.URANIUM.get(1), 0.02f) - .setHasEffect(); + beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.20f) + .addSpecialty(CombItems.Items.URANIUM.get(1), 0.02f).setHasEffect(); } @Override @@ -537,7 +552,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.20f).addSpecialty(CombItems.Items.CYANITE.get(1), 0.01f); + beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.20f) + .addSpecialty(CombItems.Items.CYANITE.get(1), 0.01f); } @Override @@ -716,8 +732,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.COAL.get(1), 0.10f).addSpecialty(CombItems.Items.CREOSOTE.get(1), 0.07f) - .setHasEffect(); + beeSpecies.addProduct(CombItems.Items.COAL.get(1), 0.10f) + .addSpecialty(CombItems.Items.CREOSOTE.get(1), 0.07f).setHasEffect(); } @Override @@ -776,8 +792,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(CombItems.Items.WATER.get(1), 0.30f).addSpecialty(new ItemStack(Items.dye, 1, 0), 0.10f) - .setHumidity(EnumHumidity.DAMP); + beeSpecies.addProduct(CombItems.Items.WATER.get(1), 0.30f) + .addSpecialty(new ItemStack(Items.dye, 1, 0), 0.10f).setHumidity(EnumHumidity.DAMP); } @Override @@ -925,8 +941,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.30f) - .addProduct(new ItemStack(Items.sugar, 1, 0), 0.15f).addSpecialty(CombItems.Items.FRUIT.get(1), 0.20f) - .setHasEffect(); + .addProduct(new ItemStack(Items.sugar, 1, 0), 0.15f) + .addSpecialty(CombItems.Items.FRUIT.get(1), 0.20f).setHasEffect(); } @Override @@ -1642,8 +1658,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.30f) - .addSpecialty(Mods.forestry.stack("pollen"), 0.20f).addSpecialty(CombItems.Items.PURPLE.get(1), 0.15f) - .setIsNotCounted().setHasEffect(); + .addSpecialty(Mods.forestry.stack("pollen"), 0.20f) + .addSpecialty(CombItems.Items.PURPLE.get(1), 0.15f).setIsNotCounted().setHasEffect(); } @Override diff --git a/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java b/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java index 093644cc..fd14582e 100644 --- a/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java @@ -1,5 +1,9 @@ package binnie.extrabees.genetics; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.IInitializable; import binnie.extrabees.ExtraBees; @@ -10,9 +14,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.IGenome; import forestry.api.recipes.RecipeManagers; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ModuleGenetics implements IInitializable { diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java index a764e9e8..8a882842 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java +++ b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java @@ -1,6 +1,5 @@ package binnie.extrabees.genetics.items; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,6 +13,7 @@ import net.minecraft.world.World; import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import binnie.extrabees.core.ExtraBeeGUID; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; diff --git a/src/main/java/binnie/extrabees/item/EBItems.java b/src/main/java/binnie/extrabees/item/EBItems.java index fc026d08..dff4eab3 100644 --- a/src/main/java/binnie/extrabees/item/EBItems.java +++ b/src/main/java/binnie/extrabees/item/EBItems.java @@ -1,13 +1,15 @@ package binnie.extrabees.item; +import net.minecraft.item.Item; + import binnie.core.item.DamageItems; import binnie.extrabees.genetics.items.ItemDictionary; import binnie.extrabees.products.CombItems; import binnie.extrabees.products.DropItems; import binnie.extrabees.products.Propolis; -import net.minecraft.item.Item; public class EBItems { + public final static DamageItems itemMisc = new EBMisc(); public final static DamageItems comb = new CombItems(); public final static DamageItems propolis = new Propolis(); diff --git a/src/main/java/binnie/extrabees/item/EBMisc.java b/src/main/java/binnie/extrabees/item/EBMisc.java index afb5ae9b..3b9da12b 100644 --- a/src/main/java/binnie/extrabees/item/EBMisc.java +++ b/src/main/java/binnie/extrabees/item/EBMisc.java @@ -3,20 +3,24 @@ package binnie.extrabees.item; import static binnie.extrabees.ExtraBees.EB_MODID; import static binnie.extrabees.item.EBItems.itemMisc; +import java.util.Arrays; + +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.Binnie; import binnie.core.Mods; import binnie.core.item.DamageItems; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.core.Tabs; import forestry.api.recipes.RecipeManagers; -import java.util.Arrays; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; public class EBMisc extends DamageItems { + public enum Items { + ScentedGear("scentedGear"), DiamondShard("diamondShard", "Diamond", false), EmeraldShard("emeraldShard", "Emerald", false), @@ -89,17 +93,14 @@ public class EBMisc extends DamageItems { } protected EBMisc() { - super( - Tabs.tabApiculture, - EB_MODID, - Arrays.stream(Items.VALUES).map(i -> i.name).toArray(String[]::new)); + super(Tabs.tabApiculture, EB_MODID, Arrays.stream(Items.VALUES).map(i -> i.name).toArray(String[]::new)); } @Override public String getIconName(int damage) { return "misc/" + super.getIconName(damage); } - + public static void init() { OreDictionary.registerOre("dyeRed", Items.RedDye.get(1)); OreDictionary.registerOre("dyeYellow", Items.YellowDye.get(1)); @@ -112,7 +113,12 @@ public class EBMisc extends DamageItems { public static void postInit() { ItemStack lapisShard = Items.LapisShard.get(1); - GameRegistry.addShapelessRecipe(new ItemStack(net.minecraft.init.Items.dye, 1, 4), lapisShard, lapisShard, lapisShard, lapisShard); + GameRegistry.addShapelessRecipe( + new ItemStack(net.minecraft.init.Items.dye, 1, 4), + lapisShard, + lapisShard, + lapisShard, + lapisShard); for (Items item : Items.VALUES) { if (item.resourceString != null && item.isMetal) { ItemStack dust = null; @@ -131,7 +137,12 @@ public class EBMisc extends DamageItems { GameRegistry .addShapelessRecipe(ingot, input, input, input, input, input, input, input, input, input); } else if (item == Items.CoalDust) { - GameRegistry.addShapelessRecipe(new ItemStack(net.minecraft.init.Items.coal), input, input, input, input); + GameRegistry.addShapelessRecipe( + new ItemStack(net.minecraft.init.Items.coal), + input, + input, + input, + input); } } else if (item.resourceString != null) { ItemStack gem = null; diff --git a/src/main/java/binnie/extrabees/products/CombItems.java b/src/main/java/binnie/extrabees/products/CombItems.java index 054bc3ad4..dbf9248a 100644 --- a/src/main/java/binnie/extrabees/products/CombItems.java +++ b/src/main/java/binnie/extrabees/products/CombItems.java @@ -23,6 +23,16 @@ import static binnie.extrabees.item.EBMisc.Items.YelloriumDust; import static binnie.extrabees.item.EBMisc.Items.ZincDust; import static net.minecraft.init.Items.dye; +import java.awt.Color; +import java.util.Arrays; +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.oredict.OreDictionary; + import binnie.core.Mods; import binnie.core.item.DamageItems; import binnie.extrabees.item.EBItems; @@ -32,17 +42,11 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import forestry.api.recipes.RecipeManagers; import it.unimi.dsi.fastutil.objects.Object2FloatOpenHashMap; -import java.awt.Color; -import java.util.Arrays; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.oredict.OreDictionary; public class CombItems extends DamageItems { + public enum Items { + BARREN("barren", new Color(0x736c44), new Color(0xc2bea7)), ROTTEN("rotten", new Color(0x3e5221), new Color(0xb1cc89)), BONE("bone", new Color(0xc4c4af), new Color(0xdedec1)), @@ -220,7 +224,7 @@ public class CombItems extends DamageItems { public static void addSubtypes() { final ItemStack beeswax = Mods.forestry.stack("beeswax"); final ItemStack honeyDrop = Mods.forestry.stack("honeyDrop"); - + OreDictionary.registerOre("gemLapis", new ItemStack(dye, 1, 4)); Items.BARREN.addProduct(beeswax, 1.00f); diff --git a/src/main/java/binnie/extrabees/products/DropItems.java b/src/main/java/binnie/extrabees/products/DropItems.java index 30c0998e..d866a61e 100644 --- a/src/main/java/binnie/extrabees/products/DropItems.java +++ b/src/main/java/binnie/extrabees/products/DropItems.java @@ -3,22 +3,25 @@ package binnie.extrabees.products; import static binnie.extrabees.ExtraBees.EB_MODID; import static binnie.extrabees.item.EBItems.honeyDrop; +import java.awt.Color; +import java.util.Arrays; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.core.item.DamageItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import forestry.api.recipes.RecipeManagers; -import java.awt.Color; -import java.util.Arrays; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.FluidStack; public class DropItems extends DamageItems { - + public enum Items { + ENERGY("energy", new Color(0x9c4972), new Color(0xe37171), ""), ACID("acid", new Color(0x4bb541), new Color(0x49de3c), "acid"), POISON("poison", new Color(0xd106b9), new Color(0xff03e2), "poison"), @@ -109,7 +112,9 @@ public class DropItems extends DamageItems { @Override public int getColorFromItemStack(ItemStack stack, int indexColor) { final int damage = stack.getItemDamage(); - final CombItems.Items comb = damage < CombItems.Items.VALUES.length ? CombItems.Items.VALUES[stack.getItemDamage()] : null; + final CombItems.Items comb = damage < CombItems.Items.VALUES.length + ? CombItems.Items.VALUES[stack.getItemDamage()] + : null; if (comb == null) return 0xffffff; return indexColor == 0 ? comb.primary : comb.secondary; diff --git a/src/main/java/binnie/extrabees/products/Propolis.java b/src/main/java/binnie/extrabees/products/Propolis.java index 85bda601..96cade0b 100644 --- a/src/main/java/binnie/extrabees/products/Propolis.java +++ b/src/main/java/binnie/extrabees/products/Propolis.java @@ -3,21 +3,25 @@ package binnie.extrabees.products; import static binnie.extrabees.ExtraBees.EB_MODID; import static binnie.extrabees.item.EBItems.propolis; +import java.awt.Color; +import java.util.Arrays; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.core.item.DamageItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import forestry.api.recipes.RecipeManagers; -import java.awt.Color; -import java.util.Arrays; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.FluidStack; public class Propolis extends DamageItems { + public enum Items { + WATER(new Color(0x24b3c9), new Color(0xc2bea7), "water"), OIL(new Color(0x172f33), new Color(0xc2bea7), "oil"), FUEL(new Color(0xa38d12), new Color(0xc2bea7), "fuel"), diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index a1204c5e..71a5f76b 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; @@ -24,8 +29,6 @@ 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; @@ -33,7 +36,6 @@ import cpw.mods.fml.common.event.FMLMissingMappingsEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; @Mod( modid = ET_MODID, diff --git a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java index 7d79c616..f720491e 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java @@ -3,6 +3,13 @@ package binnie.extratrees.carpentry; import static binnie.extratrees.item.ETMisc.Items.GlassFitting; import static binnie.extratrees.item.ETMisc.Items.WoodWax; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.extratrees.ExtraTrees; @@ -11,11 +18,6 @@ import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.IPattern; import binnie.extratrees.block.PlankType; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; public enum DesignSystem implements IDesignSystem { diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java index 86fbe2a6..d9d83d81 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java @@ -1,12 +1,24 @@ package binnie.extratrees.genetics; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import com.gtnewhorizon.gtnhlib.reflect.Fields; + import binnie.Binnie; import binnie.core.util.I18N; import binnie.extratrees.block.FruitPod; import binnie.extratrees.config.ETConfig; import binnie.extratrees.item.ETItems; import binnie.extratrees.item.FoodItems; -import com.gtnewhorizon.gtnhlib.reflect.Fields; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumTreeChromosome; @@ -19,15 +31,6 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IFruitFamily; import forestry.arboriculture.FruitProviderNone; import forestry.arboriculture.genetics.alleles.AlleleTreeSpecies; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider { diff --git a/src/main/java/binnie/extratrees/item/ETItems.java b/src/main/java/binnie/extratrees/item/ETItems.java index df4b19fd..44df2519 100644 --- a/src/main/java/binnie/extratrees/item/ETItems.java +++ b/src/main/java/binnie/extratrees/item/ETItems.java @@ -1,9 +1,11 @@ package binnie.extratrees.item; -import binnie.core.item.DamageItems; import net.minecraft.item.Item; +import binnie.core.item.DamageItems; + public class ETItems { + public final static DamageItems itemMisc = new ETMisc(); public final static Item itemDictionary = new ItemDictionary(); public static Item itemDictionaryLepi; diff --git a/src/main/java/binnie/extratrees/item/ETMisc.java b/src/main/java/binnie/extratrees/item/ETMisc.java index 9949653b..ea46e669 100644 --- a/src/main/java/binnie/extratrees/item/ETMisc.java +++ b/src/main/java/binnie/extratrees/item/ETMisc.java @@ -3,13 +3,17 @@ package binnie.extratrees.item; import static binnie.extratrees.ExtraTrees.ET_MODID; import static binnie.extratrees.item.ETItems.itemMisc; -import binnie.core.item.DamageItems; -import forestry.api.core.Tabs; import java.util.Arrays; + import net.minecraft.item.ItemStack; +import binnie.core.item.DamageItems; +import forestry.api.core.Tabs; + public class ETMisc extends DamageItems { + public enum Items { + // Binnie never enabled this one, so it does nothing // TODO: re-enable or remove this CarpentryHammer("carpentryHammer"), @@ -32,9 +36,6 @@ public class ETMisc extends DamageItems { } protected ETMisc() { - super( - Tabs.tabArboriculture, - ET_MODID, - Arrays.stream(Items.VALUES).map(i -> i.name).toArray(String[]::new)); + super(Tabs.tabArboriculture, ET_MODID, Arrays.stream(Items.VALUES).map(i -> i.name).toArray(String[]::new)); } } diff --git a/src/main/java/binnie/extratrees/item/FoodItems.java b/src/main/java/binnie/extratrees/item/FoodItems.java index 7bf9f7cd..75274f7f 100644 --- a/src/main/java/binnie/extratrees/item/FoodItems.java +++ b/src/main/java/binnie/extratrees/item/FoodItems.java @@ -3,6 +3,17 @@ package binnie.extratrees.item; import static binnie.extratrees.ExtraTrees.ET_MODID; import static binnie.extratrees.item.ETItems.itemFood; +import java.util.Arrays; +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.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.oredict.OreDictionary; + import binnie.Binnie; import binnie.core.Mods; import binnie.core.item.DamageItems; @@ -12,22 +23,15 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import forestry.api.recipes.RecipeManagers; -import java.util.Arrays; -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.ItemFood; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.oredict.OreDictionary; /** * This class doesn't extend {@link DamageItems} because it needs to extend {@link net.minecraft.item.ItemFood}, and * Java doesn't allow multiple inheritance. */ public class FoodItems extends ItemFood { + public enum Items { + Crabapple("Crabapple", 2), Orange("Orange", 4), Kumquat("Kumquat", 2), @@ -203,7 +207,7 @@ public class FoodItems extends ItemFood { NAMES = Arrays.stream(Items.VALUES).map(i -> i.name).toArray(String[]::new); ICONS = new IIcon[NAMES.length]; this.modid = ET_MODID; - + GameRegistry.registerItem(this, name); } @@ -226,7 +230,8 @@ public class FoodItems extends ItemFood { @Override public String getItemStackDisplayName(ItemStack stack) { final int damage = stack.getItemDamage(); - return (damage < NAMES.length) ? I18N.localise("for.extratrees.item.food." + NAMES[damage].toLowerCase()) : "null"; + return (damage < NAMES.length) ? I18N.localise("for.extratrees.item.food." + NAMES[damage].toLowerCase()) + : "null"; } @Override @@ -255,7 +260,7 @@ public class FoodItems extends ItemFood { * I don't quite understand why these next two functions were overridden instead of using something with deobfed * names. In the vain hope of not breaking things, I leave them unchanged. */ - + @Override public int func_150905_g(ItemStack stack) { return Items.VALUES[stack.getItemDamage()].hunger; diff --git a/src/main/java/binnie/extratrees/item/ItemDictionary.java b/src/main/java/binnie/extratrees/item/ItemDictionary.java index 6a06e806..070e8b89 100644 --- a/src/main/java/binnie/extratrees/item/ItemDictionary.java +++ b/src/main/java/binnie/extratrees/item/ItemDictionary.java @@ -1,6 +1,5 @@ package binnie.extratrees.item; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,6 +13,7 @@ import net.minecraft.world.World; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.core.ExtraTreesGUID; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/src/main/java/binnie/extratrees/item/ItemHammer.java index 94f0e6ce..0df7d988 100644 --- a/src/main/java/binnie/extratrees/item/ItemHammer.java +++ b/src/main/java/binnie/extratrees/item/ItemHammer.java @@ -1,6 +1,5 @@ package binnie.extratrees.item; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -10,6 +9,7 @@ import net.minecraft.item.ItemStack; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.IToolHammer; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index d0825f0f..b3f78da7 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -1,6 +1,5 @@ package binnie.extratrees.item; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,6 +13,7 @@ import net.minecraft.world.World; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.core.ExtraTreesGUID; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index 75d79189..d11ea3f0 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -6,6 +6,16 @@ import static binnie.extratrees.item.ETMisc.Items.GlassFitting; import static binnie.extratrees.item.ETMisc.Items.ProvenGear; import static binnie.extratrees.item.ETMisc.Items.WoodWax; +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.CraftingManager; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.IInitializable; @@ -16,15 +26,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.FuelManager; import forestry.api.recipes.RecipeManagers; -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.CraftingManager; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; public class ModuleItems implements IInitializable { @@ -128,18 +129,9 @@ public class ModuleItems implements IInitializable { 's', Items.stick)); - GameRegistry - .addRecipe(ProvenGear.get(1), " s ", "s s", " s ", 's', Mods.forestry.stack("oakStick")); + GameRegistry.addRecipe(ProvenGear.get(1), " s ", "s s", " s ", 's', Mods.forestry.stack("oakStick")); - GameRegistry.addRecipe( - GlassFitting.get(6), - "s s", - " i ", - "s s", - 'i', - Items.iron_ingot, - 's', - Items.stick); + GameRegistry.addRecipe(GlassFitting.get(6), "s s", " i ", "s s", 'i', Items.iron_ingot, 's', Items.stick); try { Item minium = (Item) Class.forName("com.pahimar.ee3.lib.ItemIds").getField("miniumShard").get(null); diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/src/main/java/binnie/extratrees/machines/ModuleMachine.java index 27183391..bd33a5f6 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -2,15 +2,16 @@ package binnie.extratrees.machines; import static binnie.extratrees.item.ETMisc.Items.ProvenGear; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraftforge.oredict.ShapedOreRecipe; + import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.machines.MachineGroup; import binnie.extratrees.ExtraTrees; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.core.Tabs; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleMachine implements IInitializable { @@ -30,8 +31,8 @@ public class ModuleMachine implements IInitializable { GameRegistry.addRecipe( new ShapedOreRecipe( ExtraTreeMachine.Lumbermill.get(1), - new Object[] { "gAg", "GsG", "gPg", 'G', Blocks.glass, 'g', ProvenGear.get(1), - 'A', Items.iron_axe, 's', Mods.forestry.stack("sturdyMachine"), 'P', "gearBronze" })); + new Object[] { "gAg", "GsG", "gPg", 'G', Blocks.glass, 'g', ProvenGear.get(1), 'A', + Items.iron_axe, 's', Mods.forestry.stack("sturdyMachine"), 'P', "gearBronze" })); GameRegistry.addRecipe( new ShapedOreRecipe( diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillComponentLogic.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillComponentLogic.java index 051c7f4f..36db4c55 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillComponentLogic.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillComponentLogic.java @@ -1,15 +1,15 @@ package binnie.extratrees.machines.lumbermill; - import static binnie.extratrees.item.ETMisc.Items.Bark; import static binnie.extratrees.item.ETMisc.Items.Sawdust; +import net.minecraft.item.ItemStack; + import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; -import net.minecraft.item.ItemStack; public class LumbermillComponentLogic extends ComponentProcessSetCost implements IProcess { @@ -56,9 +56,7 @@ public class LumbermillComponentLogic extends ComponentProcessSetCost implements } getUtil().addStack(Lumbermill.SLOT_PLANKS, result); - getUtil().addStack( - Lumbermill.SLOT_SAWDUST, - Sawdust.get(1)); + getUtil().addStack(Lumbermill.SLOT_SAWDUST, Sawdust.get(1)); getUtil().addStack(Lumbermill.SLOT_BARK, Bark.get(1)); getUtil().decreaseStack(Lumbermill.SLOT_WOOD, 1); } diff --git a/src/main/java/binnie/extratrees/nei/NEIHandlerLumbermill.java b/src/main/java/binnie/extratrees/nei/NEIHandlerLumbermill.java index 42e32767..79373f2a 100644 --- a/src/main/java/binnie/extratrees/nei/NEIHandlerLumbermill.java +++ b/src/main/java/binnie/extratrees/nei/NEIHandlerLumbermill.java @@ -3,6 +3,15 @@ package binnie.extratrees.nei; import static binnie.extratrees.item.ETMisc.Items.Bark; import static binnie.extratrees.item.ETMisc.Items.Sawdust; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.core.nei.NEIUtils; import binnie.core.nei.PositionedFluidTank; @@ -11,13 +20,6 @@ import binnie.extratrees.machines.lumbermill.Lumbermill; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; public class NEIHandlerLumbermill extends RecipeHandlerBase { diff --git a/src/main/java/binnie/genetics/genetics/Engineering.java b/src/main/java/binnie/genetics/genetics/Engineering.java index cb8899ed..8aea9ae2 100644 --- a/src/main/java/binnie/genetics/genetics/Engineering.java +++ b/src/main/java/binnie/genetics/genetics/Engineering.java @@ -4,13 +4,14 @@ import static binnie.genetics.item.GeneticsItems.sequencer; import static binnie.genetics.item.GeneticsMisc.Items.EmptyGenome; import static binnie.genetics.item.GeneticsMisc.Items.EmptySerum; +import net.minecraft.item.ItemStack; + import binnie.genetics.api.IGene; import binnie.genetics.api.IItemChargable; import binnie.genetics.api.IItemSerum; import binnie.genetics.item.GeneticsItems; import binnie.genetics.item.ItemSerum; import binnie.genetics.item.ItemSerumArray; -import net.minecraft.item.ItemStack; public class Engineering { diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/src/main/java/binnie/genetics/item/GeneticsItems.java index 027adbf8..0d22c001 100644 --- a/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -1,8 +1,9 @@ package binnie.genetics.item; -import binnie.core.item.DamageItems; import net.minecraft.item.Item; +import binnie.core.item.DamageItems; + public class GeneticsItems { public static final Item serum = new ItemSerum(); diff --git a/src/main/java/binnie/genetics/item/ItemAnalyst.java b/src/main/java/binnie/genetics/item/ItemAnalyst.java index f6e1a249..e485a273 100644 --- a/src/main/java/binnie/genetics/item/ItemAnalyst.java +++ b/src/main/java/binnie/genetics/item/ItemAnalyst.java @@ -1,6 +1,5 @@ package binnie.genetics.item; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -11,6 +10,7 @@ import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.core.GeneticsGUI; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index e95abec3..723567b1 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -1,6 +1,5 @@ package binnie.genetics.item; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,6 +14,7 @@ import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.core.GeneticsGUI; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/item/ItemFieldKit.java b/src/main/java/binnie/genetics/item/ItemFieldKit.java index 233345b7..29796a6c 100644 --- a/src/main/java/binnie/genetics/item/ItemFieldKit.java +++ b/src/main/java/binnie/genetics/item/ItemFieldKit.java @@ -1,6 +1,5 @@ package binnie.genetics.item; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,6 +14,7 @@ import binnie.core.BinnieCore; import binnie.core.gui.BinnieCoreGUI; import binnie.core.util.I18N; import binnie.genetics.GeneticsCreativeTab; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index a4466a88..eb4d3f6e 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -1,6 +1,5 @@ package binnie.genetics.item; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,6 +13,7 @@ import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.genetics.IGeneItem; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java index 03bb9815..0dc9f677 100644 --- a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java @@ -1,6 +1,5 @@ package binnie.genetics.item; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -11,6 +10,7 @@ import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.core.GeneticsGUI; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/item/ItemRegistry.java b/src/main/java/binnie/genetics/item/ItemRegistry.java index d4fdba43..6b4e9c39 100644 --- a/src/main/java/binnie/genetics/item/ItemRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemRegistry.java @@ -1,6 +1,5 @@ package binnie.genetics.item; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -11,6 +10,7 @@ import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.core.GeneticsGUI; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index d4024d75..7a98ce66 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -1,9 +1,7 @@ package binnie.genetics.item; - import static binnie.genetics.item.GeneticsItems.sequencer; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,6 +20,7 @@ import binnie.genetics.api.IItemAnalysable; import binnie.genetics.api.IItemChargable; import binnie.genetics.genetics.GeneItem; import binnie.genetics.genetics.SequencerItem; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.EnumBeeChromosome; diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index 2a448148..66a85d2c 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -2,6 +2,14 @@ package binnie.genetics.item; import static binnie.genetics.item.GeneticsItems.serum; +import java.util.List; +import java.util.Map; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; @@ -16,12 +24,6 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -import java.util.List; -import java.util.Map; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class ItemSerum extends ItemGene implements IItemSerum { diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index e98430da..0e0851d7 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -2,6 +2,14 @@ package binnie.genetics.item; import static binnie.genetics.item.GeneticsItems.serumArray; +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; @@ -19,12 +27,6 @@ import forestry.api.genetics.IChromosome; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class ItemSerumArray extends ItemGene implements IItemSerum { diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index b213e95f..250bfa4e 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -19,9 +19,6 @@ import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCasing; import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCircuit; import static binnie.genetics.item.GeneticsMisc.Items.LaboratoryCasing; -import binnie.botany.items.BotanyItems; -import binnie.extrabees.item.EBItems; -import binnie.extratrees.item.ETItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -30,11 +27,14 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import binnie.Binnie; +import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.liquid.ItemFluidContainer; import binnie.core.resource.BinnieIcon; +import binnie.extrabees.item.EBItems; +import binnie.extratrees.item.ETItems; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; @@ -190,7 +190,7 @@ public class ModuleItem implements IInitializable { Item diamond = Items.diamond; // save a reference to diamond ItemStack analystStack = new ItemStack(analyst); // save a reference to the analyst, will make the next bit - // easier + // easier // the following code is a sufficient replacement for the 3 nested loops that preceded it; arguably this is // still @@ -304,9 +304,9 @@ public class ModuleItem implements IInitializable { // do a check to ensure that the butterfly module is enabled before using the butterfly dictionary. // a similar check could be done for arboriculture and apiculture as well, but that is left to the mod owner Item lepiDb = BinnieCore.isLepidopteryActive() ? ETItems.itemDictionaryLepi : Items.diamond; // just use a - // diamond if - // Butterflies - // is disabled + // diamond if + // Butterflies + // is disabled // going to use the circuit reference above as well // as above, there are only 24 permutations here; let's find a way to just get those recipes rather than trying diff --git a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java index ec17642c..2e211354 100644 --- a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java +++ b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java @@ -5,6 +5,18 @@ import static binnie.genetics.item.GeneticsItems.database; import static binnie.genetics.item.GeneticsItems.masterRegistry; import static binnie.genetics.item.GeneticsItems.registry; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +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 binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; import binnie.core.item.BinnieItems; @@ -15,16 +27,6 @@ import binnie.core.machines.network.INetwork; import binnie.extrabees.item.EBItems; import binnie.extratrees.item.ETItems; import buildcraft.api.tools.IToolWrench; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -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 ComponentGUIHolder extends MachineComponent implements INetwork.TilePacketSync, IInteraction.RightClick { diff --git a/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java b/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java index 468c66cc..6497c99d 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java @@ -2,11 +2,12 @@ package binnie.genetics.machine.sequencer; import static binnie.genetics.item.GeneticsItems.sequencer; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import binnie.genetics.genetics.SequencerItem; import binnie.genetics.machine.ModuleMachine; -import net.minecraft.item.ItemStack; public class UnsequencedSlotValidator extends SlotValidator { diff --git a/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java b/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java index a409498a..9500d508 100644 --- a/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java @@ -1,6 +1,5 @@ package binnie.genetics.nei; -import binnie.botany.items.BotanyItems; import java.util.ArrayList; import java.util.List; @@ -8,6 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; +import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.core.nei.PositionedStackAdv; diff --git a/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java b/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java index 31689c9d..7eaf6e81 100644 --- a/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java @@ -3,6 +3,13 @@ package binnie.genetics.nei; import static binnie.genetics.item.GeneticsItems.sequencer; import static binnie.genetics.item.GeneticsMisc.Items.DNADye; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; + import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; import binnie.core.Mods; @@ -12,11 +19,6 @@ import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.oredict.OreDictionary; public class AnalyserRecipeHandler extends RecipeHandlerBase { diff --git a/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java b/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java index 3cf9c4e3..61fadd9e 100644 --- a/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java @@ -5,17 +5,19 @@ import static binnie.genetics.item.GeneticsItems.serumArray; import static binnie.genetics.item.GeneticsMisc.Items.EmptyGenome; import static binnie.genetics.item.GeneticsMisc.Items.EmptySerum; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; + import binnie.core.nei.RecipeHandlerBase; import binnie.genetics.item.ItemSerumArray; import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.oredict.OreDictionary; public class DatabaseRecipeHandler extends RecipeHandlerBase { diff --git a/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java b/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java index 19055852..3bdbd668 100644 --- a/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java @@ -2,7 +2,6 @@ package binnie.genetics.nei; import static binnie.genetics.item.GeneticsMisc.Items.Enzyme; -import binnie.botany.items.BotanyItems; import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; @@ -13,6 +12,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import binnie.Binnie; +import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.core.nei.NEIUtils; diff --git a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java index d76daa4e..07fefd7e 100644 --- a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java @@ -3,6 +3,15 @@ package binnie.genetics.nei; import static binnie.genetics.item.GeneticsItems.serum; import static binnie.genetics.item.GeneticsItems.serumArray; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; import binnie.core.Mods; @@ -16,25 +25,14 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class InoculatorRecipeHandler extends RecipeHandlerBase { private static final List recipes = new ArrayList<>(); private void createInoculatorRecipeForNEI(ItemStack dnaManipulable) { - recipes.add( - new InoculatorRecipe(dnaManipulable, new ItemStack(serum, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add( - new InoculatorRecipe( - dnaManipulable, - new ItemStack(serumArray, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new InoculatorRecipe(dnaManipulable, new ItemStack(serum, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new InoculatorRecipe(dnaManipulable, new ItemStack(serumArray, 1, OreDictionary.WILDCARD_VALUE))); } @Override diff --git a/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java index 765b18c4..9f1778d7 100644 --- a/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java @@ -4,6 +4,15 @@ import static binnie.genetics.item.GeneticsItems.sequencer; import static binnie.genetics.item.GeneticsMisc.Items.EmptySequencer; import static binnie.genetics.item.GeneticsMisc.Items.Enzyme; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.Binnie; import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; @@ -21,13 +30,6 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class IsolatorRecipeHandler extends RecipeHandlerBase { diff --git a/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java b/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java index 5ceb2418..5158b4c9 100644 --- a/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java @@ -4,6 +4,16 @@ import static binnie.genetics.item.GeneticsItems.sequencer; import static binnie.genetics.item.GeneticsItems.serum; import static binnie.genetics.item.GeneticsItems.serumArray; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.core.nei.NEIUtils; import binnie.core.nei.PositionedFluidTank; import binnie.core.nei.PositionedStackAdv; @@ -16,14 +26,6 @@ import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class PolymeriserRecipeHandler extends RecipeHandlerBase { diff --git a/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java b/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java index 7b43328e..08d80ecf 100644 --- a/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java @@ -5,15 +5,17 @@ import static binnie.genetics.item.GeneticsItems.sequencer; import static binnie.genetics.item.GeneticsMisc.Items.EmptySequencer; import static binnie.genetics.item.GeneticsMisc.Items.FluorescentDye; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; + import binnie.core.nei.RecipeHandlerBase; import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; public class SequencerRecipeHandler extends RecipeHandlerBase { diff --git a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java index 7cdb8576..4907d44c 100644 --- a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java @@ -3,6 +3,14 @@ package binnie.genetics.nei; import static binnie.genetics.item.GeneticsItems.serum; import static binnie.genetics.item.GeneticsItems.serumArray; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; import binnie.core.Mods; @@ -16,12 +24,6 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class SplicerRecipeHandler extends RecipeHandlerBase { @@ -29,10 +31,7 @@ public class SplicerRecipeHandler extends RecipeHandlerBase { private void createSplicerRecipeForNEI(ItemStack dnaManipulable) { recipes.add(new SplicerRecipe(dnaManipulable, new ItemStack(serum, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add( - new SplicerRecipe( - dnaManipulable, - new ItemStack(serumArray, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new SplicerRecipe(dnaManipulable, new ItemStack(serumArray, 1, OreDictionary.WILDCARD_VALUE))); } @Override