From a10eb9f4ae0879cff9dc7e1f48c601a9c821a276 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Sun, 31 Jan 2016 21:34:23 +1100 Subject: [PATCH] Fixed flammability for a bunch of stuff --- .../common/block/BlockBOPDoublePlant.java | 14 ++++++++++++++ .../common/block/BlockBOPFence.java | 15 +++++++++++++++ .../common/block/BlockBOPFenceGate.java | 14 ++++++++++++++ .../biomesoplenty/common/block/BlockBOPVine.java | 14 +++++++++++++- .../common/block/BlockBOPWoodStairs.java | 16 ++++++++++++++++ 5 files changed, 72 insertions(+), 1 deletion(-) diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDoublePlant.java b/src/main/java/biomesoplenty/common/block/BlockBOPDoublePlant.java index a6fa714f4..3d3eb3209 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDoublePlant.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDoublePlant.java @@ -16,8 +16,10 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.ColorizerGrass; @@ -242,4 +244,16 @@ public class BlockBOPDoublePlant extends BlockBOPDoubleDecoration implements ISh return new ItemStack(this, 1, this.getMetaFromState(state)); } + + @Override + public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) + { + return Blocks.tallgrass.getFlammability(world, pos, face); + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) + { + return Blocks.tallgrass.getFlammability(world, pos, face); + } } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFence.java b/src/main/java/biomesoplenty/common/block/BlockBOPFence.java index 88d55b552..e35781da6 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFence.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFence.java @@ -18,7 +18,11 @@ import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; public class BlockBOPFence extends BlockFence implements IBOPBlock { @@ -60,5 +64,16 @@ public class BlockBOPFence extends BlockFence implements IBOPBlock this.setStepSound(soundTypeWood); } + @Override + public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) + { + return Blocks.planks.getFlammability(world, pos, face); + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) + { + return Blocks.planks.getFireSpreadSpeed(world, pos, face); + } } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java b/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java index 866e221c1..284b1a530 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java @@ -18,7 +18,11 @@ import net.minecraft.block.BlockFenceGate; import net.minecraft.block.BlockPlanks; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; public class BlockBOPFenceGate extends BlockFenceGate implements IBOPBlock { @@ -63,5 +67,15 @@ public class BlockBOPFenceGate extends BlockFenceGate implements IBOPBlock this.setStepSound(soundTypeWood); } + public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) + { + return Blocks.planks.getFlammability(world, pos, face); + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) + { + return Blocks.planks.getFireSpreadSpeed(world, pos, face); + } } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPVine.java b/src/main/java/biomesoplenty/common/block/BlockBOPVine.java index 42cff4301..31ba25bb8 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPVine.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPVine.java @@ -13,8 +13,10 @@ import biomesoplenty.common.item.ItemBOPBlock; import net.minecraft.block.BlockVine; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -72,6 +74,16 @@ public class BlockBOPVine extends BlockVine implements IBOPBlock return (this.useGreyScaleTextures ? super.colorMultiplier(worldIn, pos, renderPass) : 0xFFFFFF); } - + @Override + public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) + { + return Blocks.vine.getFlammability(world, pos, face); + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) + { + return Blocks.vine.getFlammability(world, pos, face); + } } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java b/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java index 7ad7b4f6d..659e62223 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java @@ -17,7 +17,11 @@ import biomesoplenty.common.item.ItemBOPBlock; import net.minecraft.block.BlockStairs; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; public class BlockBOPWoodStairs extends BlockStairs implements IBOPBlock { @@ -56,5 +60,17 @@ public class BlockBOPWoodStairs extends BlockStairs implements IBOPBlock this.wood = wood; variantToBlock.put(wood, this); } + + @Override + public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) + { + return Blocks.planks.getFlammability(world, pos, face); + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) + { + return Blocks.planks.getFireSpreadSpeed(world, pos, face); + } } \ No newline at end of file