From 6ec7808b25ad3a5c6afec3b647ea06197f451479 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 17 Jun 2017 01:44:59 +0200 Subject: [PATCH] Fix #115 Add a botanist backpack recipe and fix OreDictionary integration --- .../java/binnie/botany/gardening/ModuleGardening.java | 7 ++++++- .../java/binnie/botany/genetics/ModuleGenetics.java | 10 ++++++++++ .../java/binnie/extrabees/items/ItemHoneyComb.java | 5 ----- src/main/java/binnie/extratrees/item/ModuleItems.java | 11 +++++------ 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 376abfbd..31fb4171 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -99,11 +99,16 @@ public class ModuleGardening implements IInitializable { BinnieCore.getBinnieProxy().registerTileEntity(TileCeramicBrick.class, "botany.tile.ceramicBrick"); //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicTile), new MultipassItemRenderer()); //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicBrick), new MultipassItemRenderer()); + OreDictionary.registerOre("pigment", Botany.pigment); + OreDictionary.registerOre("toolTrowel", Botany.trowelWood); + OreDictionary.registerOre("toolTrowel", Botany.trowelStone); + OreDictionary.registerOre("toolTrowel", Botany.trowelIron); + OreDictionary.registerOre("toolTrowel", Botany.trowelGold); + OreDictionary.registerOre("toolTrowel", Botany.trowelDiamond); } @Override public void init() { - OreDictionary.registerOre("pigment", Botany.pigment); RecipeSorter.register("botany:ceramictile", CeramicTileRecipe.class, RecipeSorter.Category.SHAPED, ""); RecipeSorter.register("botany:pigment", PigmentRecipe.class, RecipeSorter.Category.SHAPED, ""); final ItemStack yellow = new ItemStack(Blocks.YELLOW_FLOWER, 1); diff --git a/src/main/java/binnie/botany/genetics/ModuleGenetics.java b/src/main/java/binnie/botany/genetics/ModuleGenetics.java index 19f661f5..5556d394 100644 --- a/src/main/java/binnie/botany/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/botany/genetics/ModuleGenetics.java @@ -13,6 +13,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.BackpackManager; import forestry.api.storage.IBackpackInterface; +import forestry.core.recipes.RecipeUtil; import forestry.storage.BackpackDefinition; import binnie.Binnie; @@ -90,5 +91,14 @@ public class ModuleGenetics implements IInitializable { 'D', Items.DIAMOND, 'E', Items.EMERALD ); + RecipeUtil.addRecipe(Botany.botanistBackpack, + "X#X", + "VYZ", + "X#X", + '#', Blocks.WOOL, + 'X', Items.STRING, + 'V', Botany.soilMeter, + 'Z', "toolTrowel", + 'Y', "chestWood"); } } diff --git a/src/main/java/binnie/extrabees/items/ItemHoneyComb.java b/src/main/java/binnie/extrabees/items/ItemHoneyComb.java index 77ec9753..7d3640c7 100644 --- a/src/main/java/binnie/extrabees/items/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/items/ItemHoneyComb.java @@ -33,11 +33,6 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { public static void addSubtypes() { final ItemStack beeswax = PluginCore.getItems().beeswax.getItemStack(); final ItemStack honeyDrop = PluginApiculture.getItems().honeyDrop.getItemStack(); - OreDictionary.registerOre("ingotIron", Items.IRON_INGOT); - OreDictionary.registerOre("ingotGold", Items.GOLD_INGOT); - OreDictionary.registerOre("gemDiamond", Items.DIAMOND); - OreDictionary.registerOre("gemEmerald", Items.EMERALD); - OreDictionary.registerOre("gemLapis", new ItemStack(Items.DYE, 1, 4)); EnumHoneyComb.BARREN.addProduct(beeswax, 1.00f); EnumHoneyComb.BARREN.addProduct(honeyDrop, 0.50f); EnumHoneyComb.ROTTEN.addProduct(beeswax, 0.20f); diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index 1d2a116b..8a88ac50 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -57,11 +57,7 @@ public class ModuleItems implements IInitializable { ExtraTrees.proxy.registerItem(itemHammer); itemDurableHammer = new ItemHammer(true); ExtraTrees.proxy.registerItem(itemDurableHammer); - } - - @Override - public void init() { - + OreDictionary.registerOre("pulpWood", ExtraTreeItems.Sawdust.get(1)); Food.registerOreDictionary(); OreDictionary.registerOre("cropApple", Items.APPLE); @@ -72,9 +68,12 @@ public class ModuleItems implements IInitializable { OreDictionary.registerOre("seedCorn", ExtraTreeItems.GrainCorn.get(1)); OreDictionary.registerOre("seedRye", ExtraTreeItems.GrainRye.get(1)); OreDictionary.registerOre("seedRoasted", ExtraTreeItems.GrainRoasted.get(1)); - + OreDictionary.registerOre("gearWood", ExtraTreeItems.ProvenGear.get(1)); + } + @Override + public void init() { Food.CRABAPPLE.addJuice(10, 150, 10); Food.ORANGE.addJuice(10, 400, 15); Food.KUMQUAT.addJuice(10, 300, 10);