diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 7a43195a2..c5c08be5e 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -227,7 +227,7 @@ public class PluginApiculture extends ForestryPlugin { " # ", "XYX", "XXX", - '#', Blocks.glass, + '#', "blockGlass", 'X', "beeComb", 'Y', Blocks.chest)) .setFaces(0, 1, 2, 3, 4, 4)); @@ -597,7 +597,7 @@ public class PluginApiculture extends ForestryPlugin { " X ", "X#X", " X ", - '#', Items.redstone, 'X', "ingotBronze"); + '#', "dustRedstone", 'X', "ingotBronze"); // Bees Proxies.common.addRecipe(ForestryItem.scoop.getItemStack(1), @@ -684,7 +684,7 @@ public class PluginApiculture extends ForestryPlugin { "#G#", '#', ForestryItem.tubes.getItemStack(1, 5), 'X', ForestryBlock.alveary, - 'G', Items.gold_ingot); + 'G', "ingotGold"); // FAN Proxies.common.addRecipe(ForestryBlock.alveary.getItemStack(1, TileAlveary.FAN_META), "I I", @@ -692,7 +692,7 @@ public class PluginApiculture extends ForestryPlugin { "I#I", '#', ForestryItem.tubes.getItemStack(1, 4), 'X', ForestryBlock.alveary, - 'I', Items.iron_ingot); + 'I', "ingotIron"); // HEATER Proxies.common.addRecipe(ForestryBlock.alveary.getItemStack(1, TileAlveary.HEATER_META), "#I#", @@ -700,29 +700,29 @@ public class PluginApiculture extends ForestryPlugin { "YYY", '#', ForestryItem.tubes.getItemStack(1, 4), 'X', ForestryBlock.alveary, - 'I', Items.iron_ingot, 'Y', Blocks.stone); + 'I', "ingotIron", 'Y', Blocks.stone); // HYGROREGULATOR Proxies.common.addRecipe(ForestryBlock.alveary.getItemStack(1, TileAlveary.HYGRO_META), "GIG", "GXG", "GIG", 'X', ForestryBlock.alveary, - 'I', Items.iron_ingot, - 'G', Blocks.glass); + 'I', "ingotIron", + 'G', "blockGlass"); // STABILISER Proxies.common.addRecipe(ForestryBlock.alveary.getItemStack(1, TileAlveary.STABILIZER_META), "G G", "GXG", "G G", 'X', ForestryBlock.alveary, - 'G', Items.quartz); + 'G', "gemQuartz"); // SIEVE Proxies.common.addRecipe(ForestryBlock.alveary.getItemStack(1, TileAlveary.SIEVE_META), "III", " X ", "WWW", 'X', ForestryBlock.alveary, - 'I', Items.iron_ingot, + 'I', "ingotIron", 'W', ForestryItem.craftingMaterial.getItemStack(1, 3)); if (PluginManager.Module.FACTORY.isEnabled()) { @@ -731,15 +731,16 @@ public class PluginApiculture extends ForestryPlugin { ForestryItem.propolis.getItemStack(), 5); RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.honeydew.getItemStack()}, Fluids.HONEY.getFluid(Defaults.FLUID_PER_HONEY_DROP)); RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.phosphor.getItemStack(2), new ItemStack(Blocks.sand)}, Fluids.LAVA.getFluid(2000)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.phosphor.getItemStack(2), new ItemStack(Blocks.sand, 1, 1)}, Fluids.LAVA.getFluid(2000)); RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.phosphor.getItemStack(2), new ItemStack(Blocks.dirt)}, Fluids.LAVA.getFluid(1600)); // / CARPENTER RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.getFluid(2000), null, ForestryItem.beealyzer.getItemStack(), "X#X", "X#X", "RDR", - '#', Blocks.glass_pane, + '#', "paneGlass", 'X', "ingotTin", - 'R', Items.redstone, - 'D', Items.diamond); + 'R', "dustRedstone", + 'D', "gemDiamond"); RecipeManagers.carpenterManager.addRecipe(50, Fluids.HONEY.getFluid(500), null, ForestryItem.craftingMaterial.getItemStack(1, 6), " J ", "###", "WPW", '#', "plankWood", diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 511c5442e..78790eed6 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -192,7 +192,7 @@ public class PluginArboriculture extends ForestryPlugin { " # ", "XYX", "XXX", - '#', Blocks.glass, + '#', "blockGlass", 'X', "treeSapling", 'Y', Blocks.chest)) .setFaces(0, 1, 2, 3, 4, 4, 0, 7)); @@ -305,10 +305,10 @@ public class PluginArboriculture extends ForestryPlugin { if (PluginManager.Module.FACTORY.isEnabled()) { // Treealyzer RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.getFluid(2000), null, ForestryItem.treealyzer.getItemStack(), "X#X", "X#X", "RDR", - '#', Blocks.glass_pane, + '#', "paneGlass", 'X', "ingotCopper", - 'R', Items.redstone, - 'D', Items.diamond); + 'R', "dustRedstone", + 'D', "gemDiamond"); // SQUEEZER RECIPES int seedOilMultiplier = GameMode.getGameMode().getIntegerSetting("squeezer.liquid.seed"); diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index d76bb51d1..a45e4045c 100644 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -381,20 +381,20 @@ public class PluginCore extends ForestryPlugin { Proxies.common.addShapelessRecipe(ForestryItem.kitShovel.getItemStack(), ForestryItem.bronzeShovel, ForestryItem.carton); /* NATURALIST'S ARMOR */ - Proxies.common.addRecipe(ForestryItem.naturalistHat.getItemStack(), " X ", "Y Y", 'X', "ingotBronze", 'Y', Blocks.glass_pane); + Proxies.common.addRecipe(ForestryItem.naturalistHat.getItemStack(), " X ", "Y Y", 'X', "ingotBronze", 'Y', "paneGlass"); // / WRENCH Proxies.common.addRecipe(ForestryItem.wrench.getItemStack(), "# #", " # ", " # ", '#', "ingotBronze"); // Manure and Fertilizer if (GameMode.getGameMode().getStackSetting("recipe.output.compost.wheat").stackSize > 0) { - Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.compost.wheat"), " X ", "X#X", " X ", '#', Blocks.dirt, 'X', Items.wheat); + Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.compost.wheat"), " X ", "X#X", " X ", '#', Blocks.dirt, 'X', "cropWheat"); } if (GameMode.getGameMode().getStackSetting("recipe.output.compost.ash").stackSize > 0) { Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.compost.ash"), " X ", "X#X", " X ", '#', Blocks.dirt, 'X', "dustAsh"); } if (GameMode.getGameMode().getStackSetting("recipe.output.fertilizer.apatite").stackSize > 0) { - Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.fertilizer.apatite"), " # ", " X ", " # ", '#', Blocks.sand, 'X', "gemApatite"); + Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.fertilizer.apatite"), " # ", " X ", " # ", '#', "sand", 'X', "gemApatite"); } if (GameMode.getGameMode().getStackSetting("recipe.output.fertilizer.ash").stackSize > 0) { Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.fertilizer.ash"), "###", "#X#", "###", '#', "dustAsh", 'X', "gemApatite"); @@ -410,13 +410,13 @@ public class PluginCore extends ForestryPlugin { // Bog earth if (GameMode.getGameMode().getStackSetting("recipe.output.bogearth.bucket").stackSize > 0) { - Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.bogearth.bucket"), "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', Items.water_bucket, 'Y', Blocks.sand); + Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.bogearth.bucket"), "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', Items.water_bucket, 'Y', "sand"); } if (GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can").stackSize > 0) { - Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"), "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', ForestryItem.canWater, 'Y', Blocks.sand); - Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"), "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', ForestryItem.waxCapsuleWater, 'Y', Blocks.sand); - Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"), "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', ForestryItem.refractoryWater, 'Y', Blocks.sand); + Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"), "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', ForestryItem.canWater, 'Y', "sand"); + Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"), "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', ForestryItem.waxCapsuleWater, 'Y', "sand"); + Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"), "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', ForestryItem.refractoryWater, 'Y', "sand"); } // Crafting Material diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java index d2e176d1d..fae127a5c 100644 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/plugins/PluginFactory.java @@ -122,7 +122,7 @@ public class PluginFactory extends ForestryPlugin { "X#X", "#Y#", "X#X", - '#', Blocks.glass, + '#', "blockGlass", 'X', ForestryItem.canEmpty, 'Y', ForestryItem.sturdyCasing))); @@ -132,7 +132,7 @@ public class PluginFactory extends ForestryPlugin { "X#X", "XYX", "X#X", - '#', Blocks.glass, + '#', "blockGlass", 'X', "ingotBronze", 'Y', ForestryItem.sturdyCasing))); @@ -142,7 +142,7 @@ public class PluginFactory extends ForestryPlugin { "X#X", "XYX", "X#X", - '#', Blocks.glass, + '#', "blockGlass", 'X', "ingotCopper", 'Y', ForestryItem.sturdyCasing.getItemStack()))); @@ -152,7 +152,7 @@ public class PluginFactory extends ForestryPlugin { "X#X", "#Y#", "X#X", - '#', Blocks.glass, + '#', "blockGlass", 'X', "gearBronze", 'Y', ForestryItem.sturdyCasing))); @@ -162,7 +162,7 @@ public class PluginFactory extends ForestryPlugin { "X#X", "#Y#", "X#X", - '#', Blocks.glass, + '#', "blockGlass", 'X', "gearCopper", 'Y', ForestryItem.sturdyCasing))); @@ -172,7 +172,7 @@ public class PluginFactory extends ForestryPlugin { "X#X", "XYX", "X#X", - '#', Blocks.glass, + '#', "blockGlass", 'X', "ingotTin", 'Y', ForestryItem.sturdyCasing.getItemStack()))); @@ -182,8 +182,8 @@ public class PluginFactory extends ForestryPlugin { "X#X", "#Y#", "X#X", - '#', Blocks.glass, - 'X', Items.redstone, + '#', "blockGlass", + 'X', "dustRedstone", 'Y', ForestryItem.sturdyCasing))); definitionRainmaker = factoryTESR.addDefinition(new MachineDefinition(Defaults.DEFINITION_RAINMAKER_META, "forestry.Rainmaker", MillRainmaker.class, @@ -192,7 +192,7 @@ public class PluginFactory extends ForestryPlugin { "X#X", "#Y#", "X#X", - '#', Blocks.glass, + '#', "blockGlass", 'X', "gearTin", 'Y', ForestryItem.hardenedCasing))); @@ -206,8 +206,8 @@ public class PluginFactory extends ForestryPlugin { "X#X", "#Y#", "XZX", - '#', Blocks.glass, - 'X', Items.gold_ingot, + '#', "blockGlass", + 'X', "ingotGold", 'Y', ForestryItem.sturdyCasing, 'Z', Blocks.chest)) .setFaces(0, 1, 2, 3, 4, 4)); @@ -217,8 +217,8 @@ public class PluginFactory extends ForestryPlugin { "X#X", "XYX", "X#X", - '#', Blocks.glass, - 'X', Items.iron_ingot, + '#', "blockGlass", + 'X', "ingotIron", 'Y', ForestryItem.sturdyCasing)) .setFaces(0, 1, 0, 0, 0, 0)); @@ -280,27 +280,27 @@ public class PluginFactory extends ForestryPlugin { // / FABRICATOR RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.getFluid(500), ForestryItem.tubes.getItemStack(4, 0), new Object[]{ - " X ", "#X#", "XXX", '#', Items.redstone, 'X', "ingotCopper"}); + " X ", "#X#", "XXX", '#', "dustRedstone", 'X', "ingotCopper"}); RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.getFluid(500), ForestryItem.tubes.getItemStack(4, 1), new Object[]{ - " X ", "#X#", "XXX", '#', Items.redstone, 'X', "ingotTin"}); + " X ", "#X#", "XXX", '#', "dustRedstone", 'X', "ingotTin"}); RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.getFluid(500), ForestryItem.tubes.getItemStack(4, 2), new Object[]{ - " X ", "#X#", "XXX", '#', Items.redstone, 'X', "ingotBronze"}); + " X ", "#X#", "XXX", '#', "dustRedstone", 'X', "ingotBronze"}); RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.getFluid(500), ForestryItem.tubes.getItemStack(4, 3), new Object[]{ - " X ", "#X#", "XXX", '#', Items.redstone, 'X', Items.iron_ingot}); + " X ", "#X#", "XXX", '#', "dustRedstone", 'X', "ingotIron"}); RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.getFluid(500), ForestryItem.tubes.getItemStack(4, 4), new Object[]{ - " X ", "#X#", "XXX", '#', Items.redstone, 'X', Items.gold_ingot}); + " X ", "#X#", "XXX", '#', "dustRedstone", 'X', Items.gold_ingot}); RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.getFluid(500), ForestryItem.tubes.getItemStack(4, 5), new Object[]{ - " X ", "#X#", "XXX", '#', Items.redstone, 'X', Items.diamond}); + " X ", "#X#", "XXX", '#', "dustRedstone", 'X', "gemDiamond"}); RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.getFluid(500), ForestryItem.tubes.getItemStack(4, 6), new Object[]{ - " X ", "#X#", "XXX", '#', Items.redstone, 'X', Blocks.obsidian}); + " X ", "#X#", "XXX", '#', "dustRedstone", 'X', Blocks.obsidian}); RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.getFluid(500), ForestryItem.tubes.getItemStack(4, 7), new Object[]{ - " X ", "#X#", "XXX", '#', Items.redstone, 'X', Items.blaze_powder}); + " X ", "#X#", "XXX", '#', "dustRedstone", 'X', Items.blaze_powder}); RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.getFluid(500), ForestryItem.tubes.getItemStack(4, 9), new Object[]{ - " X ", "#X#", "XXX", '#', Items.redstone, 'X', Items.emerald}); + " X ", "#X#", "XXX", '#', "dustRedstone", 'X', "gemEmerald"}); RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.getFluid(500), ForestryItem.tubes.getItemStack(4, 10), - new Object[]{" X ", "#X#", "XXX", '#', Items.redstone, 'X', "gemApatite"}); + new Object[]{" X ", "#X#", "XXX", '#', "dustRedstone", 'X', "gemApatite"}); RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.getFluid(500), ForestryItem.tubes.getItemStack(4, 11), - new Object[]{" X ", "#X#", "XXX", '#', Items.redstone, 'X', new ItemStack(Items.dye, 1, 4)}); + new Object[]{" X ", "#X#", "XXX", '#', "dustRedstone", 'X', new ItemStack(Items.dye, 1, 4)}); RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.getFluid(500), ForestryItem.tubes.getItemStack(4, 12), new Object[]{" X ", "#X#", "XXX", '#', new ItemStack(Items.ender_eye, 1, 0), 'X', new ItemStack(Blocks.end_stone, 1, 0)}); @@ -399,26 +399,26 @@ public class PluginFactory extends ForestryPlugin { "#X#", "XYX", "#X#", '#', Blocks.dirt, - 'X', Blocks.sand, + 'X', "sand", 'Y', ForestryItem.mulch); RecipeManagers.carpenterManager.addRecipe(75, Fluids.WATER.getFluid(5000), null, ForestryItem.hardenedCasing.getItemStack(), "# #", " Y ", "# #", - '#', Items.diamond, + '#', "gemDiamond", 'Y', ForestryItem.sturdyCasing); // / CHIPSETS RecipeManagers.carpenterManager.addRecipe(20, Fluids.WATER.getFluid(1000), null, ForestryItem.circuitboards.getItemStack(1, 0), - "R R", "R#R", "R R", '#', "ingotTin", 'R', Items.redstone); + "R R", "R#R", "R R", '#', "ingotTin", 'R', "dustRedstone"); RecipeManagers.carpenterManager.addRecipe(40, Fluids.WATER.getFluid(1000), null, ForestryItem.circuitboards.getItemStack(1, 1), - "R#R", "R#R", "R#R", '#', "ingotBronze", 'R', Items.redstone); + "R#R", "R#R", "R#R", '#', "ingotBronze", 'R', "dustRedstone"); RecipeManagers.carpenterManager.addRecipe(80, Fluids.WATER.getFluid(1000), null, ForestryItem.circuitboards.getItemStack(1, 2), - "R#R", "R#R", "R#R", '#', Items.iron_ingot, 'R', Items.redstone); + "R#R", "R#R", "R#R", '#', "ingotIron", 'R', "dustRedstone"); RecipeManagers.carpenterManager.addRecipe(80, Fluids.WATER.getFluid(1000), null, ForestryItem.circuitboards.getItemStack(1, 3), - "R#R", "R#R", "R#R", '#', Items.gold_ingot, 'R', Items.redstone); + "R#R", "R#R", "R#R", '#', "ingotGold", 'R', "dustRedstone"); RecipeManagers.carpenterManager.addRecipe(40, Fluids.WATER.getFluid(1000), null, ForestryItem.solderingIron.getItemStack(), - " # ", "# #", " B", '#', Items.iron_ingot, 'B', "ingotBronze"); + " # ", "# #", " B", '#', "ingotIron", 'B', "ingotBronze"); // ForestryCore.oreHandler.registerCarpenterRecipe(solderingIron); // RAIN SUBSTRATES diff --git a/src/main/java/forestry/plugins/PluginFarming.java b/src/main/java/forestry/plugins/PluginFarming.java index 5a1c49957..848abc618 100644 --- a/src/main/java/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/plugins/PluginFarming.java @@ -305,10 +305,10 @@ public class PluginFarming extends ForestryPlugin { ShapedRecipeCustom.buildRecipe(hatch, " # ", "TDT", '#', basic, 'T', "gearTin", 'D', Blocks.trapdoor).setPreserveNBT(); ItemStack valve = ForestryBlock.farm.getItemStack(1, 4); - ShapedRecipeCustom.buildRecipe(valve, " # ", "XTX", '#', basic, 'T', "gearTin", 'X', Blocks.glass).setPreserveNBT(); + ShapedRecipeCustom.buildRecipe(valve, " # ", "XTX", '#', basic, 'T', "gearTin", 'X', "blockGlass").setPreserveNBT(); ItemStack control = ForestryBlock.farm.getItemStack(1, 5); - ShapedRecipeCustom.buildRecipe(control, " # ", "XTX", '#', basic, 'T', ForestryItem.tubes.getItemStack(1, 4), 'X', Items.redstone).setPreserveNBT(); + ShapedRecipeCustom.buildRecipe(control, " # ", "XTX", '#', basic, 'T', ForestryItem.tubes.getItemStack(1, 4), 'X', "dustRedstone").setPreserveNBT(); // Circuits ICircuitLayout layoutManaged = ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed"); diff --git a/src/main/java/forestry/plugins/PluginFood.java b/src/main/java/forestry/plugins/PluginFood.java index b51c7bda8..f3c7675fa 100755 --- a/src/main/java/forestry/plugins/PluginFood.java +++ b/src/main/java/forestry/plugins/PluginFood.java @@ -76,7 +76,7 @@ public class PluginFood extends ForestryPlugin { // INFUSER Proxies.common.addRecipe(ForestryItem.infuser.getItemStack(), "X", "#", "X", - '#', Items.iron_ingot, + '#', "ingotIron", 'X', "ingotBronze"); } diff --git a/src/main/java/forestry/plugins/PluginIC2.java b/src/main/java/forestry/plugins/PluginIC2.java index 4f05ea7a4..c5ac63b8a 100644 --- a/src/main/java/forestry/plugins/PluginIC2.java +++ b/src/main/java/forestry/plugins/PluginIC2.java @@ -127,7 +127,7 @@ public class PluginIC2 extends ForestryPlugin { " X ", "YVY", '#', "ingotTin", - 'X', Blocks.glass, + 'X', "blockGlass", 'Y', "gearTin", 'V', Blocks.piston))); @@ -137,8 +137,8 @@ public class PluginIC2 extends ForestryPlugin { "X#X", "XYX", "X#X", - '#', Blocks.glass, - 'X', Items.gold_ingot, + '#', "blockGlass", + 'X', "ingotGold", 'Y', ForestryItem.sturdyCasing))); emptyCell = IC2Items.getItem("cell"); @@ -257,7 +257,7 @@ public class PluginIC2 extends ForestryPlugin { if (rubber != null) { for (Object rubberOreDict : RecipeUtil.getOreDictRecipeEquivalents(rubber)) { RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.getFluid(500), ForestryItem.tubes.getItemStack(4, 8), - new Object[]{" X ", "#X#", "XXX", '#', Items.redstone, 'X', rubberOreDict}); + new Object[]{" X ", "#X#", "XXX", '#', "dustRedstone", 'X', rubberOreDict}); } } @@ -304,7 +304,7 @@ public class PluginIC2 extends ForestryPlugin { ItemStack bogEarthCan = GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"); if (bogEarthCan.stackSize > 0) { - Proxies.common.addRecipe(bogEarthCan, "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', waterCell, 'Y', Blocks.sand); + Proxies.common.addRecipe(bogEarthCan, "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', waterCell, 'Y', "sand"); } } diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java index 7257ec66b..79306274d 100755 --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -131,7 +131,7 @@ public class PluginLepidopterology extends ForestryPlugin { " # ", "XYX", "XXX", - '#', Blocks.glass, + '#', "blockGlass", 'X', ForestryItem.butterflyGE.getItemStack(1, Defaults.WILDCARD), 'Y', Blocks.chest)) .setFaces(0, 1, 2, 3, 4, 4, 0, 7))); @@ -182,8 +182,8 @@ public class PluginLepidopterology extends ForestryPlugin { CraftingManager.getInstance().getRecipeList().add(new MatingRecipe()); RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.getFluid(2000), null, ForestryItem.flutterlyzer.getItemStack(), - "X#X", "X#X", "RDR", '#', Blocks.glass_pane, 'X', "ingotBronze", 'R', - Items.redstone, 'D', Items.diamond); + "X#X", "X#X", "RDR", '#', "paneGlass", 'X', "ingotBronze", 'R', + "dustRedstone", 'D', "gemDiamond"); } private static void createAlleles() {