From e058360427d527ffae8423b97e1b67b9a6c6a08a Mon Sep 17 00:00:00 2001 From: EoD Date: Thu, 11 Sep 2014 18:37:08 +0200 Subject: [PATCH 1/3] Fixes Pokefenn/Chisel#39 The duplicate blocks from chisel should be removed in a future commit. --- src/main/java/info/jbcs/minecraft/chisel/Crafting.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java index aca213c4..f3ff32f7 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java @@ -34,7 +34,7 @@ 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),}); From 385ed88d91f655b05c489a05bc5b1e413f0cf76a Mon Sep 17 00:00:00 2001 From: EoD Date: Sun, 14 Sep 2014 19:49:24 +0200 Subject: [PATCH 2/3] add compatbility recipes for wrong sandstone block --- src/main/java/info/jbcs/minecraft/chisel/Crafting.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java index f3ff32f7..de5af0d2 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java @@ -40,6 +40,13 @@ public class Crafting 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)}); From 164d24fa746175cc17306b72b21719f5fc395729 Mon Sep 17 00:00:00 2001 From: EoD Date: Sun, 14 Sep 2014 19:52:20 +0200 Subject: [PATCH 3/3] remove duplicate sandstone blocks followup of 1d11c221621a36d0855b63b7549076a4c6b61474 --- src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java | 4 ++-- src/main/resources/assets/chisel/lang/en_US.lang | 2 -- src/main/resources/assets/chisel/lang/ru_RU.lang | 2 -- src/main/resources/assets/chisel/lang/zh_CN.lang | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index fc2b8566..1202937f 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/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 46468d16..eefd2cb9 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 b5911723..edfc89e3 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=沙石柱顶石