From ff9942d0bc6a6f5e57d2b251301a1b1c04382b2c Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 8 Oct 2016 20:05:35 -0700 Subject: [PATCH] Fix "upper half" wood slabs having the wrong wood type --- .../forestry/arboriculture/blocks/slab/BlockArbSlab.java | 1 + .../blocks/slab/BlockFireproofVanillaSlab.java | 1 + .../arboriculture/blocks/slab/BlockForestrySlab.java | 8 +++++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/arboriculture/blocks/slab/BlockArbSlab.java b/src/main/java/forestry/arboriculture/blocks/slab/BlockArbSlab.java index be6b690c6..0cbfe77f5 100644 --- a/src/main/java/forestry/arboriculture/blocks/slab/BlockArbSlab.java +++ b/src/main/java/forestry/arboriculture/blocks/slab/BlockArbSlab.java @@ -50,6 +50,7 @@ public abstract class BlockArbSlab extends BlockForestrySlab & IWoodType> extends B return blockNumber; } + @Nonnull @Override protected BlockStateContainer createBlockState() { return this.isDouble() ? new BlockStateContainer(this, getVariant()) : new BlockStateContainer(this, HALF, getVariant()); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { T woodType = getWoodType(meta); @@ -99,8 +101,7 @@ public abstract class BlockForestrySlab & IWoodType> extends B @Override public int getMetaFromState(IBlockState state) { - T woodType = state.getValue(getVariant()); - int meta = woodType.getMetadata() - blockNumber * VARIANTS_PER_BLOCK; + int meta = damageDropped(state); if (!this.isDouble() && state.getValue(HALF) == BlockSlab.EnumBlockHalf.TOP) { meta |= 8; @@ -111,7 +112,8 @@ public abstract class BlockForestrySlab & IWoodType> extends B @Override public int damageDropped(IBlockState state) { - return state.getValue(getVariant()).getMetadata() - blockNumber * VARIANTS_PER_BLOCK; + T woodType = state.getValue(getVariant()); + return woodType.getMetadata() - blockNumber * VARIANTS_PER_BLOCK; } @Override