From 68651939e7664ed456ae643a89977fc88a17af96 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 7 Oct 2016 15:41:33 -0700 Subject: [PATCH] Fix crash when getting wood blocks with invalid variants --- .../forestry/arboriculture/blocks/BlockDecorativeLeaves.java | 4 ++-- .../forestry/arboriculture/blocks/fence/BlockArbFence.java | 3 ++- .../blocks/fence/BlockFireproofVanillaFence.java | 3 ++- .../arboriculture/blocks/fence/BlockForestryFence.java | 1 - .../java/forestry/arboriculture/blocks/log/BlockArbLog.java | 3 ++- .../arboriculture/blocks/log/BlockFireproofVanillaLog.java | 3 ++- .../forestry/arboriculture/blocks/log/BlockForestryLog.java | 1 - .../forestry/arboriculture/blocks/planks/BlockArbPlanks.java | 3 ++- .../blocks/planks/BlockFireproofVanillaPlanks.java | 3 ++- .../arboriculture/blocks/planks/BlockForestryPlanks.java | 1 - .../java/forestry/arboriculture/blocks/slab/BlockArbSlab.java | 3 ++- .../arboriculture/blocks/slab/BlockFireproofVanillaSlab.java | 3 ++- .../forestry/arboriculture/blocks/slab/BlockForestrySlab.java | 1 - 13 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/main/java/forestry/arboriculture/blocks/BlockDecorativeLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockDecorativeLeaves.java index b8b538f61..85776eb6a 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockDecorativeLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockDecorativeLeaves.java @@ -41,7 +41,6 @@ import forestry.core.proxy.Proxies; public abstract class BlockDecorativeLeaves extends Block implements IItemModelRegister, IColoredBlock, IShearable { private static final int VARIANTS_PER_BLOCK = 16; - private static final int VARIANTS_META_MASK = VARIANTS_PER_BLOCK - 1; public static List create() { List blocks = new ArrayList<>(); @@ -148,7 +147,8 @@ public abstract class BlockDecorativeLeaves extends Block implements IItemModelR @Nonnull public TreeDefinition getTreeType(int meta) { - int variantMeta = (meta & VARIANTS_META_MASK) + blockNumber * VARIANTS_PER_BLOCK; + int variantCount = getVariant().getAllowedValues().size(); + int variantMeta = (meta % variantCount) + blockNumber * VARIANTS_PER_BLOCK; return TreeDefinition.byMetadata(variantMeta); } diff --git a/src/main/java/forestry/arboriculture/blocks/fence/BlockArbFence.java b/src/main/java/forestry/arboriculture/blocks/fence/BlockArbFence.java index d570773fd..edf48d83f 100644 --- a/src/main/java/forestry/arboriculture/blocks/fence/BlockArbFence.java +++ b/src/main/java/forestry/arboriculture/blocks/fence/BlockArbFence.java @@ -46,7 +46,8 @@ public abstract class BlockArbFence extends BlockForestryFence & IWoodType> extends BlockFence implements IWoodTyped, IItemModelRegister, IStateMapperRegister { protected static final int VARIANTS_PER_BLOCK = 16; - protected static final int VARIANTS_META_MASK = VARIANTS_PER_BLOCK - 1; private final boolean fireproof; private final int blockNumber; diff --git a/src/main/java/forestry/arboriculture/blocks/log/BlockArbLog.java b/src/main/java/forestry/arboriculture/blocks/log/BlockArbLog.java index e42cbca2b..31916223e 100644 --- a/src/main/java/forestry/arboriculture/blocks/log/BlockArbLog.java +++ b/src/main/java/forestry/arboriculture/blocks/log/BlockArbLog.java @@ -42,7 +42,8 @@ public abstract class BlockArbLog extends BlockForestryLog @Nonnull @Override public EnumForestryWoodType getWoodType(int meta) { - int variantMeta = (meta & VARIANTS_META_MASK) + getBlockNumber() * VARIANTS_PER_BLOCK; + int variantCount = getVariant().getAllowedValues().size(); + int variantMeta = (meta % variantCount) + getBlockNumber() * VARIANTS_PER_BLOCK; return EnumForestryWoodType.byMetadata(variantMeta); } } diff --git a/src/main/java/forestry/arboriculture/blocks/log/BlockFireproofVanillaLog.java b/src/main/java/forestry/arboriculture/blocks/log/BlockFireproofVanillaLog.java index 8e6b2b522..b43ab7f81 100644 --- a/src/main/java/forestry/arboriculture/blocks/log/BlockFireproofVanillaLog.java +++ b/src/main/java/forestry/arboriculture/blocks/log/BlockFireproofVanillaLog.java @@ -42,7 +42,8 @@ public abstract class BlockFireproofVanillaLog extends BlockForestryLog & IWoodType> extends BlockLog implements IWoodTyped, IStateMapperRegister, IItemModelRegister { protected static final int VARIANTS_PER_BLOCK = 4; - protected static final int VARIANTS_META_MASK = VARIANTS_PER_BLOCK - 1; private final boolean fireproof; private final int blockNumber; diff --git a/src/main/java/forestry/arboriculture/blocks/planks/BlockArbPlanks.java b/src/main/java/forestry/arboriculture/blocks/planks/BlockArbPlanks.java index ce53017fc..a5f880e34 100644 --- a/src/main/java/forestry/arboriculture/blocks/planks/BlockArbPlanks.java +++ b/src/main/java/forestry/arboriculture/blocks/planks/BlockArbPlanks.java @@ -42,7 +42,8 @@ public abstract class BlockArbPlanks extends BlockForestryPlanks & IWoodType> extends Block implements IWoodTyped, IStateMapperRegister, IItemModelRegister { protected static final int VARIANTS_PER_BLOCK = 16; - protected static final int VARIANTS_META_MASK = VARIANTS_PER_BLOCK - 1; private final boolean fireproof; private final int blockNumber; diff --git a/src/main/java/forestry/arboriculture/blocks/slab/BlockArbSlab.java b/src/main/java/forestry/arboriculture/blocks/slab/BlockArbSlab.java index c8e0cc0e2..be6b690c6 100644 --- a/src/main/java/forestry/arboriculture/blocks/slab/BlockArbSlab.java +++ b/src/main/java/forestry/arboriculture/blocks/slab/BlockArbSlab.java @@ -50,7 +50,8 @@ public abstract class BlockArbSlab extends BlockForestrySlab & IWoodType> extends BlockSlab implements IWoodTyped, IItemModelRegister, IStateMapperRegister { protected static final int VARIANTS_PER_BLOCK = 8; - protected static final int VARIANTS_META_MASK = VARIANTS_PER_BLOCK - 1; private final boolean fireproof; private final int blockNumber;