From a5b79c97d26fc8ce563e1d67f25545d797c76e6d Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Fri, 7 Apr 2017 14:12:42 +0200 Subject: [PATCH] Improve greenhouse recipes --- src/main/java/forestry/core/PluginCore.java | 7 +++---- .../forestry/greenhouse/PluginGreenhouse.java | 20 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/forestry/core/PluginCore.java b/src/main/java/forestry/core/PluginCore.java index bfaa14361..ba1acd8d3 100644 --- a/src/main/java/forestry/core/PluginCore.java +++ b/src/main/java/forestry/core/PluginCore.java @@ -311,10 +311,9 @@ public class PluginCore extends BlankForestryPlugin { 'R', OreDictUtil.DUST_REDSTONE, 'D', OreDictUtil.GEM_DIAMOND); // Camouflaged Paneling - RecipeManagers.carpenterManager.addRecipe(50, Fluids.BIOMASS.getFluid(500), ItemStack.EMPTY, items.craftingMaterial.getCamouflagedPaneling(4), - "YAR", "B#B", "RPY", + RecipeManagers.carpenterManager.addRecipe(50, Fluids.BIOMASS.getFluid(500), ItemStack.EMPTY, items.craftingMaterial.getCamouflagedPaneling(8), + "Y#R", "BPB", "R#Y", '#', OreDictUtil.PLANK_WOOD, - 'A', OreDictUtil.DUST_ASH, 'R', OreDictUtil.DUST_REDSTONE, 'P', OreDictUtil.PULP_WOOD, 'R', OreDictUtil.DYE_RED, @@ -331,7 +330,7 @@ public class PluginCore extends BlankForestryPlugin { 'R', OreDictUtil.DUST_REDSTONE, 'D', OreDictUtil.GEM_DIAMOND); // Camouflaged Paneling - RecipeUtil.addRecipe(items.craftingMaterial.getCamouflagedPaneling(4), + RecipeUtil.addRecipe(items.craftingMaterial.getCamouflagedPaneling(8), "WWW", "YBR", "WWW", diff --git a/src/main/java/forestry/greenhouse/PluginGreenhouse.java b/src/main/java/forestry/greenhouse/PluginGreenhouse.java index 8afeca2d4..36be6717f 100644 --- a/src/main/java/forestry/greenhouse/PluginGreenhouse.java +++ b/src/main/java/forestry/greenhouse/PluginGreenhouse.java @@ -103,19 +103,21 @@ public class PluginGreenhouse extends BlankForestryPlugin { BlockRegistryGreenhouse blocks = getBlocks(); Block greenhousePlainBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN); - RecipeUtil.addRecipe(new ItemStack(greenhousePlainBlock, 4), - "###", + RecipeUtil.addRecipe(new ItemStack(greenhousePlainBlock, 2), "#X#", - "###", + "SIS", + 'I', OreDictUtil.INGOT_IRON, + 'S', OreDictUtil.SLAB_WOOD, 'X', Blocks.BRICK_BLOCK, '#', coreItems.craftingMaterial.getCamouflagedPaneling()); Block greenhouseGlassBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.GLASS); - RecipeUtil.addRecipe(new ItemStack(greenhouseGlassBlock, 4), - "###", + RecipeUtil.addRecipe(new ItemStack(greenhouseGlassBlock, 2), "#X#", - "###", - 'X', "blockGlass", + "PIP", + 'I', OreDictUtil.INGOT_IRON, + 'X', OreDictUtil.BLOCK_GLASS, + 'P', OreDictUtil.PANE_GLASS, '#', coreItems.craftingMaterial.getCamouflagedPaneling()); Block greenhouseHatchInputBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HATCH_INPUT); @@ -124,7 +126,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { "#H#", 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), 'H', OreDictUtil.TRAPDOOR_WOOD, - '#', "gearTin", + '#', OreDictUtil.GEAR_TIN, 'T', coreItems.tubes.get(EnumElectronTube.BRONZE, 1)); Block greenhouseHatchOutputBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HATCH_OUTPUT); @@ -133,7 +135,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { "TXT", 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), 'H', OreDictUtil.TRAPDOOR_WOOD, - '#', "gearTin", + '#', OreDictUtil.GEAR_TIN, 'T', coreItems.tubes.get(EnumElectronTube.BRONZE, 1)); Block greenhouseControlBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.CONTROL);