Fix crash when getting wood blocks with invalid variants

This commit is contained in:
mezz committed 2016-10-07 15:42:20 -07:00
1 parent 9dcc818a17
commit 68651939e7
13 files changed
+18 -14

No files matched your search

@@ -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<BlockDecorativeLeaves> create() {
List<BlockDecorativeLeaves> 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);
}
@@ -46,7 +46,8 @@ public abstract class BlockArbFence extends BlockForestryFence<EnumForestryWoodT
@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);
}
}
@@ -33,7 +33,8 @@ public abstract class BlockFireproofVanillaFence extends BlockForestryFence<Enum
@Nonnull
@Override
public EnumVanillaWoodType 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 EnumVanillaWoodType.byMetadata(variantMeta);
}
}
@@ -42,7 +42,6 @@ import forestry.core.proxy.Proxies;
public abstract class BlockForestryFence<T extends Enum<T> & 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;
@@ -42,7 +42,8 @@ public abstract class BlockArbLog extends BlockForestryLog<EnumForestryWoodType>
@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);
}
}
@@ -42,7 +42,8 @@ public abstract class BlockFireproofVanillaLog extends BlockForestryLog<EnumVani
@Nonnull
@Override
public EnumVanillaWoodType 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 EnumVanillaWoodType.byMetadata(variantMeta);
}
}
@@ -35,7 +35,6 @@ import forestry.core.proxy.Proxies;
public abstract class BlockForestryLog<T extends Enum<T> & 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;
@@ -42,7 +42,8 @@ public abstract class BlockArbPlanks extends BlockForestryPlanks<EnumForestryWoo
@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);
}
}
@@ -32,7 +32,8 @@ public abstract class BlockFireproofVanillaPlanks extends BlockForestryPlanks<En
@Nonnull
@Override
public EnumVanillaWoodType 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 EnumVanillaWoodType.byMetadata(variantMeta);
}
}
@@ -37,7 +37,6 @@ import forestry.core.proxy.Proxies;
public abstract class BlockForestryPlanks<T extends Enum<T> & 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;
@@ -50,7 +50,8 @@ public abstract class BlockArbSlab extends BlockForestrySlab<EnumForestryWoodTyp
@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);
}
}
@@ -50,7 +50,8 @@ public abstract class BlockFireproofVanillaSlab extends BlockForestrySlab<EnumVa
@Nonnull
@Override
public EnumVanillaWoodType 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 EnumVanillaWoodType.byMetadata(variantMeta);
}
}
@@ -38,7 +38,6 @@ import forestry.core.proxy.Proxies;
public abstract class BlockForestrySlab<T extends Enum<T> & 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;