Fixed flammability for a bunch of stuff

This commit is contained in:
Adubbz 2016-01-31 21:34:23 +11:00
parent 2e39cea6c0
commit a10eb9f4ae
5 changed files with 72 additions and 1 deletions

View file

@ -16,8 +16,10 @@ import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockState; import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IStringSerializable; import net.minecraft.util.IStringSerializable;
import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.ColorizerFoliage;
import net.minecraft.world.ColorizerGrass; import net.minecraft.world.ColorizerGrass;
@ -242,4 +244,16 @@ public class BlockBOPDoublePlant extends BlockBOPDoubleDecoration implements ISh
return new ItemStack(this, 1, this.getMetaFromState(state)); 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);
}
} }

View file

@ -18,7 +18,11 @@ import net.minecraft.block.BlockFence;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock; 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 public class BlockBOPFence extends BlockFence implements IBOPBlock
{ {
@ -60,5 +64,16 @@ public class BlockBOPFence extends BlockFence implements IBOPBlock
this.setStepSound(soundTypeWood); 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);
}
} }

View file

@ -18,7 +18,11 @@ import net.minecraft.block.BlockFenceGate;
import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockPlanks;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock; 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 public class BlockBOPFenceGate extends BlockFenceGate implements IBOPBlock
{ {
@ -63,5 +67,15 @@ public class BlockBOPFenceGate extends BlockFenceGate implements IBOPBlock
this.setStepSound(soundTypeWood); 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);
}
} }

View file

@ -13,8 +13,10 @@ import biomesoplenty.common.item.ItemBOPBlock;
import net.minecraft.block.BlockVine; import net.minecraft.block.BlockVine;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; 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); 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);
}
} }

View file

@ -17,7 +17,11 @@ import biomesoplenty.common.item.ItemBOPBlock;
import net.minecraft.block.BlockStairs; import net.minecraft.block.BlockStairs;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock; 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 public class BlockBOPWoodStairs extends BlockStairs implements IBOPBlock
{ {
@ -56,5 +60,17 @@ public class BlockBOPWoodStairs extends BlockStairs implements IBOPBlock
this.wood = wood; this.wood = wood;
variantToBlock.put(wood, this); 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);
}
} }