From 4152cbfd4390fc4cf5501284703da52707c9bd6a Mon Sep 17 00:00:00 2001 From: Fenn Date: Fri, 8 Aug 2014 17:18:09 +0100 Subject: [PATCH] Fixed the stained glass carving issues. --- .../java/info/jbcs/minecraft/chisel/ChiselBlocks.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index e2096a28..292bf8cc 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -1139,17 +1139,17 @@ public class ChiselBlocks if(Configurations.featureEnabled("glassStained")) for(int i = 0; i < 16; i++) { - String nameWithoutSpace = sGNames[i].replaceAll(" ", ""); - String blockName = "chisel.stainedGlass" + nameWithoutSpace; - String oreName = "stainedGlass" + nameWithoutSpace; + String blockName = "chisel.stainedGlass" + sGNames[i].replaceAll(" ", ""); + String oreName = "stainedGlass" + sGNames[i].replaceAll(" ", ""); String texName = "glassdyed/" + sGNames[i].toLowerCase().replaceAll(" ", "") + "-"; int glassPrefix = (i & 3) << 2; int glassId = i >> 2; + Carving.chisel.addVariation(blockName, Blocks.stained_glass, i, 0); if(glassPrefix == 0) { blockStainedGlass[glassId] = (BlockCarvableGlass) new BlockCarvableGlass().setStained(true).setHardness(0.3F).setStepSound(Block.soundTypeGlass).setBlockName("Stained Glass"); blockStainedGlass[glassId].carverHelper.registerBlock(blockStainedGlass[glassId], blockName); - blockStainedGlass[glassId].carverHelper.blockName = "Stained Glass"; + //blockStainedGlass[glassId].carverHelper.blockName = "Stained Glass"; } blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " bubble glass", glassPrefix, texName + "bubble"); blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " glass panel", glassPrefix + 1, texName + "panel"); @@ -1170,6 +1170,7 @@ public class ChiselBlocks String blockName = "chisel.stainedGlassPane" + sGNames[i].replaceAll(" ", ""); String oreName = "stainedGlassPane" + sGNames[i].replaceAll(" ", ""); String texName = "glasspanedyed/" + sGNames[i].toLowerCase().replaceAll(" ", "") + "-"; + Carving.chisel.addVariation(blockName, Blocks.stained_glass_pane, i, 0); int glassPrefix = (i & 1) << 3; int glassId = i >> 1; if(glassPrefix == 0)