diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index c8a2b9ae..ff622be8 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -351,8 +351,8 @@ public class ChiselBlocks { blockSandstone = (BlockCarvable) new BlockCarvable().setStepSound(Block.soundTypeStone).setHardness(0.8F); Carving.chisel.addVariation("sandstone", Blocks.sandstone, 0, 0); - blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.1.desc"), 1, Blocks.sandstone, 1); - blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.2.desc"), 2, Blocks.sandstone, 2); + Carving.chisel.addVariation("sandstone", Blocks.sandstone, 1, 1); + Carving.chisel.addVariation("sandstone", Blocks.sandstone, 2, 2); blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.3.desc"), 3, "sandstone/faded"); blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.4.desc"), 4, "sandstone/column"); blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.5.desc"), 5, "sandstone/capstone"); diff --git a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java index aca213c4..de5af0d2 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java @@ -34,12 +34,19 @@ public class Crafting GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockIcePillar, 6, 1), new Object[]{"XX", "XX", "XX", 'X', new ItemStack(ChiselBlocks.blockIce, 1, meta),}); GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockIce, 4, 1), new Object[]{"XX", "XX", 'X', new ItemStack(ChiselBlocks.blockIcePillar, 1, meta),}); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockSandstone, 1, 1), new Object[]{"X", 'X', new ItemStack(ChiselBlocks.blockSandstoneScribbles, 1, meta),}); + GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[]{"X", 'X', new ItemStack(ChiselBlocks.blockSandstoneScribbles, 1, meta),}); GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockCarpet, 8, meta), new Object[]{"YYY", "YXY", "YYY", 'X', new ItemStack(Items.string, 1), 'Y', new ItemStack(Blocks.wool, 1, meta),}); GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockCarpetFloor, 3, meta), new Object[]{"XX", 'X', new ItemStack(ChiselBlocks.blockCarpet, 1, meta),}); } + // The following recipe is due to bugs with Chisel 1.5.1 to 1.5.6a + GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 0), new Object[]{"X", 'X', new ItemStack(ChiselBlocks.blockSandstone, 1, 0),}); + + // The following recipe is due to bug with Chisel 1.5.6b + GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[]{"X", 'X', new ItemStack(ChiselBlocks.blockSandstone, 1, 1),}); + + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockHolystone, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.feather, 1)}); GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockLavastone, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.lava_bucket, 1)}); GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockFft, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.gold_nugget, 1)}); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 220ffece..e4bb1e79 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -298,8 +298,6 @@ chisel.tile.glass.15.desc=Modern Iron Fence #Sandstone chisel.tile.sandstone.name=Sandstone -chisel.tile.sandstone.1.desc=Chiseled Sandstone -chisel.tile.sandstone.2.desc=Smooth Sandstone chisel.tile.sandstone.3.desc=Faded Sandstone chisel.tile.sandstone.4.desc=Sandstone Pillar chisel.tile.sandstone.5.desc=Sandstone Pillar Capstone diff --git a/src/main/resources/assets/chisel/lang/ru_RU.lang b/src/main/resources/assets/chisel/lang/ru_RU.lang index 72598d89..496c1fbe 100644 --- a/src/main/resources/assets/chisel/lang/ru_RU.lang +++ b/src/main/resources/assets/chisel/lang/ru_RU.lang @@ -298,8 +298,6 @@ chisel.tile.glass.15.desc=Современный железный забор #Sandstone chisel.tile.sandstone.name=Песчаник -chisel.tile.sandstone.1.desc=Резной песчаник -chisel.tile.sandstone.2.desc=Гладкий песчаник chisel.tile.sandstone.3.desc=Блеклый песчаник chisel.tile.sandstone.4.desc=Песчаная колонна chisel.tile.sandstone.5.desc=Капитель песчаной колонны diff --git a/src/main/resources/assets/chisel/lang/zh_CN.lang b/src/main/resources/assets/chisel/lang/zh_CN.lang index 9dc985bb..3db6fc56 100644 --- a/src/main/resources/assets/chisel/lang/zh_CN.lang +++ b/src/main/resources/assets/chisel/lang/zh_CN.lang @@ -298,8 +298,6 @@ chisel.tile.glass.15.desc=现代式铁栅栏 #Sandstone chisel.tile.sandstone.name=沙石 -chisel.tile.sandstone.1.desc=錾制沙石 -chisel.tile.sandstone.2.desc=光滑沙石 chisel.tile.sandstone.3.desc=褪色沙石 chisel.tile.sandstone.4.desc=沙石柱 chisel.tile.sandstone.5.desc=沙石柱顶石