From 69cf513e515d0340b088de69d3dd56dd92ee415b Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 24 May 2016 21:39:43 +0200 Subject: [PATCH] Fix #1237 All fireproof blocks work as fuel --- .../arboriculture/blocks/BlockArbDoor.java | 2 +- .../arboriculture/blocks/BlockArbFence.java | 2 +- .../arboriculture/blocks/BlockArbFenceGate.java | 6 ++++++ .../arboriculture/blocks/BlockArbLog.java | 6 ++++++ .../arboriculture/blocks/BlockArbPlanks.java | 2 +- .../arboriculture/blocks/BlockArbSlab.java | 2 +- .../arboriculture/blocks/BlockArbStairs.java | 6 ++++++ .../arboriculture/blocks/MaterialArbWood.java | 15 +++++++++++++++ 8 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 src/main/java/forestry/arboriculture/blocks/MaterialArbWood.java diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java b/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java index 106608541..21b24aeb2 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java @@ -40,7 +40,7 @@ public class BlockArbDoor extends BlockDoor implements IWoodTyped, IItemModelReg private final EnumWoodType woodType; public BlockArbDoor(EnumWoodType woodType) { - super(Material.WOOD); + super(MaterialArbWood.ARB_WOOD); this.woodType = woodType; setHarvestLevel("axe", 0); diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java index ca7ebe510..f29a791a4 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java @@ -74,7 +74,7 @@ public abstract class BlockArbFence extends BlockFence implements IWoodTyped, II private final int blockNumber; public BlockArbFence(boolean fireproof, int blockNumber) { - super(Material.WOOD, BlockPlanks.EnumType.OAK.getMapColor()); + super(MaterialArbWood.ARB_WOOD, BlockPlanks.EnumType.OAK.getMapColor()); this.fireproof = fireproof; this.blockNumber = blockNumber; diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbFenceGate.java b/src/main/java/forestry/arboriculture/blocks/BlockArbFenceGate.java index bc5ba0fcc..10348ab9b 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbFenceGate.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbFenceGate.java @@ -28,6 +28,7 @@ import forestry.arboriculture.WoodHelper.WoodMeshDefinition; import forestry.core.proxy.Proxies; import net.minecraft.block.BlockFenceGate; import net.minecraft.block.BlockPlanks.EnumType; +import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.block.SoundType; import net.minecraft.creativetab.CreativeTabs; @@ -56,6 +57,11 @@ public class BlockArbFenceGate extends BlockFenceGate implements IWoodTyped, IIt setCreativeTab(Tabs.tabArboriculture); } + @Override + public Material getMaterial(IBlockState state) { + return MaterialArbWood.ARB_WOOD; + } + @Override public boolean isFireproof() { return fireproof; diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbLog.java b/src/main/java/forestry/arboriculture/blocks/BlockArbLog.java index 323fe3fef..7af165aef 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbLog.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbLog.java @@ -16,6 +16,7 @@ import java.util.Collection; import java.util.List; import net.minecraft.block.BlockLog; +import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -93,6 +94,11 @@ public abstract class BlockArbLog extends BlockLog implements IWoodTyped, IState public int getBlockNumber() { return blockNumber; } + + @Override + public Material getMaterial(IBlockState state) { + return MaterialArbWood.ARB_WOOD; + } @Override public IBlockState getStateFromMeta(int meta) { diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbPlanks.java b/src/main/java/forestry/arboriculture/blocks/BlockArbPlanks.java index 2139485ca..a8c9fc65a 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbPlanks.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbPlanks.java @@ -67,7 +67,7 @@ public abstract class BlockArbPlanks extends Block implements IWoodTyped, IState private final int blockNumber; private BlockArbPlanks(boolean fireproof, int blockNumber) { - super(Material.WOOD); + super(MaterialArbWood.ARB_WOOD); this.fireproof = fireproof; this.blockNumber = blockNumber; diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbSlab.java b/src/main/java/forestry/arboriculture/blocks/BlockArbSlab.java index 6aa603df6..5aa8b4ac7 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbSlab.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbSlab.java @@ -75,7 +75,7 @@ public abstract class BlockArbSlab extends BlockSlab implements IWoodTyped, IIte private final int blockNumber; private BlockArbSlab(boolean fireproof, int blockNumber) { - super(Material.WOOD); + super(MaterialArbWood.ARB_WOOD); this.fireproof = fireproof; this.blockNumber = blockNumber; diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java b/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java index b2ed26126..01c5eab86 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.Collections; import net.minecraft.block.BlockStairs; +import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.util.math.BlockPos; @@ -45,6 +46,11 @@ public class BlockArbStairs extends BlockStairs implements IWoodTyped, IItemMode setCreativeTab(Tabs.tabArboriculture); setHarvestLevel("axe", 0); } + + @Override + public Material getMaterial(IBlockState state) { + return MaterialArbWood.ARB_WOOD; + } /* MODELS */ @SideOnly(Side.CLIENT) diff --git a/src/main/java/forestry/arboriculture/blocks/MaterialArbWood.java b/src/main/java/forestry/arboriculture/blocks/MaterialArbWood.java new file mode 100644 index 000000000..dade33f8c --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/MaterialArbWood.java @@ -0,0 +1,15 @@ +package forestry.arboriculture.blocks; + +import net.minecraft.block.material.MapColor; +import net.minecraft.block.material.Material; + +public class MaterialArbWood extends Material { + + public static final Material ARB_WOOD = new MaterialArbWood(); + + private MaterialArbWood() { + super(MapColor.WOOD); + setBurning(); + } + +}