Fix #1237 All fireproof blocks work as fuel

This commit is contained in:
Nedelosk committed 2016-05-24 21:39:43 +02:00
1 parent 2c173766cb
commit 69cf513e51
8 files changed
+37 -4

No files matched your search

@@ -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);
@@ -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;
@@ -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;
@@ -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) {
@@ -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;
@@ -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;
@@ -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)
@@ -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();
}
}