diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index e71a9d068..356943c90 100755 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -437,59 +437,59 @@ public class PluginApiculture extends BlankForestryPlugin { // / APIARIST'S ARMOR ItemStack wovenSilk = coreItems.craftingMaterial.getWovenSilk(); - RecipeUtil.addRecipe(items.apiaristHat, + RecipeUtil.addRecipe("apiarist_hat", items.apiaristHat, "###", "# #", '#', wovenSilk); - RecipeUtil.addRecipe(items.apiaristChest, + RecipeUtil.addRecipe("apiarist_chest", items.apiaristChest, "# #", "###", "###", '#', wovenSilk); - RecipeUtil.addRecipe(items.apiaristLegs, + RecipeUtil.addRecipe("apiarist_legs", items.apiaristLegs, "###", "# #", "# #", '#', wovenSilk); - RecipeUtil.addRecipe(items.apiaristBoots, + RecipeUtil.addRecipe("apiarist_boots", items.apiaristBoots, "# #", "# #", '#', wovenSilk); // / HABITAT LOCATOR - RecipeUtil.addRecipe(items.habitatLocator, + RecipeUtil.addRecipe("habitat_locator", items.habitatLocator, " X ", "X#X", " X ", '#', OreDictUtil.DUST_REDSTONE, 'X', OreDictUtil.INGOT_BRONZE); // Bees - RecipeUtil.addRecipe(items.scoop, + RecipeUtil.addRecipe("scoop", items.scoop, "#X#", "###", " # ", '#', OreDictUtil.STICK_WOOD, 'X', Blocks.WOOL); - RecipeUtil.addRecipe(items.smoker, + RecipeUtil.addRecipe("smoker", items.smoker, "LS#", "LF#", "###", '#', "ingotTin", 'S', OreDictUtil.STICK_WOOD, 'F', Items.FLINT_AND_STEEL, 'L', OreDictUtil.LEATHER); - RecipeUtil.addRecipe(new ItemStack(Items.SLIME_BALL), + RecipeUtil.addRecipe("propolis_to_slime", new ItemStack(Items.SLIME_BALL), "#X#", "#X#", "#X#", '#', items.propolis, 'X', items.pollenCluster.get(EnumPollenCluster.NORMAL, 1)); - RecipeUtil.addRecipe(new ItemStack(Items.SPECKLED_MELON), + RecipeUtil.addRecipe("honey_melon", new ItemStack(Items.SPECKLED_MELON), "#X#", "#Y#", "#X#", '#', items.honeyDrop, 'X', items.honeydew, 'Y', Items.MELON); - RecipeUtil.addRecipe(items.frameUntreated, + RecipeUtil.addRecipe("frame_untreated", items.frameUntreated, "###", "#S#", "###", '#', OreDictUtil.STICK_WOOD, 'S', Items.STRING); - RecipeUtil.addRecipe(items.frameImpregnated, + RecipeUtil.addRecipe("frame_impregnated", items.frameImpregnated, "###", "#S#", "###", '#', coreItems.stickImpregnated, 'S', Items.STRING); - RecipeUtil.addRecipe(items.minecartBeehouse.getBeeHouseMinecart(), + RecipeUtil.addRecipe("bee_house_minecart", items.minecartBeehouse.getBeeHouseMinecart(), "B", "C", 'B', new ItemStack(blocks.beeHouse), 'C', Items.MINECART); - RecipeUtil.addRecipe(items.minecartBeehouse.getApiaryMinecart(), + RecipeUtil.addRecipe("apiary_minecart", items.minecartBeehouse.getApiaryMinecart(), "B", "C", 'B', new ItemStack(blocks.apiary), @@ -497,7 +497,7 @@ public class PluginApiculture extends BlankForestryPlugin { for(int i = 0;i < blocks.beeCombs.length;i++){ BlockHoneyComb block = blocks.beeCombs[i]; for(int m = 0;m < EnumHoneyComb.VALUES.length - i * 16;m++){ - RecipeUtil.addRecipe(new ItemStack(block, 1, m), + RecipeUtil.addRecipe("comb." + m, new ItemStack(block, 1, m), "###", "###", "###", '#', items.beeComb.get(EnumHoneyComb.get(i * 16 + m), 1)); @@ -507,17 +507,17 @@ public class PluginApiculture extends BlankForestryPlugin { // FOOD STUFF if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FOOD)) { ItemRegistryFood foodItems = PluginFood.getItems(); - RecipeUtil.addRecipe(new ItemStack(foodItems.honeyedSlice, 4), + RecipeUtil.addRecipe("honeyed_slice", new ItemStack(foodItems.honeyedSlice, 4), "###", "#X#", "###", '#', items.honeyDrop, 'X', Items.BREAD); - RecipeUtil.addRecipe(foodItems.honeyPot, + RecipeUtil.addRecipe("honey_pot", foodItems.honeyPot, "# #", " X ", "# #", '#', items.honeyDrop, 'X', fluidItems.waxCapsuleEmpty); - RecipeUtil.addRecipe(foodItems.ambrosia, + RecipeUtil.addRecipe("ambrosia", foodItems.ambrosia, "#Y#", "XXX", "###", '#', items.honeydew, 'X', items.royalJelly, @@ -529,33 +529,33 @@ public class PluginApiculture extends BlankForestryPlugin { int outputCapsuleAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.capsule"); if (outputCapsuleAmount > 0) { ItemStack capsule = fluidItems.waxCapsuleEmpty.getItemStack(outputCapsuleAmount); - RecipeUtil.addRecipe(capsule, "###", '#', coreItems.beeswax); + RecipeUtil.addRecipe("wax_capsule", capsule, "###", '#', coreItems.beeswax); } int outputRefractoryAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.refractory"); if (outputRefractoryAmount > 0) { ItemStack capsule = fluidItems.refractoryEmpty.getItemStack(outputRefractoryAmount); - RecipeUtil.addRecipe(capsule, "###", '#', coreItems.refractoryWax); + RecipeUtil.addRecipe("refractory_capsule", capsule, "###", '#', coreItems.refractoryWax); } // / BITUMINOUS PEAT - RecipeUtil.addRecipe(coreItems.bituminousPeat.getItemStack(), + RecipeUtil.addRecipe("bituminous_peat", coreItems.bituminousPeat.getItemStack(), " # ", "XYX", " # ", '#', OreDictUtil.DUST_ASH, 'X', coreItems.peat, 'Y', items.propolis); // / TORCHES - RecipeUtil.addRecipe(new ItemStack(Blocks.TORCH, 3), + RecipeUtil.addRecipe("beeswax_worth", new ItemStack(Blocks.TORCH, 3), " # ", " # ", " Y ", '#', coreItems.beeswax, 'Y', OreDictUtil.STICK_WOOD); - RecipeUtil.addRecipe(coreItems.craftingMaterial.getPulsatingMesh(), + RecipeUtil.addRecipe("pulsating_mesh", coreItems.craftingMaterial.getPulsatingMesh(), "# #", " # ", "# #", '#', items.propolis.get(EnumPropolis.PULSATING, 1)); // / WAX CAST - RecipeUtil.addRecipe(items.waxCast, + RecipeUtil.addRecipe("wax_cast", items.waxCast, "###", "# #", "###", @@ -563,14 +563,14 @@ public class PluginApiculture extends BlankForestryPlugin { // / ALVEARY ItemStack alvearyPlainBlock = blocks.getAlvearyBlock(BlockAlvearyType.PLAIN); - RecipeUtil.addRecipe(alvearyPlainBlock, + RecipeUtil.addRecipe("alveary_plain", alvearyPlainBlock, "###", "#X#", "###", 'X', coreItems.impregnatedCasing, '#', coreItems.craftingMaterial.getScentedPaneling()); // SWARMER - RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.SWARMER), + RecipeUtil.addRecipe("alveary_swarmer", blocks.getAlvearyBlock(BlockAlvearyType.SWARMER), "#G#", " X ", "#G#", @@ -578,7 +578,7 @@ public class PluginApiculture extends BlankForestryPlugin { 'X', alvearyPlainBlock, 'G', OreDictUtil.INGOT_GOLD); // FAN - RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.FAN), + RecipeUtil.addRecipe("alveary_fan", blocks.getAlvearyBlock(BlockAlvearyType.FAN), "I I", " X ", "I#I", @@ -586,7 +586,7 @@ public class PluginApiculture extends BlankForestryPlugin { 'X', alvearyPlainBlock, 'I', OreDictUtil.INGOT_IRON); // HEATER - RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.HEATER), + RecipeUtil.addRecipe("alveary_heater", blocks.getAlvearyBlock(BlockAlvearyType.HEATER), "#I#", " X ", "YYY", @@ -594,7 +594,7 @@ public class PluginApiculture extends BlankForestryPlugin { 'X', alvearyPlainBlock, 'I', OreDictUtil.INGOT_IRON, 'Y', OreDictUtil.STONE); // HYGROREGULATOR - RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.HYGRO), + RecipeUtil.addRecipe("alveary_hygro", blocks.getAlvearyBlock(BlockAlvearyType.HYGRO), "GIG", "GXG", "GIG", @@ -602,14 +602,14 @@ public class PluginApiculture extends BlankForestryPlugin { 'I', OreDictUtil.INGOT_IRON, 'G', OreDictUtil.BLOCK_GLASS); // STABILISER - RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.STABILISER), + RecipeUtil.addRecipe("alveary_stabiliser", blocks.getAlvearyBlock(BlockAlvearyType.STABILISER), "G G", "GXG", "G G", 'X', alvearyPlainBlock, 'G', OreDictUtil.GEM_QUARTZ); // SIEVE - RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.SIEVE), + RecipeUtil.addRecipe("alveary_sieve", blocks.getAlvearyBlock(BlockAlvearyType.SIEVE), "III", " X ", "WWW", @@ -657,8 +657,8 @@ public class PluginApiculture extends BlankForestryPlugin { "#X#", '#', coreItems.beeswax, 'X', coreItems.craftingMaterial.getSilkWisp()); - RecipeUtil.addShapelessRecipe(blocks.candle.getUnlitCandle(1), blocks.candle.getUnlitCandle(1)); - RecipeUtil.addShapelessRecipe(blocks.candle.getLitCandle(1), blocks.candle.getLitCandle(1)); + RecipeUtil.addShapelessRecipe("candle_unlit_reset", blocks.candle.getUnlitCandle(1), blocks.candle.getUnlitCandle(1)); + RecipeUtil.addShapelessRecipe("candle_lit_reset", blocks.candle.getLitCandle(1), blocks.candle.getLitCandle(1)); // / CENTRIFUGE // Honey combs @@ -758,7 +758,7 @@ public class PluginApiculture extends BlankForestryPlugin { RecipeManagers.fermenterManager.addRecipe(items.honeydew.getItemStack(), 500, 1.0f, Fluids.SHORT_MEAD.getFluid(1), Fluids.FOR_HONEY.getFluid(1)); } - RecipeUtil.addRecipe(blocks.apiary, + RecipeUtil.addRecipe("apiary", blocks.apiary, "XXX", "#C#", "###", @@ -766,7 +766,7 @@ public class PluginApiculture extends BlankForestryPlugin { '#', OreDictUtil.PLANK_WOOD, 'C', coreItems.impregnatedCasing); - RecipeUtil.addRecipe(blocks.beeChest, + RecipeUtil.addRecipe("bee_chest", blocks.beeChest, " # ", "XYX", "XXX", @@ -774,7 +774,7 @@ public class PluginApiculture extends BlankForestryPlugin { 'X', OreDictUtil.BEE_COMB, 'Y', OreDictUtil.CHEST_WOOD); - RecipeUtil.addRecipe(blocks.beeHouse, + RecipeUtil.addRecipe("bee_house", blocks.beeHouse, "XXX", "#C#", "###", diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index 4615cd21b..0017ff272 100755 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -327,29 +327,29 @@ public class PluginArboriculture extends BlankForestryPlugin { if (woodType instanceof EnumForestryWoodType) { planks.setCount(4); logs.setCount(1); - RecipeUtil.addShapelessRecipe(planks.copy(), logs.copy()); + RecipeUtil.addShapelessRecipe("planks_" + woodType.getName(), planks.copy(), logs.copy()); slabs.setCount(6); planks.setCount(1); - RecipeUtil.addRecipe(slabs.copy(), "###", '#', planks.copy()); + RecipeUtil.addRecipe("slabs_" + woodType.getName(), slabs.copy(), "###", '#', planks.copy()); fences.setCount(3); planks.setCount(1); - RecipeUtil.addRecipe(fences.copy(), + RecipeUtil.addRecipe("fences_" + woodType.getName(), fences.copy(), "#X#", "#X#", '#', planks.copy(), 'X', "stickWood"); fenceGates.setCount(1); planks.setCount(1); - RecipeUtil.addRecipe(fenceGates.copy(), + RecipeUtil.addRecipe("fence_gates_" + woodType.getName(), fenceGates.copy(), "X#X", "X#X", '#', planks.copy(), 'X', "stickWood"); stairs.setCount(4); planks.setCount(1); - RecipeUtil.addRecipe(stairs.copy(), + RecipeUtil.addRecipe("stairs_" + woodType.getName(), stairs.copy(), "# ", "## ", "###", @@ -357,7 +357,7 @@ public class PluginArboriculture extends BlankForestryPlugin { doors.setCount(3); planks.setCount(1); - RecipeUtil.addRecipe(doors.copy(), + RecipeUtil.addRecipe("doors_" + woodType.getName(), doors.copy(), "## ", "## ", "## ", @@ -366,31 +366,31 @@ public class PluginArboriculture extends BlankForestryPlugin { fireproofPlanks.setCount(4); fireproofLogs.setCount(1); - RecipeUtil.addShapelessRecipe(fireproofPlanks.copy(), fireproofLogs.copy()); + RecipeUtil.addShapelessRecipe("fireproof_planks_" + woodType.getName(), fireproofPlanks.copy(), fireproofLogs.copy()); fireproofSlabs.setCount(6); fireproofPlanks.setCount(1); - RecipeUtil.addRecipe(fireproofSlabs.copy(), + RecipeUtil.addRecipe("fireproof_slabs_" + woodType.getName(), fireproofSlabs.copy(), "###", '#', fireproofPlanks.copy()); fireproofFences.setCount(3); fireproofPlanks.setCount(1); - RecipeUtil.addRecipe(fireproofFences.copy(), + RecipeUtil.addRecipe("fireproof_fences_" + woodType.getName(), fireproofFences.copy(), "#X#", "#X#", '#', fireproofPlanks.copy(), 'X', "stickWood"); fireproofFenceGates.setCount(1); fireproofPlanks.setCount(1); - RecipeUtil.addRecipe(fireproofFenceGates.copy(), + RecipeUtil.addRecipe("fireproof_fence_gates_" + woodType.getName(), fireproofFenceGates.copy(), "X#X", "X#X", '#', fireproofPlanks.copy(), 'X', "stickWood"); fireproofStairs.setCount(4); fireproofPlanks.setCount(1); - RecipeUtil.addRecipe(fireproofStairs.copy(), + RecipeUtil.addRecipe("fireproof_stairs_" + woodType.getName(), fireproofStairs.copy(), "# ", "## ", "###", @@ -398,7 +398,7 @@ public class PluginArboriculture extends BlankForestryPlugin { doors.setCount(3); fireproofPlanks.setCount(1); - RecipeUtil.addRecipe(doors.copy(), + RecipeUtil.addRecipe("fireproof_doors_" + woodType.getName(), doors.copy(), "## ", "## ", "## ", @@ -445,14 +445,14 @@ public class PluginArboriculture extends BlankForestryPlugin { } // Grafter - RecipeUtil.addRecipe(items.grafter.getItemStack(), + RecipeUtil.addRecipe("grafter", items.grafter.getItemStack(), " B", " # ", "# ", 'B', "ingotBronze", '#', "stickWood"); - RecipeUtil.addRecipe(blocks.treeChest, + RecipeUtil.addRecipe("tree_chest", blocks.treeChest, " # ", "XYX", "XXX", @@ -461,10 +461,10 @@ public class PluginArboriculture extends BlankForestryPlugin { 'Y', "chestWood"); //Wood Pile - RecipeUtil.addShapelessRecipe(new ItemStack(blocks.woodPile), OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD); + RecipeUtil.addShapelessRecipe("wood_pile", new ItemStack(blocks.woodPile), OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD); //Dirt Pile Block - RecipeUtil.addShapelessRecipe(new ItemStack(blocks.loam, 4), Items.CLAY_BALL, coreItems.fertilizerBio, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, coreItems.fertilizerBio, Items.CLAY_BALL); + RecipeUtil.addShapelessRecipe("loam", new ItemStack(blocks.loam, 4), Items.CLAY_BALL, coreItems.compost, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, coreItems.compost, Items.CLAY_BALL); } private static void registerAlleles() { diff --git a/src/main/java/forestry/core/PluginCore.java b/src/main/java/forestry/core/PluginCore.java index ba1acd8d3..c55ec436c 100644 --- a/src/main/java/forestry/core/PluginCore.java +++ b/src/main/java/forestry/core/PluginCore.java @@ -260,16 +260,16 @@ public class PluginCore extends BlankForestryPlugin { if (Config.isCraftingBronzeEnabled()) { ItemStack ingotBronze = items.ingotBronze.copy(); ingotBronze.setCount(4); - RecipeUtil.addShapelessRecipe(ingotBronze, OreDictUtil.INGOT_TIN, OreDictUtil.INGOT_COPPER, OreDictUtil.INGOT_COPPER, OreDictUtil.INGOT_COPPER); + RecipeUtil.addShapelessRecipe("bronze_ingot", ingotBronze, OreDictUtil.INGOT_TIN, OreDictUtil.INGOT_COPPER, OreDictUtil.INGOT_COPPER, OreDictUtil.INGOT_COPPER); } /* STURDY MACHINE */ - RecipeUtil.addRecipe(items.sturdyCasing, "###", "# #", "###", '#', OreDictUtil.INGOT_BRONZE); + RecipeUtil.addRecipe("sturdy_casing", items.sturdyCasing, "###", "# #", "###", '#', OreDictUtil.INGOT_BRONZE); // / EMPTY CANS int canAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.can"); ItemStack canOutput = fluidItems.canEmpty.getItemStack(canAmount); - RecipeUtil.addRecipe(canOutput, " # ", "# #", '#', OreDictUtil.INGOT_TIN); + RecipeUtil.addRecipe("tin_can", canOutput, " # ", "# #", '#', OreDictUtil.INGOT_TIN); // / GEARS List stoneGear = OreDictionary.getOres(OreDictUtil.GEAR_STONE); @@ -279,27 +279,27 @@ public class PluginCore extends BlankForestryPlugin { } else { gearCenter = OreDictUtil.INGOT_COPPER; } - RecipeUtil.addRecipe(items.gearBronze, " # ", "#X#", " # ", '#', OreDictUtil.INGOT_BRONZE, 'X', gearCenter); - RecipeUtil.addRecipe(items.gearCopper, " # ", "#X#", " # ", '#', OreDictUtil.INGOT_COPPER, 'X', gearCenter); - RecipeUtil.addRecipe(items.gearTin, " # ", "#X#", " # ", '#', OreDictUtil.INGOT_TIN, 'X', gearCenter); + RecipeUtil.addRecipe("gear_bronze", items.gearBronze, " # ", "#X#", " # ", '#', OreDictUtil.INGOT_BRONZE, 'X', gearCenter); + RecipeUtil.addRecipe("gear_copper", items.gearCopper, " # ", "#X#", " # ", '#', OreDictUtil.INGOT_COPPER, 'X', gearCenter); + RecipeUtil.addRecipe("gear_tin", items.gearTin, " # ", "#X#", " # ", '#', OreDictUtil.INGOT_TIN, 'X', gearCenter); // / SURVIVALIST TOOLS - RecipeUtil.addRecipe(items.bronzePickaxe, " X ", " X ", "###", '#', OreDictUtil.INGOT_BRONZE, 'X', OreDictUtil.STICK_WOOD); - RecipeUtil.addRecipe(items.bronzeShovel, " X ", " X ", " # ", '#', OreDictUtil.INGOT_BRONZE, 'X', OreDictUtil.STICK_WOOD); - RecipeUtil.addShapelessRecipe(items.kitPickaxe, items.bronzePickaxe, items.carton); - RecipeUtil.addShapelessRecipe(items.kitShovel, items.bronzeShovel, items.carton); + RecipeUtil.addRecipe("bronze_pickaxe", items.bronzePickaxe, " X ", " X ", "###", '#', OreDictUtil.INGOT_BRONZE, 'X', OreDictUtil.STICK_WOOD); + RecipeUtil.addRecipe("bronze_shovel", items.bronzeShovel, " X ", " X ", " # ", '#', OreDictUtil.INGOT_BRONZE, 'X', OreDictUtil.STICK_WOOD); + RecipeUtil.addShapelessRecipe("pickaxe_kit", items.kitPickaxe, items.bronzePickaxe, items.carton); + RecipeUtil.addShapelessRecipe("shovel_kit", items.kitShovel, items.bronzeShovel, items.carton); /* NATURALIST'S ARMOR */ - RecipeUtil.addRecipe(items.spectacles, " X ", "Y Y", 'X', OreDictUtil.INGOT_BRONZE, 'Y', OreDictUtil.PANE_GLASS); + RecipeUtil.addRecipe("spectacles", items.spectacles, " X ", "Y Y", 'X', OreDictUtil.INGOT_BRONZE, 'Y', OreDictUtil.PANE_GLASS); // / WRENCH - RecipeUtil.addRecipe(items.wrench, "# #", " # ", " # ", '#', OreDictUtil.INGOT_BRONZE); + RecipeUtil.addRecipe("wrench", items.wrench, "# #", " # ", " # ", '#', OreDictUtil.INGOT_BRONZE); // / CAMOUFLAGE SPRAY CAN - RecipeUtil.addRecipe(items.camouflageSprayCan, "TTT", "TCT", "TCT", 'T', OreDictUtil.INGOT_TIN, 'C', items.craftingMaterial.getCamouflagedPaneling()); + RecipeUtil.addRecipe("camoflage_spray_can", items.camouflageSprayCan, "TTT", "TCT", "TCT", 'T', OreDictUtil.INGOT_TIN, 'C', items.craftingMaterial.getCamouflagedPaneling()); // / WEB - RecipeUtil.addRecipe(new ItemStack(Blocks.WEB, 4), "# #", " # ", "# #", '#', items.craftingMaterial.getSilkWisp()); + RecipeUtil.addRecipe("silk_wisp_to_web", new ItemStack(Blocks.WEB, 4), "# #", " # ", "# #", '#', items.craftingMaterial.getSilkWisp()); if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) { // / CARPENTER @@ -321,7 +321,7 @@ public class PluginCore extends BlankForestryPlugin { 'Y', OreDictUtil.DYE_YELLOW); } else { // Portable ANALYZER - RecipeUtil.addRecipe(items.portableAlyzer.getItemStack(), + RecipeUtil.addRecipe("portable_alyzer", items.portableAlyzer.getItemStack(), "X#X", "X#X", "RDR", @@ -330,7 +330,7 @@ public class PluginCore extends BlankForestryPlugin { 'R', OreDictUtil.DUST_REDSTONE, 'D', OreDictUtil.GEM_DIAMOND); // Camouflaged Paneling - RecipeUtil.addRecipe(items.craftingMaterial.getCamouflagedPaneling(8), + RecipeUtil.addRecipe("camoflaged_paneling", items.craftingMaterial.getCamouflagedPaneling(8), "WWW", "YBR", "WWW", @@ -342,7 +342,7 @@ public class PluginCore extends BlankForestryPlugin { } // ANALYZER - RecipeUtil.addRecipe(blocks.analyzer, + RecipeUtil.addRecipe("alyzer", blocks.analyzer, "XTX", " Y ", "X X", @@ -353,46 +353,46 @@ public class PluginCore extends BlankForestryPlugin { // Manure and Fertilizer int compostWheatAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.compost.wheat"); if (compostWheatAmount > 0) { - ItemStack compost = items.fertilizerBio.getItemStack(compostWheatAmount); - RecipeUtil.addRecipe(compost, " X ", "X#X", " X ", '#', Blocks.DIRT, 'X', OreDictUtil.CROP_WHEAT); + ItemStack compost = items.compost.getItemStack(compostWheatAmount); + RecipeUtil.addRecipe("wheat_to_compost", compost, " X ", "X#X", " X ", '#', Blocks.DIRT, 'X', OreDictUtil.CROP_WHEAT); } int compostAshAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.compost.ash"); if (compostAshAmount > 0) { - ItemStack compost = items.fertilizerBio.getItemStack(compostAshAmount); - RecipeUtil.addRecipe(compost, " X ", "X#X", " X ", '#', Blocks.DIRT, 'X', OreDictUtil.DUST_ASH); + ItemStack compost = items.compost.getItemStack(compostAshAmount); + RecipeUtil.addRecipe("ash_to_compost", compost, " X ", "X#X", " X ", '#', Blocks.DIRT, 'X', OreDictUtil.DUST_ASH); } int fertilizerApatiteAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.fertilizer.apatite"); if (fertilizerApatiteAmount > 0) { ItemStack fertilizer = items.fertilizerCompound.getItemStack(fertilizerApatiteAmount); - RecipeUtil.addRecipe(fertilizer, " # ", " X ", " # ", '#', OreDictUtil.SAND, 'X', OreDictUtil.GEM_APATITE); + RecipeUtil.addRecipe("sand_to_fertilizer", fertilizer, " # ", " X ", " # ", '#', OreDictUtil.SAND, 'X', OreDictUtil.GEM_APATITE); } int fertilizerAshAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.fertilizer.ash"); if (fertilizerAshAmount > 0) { ItemStack fertilizer = items.fertilizerCompound.getItemStack(fertilizerAshAmount); - RecipeUtil.addRecipe(fertilizer, "###", "#X#", "###", '#', OreDictUtil.DUST_ASH, 'X', OreDictUtil.GEM_APATITE); + RecipeUtil.addRecipe("ash_to_fertilizer", fertilizer, "###", "#X#", "###", '#', OreDictUtil.DUST_ASH, 'X', OreDictUtil.GEM_APATITE); } // Humus int humusCompostAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.humus.compost"); if (humusCompostAmount > 0) { ItemStack humus = new ItemStack(blocks.humus, humusCompostAmount); - RecipeUtil.addRecipe(humus, "###", "#X#", "###", '#', Blocks.DIRT, 'X', items.fertilizerBio); + RecipeUtil.addRecipe("compost_humus", humus, "###", "#X#", "###", '#', Blocks.DIRT, 'X', items.compost); } int humusFertilizerAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.humus.fertilizer"); if (humusFertilizerAmount > 0) { ItemStack humus = new ItemStack(blocks.humus, humusFertilizerAmount); - RecipeUtil.addRecipe(humus, "###", "#X#", "###", '#', Blocks.DIRT, 'X', items.fertilizerCompound); + RecipeUtil.addRecipe("fertilizer_humus", humus, "###", "#X#", "###", '#', Blocks.DIRT, 'X', items.fertilizerCompound); } // Bog earth int bogEarthOutputBucket = ForestryAPI.activeMode.getIntegerSetting("recipe.output.bogearth.bucket"); if (bogEarthOutputBucket > 0) { ItemStack bogEarth = blocks.bogEarth.get(BlockBogEarth.SoilType.BOG_EARTH, bogEarthOutputBucket); - RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', Items.WATER_BUCKET, 'Y', OreDictUtil.SAND); + RecipeUtil.addRecipe("bucket_bog_earth", bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', Items.WATER_BUCKET, 'Y', OreDictUtil.SAND); } int bogEarthOutputCan = ForestryAPI.activeMode.getIntegerSetting("recipe.output.bogearth.can"); @@ -401,46 +401,46 @@ public class PluginCore extends BlankForestryPlugin { ItemStack canWater = fluidItems.getContainer(EnumContainerType.CAN, FluidRegistry.WATER); ItemStack waxCapsuleWater = fluidItems.getContainer(EnumContainerType.CAPSULE, FluidRegistry.WATER); ItemStack refractoryWater = fluidItems.getContainer(EnumContainerType.REFRACTORY, FluidRegistry.WATER); - RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', canWater, 'Y', OreDictUtil.SAND); - RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', waxCapsuleWater, 'Y', OreDictUtil.SAND); - RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', refractoryWater, 'Y', OreDictUtil.SAND); + RecipeUtil.addRecipe("can_bog_earth", bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', canWater, 'Y', OreDictUtil.SAND); + RecipeUtil.addRecipe("capsule_bog_earth", bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', waxCapsuleWater, 'Y', OreDictUtil.SAND); + RecipeUtil.addRecipe("refractory_capsule_bog_earth", bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', refractoryWater, 'Y', OreDictUtil.SAND); } // Crafting Material - RecipeUtil.addRecipe(new ItemStack(Items.STRING), "#", "#", "#", '#', items.craftingMaterial.getSilkWisp()); + RecipeUtil.addRecipe("silk_to_string", new ItemStack(Items.STRING), "#", "#", "#", '#', items.craftingMaterial.getSilkWisp()); // / Pipette - RecipeUtil.addRecipe(items.pipette, " #", " X ", "X ", 'X', OreDictUtil.PANE_GLASS, '#', new ItemStack(Blocks.WOOL, 1, OreDictionary.WILDCARD_VALUE)); + RecipeUtil.addRecipe("pipette", items.pipette, " #", " X ", "X ", 'X', OreDictUtil.PANE_GLASS, '#', new ItemStack(Blocks.WOOL, 1, OreDictionary.WILDCARD_VALUE)); // Storage Blocks { - RecipeUtil.addRecipe(blocks.resourceStorageApatite, "###", "###", "###", '#', OreDictUtil.GEM_APATITE); + RecipeUtil.addRecipe("apatite_block", blocks.resourceStorageApatite, "###", "###", "###", '#', OreDictUtil.GEM_APATITE); - RecipeUtil.addShapelessRecipe(new ItemStack(items.apatite, 9), OreDictUtil.BLOCK_APATITE); + RecipeUtil.addShapelessRecipe("block_to_apatite", new ItemStack(items.apatite, 9), OreDictUtil.BLOCK_APATITE); } { - RecipeUtil.addRecipe(blocks.resourceStorageCopper, "###", "###", "###", '#', OreDictUtil.INGOT_COPPER); + RecipeUtil.addRecipe("copper_block", blocks.resourceStorageCopper, "###", "###", "###", '#', OreDictUtil.INGOT_COPPER); ItemStack ingotCopper = items.ingotCopper.copy(); ingotCopper.setCount(9); - RecipeUtil.addShapelessRecipe(ingotCopper, OreDictUtil.BLOCK_COPPER); + RecipeUtil.addShapelessRecipe("block_to_copper", ingotCopper, OreDictUtil.BLOCK_COPPER); } { - RecipeUtil.addRecipe(blocks.resourceStorageTin, "###", "###", "###", '#', OreDictUtil.INGOT_TIN); + RecipeUtil.addRecipe("tin_block", blocks.resourceStorageTin, "###", "###", "###", '#', OreDictUtil.INGOT_TIN); ItemStack ingotTin = items.ingotTin.copy(); ingotTin.setCount(9); - RecipeUtil.addShapelessRecipe(ingotTin, OreDictUtil.BLOCK_TIN); + RecipeUtil.addShapelessRecipe("block_to_tin", ingotTin, OreDictUtil.BLOCK_TIN); } { - RecipeUtil.addRecipe(blocks.resourceStorageBronze, "###", "###", "###", '#', OreDictUtil.INGOT_BRONZE); + RecipeUtil.addRecipe("bronze_block", blocks.resourceStorageBronze, "###", "###", "###", '#', OreDictUtil.INGOT_BRONZE); ItemStack ingotBronze = items.ingotBronze.copy(); ingotBronze.setCount(9); - RecipeUtil.addShapelessRecipe(ingotBronze, OreDictUtil.BLOCK_BRONZE); + RecipeUtil.addShapelessRecipe("block_to_bronze", ingotBronze, OreDictUtil.BLOCK_BRONZE); } // alternate recipes diff --git a/src/main/java/forestry/core/items/ItemRegistryCore.java b/src/main/java/forestry/core/items/ItemRegistryCore.java index 5721ee740..9d0da76f7 100644 --- a/src/main/java/forestry/core/items/ItemRegistryCore.java +++ b/src/main/java/forestry/core/items/ItemRegistryCore.java @@ -19,7 +19,7 @@ import net.minecraftforge.oredict.OreDictionary; public class ItemRegistryCore extends ItemRegistry { /* Fertilizer */ - public final ItemForestry fertilizerBio; + public final ItemForestry compost; public final ItemFertilizer fertilizerCompound; /* Gems */ @@ -91,7 +91,7 @@ public class ItemRegistryCore extends ItemRegistry { public final ItemCamouflageSprayCan camouflageSprayCan; public ItemRegistryCore() { - fertilizerBio = registerItem(new ItemForestry(), "fertilizer_bio"); + compost = registerItem(new ItemForestry(), "fertilizer_bio"); fertilizerCompound = registerItem(new ItemFertilizer(), "fertilizer_compound"); apatite = registerItem(new ItemForestry(), "apatite"); diff --git a/src/main/java/forestry/core/recipes/RecipeUtil.java b/src/main/java/forestry/core/recipes/RecipeUtil.java index 01aeedbfe..1f1bcfa66 100755 --- a/src/main/java/forestry/core/recipes/RecipeUtil.java +++ b/src/main/java/forestry/core/recipes/RecipeUtil.java @@ -37,9 +37,7 @@ import forestry.factory.inventory.InventoryCraftingForestry; public abstract class RecipeUtil { - // hack to make unique recipe names. // TODO use json recipes - private static int recipeIndex; public static void addFermenterRecipes(ItemStack resource, int fermentationValue, Fluids output) { if (RecipeManagers.fermenterManager == null) { @@ -171,27 +169,27 @@ public abstract class RecipeUtil { return ItemStack.EMPTY; } - public static void addRecipe(Block block, Object... obj) { - addRecipe(new ItemStack(block), obj); + public static void addRecipe(String recipeName, Block block, Object... obj) { + addRecipe(recipeName, new ItemStack(block), obj); } - public static void addRecipe(Item item, Object... obj) { - addRecipe(new ItemStack(item), obj); + public static void addRecipe(String recipeName, Item item, Object... obj) { + addRecipe(recipeName, new ItemStack(item), obj); } - public static void addRecipe(ItemStack itemstack, Object... obj) { + public static void addRecipe(String recipeName, ItemStack itemstack, Object... obj) { ShapedRecipeCustom recipe = new ShapedRecipeCustom(itemstack, obj); - recipe.setRegistryName(Constants.MOD_ID, "Recipe" + recipeIndex++); + recipe.setRegistryName(Constants.MOD_ID, recipeName); ForgeRegistries.RECIPES.register(recipe); } - public static void addShapelessRecipe(Item item, Object... obj) { - addShapelessRecipe(new ItemStack(item), obj); + public static void addShapelessRecipe(String recipeName, Item item, Object... obj) { + addShapelessRecipe(recipeName, new ItemStack(item), obj); } - public static void addShapelessRecipe(ItemStack itemstack, Object... obj) { + public static void addShapelessRecipe(String recipeName, ItemStack itemstack, Object... obj) { ShapelessOreRecipe recipe = new ShapelessOreRecipe(null, itemstack, obj); - recipe.setRegistryName(Constants.MOD_ID, "Recipe" + recipeIndex++); + recipe.setRegistryName(Constants.MOD_ID, recipeName); ForgeRegistries.RECIPES.register(recipe); } diff --git a/src/main/java/forestry/energy/PluginEnergy.java b/src/main/java/forestry/energy/PluginEnergy.java index 1c80a1966..b3f1ecd0e 100644 --- a/src/main/java/forestry/energy/PluginEnergy.java +++ b/src/main/java/forestry/energy/PluginEnergy.java @@ -57,7 +57,7 @@ public class PluginEnergy extends BlankForestryPlugin { super.registerRecipes(); Preconditions.checkState(blocks != null); - RecipeUtil.addRecipe(new ItemStack(blocks.peatEngine), + RecipeUtil.addRecipe("peat_engine", new ItemStack(blocks.peatEngine), "###", " X ", "YVY", @@ -66,7 +66,7 @@ public class PluginEnergy extends BlankForestryPlugin { 'Y', "gearCopper", 'V', Blocks.PISTON); - RecipeUtil.addRecipe(new ItemStack(blocks.biogasEngine), + RecipeUtil.addRecipe("biogas_engine", new ItemStack(blocks.biogasEngine), "###", " X ", "YVY", @@ -76,7 +76,7 @@ public class PluginEnergy extends BlankForestryPlugin { 'V', Blocks.PISTON); if (ForestryAPI.activeMode.getBooleanSetting("energy.engine.clockwork")) { - RecipeUtil.addRecipe(new ItemStack(blocks.clockworkEngine), + RecipeUtil.addRecipe("clockwork_engine", new ItemStack(blocks.clockworkEngine), "###", " X ", "ZVY", diff --git a/src/main/java/forestry/factory/PluginFactory.java b/src/main/java/forestry/factory/PluginFactory.java index 38eb08680..4ef722ee3 100755 --- a/src/main/java/forestry/factory/PluginFactory.java +++ b/src/main/java/forestry/factory/PluginFactory.java @@ -144,7 +144,7 @@ public class PluginFactory extends BlankForestryPlugin { int cyclesCompost = ForestryAPI.activeMode.getIntegerSetting("fermenter.cycles.compost"); int valueCompost = ForestryAPI.activeMode.getIntegerSetting("fermenter.value.compost"); - ItemStack fertilizerBio = coreItems.fertilizerBio.getItemStack(); + ItemStack fertilizerBio = coreItems.compost.getItemStack(); ItemStack mulch = coreItems.mulch.getItemStack(); FuelManager.fermenterFuel.put(fertilizerBio, new FermenterFuel(fertilizerBio, valueCompost, cyclesCompost)); FuelManager.fermenterFuel.put(mulch, new FermenterFuel(mulch, valueCompost, cyclesCompost)); @@ -542,7 +542,7 @@ public class PluginFactory extends BlankForestryPlugin { ChipsetManager.solderManager.addRecipe(layout, coreItems.tubes.get(EnumElectronTube.BLAZE, 1), Circuits.machineSpeedUpgrade2); ChipsetManager.solderManager.addRecipe(layout, coreItems.tubes.get(EnumElectronTube.GOLD, 1), Circuits.machineEfficiencyUpgrade1); - RecipeUtil.addRecipe(blocks.bottler, + RecipeUtil.addRecipe("bottler", blocks.bottler, "X#X", "#Y#", "X#X", @@ -550,7 +550,7 @@ public class PluginFactory extends BlankForestryPlugin { 'X', fluidItems.canEmpty, 'Y', coreItems.sturdyCasing); - RecipeUtil.addRecipe(blocks.carpenter, + RecipeUtil.addRecipe("carpenter", blocks.carpenter, "X#X", "XYX", "X#X", @@ -558,7 +558,7 @@ public class PluginFactory extends BlankForestryPlugin { 'X', "ingotBronze", 'Y', coreItems.sturdyCasing); - RecipeUtil.addRecipe(blocks.centrifuge, + RecipeUtil.addRecipe("centrifuge", blocks.centrifuge, "X#X", "XYX", "X#X", @@ -566,7 +566,7 @@ public class PluginFactory extends BlankForestryPlugin { 'X', "ingotCopper", 'Y', coreItems.sturdyCasing); - RecipeUtil.addRecipe(blocks.fermenter, + RecipeUtil.addRecipe("fermenter", blocks.fermenter, "X#X", "#Y#", "X#X", @@ -574,7 +574,7 @@ public class PluginFactory extends BlankForestryPlugin { 'X', "gearBronze", 'Y', coreItems.sturdyCasing); - RecipeUtil.addRecipe(blocks.moistener, + RecipeUtil.addRecipe("moistener", blocks.moistener, "X#X", "#Y#", "X#X", @@ -582,7 +582,7 @@ public class PluginFactory extends BlankForestryPlugin { 'X', "gearCopper", 'Y', coreItems.sturdyCasing); - RecipeUtil.addRecipe(blocks.squeezer, + RecipeUtil.addRecipe("squeezer", blocks.squeezer, "X#X", "XYX", "X#X", @@ -590,7 +590,7 @@ public class PluginFactory extends BlankForestryPlugin { 'X', "ingotTin", 'Y', coreItems.sturdyCasing); - RecipeUtil.addRecipe(blocks.still, + RecipeUtil.addRecipe("still", blocks.still, "X#X", "#Y#", "X#X", @@ -598,7 +598,7 @@ public class PluginFactory extends BlankForestryPlugin { 'X', "dustRedstone", 'Y', coreItems.sturdyCasing); - RecipeUtil.addRecipe(blocks.rainmaker, + RecipeUtil.addRecipe("rainmaker", blocks.rainmaker, "X#X", "#Y#", "X#X", @@ -606,7 +606,7 @@ public class PluginFactory extends BlankForestryPlugin { 'X', "gearTin", 'Y', coreItems.hardenedCasing); - RecipeUtil.addRecipe(blocks.fabricator, + RecipeUtil.addRecipe("fabricator", blocks.fabricator, "X#X", "#Y#", "XZX", @@ -615,7 +615,7 @@ public class PluginFactory extends BlankForestryPlugin { 'Y', coreItems.sturdyCasing, 'Z', "chestWood"); - RecipeUtil.addRecipe(blocks.raintank, + RecipeUtil.addRecipe("raintank", blocks.raintank, "X#X", "XYX", "X#X", @@ -623,7 +623,7 @@ public class PluginFactory extends BlankForestryPlugin { 'X', "ingotIron", 'Y', coreItems.sturdyCasing); - RecipeUtil.addRecipe(blocks.worktable, + RecipeUtil.addRecipe("worktable", blocks.worktable, "B", "W", "C", diff --git a/src/main/java/forestry/farming/PluginFarming.java b/src/main/java/forestry/farming/PluginFarming.java index 67cd7d8b0..7626a4b65 100644 --- a/src/main/java/forestry/farming/PluginFarming.java +++ b/src/main/java/forestry/farming/PluginFarming.java @@ -213,7 +213,7 @@ public class PluginFarming extends BlankForestryPlugin { valve.setTagCompound(compound); control.setTagCompound(compound); - RecipeUtil.addRecipe(basic, + RecipeUtil.addRecipe("farm_basic", basic, "I#I", "WCW", '#', block.getBase(), @@ -221,27 +221,27 @@ public class PluginFarming extends BlankForestryPlugin { 'C', coreItems.tubes.get(EnumElectronTube.TIN, 1), 'I', "ingotCopper"); - RecipeUtil.addRecipe(gearbox, + RecipeUtil.addRecipe("farm_gearbox", gearbox, " # ", "TTT", '#', basic, 'T', "gearTin"); - RecipeUtil.addRecipe(hatch, + RecipeUtil.addRecipe("farm_hatch", hatch, " # ", "TDT", '#', basic, 'T', "gearTin", 'D', OreDictUtil.TRAPDOOR_WOOD); - RecipeUtil.addRecipe(valve, + RecipeUtil.addRecipe("farm_valve", valve, " # ", "XTX", '#', basic, 'T', "gearTin", 'X', "blockGlass"); - RecipeUtil.addRecipe(control, + RecipeUtil.addRecipe("farm_control", control, " # ", "XTX", '#', basic, diff --git a/src/main/java/forestry/greenhouse/PluginGreenhouse.java b/src/main/java/forestry/greenhouse/PluginGreenhouse.java index 36be6717f..bfc619c63 100644 --- a/src/main/java/forestry/greenhouse/PluginGreenhouse.java +++ b/src/main/java/forestry/greenhouse/PluginGreenhouse.java @@ -103,7 +103,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { BlockRegistryGreenhouse blocks = getBlocks(); Block greenhousePlainBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN); - RecipeUtil.addRecipe(new ItemStack(greenhousePlainBlock, 2), + RecipeUtil.addRecipe("greenhouse_plain", new ItemStack(greenhousePlainBlock, 2), "#X#", "SIS", 'I', OreDictUtil.INGOT_IRON, @@ -112,7 +112,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { '#', coreItems.craftingMaterial.getCamouflagedPaneling()); Block greenhouseGlassBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.GLASS); - RecipeUtil.addRecipe(new ItemStack(greenhouseGlassBlock, 2), + RecipeUtil.addRecipe("greenhouse_glass", new ItemStack(greenhouseGlassBlock, 2), "#X#", "PIP", 'I', OreDictUtil.INGOT_IRON, @@ -121,7 +121,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { '#', coreItems.craftingMaterial.getCamouflagedPaneling()); Block greenhouseHatchInputBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HATCH_INPUT); - RecipeUtil.addRecipe(greenhouseHatchInputBlock, + RecipeUtil.addRecipe("greenhouse_hatch_in", greenhouseHatchInputBlock, "TXT", "#H#", 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), @@ -130,7 +130,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { 'T', coreItems.tubes.get(EnumElectronTube.BRONZE, 1)); Block greenhouseHatchOutputBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HATCH_OUTPUT); - RecipeUtil.addRecipe(greenhouseHatchOutputBlock, + RecipeUtil.addRecipe("greenhouse_hatch_out", greenhouseHatchOutputBlock, "#H#", "TXT", 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), @@ -139,7 +139,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { 'T', coreItems.tubes.get(EnumElectronTube.BRONZE, 1)); Block greenhouseControlBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.CONTROL); - RecipeUtil.addRecipe(greenhouseControlBlock, + RecipeUtil.addRecipe("greenhouse_control", greenhouseControlBlock, " X ", "#T#", 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), @@ -147,14 +147,14 @@ public class PluginGreenhouse extends BlankForestryPlugin { 'T', coreItems.tubes.get(EnumElectronTube.GOLD, 1)); Block greenhouseGearBoxBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.GEARBOX); - RecipeUtil.addRecipe(greenhouseGearBoxBlock, + RecipeUtil.addRecipe("greenhouse_gearbox", greenhouseGearBoxBlock, " X ", "###", 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), '#', OreDictUtil.GEAR_TIN); Block greenhouseValveBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.VALVE); - RecipeUtil.addRecipe(greenhouseValveBlock, + RecipeUtil.addRecipe("greenhouse_valve", greenhouseValveBlock, " X ", "#G#", 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), @@ -162,7 +162,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { 'G', OreDictUtil.GEAR_TIN); Block greenhouseHeaterBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HEATER); - RecipeUtil.addRecipe(greenhouseHeaterBlock, + RecipeUtil.addRecipe("greenhouse_heater", greenhouseHeaterBlock, "T#T", "#X#", "T#T", @@ -171,7 +171,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { 'T', coreItems.tubes.get(EnumElectronTube.GOLD, 1)); Block greenhouseFanlock = blocks.getGreenhouseBlock(BlockGreenhouseType.FAN); - RecipeUtil.addRecipe(greenhouseFanlock, + RecipeUtil.addRecipe("greenhouse_fan", greenhouseFanlock, "T#T", "#X#", "T#T", @@ -180,7 +180,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { 'T', coreItems.tubes.get(EnumElectronTube.TIN, 1)); Block greenhouseDryerBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.DEHUMIDIFIER); - RecipeUtil.addRecipe(greenhouseDryerBlock, + RecipeUtil.addRecipe("greenhouse_dryer", greenhouseDryerBlock, "T#T", "#X#", "T#T", @@ -189,7 +189,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { 'T', coreItems.tubes.get(EnumElectronTube.BLAZE, 1)); Block greenhouseSprinklerBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HUMIDIFIER); - RecipeUtil.addRecipe(greenhouseSprinklerBlock, + RecipeUtil.addRecipe("greenhouse_sprinkler", greenhouseSprinklerBlock, "T#T", "#X#", "T#T", @@ -198,7 +198,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { 'T', coreItems.tubes.get(EnumElectronTube.LAPIS, 1)); Block greenhouseDoorBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.DOOR); - RecipeUtil.addRecipe(greenhouseDoorBlock, + RecipeUtil.addRecipe("greenhouse_door", greenhouseDoorBlock, true, "GG ", "GG ", @@ -206,7 +206,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { 'G', blocks.getGreenhouseBlock(BlockGreenhouseType.GLASS)); Block greenhouseWindowBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.WINDOW); - RecipeUtil.addRecipe(greenhouseWindowBlock, + RecipeUtil.addRecipe("greenhouse_window", greenhouseWindowBlock, true, "GGS", "GGG", @@ -215,7 +215,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { 'S', OreDictUtil.STICK_WOOD); Block greenhouseWindowRoofBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.WINDOW_UP); - RecipeUtil.addRecipe(greenhouseWindowRoofBlock, + RecipeUtil.addRecipe("greenhouse_window_roof", greenhouseWindowRoofBlock, true, "SGS", "GGG", @@ -224,7 +224,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { 'S', OreDictUtil.STICK_WOOD); Block greenhouseClimateControlBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.CLIMATE_CONTROL); - RecipeUtil.addRecipe(greenhouseClimateControlBlock, + RecipeUtil.addRecipe("greenhouse_climate_control", greenhouseClimateControlBlock, true, "IRG", "EBT", @@ -238,7 +238,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) { Block greenhouseButterflyHatchBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.NURSERY); - RecipeUtil.addRecipe(greenhouseButterflyHatchBlock, + RecipeUtil.addRecipe("greenhouse_butterfly_hatch", greenhouseButterflyHatchBlock, true, "IRG", "SBS", diff --git a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java index 2425b6e20..1fc9c0766 100755 --- a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java @@ -303,7 +303,7 @@ public class PluginLepidopterology extends BlankForestryPlugin { ForgeRegistries.RECIPES.register(new MatingRecipe()); - RecipeUtil.addRecipe(blocks.butterflyChest, " # ", "XYX", "XXX", '#', "blockGlass", 'X', + RecipeUtil.addRecipe("butterfly_chest", blocks.butterflyChest, " # ", "XYX", "XXX", '#', "blockGlass", 'X', new ItemStack(items.butterflyGE, 1, OreDictionary.WILDCARD_VALUE), 'Y', "chestWood"); } diff --git a/src/main/java/forestry/mail/PluginMail.java b/src/main/java/forestry/mail/PluginMail.java index 35555a500..3fec137f6 100644 --- a/src/main/java/forestry/mail/PluginMail.java +++ b/src/main/java/forestry/mail/PluginMail.java @@ -126,7 +126,7 @@ public class PluginMail extends BlankForestryPlugin { letterGlue = new ItemStack(Items.SLIME_BALL); } - RecipeUtil.addShapelessRecipe(items.letters.getItemStack(), Items.PAPER, letterGlue); + RecipeUtil.addShapelessRecipe("letter", items.letters.getItemStack(), Items.PAPER, letterGlue); if (Config.craftingStampsEnabled) { for (EnumStampDefinition stampDefinition : EnumStampDefinition.VALUES) { @@ -136,7 +136,7 @@ public class PluginMail extends BlankForestryPlugin { ItemStack stamps = items.stamps.get(stampDefinition, 9); - RecipeUtil.addRecipe(stamps, + RecipeUtil.addRecipe("stamps", stamps, "XXX", "###", "ZZZ", @@ -152,14 +152,14 @@ public class PluginMail extends BlankForestryPlugin { } // Recycling - RecipeUtil.addRecipe(new ItemStack(Items.PAPER), "###", '#', OreDictUtil.EMPTIED_LETTER_ORE_DICT); + RecipeUtil.addRecipe("letter_recycling", new ItemStack(Items.PAPER), "###", '#', OreDictUtil.EMPTIED_LETTER_ORE_DICT); // Carpenter RecipeManagers.carpenterManager.addRecipe(10, new FluidStack(FluidRegistry.WATER, 250), ItemStack.EMPTY, items.letters.getItemStack(), "###", "###", '#', coreItems.woodPulp); - RecipeUtil.addShapelessRecipe(items.catalogue.getItemStack(), items.stamps.getWildcard(), new ItemStack(Items.BOOK)); + RecipeUtil.addShapelessRecipe("catalogue", items.catalogue.getItemStack(), items.stamps.getWildcard(), new ItemStack(Items.BOOK)); - RecipeUtil.addRecipe(new ItemStack(blocks.mailbox), + RecipeUtil.addRecipe("mailbox", new ItemStack(blocks.mailbox), " # ", "#Y#", "XXX", @@ -167,7 +167,7 @@ public class PluginMail extends BlankForestryPlugin { 'X', "chestWood", 'Y', coreItems.sturdyCasing); - RecipeUtil.addRecipe(new ItemStack(blocks.tradeStation), + RecipeUtil.addRecipe("trade_station", new ItemStack(blocks.tradeStation), "Z#Z", "#Y#", "XWX", diff --git a/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java b/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java index 5cbf45402..4ad1b0050 100644 --- a/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java +++ b/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java @@ -43,7 +43,7 @@ public class PluginBuildCraftTransport extends BlankForestryPlugin { Item beeswax = PluginCore.getItems().beeswax; Item pipeWaterproof = ForgeRegistries.ITEMS.getValue(new ResourceLocation(BCT, "waterproof")); if (pipeWaterproof != null) { - RecipeUtil.addShapelessRecipe(new ItemStack(pipeWaterproof), beeswax); + RecipeUtil.addShapelessRecipe("pipe_waterproof", new ItemStack(pipeWaterproof), beeswax); } else { Log.warning("No BuildCraft pipe waterproof found."); } diff --git a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java b/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java index 20716cb50..20da60637 100644 --- a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java +++ b/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java @@ -279,7 +279,7 @@ public class PluginHarvestCraft extends BlankForestryPlugin { ItemStack grainSeed = getItemStack(grainName + "seedItem"); Block grainBlock = getBlock("pam" + grainName + "Crop"); if (grain != null && wheatamount > 0) { - RecipeUtil.addRecipe(coreItems.fertilizerBio.getItemStack(wheatamount), " X ", "X#X", " X ", '#', Blocks.DIRT, 'X', grain); + RecipeUtil.addRecipe("pam_compost_" + grainName, coreItems.compost.getItemStack(wheatamount), " X ", "X#X", " X ", '#', Blocks.DIRT, 'X', grain); FuelManager.moistenerResource.put(grain, new MoistenerFuel(grain, coreItems.mouldyWheat.getItemStack(), 0, 300)); } if (grainSeed != null) { @@ -387,7 +387,7 @@ public class PluginHarvestCraft extends BlankForestryPlugin { ItemStack hcBeeswaxItem = getItemStack("beeswaxItem"); if (hcBeeswaxItem != null) { - RecipeUtil.addRecipe(PluginFluids.getItems().waxCapsuleEmpty.getItemStack(ForestryAPI.activeMode.getIntegerSetting("recipe.output.capsule")), "XXX ", 'X', hcBeeswaxItem); + RecipeUtil.addRecipe("pam_wax_capsule", PluginFluids.getItems().waxCapsuleEmpty.getItemStack(ForestryAPI.activeMode.getIntegerSetting("recipe.output.capsule")), "XXX ", 'X', hcBeeswaxItem); } } diff --git a/src/main/java/forestry/plugins/compat/PluginIC2.java b/src/main/java/forestry/plugins/compat/PluginIC2.java index 96b0b7896..80fee26fc 100755 --- a/src/main/java/forestry/plugins/compat/PluginIC2.java +++ b/src/main/java/forestry/plugins/compat/PluginIC2.java @@ -270,7 +270,7 @@ public class PluginIC2 extends BlankForestryPlugin { int bogEarthOutputCan = ForestryAPI.activeMode.getIntegerSetting("recipe.output.bogearth.can"); if (bogEarthOutputCan > 0) { ItemStack bogEarthCan = PluginCore.getBlocks().bogEarth.get(BlockBogEarth.SoilType.BOG_EARTH, bogEarthOutputCan); - RecipeUtil.addRecipe(bogEarthCan, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', waterCell, 'Y', "sand"); + RecipeUtil.addRecipe("ic2_bog_earth_can", bogEarthCan, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', waterCell, 'Y', "sand"); } } @@ -294,7 +294,7 @@ public class PluginIC2 extends BlankForestryPlugin { BlockRegistryEnergy energyBlocks = PluginEnergy.blocks; if (energyBlocks != null) { - RecipeUtil.addRecipe(blocks.generator, + RecipeUtil.addRecipe("ic2_generator", blocks.generator, "X#X", "XYX", "X#X", @@ -302,7 +302,7 @@ public class PluginIC2 extends BlankForestryPlugin { 'X', "ingotGold", 'Y', coreItems.sturdyCasing); - RecipeUtil.addRecipe(blocks.electricalEngine, + RecipeUtil.addRecipe("ic2_eletrical_engine", blocks.electricalEngine, "###", " X ", "YVY", diff --git a/src/main/java/forestry/plugins/compat/PluginNatura.java b/src/main/java/forestry/plugins/compat/PluginNatura.java index d3b7bc0ce..75efdfc27 100644 --- a/src/main/java/forestry/plugins/compat/PluginNatura.java +++ b/src/main/java/forestry/plugins/compat/PluginNatura.java @@ -277,8 +277,8 @@ public class PluginNatura extends BlankForestryPlugin { RecipeUtil.addFermenterRecipes(itemBarley, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); int compostWheatAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.compost.wheat"); if (compostWheatAmount > 0) { - ItemStack compostWheat = PluginCore.getItems().fertilizerBio.getItemStack(compostWheatAmount); - RecipeUtil.addRecipe(compostWheat, " X ", "X#X", " X ", '#', Blocks.DIRT, 'X', itemBarley); + ItemStack compostWheat = PluginCore.getItems().compost.getItemStack(compostWheatAmount); + RecipeUtil.addRecipe("natura_compost_wheat", compostWheat, " X ", "X#X", " X ", '#', Blocks.DIRT, 'X', itemBarley); } FuelManager.moistenerResource.put(itemBarley, new MoistenerFuel(itemBarley, PluginCore.getItems().mouldyWheat.getItemStack(), 0, 300)); } diff --git a/src/main/java/forestry/storage/PluginStorage.java b/src/main/java/forestry/storage/PluginStorage.java index 691db870e..ac4859fda 100644 --- a/src/main/java/forestry/storage/PluginStorage.java +++ b/src/main/java/forestry/storage/PluginStorage.java @@ -587,21 +587,21 @@ public class PluginStorage extends BlankForestryPlugin { ItemRegistryStorage items = getItems(); if (items.apiaristBackpack != null && ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { BlockRegistryApiculture beeBlocks = PluginApiculture.getBlocks(); - addBackpackRecipe(items.apiaristBackpack, "stickWood", beeBlocks.beeChest); + addBackpackRecipe("bee", items.apiaristBackpack, "stickWood", beeBlocks.beeChest); } if (items.lepidopteristBackpack != null && ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) { BlockRegistryLepidopterology butterflyBlocks = PluginLepidopterology.getBlocks(); ItemStack chest = new ItemStack(butterflyBlocks.butterflyChest); - addBackpackRecipe(items.lepidopteristBackpack, "stickWood", chest); + addBackpackRecipe("butterfly", items.lepidopteristBackpack, "stickWood", chest); } - addBackpackRecipe(items.minerBackpack, "ingotIron"); - addBackpackRecipe(items.diggerBackpack, "stone"); - addBackpackRecipe(items.foresterBackpack, "logWood"); - addBackpackRecipe(items.hunterBackpack, Items.FEATHER); - addBackpackRecipe(items.adventurerBackpack, Items.BONE); - addBackpackRecipe(items.builderBackpack, Items.CLAY_BALL); + addBackpackRecipe("mining", items.minerBackpack, "ingotIron"); + addBackpackRecipe("digging", items.diggerBackpack, "stone"); + addBackpackRecipe("foresting", items.foresterBackpack, "logWood"); + addBackpackRecipe("hunting", items.hunterBackpack, Items.FEATHER); + addBackpackRecipe("adventuring", items.adventurerBackpack, Items.BONE); + addBackpackRecipe("building", items.builderBackpack, Items.CLAY_BALL); // / CARPENTER if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) { @@ -619,12 +619,12 @@ public class PluginStorage extends BlankForestryPlugin { } } - private static void addBackpackRecipe(Item backpack, Object material) { - addBackpackRecipe(backpack, material, "chestWood"); + private static void addBackpackRecipe(String recipeName, Item backpack, Object material) { + addBackpackRecipe(recipeName, backpack, material, "chestWood"); } - private static void addBackpackRecipe(Item backpack, Object material, Object chest) { - RecipeUtil.addRecipe(backpack, + private static void addBackpackRecipe(String recipeName, Item backpack, Object material, Object chest) { + RecipeUtil.addRecipe("backpack_" + recipeName, backpack, "X#X", "VYV", "X#X",