From 009df6aa0e600d5a555331b92cc620621ef78696 Mon Sep 17 00:00:00 2001 From: Amnet Date: Sat, 15 Feb 2014 22:16:50 +0100 Subject: [PATCH] Fix for slabs. --- .../common/blocks/BlockBOPSlab.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java index 0240a3d2e..59e2de268 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java @@ -93,9 +93,9 @@ public class BlockBOPSlab extends BlockSlab public IIcon getIcon(int side, int meta) { if (category == SlabCategory.STONE) - return textures[getTypeFromMeta(meta)]; + return textures[getRockType(meta)]; else - return textures[(getTypeFromMeta(meta) + category.ordinal() * 8)]; + return textures[getWoodType(meta)]; } @Override @@ -123,7 +123,7 @@ public class BlockBOPSlab extends BlockSlab public String func_150002_b(int meta) { if (category == SlabCategory.STONE) - return (new StringBuilder()).append(rockTypes[getTypeFromMeta(meta)]).append("Slab").toString(); + return (new StringBuilder()).append(rockTypes[getRockType(meta)]).append("Slab").toString(); else return (new StringBuilder()).append(woodTypes[getWoodType(meta)]).append("Slab").toString(); } @@ -242,13 +242,18 @@ public class BlockBOPSlab extends BlockSlab return 0; } + + private int getRockType(int meta) + { + meta = getTypeFromMeta(meta); + if (meta < rockTypes.length) + return meta; + + return 0; + } private static int getTypeFromMeta(int meta) { - meta = meta & 7; - if (meta < rockTypes.length) - meta = 0; - - return meta; + return meta & 7; } }