diff --git a/src/main/java/forestry/arboriculture/WoodAccess.java b/src/main/java/forestry/arboriculture/WoodAccess.java index 7abfd6f8b..f80cf1346 100644 --- a/src/main/java/forestry/arboriculture/WoodAccess.java +++ b/src/main/java/forestry/arboriculture/WoodAccess.java @@ -27,6 +27,7 @@ import forestry.arboriculture.blocks.BlockArbLog; import forestry.arboriculture.blocks.BlockArbPlanks; import forestry.arboriculture.blocks.BlockArbSlab; import forestry.arboriculture.blocks.BlockArbStairs; +import forestry.arboriculture.blocks.property.PropertyWoodType; import forestry.core.utils.Log; public class WoodAccess implements IWoodAccess { @@ -84,51 +85,52 @@ public class WoodAccess implements IWoodAccess { public static void registerLogs(List blocks) { for (BlockArbLog block : blocks) { - register(block, logs); + registerWithVariants(block, logs, block.getVariant()); } } public static void registerPlanks(List blocks) { for (BlockArbPlanks block : blocks) { - register(block, planks); + registerWithVariants(block, planks, block.getVariant()); } } public static void registerSlabs(List blocks) { for (BlockArbSlab block : blocks) { - register(block, slabs); + registerWithVariants(block, slabs, block.getVariant()); } } public static void registerFences(List blocks) { for (BlockArbFence block : blocks) { - register(block, fences); + registerWithVariants(block, fences, block.getVariant()); } } public static void registerFenceGates(List blocks) { for (BlockArbFenceGate block : blocks) { - register(block, fenceGates); + registerWithoutVariants(block, fenceGates); } } public static void registerStairs(List blocks) { for (BlockArbStairs block : blocks) { - register(block, stairs); + registerWithoutVariants(block, stairs); } } public static void registerDoors(List blocks) { for (BlockArbDoor block : blocks) { - register(block, doors); + registerWithoutVariants(block, doors); } } - private static void register(T woodTyped, WoodMap woodMap) { + private static void registerWithVariants(T woodTyped, WoodMap woodMap, PropertyWoodType property) { boolean fireproof = woodTyped.isFireproof(); EnumMap itemRegistryMap = woodMap.getItem(fireproof); EnumMap blockRegistryMap = woodMap.getBlock(fireproof); - for (IBlockState blockState : woodTyped.getBlockState().getValidStates()) { + for (EnumWoodType value : property.getAllowedValues()) { + IBlockState blockState = woodTyped.getDefaultState().withProperty(property, value); int meta = woodTyped.getMetaFromState(blockState); EnumWoodType woodType = woodTyped.getWoodType(meta); ItemStack itemStack = new ItemStack(woodTyped, 1, meta); @@ -138,6 +140,22 @@ public class WoodAccess implements IWoodAccess { } } + /** + * Register wood blocks that have no variant property + */ + private static , V extends P> void registerWithoutVariants(T woodTyped, WoodMap woodMap) { + boolean fireproof = woodTyped.isFireproof(); + EnumMap itemRegistryMap = woodMap.getItem(fireproof); + EnumMap blockRegistryMap = woodMap.getBlock(fireproof); + + IBlockState blockState = woodTyped.getDefaultState(); + EnumWoodType woodType = woodTyped.getWoodType(0); + ItemStack itemStack = new ItemStack(woodTyped); + + itemRegistryMap.put(woodType, itemStack); + blockRegistryMap.put(woodType, blockState); + } + @Override public ItemStack getPlanks(EnumWoodType woodType, boolean fireproof) { return getItem(woodType, fireproof, planks); diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java index f3d96c039..ca7ebe510 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java @@ -61,7 +61,7 @@ public abstract class BlockArbFence extends BlockFence implements IWoodTyped, II BlockArbFence block = new BlockArbFence(fireproof, blockNumber) { @Nonnull @Override - protected PropertyWoodType getVariant() { + public PropertyWoodType getVariant() { return variant; } }; @@ -95,7 +95,7 @@ public abstract class BlockArbFence extends BlockFence implements IWoodTyped, II } @Nonnull - protected abstract PropertyWoodType getVariant(); + public abstract PropertyWoodType getVariant(); @Override public boolean isFireproof() { diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbLog.java b/src/main/java/forestry/arboriculture/blocks/BlockArbLog.java index 56094895a..249a69cd6 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbLog.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbLog.java @@ -53,7 +53,7 @@ public abstract class BlockArbLog extends BlockLog implements IWoodTyped, IState BlockArbLog log = new BlockArbLog(fireproof, blockNumber) { @Nonnull @Override - protected PropertyWoodType getVariant() { + public PropertyWoodType getVariant() { return variant; } }; @@ -70,7 +70,7 @@ public abstract class BlockArbLog extends BlockLog implements IWoodTyped, IState this.blockNumber = blockNumber; PropertyWoodType variant = getVariant(); - setDefaultState(this.blockState.getBaseState().withProperty(variant, variant.getFirstType()).withProperty(LOG_AXIS, EnumAxis.NONE)); + setDefaultState(this.blockState.getBaseState().withProperty(variant, variant.getFirstType()).withProperty(LOG_AXIS, EnumAxis.Y)); setHarvestLevel("axe", 0); setCreativeTab(Tabs.tabArboriculture); @@ -88,7 +88,7 @@ public abstract class BlockArbLog extends BlockLog implements IWoodTyped, IState } @Nonnull - protected abstract PropertyWoodType getVariant(); + public abstract PropertyWoodType getVariant(); public int getBlockNumber() { return blockNumber; diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbPlanks.java b/src/main/java/forestry/arboriculture/blocks/BlockArbPlanks.java index 451a4a52d..5ba485e79 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbPlanks.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbPlanks.java @@ -53,7 +53,7 @@ public abstract class BlockArbPlanks extends Block implements IWoodTyped, IState BlockArbPlanks block = new BlockArbPlanks(fireproof, blockNumber) { @Nonnull @Override - protected PropertyWoodType getVariant() { + public PropertyWoodType getVariant() { return variant; } }; @@ -83,7 +83,7 @@ public abstract class BlockArbPlanks extends Block implements IWoodTyped, IState } @Nonnull - protected abstract PropertyWoodType getVariant(); + public abstract PropertyWoodType getVariant(); public int getBlockNumber() { return blockNumber; diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbSlab.java b/src/main/java/forestry/arboriculture/blocks/BlockArbSlab.java index 9146a59a7..6aa603df6 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbSlab.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbSlab.java @@ -57,7 +57,7 @@ public abstract class BlockArbSlab extends BlockSlab implements IWoodTyped, IIte BlockArbSlab block = new BlockArbSlab(fireproof, blockNumber) { @Nonnull @Override - protected PropertyWoodType getVariant() { + public PropertyWoodType getVariant() { return variant; } @@ -102,7 +102,7 @@ public abstract class BlockArbSlab extends BlockSlab implements IWoodTyped, IIte } @Nonnull - protected abstract PropertyWoodType getVariant(); + public abstract PropertyWoodType getVariant(); public int getBlockNumber() { return blockNumber; diff --git a/src/main/java/forestry/arboriculture/blocks/property/PropertyWoodType.java b/src/main/java/forestry/arboriculture/blocks/property/PropertyWoodType.java index 769abe86c..59822ecd8 100644 --- a/src/main/java/forestry/arboriculture/blocks/property/PropertyWoodType.java +++ b/src/main/java/forestry/arboriculture/blocks/property/PropertyWoodType.java @@ -40,4 +40,9 @@ public class PropertyWoodType extends PropertyEnum { public EnumWoodType getFirstType() { return getAllowedValues().iterator().next(); } + + @Override + public Collection getAllowedValues() { + return super.getAllowedValues(); + } }