diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 4de1d0bc..aeb7c17e 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -1,5 +1,7 @@ package binnie.botany; +import static binnie.botany.items.BotanyItems.misc; + import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumSoilType; import binnie.botany.api.IFlower; @@ -11,26 +13,19 @@ import binnie.botany.ceramic.BlockStained; import binnie.botany.core.BotanyCore; import binnie.botany.core.BotanyGUI; import binnie.botany.flower.BlockFlower; -import binnie.botany.flower.ItemFlower; -import binnie.botany.flower.ItemInsulatedTube; import binnie.botany.flower.TileEntityFlower; import binnie.botany.gardening.BlockPlant; import binnie.botany.gardening.BlockSoil; import binnie.botany.gardening.Gardening; -import binnie.botany.gardening.ItemSoilMeter; -import binnie.botany.gardening.ItemTrowel; import binnie.botany.gardening.ModuleGardening; -import binnie.botany.genetics.ItemDictionary; import binnie.botany.genetics.ModuleGenetics; -import binnie.botany.items.ItemClay; -import binnie.botany.items.ItemPigment; +import binnie.botany.items.BotanyItems; import binnie.botany.network.PacketID; import binnie.botany.proxy.Proxy; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.Tags; import binnie.core.gui.IBinnieGUID; -import binnie.core.item.ItemMisc; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; import binnie.core.proxy.IProxyCore; @@ -38,13 +33,14 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; +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.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.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -52,9 +48,12 @@ import net.minecraftforge.event.entity.player.BonemealEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; -@Mod(modid = "Botany", name = "Botany", 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"; + public static final String BOTANY_MODNAME = "Botany"; + @Mod.Instance("Botany") public static Botany instance; @@ -62,27 +61,13 @@ public class Botany extends AbstractMod { public static Proxy proxy; public static BlockFlower flower; - public static Item seed; - public static Item pollen; - public static ItemDictionary database; public static BlockPlant plant; - public static ItemTrowel trowelWood; - public static ItemTrowel trowelStone; - public static ItemTrowel trowelIron; - public static ItemTrowel trowelDiamond; - public static ItemTrowel trowelGold; public static BlockSoil soil; public static BlockSoil loam; public static BlockSoil flowerbed; public static BlockSoil soilNoWeed; public static BlockSoil loamNoWeed; public static BlockSoil flowerbedNoWeed; - public static ItemInsulatedTube insulatedTube; - public static ItemSoilMeter soilMeter; - public static ItemMisc misc; - public static ItemFlower flowerItem; - public static ItemPigment pigment; - public static ItemClay clay; public static BlockCeramic ceramic; public static BlockCeramicPatterned ceramicTile; public static BlockStained stained; @@ -94,6 +79,10 @@ public class Botany extends AbstractMod { @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { + // Loads BotanyItems.class, guaranteeing that items are init by this point + // TODO: is this needed? + misc.getUnlocalizedName(); + addModule(new ModuleGenetics()); addModule(new ModuleGardening()); preInit(); @@ -109,6 +98,19 @@ public class Botany extends AbstractMod { postInit(); } + @Mod.EventHandler + public void missingMappings(FMLMissingMappingsEvent event) { + for (FMLMissingMappingsEvent.MissingMapping m : event.getAll()) { + final String[] name = m.name.split(":"); + if (name.length < 2) continue; + + if (name[0].equals("Botany")) { + if (m.type == GameRegistry.Type.BLOCK) m.remap(GameRegistry.findBlock(BOTANY_MODID, name[1])); + else m.remap(GameRegistry.findItem(BOTANY_MODID, name[1])); + } + } + } + @Override public IBinnieGUID[] getGUIDs() { return BotanyGUI.values(); @@ -131,7 +133,7 @@ public class Botany extends AbstractMod { @Override public String getModID() { - return "botany"; + return BOTANY_MODID; } @Override @@ -155,7 +157,7 @@ public class Botany extends AbstractMod { } if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null - && event.entityPlayer.getHeldItem().getItem() == Botany.pollen) { + && event.entityPlayer.getHeldItem().getItem() == BotanyItems.pollen) { TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); if (tile instanceof TileEntityFlower tileFlower) { IFlower pollen = BotanyCore.getFlowerRoot().getMember(event.entityPlayer.getHeldItem()); diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java index d09e847d..fb44a9b5 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java @@ -1,5 +1,7 @@ package binnie.botany.ceramic; +import static binnie.botany.items.BotanyMisc.Items.Mortar; + import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; @@ -471,7 +473,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa } private boolean isMortar(ItemStack stack) { - return stack.getItem() == Botany.misc && stack.getItemDamage() == BotanyItems.Mortar.ordinal(); + return stack.getItem() == BotanyItems.misc && stack.getItemDamage() == Mortar.ordinal(); } } diff --git a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java index 9daf34dc..d0335b08 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java +++ b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java @@ -1,16 +1,9 @@ package binnie.botany.ceramic; -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 static binnie.botany.items.BotanyMisc.Items.Mortar; import binnie.botany.Botany; import binnie.botany.genetics.EnumFlowerColor; -import binnie.botany.items.BotanyItems; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.extratrees.api.IDesignMaterial; @@ -18,6 +11,12 @@ 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 { @@ -96,7 +95,7 @@ public class CeramicDesignSystem implements IDesignSystem { @Override public ItemStack getAdhesive() { - return BotanyItems.Mortar.get(1); + return Mortar.get(1); } @Override diff --git a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java index f499d673..f0da0a6f 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java +++ b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java @@ -1,5 +1,6 @@ package binnie.botany.ceramic; +import binnie.botany.items.BotanyItems; import java.util.ArrayList; import java.util.List; @@ -26,7 +27,7 @@ public class CeramicTileRecipe implements IRecipe { Item ceramicBlock = Item.getItemFromBlock(Botany.ceramic); Item ceramicTile = Item.getItemFromBlock(Botany.ceramicTile); Item ceramicBrick = Item.getItemFromBlock(Botany.ceramicBrick); - Item mortar = Botany.misc; + Item mortar = BotanyItems.misc; List stacks = new ArrayList<>(); int ix = -1; int iy = -1; diff --git a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java index 8aa1797c..e4dc2814 100644 --- a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java +++ b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java @@ -1,12 +1,12 @@ 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; import net.minecraft.world.World; import binnie.Binnie; -import binnie.botany.Botany; import binnie.botany.api.IFlower; public class PigmentRecipe implements IRecipe { @@ -47,7 +47,7 @@ public class PigmentRecipe implements IRecipe { IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(crafting.getStackInSlot(i)); if (flower.getAge() >= 1) { - stack = new ItemStack(Botany.pigment, 1, flower.getGenome().getPrimaryColor().getID()); + stack = new ItemStack(BotanyItems.pigment, 1, flower.getGenome().getPrimaryColor().getID()); } } } diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index adf59c3f..a23c3fc9 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -1,5 +1,6 @@ package binnie.botany.flower; +import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.block.Block; @@ -39,6 +40,8 @@ public abstract class ItemBotany extends Item { setCreativeTab(CreativeTabBotany.instance); setUnlocalizedName(name); hasSubtypes = true; + + GameRegistry.registerItem(this, name); } @Override diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index 068dd792..2a000bf0 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -1,5 +1,6 @@ package binnie.botany.flower; +import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -21,10 +22,14 @@ public class ItemInsulatedTube extends Item { IIcon[] icons; public ItemInsulatedTube() { + final String name = "insulatedTube"; + icons = new IIcon[3]; - setUnlocalizedName("insulatedTube"); + setUnlocalizedName(name); setCreativeTab(CreativeTabBotany.instance); setHasSubtypes(true); + + GameRegistry.registerItem(this, name); } public static ItemStack getInsulateStack(ItemStack stack) { diff --git a/src/main/java/binnie/botany/gardening/Gardening.java b/src/main/java/binnie/botany/gardening/Gardening.java index 67a5c25d..6712d926 100644 --- a/src/main/java/binnie/botany/gardening/Gardening.java +++ b/src/main/java/binnie/botany/gardening/Gardening.java @@ -1,19 +1,6 @@ package binnie.botany.gardening; -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 static binnie.botany.items.BotanyMisc.Items.Weedkiller; import binnie.botany.Botany; import binnie.botany.api.EnumAcidity; @@ -22,9 +9,20 @@ import binnie.botany.api.EnumSoilType; import binnie.botany.api.IFlower; import binnie.botany.api.gardening.IBlockSoil; import binnie.botany.flower.TileEntityFlower; -import binnie.botany.items.BotanyItems; 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 { @@ -263,7 +261,7 @@ public class Gardening { } public static boolean isWeedkiller(ItemStack heldItem) { - return heldItem != null && heldItem.isItemEqual(BotanyItems.Weedkiller.get(1)); + return heldItem != null && heldItem.isItemEqual(Weedkiller.get(1)); } public static boolean addWeedKiller(World world, int x, int y, int z) { diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index 5173969e..10a67946 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -1,5 +1,6 @@ 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; @@ -25,9 +26,13 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemSoilMeter extends Item { public ItemSoilMeter() { + final String name = "soilMeter"; + setCreativeTab(CreativeTabBotany.instance); - setUnlocalizedName("soilMeter"); + setUnlocalizedName(name); setMaxStackSize(1); + + GameRegistry.registerItem(this, name); } @Override diff --git a/src/main/java/binnie/botany/gardening/ItemTrowel.java b/src/main/java/binnie/botany/gardening/ItemTrowel.java index 5a2408c1..eaea490f 100644 --- a/src/main/java/binnie/botany/gardening/ItemTrowel.java +++ b/src/main/java/binnie/botany/gardening/ItemTrowel.java @@ -1,5 +1,6 @@ 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; @@ -19,15 +20,18 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemTrowel extends Item { protected Item.ToolMaterial theToolMaterial; - String locName; + final String locName; public ItemTrowel(Item.ToolMaterial toolMaterial, String material) { + locName = "trowel" + material; + theToolMaterial = toolMaterial; maxStackSize = 1; setMaxDamage(toolMaterial.getMaxUses()); setCreativeTab(CreativeTabBotany.instance); - setUnlocalizedName("trowel" + material); - locName = "trowel" + material; + setUnlocalizedName(locName); + + GameRegistry.registerItem(this, locName); } @Override diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 55bf7a3c..c72b8696 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -1,20 +1,15 @@ package binnie.botany.gardening; -import java.util.HashMap; -import java.util.Map; +import static binnie.botany.items.BotanyMisc.Items.AshPowder; +import static binnie.botany.items.BotanyMisc.Items.CompostPowder; +import static binnie.botany.items.BotanyMisc.Items.FertiliserPowder; +import static binnie.botany.items.BotanyMisc.Items.Mortar; +import static binnie.botany.items.BotanyMisc.Items.MulchPowder; +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 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.Binnie; import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; @@ -28,8 +23,6 @@ import binnie.botany.farm.CircuitGarden; import binnie.botany.flower.ItemInsulatedTube; import binnie.botany.genetics.EnumFlowerColor; import binnie.botany.items.BotanyItems; -import binnie.botany.items.ItemClay; -import binnie.botany.items.ItemPigment; import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; @@ -38,6 +31,16 @@ 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 { @@ -68,17 +71,6 @@ public class ModuleGardening implements IInitializable { Botany.flowerbedNoWeed = new BlockSoil(EnumSoilType.FLOWERBED, "flowerbedNoWeed", true); GameRegistry.registerBlock(Botany.flowerbedNoWeed, ItemSoil.class, "flowerbedNoWeed"); - Botany.soilMeter = new ItemSoilMeter(); - Botany.insulatedTube = new ItemInsulatedTube(); - Botany.trowelWood = new ItemTrowel(Item.ToolMaterial.WOOD, "Wood"); - Botany.trowelStone = new ItemTrowel(Item.ToolMaterial.STONE, "Stone"); - Botany.trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "Iron"); - Botany.trowelDiamond = new ItemTrowel(Item.ToolMaterial.EMERALD, "Diamond"); - Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold"); - Botany.misc = Binnie.Item.registerMiscItems(BotanyItems.values(), CreativeTabBotany.instance); - Botany.pigment = new ItemPigment(); - Botany.clay = new ItemClay(); - Botany.ceramic = new BlockCeramic(); GameRegistry.registerBlock(Botany.ceramic, ItemMetadata.class, "ceramic"); BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramic), new ItemMetadataRenderer()); @@ -100,7 +92,7 @@ public class ModuleGardening implements IInitializable { @Override public void init() { - OreDictionary.registerOre("pigment", Botany.pigment); + OreDictionary.registerOre("pigment", BotanyItems.pigment); RecipeSorter.register("botany:ceramictile", CeramicTileRecipe.class, RecipeSorter.Category.SHAPED, ""); RecipeSorter.register("botany:pigment", PigmentRecipe.class, RecipeSorter.Category.SHAPED, ""); ItemStack yellow = new ItemStack(Blocks.yellow_flower, 1); @@ -121,28 +113,28 @@ public class ModuleGardening implements IInitializable { null, manual, fertilised, - new ItemStack(Botany.insulatedTube, 1, 128 * insulate), + new ItemStack(BotanyItems.insulatedTube, 1, 128 * insulate), icon); new CircuitGarden( moist, EnumAcidity.ACID, manual, fertilised, - new ItemStack(Botany.insulatedTube, 1, 1 + 128 * insulate), + new ItemStack(BotanyItems.insulatedTube, 1, 1 + 128 * insulate), icon); new CircuitGarden( moist, EnumAcidity.NEUTRAL, manual, fertilised, - new ItemStack(Botany.insulatedTube, 1, 2 + 128 * insulate), + new ItemStack(BotanyItems.insulatedTube, 1, 2 + 128 * insulate), icon); new CircuitGarden( moist, EnumAcidity.ALKALINE, manual, fertilised, - new ItemStack(Botany.insulatedTube, 1, 3 + 128 * insulate), + new ItemStack(BotanyItems.insulatedTube, 1, 3 + 128 * insulate), icon); } } @@ -154,7 +146,7 @@ public class ModuleGardening implements IInitializable { GameRegistry.addRecipe(new CeramicTileRecipe()); for (int mat = 0; mat < 4; ++mat) { for (int insulate = 0; insulate < 6; ++insulate) { - ItemStack tubes = new ItemStack(Botany.insulatedTube, 2, mat + 128 * insulate); + ItemStack tubes = new ItemStack(BotanyItems.insulatedTube, 2, mat + 128 * insulate); ItemStack insulateStack = ItemInsulatedTube.getInsulateStack(tubes); ItemStack forestryTube = new ItemStack(Mods.forestry.item("thermionicTubes"), 1, mat); GameRegistry.addShapelessRecipe(tubes, forestryTube, forestryTube, insulateStack); @@ -182,62 +174,62 @@ public class ModuleGardening implements IInitializable { GameRegistry.addRecipe( new ShapedOreRecipe( - Botany.trowelWood, + BotanyItems.trowelWood, new Object[] { "d ", " x ", " s", 'd', Blocks.dirt, 's', "stickWood", 'x', "plankWood" })); GameRegistry.addRecipe( new ShapedOreRecipe( - Botany.trowelStone, + BotanyItems.trowelStone, new Object[] { "d ", " x ", " s", 'd', Blocks.dirt, 's', "stickWood", 'x', "cobblestone" })); GameRegistry.addRecipe( new ShapedOreRecipe( - Botany.trowelIron, + BotanyItems.trowelIron, new Object[] { "d ", " x ", " s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotIron" })); GameRegistry.addRecipe( new ShapedOreRecipe( - Botany.trowelGold, + BotanyItems.trowelGold, new Object[] { "d ", " x ", " s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotGold" })); GameRegistry.addRecipe( new ShapedOreRecipe( - Botany.trowelDiamond, + BotanyItems.trowelDiamond, new Object[] { "d ", " x ", " s", 'd', Blocks.dirt, 's', "stickWood", 'x', "gemDiamond" })); GameRegistry.addRecipe( new ShapedOreRecipe( - Botany.soilMeter, + BotanyItems.soilMeter, new Object[] { " gg", " rg", "i ", 'g', "ingotGold", 'r', "dustRedstone", 'i', "ingotIron" })); GameRegistry.addShapelessRecipe( - BotanyItems.Weedkiller.get(4), + Weedkiller.get(4), new ItemStack(Items.spider_eye), new ItemStack(Items.wheat_seeds), new ItemStack(Items.wheat_seeds), new ItemStack(Items.wheat_seeds)); - GameRegistry.addShapelessRecipe(BotanyItems.AshPowder.get(4), Mods.forestry.stack("ash")); - GameRegistry.addShapelessRecipe(BotanyItems.MulchPowder.get(4), Mods.forestry.stack("mulch")); - GameRegistry.addShapelessRecipe(BotanyItems.CompostPowder.get(4), Mods.forestry.stack("fertilizerBio")); - GameRegistry.addShapelessRecipe(BotanyItems.FertiliserPowder.get(4), Mods.forestry.stack("fertilizerCompound")); - GameRegistry.addShapelessRecipe(BotanyItems.PulpPowder.get(4), Mods.forestry.stack("woodPulp")); + GameRegistry.addShapelessRecipe(AshPowder.get(4), Mods.forestry.stack("ash")); + GameRegistry.addShapelessRecipe(MulchPowder.get(4), Mods.forestry.stack("mulch")); + 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(BotanyItems.SulphurPowder.get(4), new Object[] { "dustSulphur" })); + .addRecipe(new ShapelessOreRecipe(SulphurPowder.get(4), new Object[] { "dustSulphur" })); GameRegistry.addRecipe( new ShapelessOreRecipe( - new ItemStack(Botany.pigment, 2, EnumFlowerColor.BLACK.ordinal()), + new ItemStack(BotanyItems.pigment, 2, EnumFlowerColor.BLACK.ordinal()), new Object[] { "pigment", "pigment", "dyeBlack" })); - ModuleGardening.queuedAcidFertilisers.put(BotanyItems.SulphurPowder.get(1), 1); - ModuleGardening.queuedAcidFertilisers.put(BotanyItems.MulchPowder.get(1), 1); + ModuleGardening.queuedAcidFertilisers.put(SulphurPowder.get(1), 1); + ModuleGardening.queuedAcidFertilisers.put(MulchPowder.get(1), 1); ModuleGardening.queuedAcidFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "mulch")), 2); for (ItemStack stack : OreDictionary.getOres("dustSulfur")) { ModuleGardening.queuedAcidFertilisers.put(stack, 2); } - ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.AshPowder.get(1), 1); - ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.PulpPowder.get(1), 1); + ModuleGardening.queuedAlkalineFertilisers.put(AshPowder.get(1), 1); + ModuleGardening.queuedAlkalineFertilisers.put(PulpPowder.get(1), 1); ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "ash")), 2); ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "woodPulp")), 2); - ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.CompostPowder.get(1), 1); - ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.FertiliserPowder.get(1), 1); + ModuleGardening.queuedNutrientFertilisers.put(CompostPowder.get(1), 1); + ModuleGardening.queuedNutrientFertilisers.put(FertiliserPowder.get(1), 1); ModuleGardening.queuedNutrientFertilisers .put(new ItemStack(GameRegistry.findItem("Forestry", "fertilizerBio")), 2); ModuleGardening.queuedNutrientFertilisers @@ -256,11 +248,11 @@ public class ModuleGardening implements IInitializable { } GameRegistry - .addRecipe(BotanyItems.Mortar.get(6), " c ", "cgc", " c ", 'c', Items.clay_ball, 'g', Blocks.gravel); + .addRecipe(Mortar.get(6), " c ", "cgc", " c ", 'c', Items.clay_ball, 'g', Blocks.gravel); for (EnumFlowerColor c : EnumFlowerColor.values()) { - ItemStack clay = new ItemStack(Botany.clay, 1, c.ordinal()); - ItemStack pigment = new ItemStack(Botany.pigment, 1, c.ordinal()); + ItemStack clay = new ItemStack(BotanyItems.clay, 1, c.ordinal()); + ItemStack pigment = new ItemStack(BotanyItems.pigment, 1, c.ordinal()); GameRegistry.addShapelessRecipe(clay, Items.clay_ball, Items.clay_ball, Items.clay_ball, pigment); GameRegistry.addSmelting(clay, TileEntityMetadata.getItemStack(Botany.ceramic, c.ordinal()), 0.0f); ItemStack glass = TileEntityMetadata.getItemStack(Botany.stained, c.ordinal()); diff --git a/src/main/java/binnie/botany/genetics/FlowerHelper.java b/src/main/java/binnie/botany/genetics/FlowerHelper.java index 73b4f800..a3bada6e 100644 --- a/src/main/java/binnie/botany/genetics/FlowerHelper.java +++ b/src/main/java/binnie/botany/genetics/FlowerHelper.java @@ -1,5 +1,6 @@ package binnie.botany.genetics; +import binnie.botany.items.BotanyItems; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -14,7 +15,6 @@ import net.minecraft.world.World; import com.mojang.authlib.GameProfile; -import binnie.botany.Botany; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumFlowerStage; import binnie.botany.api.IAlleleFlowerSpecies; @@ -88,16 +88,16 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot { return null; } - Item flowerItem = Botany.flowerItem; + Item flowerItem = BotanyItems.flowerItem; if (type == EnumFlowerStage.SEED.ordinal()) { - flowerItem = Botany.seed; + flowerItem = BotanyItems.seed; } if (type == EnumFlowerStage.POLLEN.ordinal()) { - flowerItem = Botany.pollen; + flowerItem = BotanyItems.pollen; } - if (flowerItem != Botany.flowerItem) { + if (flowerItem != BotanyItems.flowerItem) { ((IFlower) flower).setAge(0); } @@ -113,13 +113,13 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot { if (stack == null) { return EnumFlowerStage.NONE; } - if (stack.getItem() == Botany.flowerItem) { + if (stack.getItem() == BotanyItems.flowerItem) { return EnumFlowerStage.FLOWER; } - if (stack.getItem() == Botany.pollen) { + if (stack.getItem() == BotanyItems.pollen) { return EnumFlowerStage.POLLEN; } - if (stack.getItem() == Botany.seed) { + if (stack.getItem() == BotanyItems.seed) { return EnumFlowerStage.SEED; } return EnumFlowerStage.NONE; diff --git a/src/main/java/binnie/botany/genetics/ItemDictionary.java b/src/main/java/binnie/botany/genetics/ItemDictionary.java index 7a38f852..9c8e8711 100644 --- a/src/main/java/binnie/botany/genetics/ItemDictionary.java +++ b/src/main/java/binnie/botany/genetics/ItemDictionary.java @@ -1,5 +1,6 @@ package binnie.botany.genetics; +import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,9 +23,13 @@ public class ItemDictionary extends Item { protected IIcon iconMaster; public ItemDictionary() { + final String name = "database"; + setCreativeTab(CreativeTabBotany.instance); - setUnlocalizedName("database"); + setUnlocalizedName(name); setMaxStackSize(1); + + GameRegistry.registerItem(this, name); } @Override diff --git a/src/main/java/binnie/botany/genetics/ModuleGenetics.java b/src/main/java/binnie/botany/genetics/ModuleGenetics.java index c220169a..eeb2e615 100644 --- a/src/main/java/binnie/botany/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/botany/genetics/ModuleGenetics.java @@ -1,18 +1,12 @@ 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; import binnie.botany.flower.BlockFlower; -import binnie.botany.flower.ItemFlower; -import binnie.botany.flower.ItemPollen; -import binnie.botany.flower.ItemSeed; import binnie.botany.flower.RendererBotany; import binnie.botany.flower.TileEntityFlower; +import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; import binnie.core.IInitializable; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -21,6 +15,9 @@ 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 { @@ -30,14 +27,10 @@ public class ModuleGenetics implements IInitializable { public void preInit() { EnumFlowerColor.setupMutations(); Botany.flower = new BlockFlower(); - Botany.flowerItem = new ItemFlower(); - Botany.pollen = new ItemPollen(); - Botany.seed = new ItemSeed(); AlleleManager.alleleRegistry.registerSpeciesRoot(BotanyCore.speciesRoot); AlleleManager.alleleRegistry.registerAllele(ModuleGenetics.alleleEffectNone); GameRegistry.registerBlock(Botany.flower, "flower"); BinnieCore.proxy.registerTileEntity(TileEntityFlower.class, "botany.tile.flower", null); - Botany.database = new ItemDictionary(); } @Override @@ -66,7 +59,7 @@ public class ModuleGenetics implements IInitializable { 100, Binnie.Liquid.getLiquidStack("water", 2000), null, - new ItemStack(Botany.database), + new ItemStack(BotanyItems.database), "X#X", "YEY", "RDR", diff --git a/src/main/java/binnie/botany/items/BotanyItems.java b/src/main/java/binnie/botany/items/BotanyItems.java index 917f1674..a5eef242 100644 --- a/src/main/java/binnie/botany/items/BotanyItems.java +++ b/src/main/java/binnie/botany/items/BotanyItems.java @@ -1,51 +1,29 @@ package binnie.botany.items; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import binnie.botany.flower.ItemFlower; +import binnie.botany.flower.ItemInsulatedTube; +import binnie.botany.flower.ItemPollen; +import binnie.botany.flower.ItemSeed; +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; -import binnie.botany.Botany; -import binnie.core.item.IItemMisc; -import binnie.core.util.I18N; - -public enum BotanyItems implements IItemMisc { - - AshPowder("powderAsh"), - PulpPowder("powderPulp"), - MulchPowder("powderMulch"), - SulphurPowder("powderSulphur"), - FertiliserPowder("powderFertiliser"), - CompostPowder("powderCompost"), - Mortar("mortar"), - Weedkiller("weedkiller"); - - private IIcon icon; - private final String name; - private final String iconPath; - - BotanyItems(String name) { - this.name = name; - this.iconPath = name; - } - - @Override - public IIcon getIcon(ItemStack itemStack) { - return icon; - } - - @Override - public void registerIcons(IIconRegister register) { - icon = Botany.proxy.getIcon(register, iconPath); - } - - @Override - public String getName(ItemStack itemStack) { - return I18N.localise("botany.item." + name + ".name"); - } - - @Override - public ItemStack get(int count) { - return new ItemStack(Botany.misc, count, ordinal()); - } +public class BotanyItems { + public static final ItemInsulatedTube insulatedTube = new ItemInsulatedTube(); + public static final ItemSoilMeter soilMeter = new ItemSoilMeter(); + public static final DamageItems misc = new BotanyMisc(); + public static final ItemFlower flowerItem = new ItemFlower(); + public static final ItemPigment pigment = new ItemPigment(); + public static final ItemClay clay = new ItemClay(); + public static final Item seed = new ItemSeed(); + public static final Item pollen = new ItemPollen(); + public static final ItemDictionary database = new ItemDictionary(); + public static final ItemTrowel trowelWood = new ItemTrowel(Item.ToolMaterial.WOOD, "Wood"); + public static final ItemTrowel trowelStone = new ItemTrowel(Item.ToolMaterial.STONE, "Stone"); + public static final ItemTrowel trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "Iron"); + public static final ItemTrowel trowelDiamond = new ItemTrowel(Item.ToolMaterial.EMERALD, "Diamond"); + public static final ItemTrowel trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold"); } diff --git a/src/main/java/binnie/botany/items/BotanyMisc.java b/src/main/java/binnie/botany/items/BotanyMisc.java new file mode 100644 index 00000000..92314652 --- /dev/null +++ b/src/main/java/binnie/botany/items/BotanyMisc.java @@ -0,0 +1,37 @@ +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; + +public class BotanyMisc extends DamageItems { + public enum Items { + AshPowder("powderAsh"), + PulpPowder("powderPulp"), + MulchPowder("powderMulch"), + SulphurPowder("powderSulphur"), + FertiliserPowder("powderFertiliser"), + CompostPowder("powderCompost"), + Mortar("mortar"), + Weedkiller("weedkiller"); + + final String name; + private static final Items[] VALUES = values(); + + Items(String name) { + this.name = name; + } + + public ItemStack get(int count) { + return misc.getStack(count, ordinal()); + } + } + + public BotanyMisc() { + 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 bc116aea..638bb958 100644 --- a/src/main/java/binnie/botany/items/ItemClay.java +++ b/src/main/java/binnie/botany/items/ItemClay.java @@ -1,5 +1,6 @@ package binnie.botany.items; +import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,9 +20,13 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemClay extends Item { public ItemClay() { - setUnlocalizedName("clay"); + final String name = "clay"; + + setUnlocalizedName(name); setHasSubtypes(true); setCreativeTab(CreativeTabBotany.instance); + + GameRegistry.registerItem(this, name); } @Override diff --git a/src/main/java/binnie/botany/items/ItemPigment.java b/src/main/java/binnie/botany/items/ItemPigment.java index fe2ae787..ca18fba3 100644 --- a/src/main/java/binnie/botany/items/ItemPigment.java +++ b/src/main/java/binnie/botany/items/ItemPigment.java @@ -1,5 +1,6 @@ package binnie.botany.items; +import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,9 +20,13 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemPigment extends Item { public ItemPigment() { - setUnlocalizedName("pigment"); + final String name = "pigment"; + + setUnlocalizedName(name); setHasSubtypes(true); setCreativeTab(CreativeTabBotany.instance); + + GameRegistry.registerItem(this, name); } @Override diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index b97dfa95..b213e95f 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -19,6 +19,7 @@ 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; @@ -29,7 +30,6 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import binnie.Binnie; -import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; @@ -299,7 +299,7 @@ public class ModuleItem implements IInitializable { ItemStack registryStack = new ItemStack(registry); Item beeDb = EBItems.dictionary; Item treeDb = ETItems.itemDictionary; - Item flwrDb = Botany.database; + Item flwrDb = BotanyItems.database; // 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 diff --git a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java index 89d67983..ec17642c 100644 --- a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java +++ b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java @@ -5,7 +5,7 @@ import static binnie.genetics.item.GeneticsItems.database; import static binnie.genetics.item.GeneticsItems.masterRegistry; import static binnie.genetics.item.GeneticsItems.registry; -import binnie.botany.Botany; +import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; import binnie.core.item.BinnieItems; import binnie.core.machines.IMachine; @@ -119,7 +119,7 @@ public class ComponentGUIHolder extends MachineComponent implements INetwork.Til } List validSelections = new ArrayList<>(); - validSelections.add(Botany.database); + validSelections.add(BotanyItems.database); if (BinnieCore.isExtraBeesActive()) { validSelections.add(EBItems.dictionary); diff --git a/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java b/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java index 6a4f006a..a409498a 100644 --- a/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java @@ -1,5 +1,6 @@ package binnie.genetics.nei; +import binnie.botany.items.BotanyItems; import java.util.ArrayList; import java.util.List; @@ -7,7 +8,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; -import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.core.nei.PositionedStackAdv; @@ -38,9 +38,9 @@ public class AcclimatiserRecipeHandler extends RecipeHandlerBase { targets.add(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE)); } - targets.add(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE)); - targets.add(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE)); - targets.add(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)); + targets.add(new ItemStack(BotanyItems.flowerItem, 1, OreDictionary.WILDCARD_VALUE)); + targets.add(new ItemStack(BotanyItems.seed, 1, OreDictionary.WILDCARD_VALUE)); + targets.add(new ItemStack(BotanyItems.pollen, 1, OreDictionary.WILDCARD_VALUE)); recipes.add(new AcclimatiserRecipe(targets, resource, effect, ToleranceType.Temperature)); }); Acclimatiser.humidityItems.forEach((resource, effect) -> { @@ -57,9 +57,9 @@ public class AcclimatiserRecipeHandler extends RecipeHandlerBase { targets.add(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE)); } - targets.add(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE)); - targets.add(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE)); - targets.add(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)); + targets.add(new ItemStack(BotanyItems.flowerItem, 1, OreDictionary.WILDCARD_VALUE)); + targets.add(new ItemStack(BotanyItems.seed, 1, OreDictionary.WILDCARD_VALUE)); + targets.add(new ItemStack(BotanyItems.pollen, 1, OreDictionary.WILDCARD_VALUE)); recipes.add(new AcclimatiserRecipe(targets, resource, effect, ToleranceType.Humidity)); }); } diff --git a/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java b/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java index a2b85b6d..31689c9d 100644 --- a/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java @@ -3,7 +3,7 @@ package binnie.genetics.nei; import static binnie.genetics.item.GeneticsItems.sequencer; import static binnie.genetics.item.GeneticsMisc.Items.DNADye; -import binnie.botany.Botany; +import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.core.nei.RecipeHandlerBase; @@ -42,9 +42,9 @@ public class AnalyserRecipeHandler extends RecipeHandlerBase { recipes.add(new AnalyserRecipe(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE))); } - recipes.add(new AnalyserRecipe(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new AnalyserRecipe(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new AnalyserRecipe(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new AnalyserRecipe(new ItemStack(BotanyItems.flowerItem, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new AnalyserRecipe(new ItemStack(BotanyItems.seed, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new AnalyserRecipe(new ItemStack(BotanyItems.pollen, 1, OreDictionary.WILDCARD_VALUE))); } @Override diff --git a/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java b/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java index b4055116..19055852 100644 --- a/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java @@ -2,6 +2,7 @@ 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; @@ -12,7 +13,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import binnie.Binnie; -import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.core.nei.NEIUtils; @@ -46,9 +46,9 @@ public class GenepoolRecipeHandler extends RecipeHandlerBase { recipes.add(new GenepoolRecipe(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE))); } - recipes.add(new GenepoolRecipe(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new GenepoolRecipe(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new GenepoolRecipe(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new GenepoolRecipe(new ItemStack(BotanyItems.flowerItem, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new GenepoolRecipe(new ItemStack(BotanyItems.seed, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new GenepoolRecipe(new ItemStack(BotanyItems.pollen, 1, OreDictionary.WILDCARD_VALUE))); } @Override diff --git a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java index 33f4da87..d76daa4e 100644 --- a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java @@ -3,7 +3,7 @@ package binnie.genetics.nei; import static binnie.genetics.item.GeneticsItems.serum; import static binnie.genetics.item.GeneticsItems.serumArray; -import binnie.botany.Botany; +import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.core.nei.NEIUtils; @@ -46,7 +46,7 @@ public class InoculatorRecipeHandler extends RecipeHandlerBase { if (BinnieCore.isLepidopteryActive()) createInoculatorRecipeForNEI(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE)); - createInoculatorRecipeForNEI(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)); + createInoculatorRecipeForNEI(new ItemStack(BotanyItems.pollen, 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 efc4aff1..765b18c4 100644 --- a/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java @@ -5,7 +5,7 @@ import static binnie.genetics.item.GeneticsMisc.Items.EmptySequencer; import static binnie.genetics.item.GeneticsMisc.Items.Enzyme; import binnie.Binnie; -import binnie.botany.Botany; +import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.core.genetics.Gene; @@ -51,9 +51,9 @@ public class IsolatorRecipeHandler extends RecipeHandlerBase { recipes.add(new IsolatorRecipe(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE))); } - recipes.add(new IsolatorRecipe(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new IsolatorRecipe(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new IsolatorRecipe(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new IsolatorRecipe(new ItemStack(BotanyItems.flowerItem, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new IsolatorRecipe(new ItemStack(BotanyItems.seed, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new IsolatorRecipe(new ItemStack(BotanyItems.pollen, 1, OreDictionary.WILDCARD_VALUE))); } @Override diff --git a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java index e017e168..7cdb8576 100644 --- a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java @@ -3,7 +3,7 @@ package binnie.genetics.nei; import static binnie.genetics.item.GeneticsItems.serum; import static binnie.genetics.item.GeneticsItems.serumArray; -import binnie.botany.Botany; +import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.core.nei.NEIUtils; @@ -44,7 +44,7 @@ public class SplicerRecipeHandler extends RecipeHandlerBase { if (BinnieCore.isLepidopteryActive()) createSplicerRecipeForNEI(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE)); - createSplicerRecipeForNEI(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)); + createSplicerRecipeForNEI(new ItemStack(BotanyItems.pollen, 1, OreDictionary.WILDCARD_VALUE)); } @Override