etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed the flammability of all of the blocks

Browse source
This commit is contained in:
Adubbz 2014-01-15 15:47:48 +11:00
parent 07e0e399fa
commit ace4f77e1b
15 changed files with 36 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/biomesoplenty/common/blocks/BlockBOPAppleLeaves.java
View file

@ -37,7 +37,6 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable
//TODO: Material.leaves //TODO: Material.leaves
super(Material.field_151584_j, false); super(Material.field_151584_j, false);
//TODO: FEATURE Blocks.fire.setFireInfo(this, 30, 60);
//TODO: setTickRandomly() //TODO: setTickRandomly()
this.func_149675_a(true); this.func_149675_a(true);
//TODO: this.setHardness //TODO: this.setHardness

1
src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java
View file

@ -52,7 +52,6 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
//TODO: setTickRandomly() //TODO: setTickRandomly()
this.func_149675_a(true); this.func_149675_a(true);
//TODO: FEATURE Blocks.fire.setFireInfo(this, 30, 60);
//TODO: this.setHardness //TODO: this.setHardness
this.func_149711_c(0.2F); this.func_149711_c(0.2F);
//TODO setStepSound(Block.soundGrassFootstep) //TODO setStepSound(Block.soundGrassFootstep)

1
src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java
View file

@ -57,7 +57,6 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
//TODO setStepSound(Block.soundGrassFootstep) //TODO setStepSound(Block.soundGrassFootstep)
this.func_149672_a(Block.field_149779_h); this.func_149672_a(Block.field_149779_h);
//TODO: FEATURE Blocks.fire.setFireInfo(this, 60, 100);
//TODO: setBlockBounds //TODO: setBlockBounds
this.func_149676_a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f); this.func_149676_a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f);

2
src/main/java/biomesoplenty/common/blocks/BlockBOPGeneric.java
View file

@ -12,8 +12,6 @@ import biomesoplenty.api.BOPItemHelper;
public class BlockBOPGeneric extends Block public class BlockBOPGeneric extends Block
{ {
//TODO: FEATURE KILL THIS AWFUL CLASS
public enum BlockType public enum BlockType
{ {
ASH_STONE, HARD_SAND, HARD_DIRT, HARD_ICE, DRIED_DIRT, CRAG_ROCK, MUD_BRICK, HOLY_DIRT, CRYSTAL; ASH_STONE, HARD_SAND, HARD_DIRT, HARD_ICE, DRIED_DIRT, CRAG_ROCK, MUD_BRICK, HOLY_DIRT, CRYSTAL;

1
src/main/java/biomesoplenty/common/blocks/BlockBOPPersimmonLeaves.java
View file

@ -38,7 +38,6 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab
//TODO: Material.leaves //TODO: Material.leaves
super(Material.field_151584_j, false); super(Material.field_151584_j, false);
//TODO: FEATURE Blocks.fire.setFireInfo(this, 30, 60);
//TODO: setTickRandomly() //TODO: setTickRandomly()
this.func_149675_a(true); this.func_149675_a(true);
//TODO: this.setHardness //TODO: this.setHardness

1
src/main/java/biomesoplenty/common/blocks/BlockBOPPetals.java
View file

@ -28,7 +28,6 @@ public class BlockBOPPetals extends BlockLeavesBase implements IShearable
//TODO: Material.leaves //TODO: Material.leaves
super(Material.field_151584_j, false); super(Material.field_151584_j, false);
//TODO: FEATURE Blocks.fire.setFireInfo(this, 30, 60);
//TODO: setTickRandomly() //TODO: setTickRandomly()
this.func_149675_a(true); this.func_149675_a(true);
//TODO: this.setHardness //TODO: this.setHardness

2
src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java
View file

@ -29,8 +29,6 @@ public class BlockBOPPlank extends Block
//TODO setStepSound(Block.soundWoodFootstep) //TODO setStepSound(Block.soundWoodFootstep)
this.func_149672_a(Block.field_149766_f); this.func_149672_a(Block.field_149766_f);
//TODO: FEATURE Blocks.fire.setFireInfo(this, 5, 20);
//TODO: this.setCreativeTab() //TODO: this.setCreativeTab()
this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty);
} }

1
src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java
View file

@ -55,7 +55,6 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable
//TODO: setTickRandomly() //TODO: setTickRandomly()
this.func_149675_a(true); this.func_149675_a(true);
float var3 = 0.4F; float var3 = 0.4F;
//TODO: FEATURE Blocks.fire.setFireInfo(this, 60, 100);
//TODO: setBlockBounds //TODO: setBlockBounds
this.func_149676_a(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, 0.8F, 0.5F + var3); this.func_149676_a(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, 0.8F, 0.5F + var3);

1
src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java
View file

@ -40,7 +40,6 @@ public class BlockBOPSlab extends BlockSlab
//TODO: Material.wood //TODO: Material.wood
if (material == Material.field_151575_d) if (material == Material.field_151575_d)
{ {
//TODO: FEATURE Blocks.fire.setFireInfo(this, 5, 20);
//TODO: this.setHardness //TODO: this.setHardness
this.func_149711_c(2.0F); this.func_149711_c(2.0F);
//TODO: this.setResistance //TODO: this.setResistance

2
src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java
View file

@ -54,8 +54,6 @@ public class BlockBOPStairs extends BlockStairs
//TODO setStepSound(Block.soundStoneFootstep) //TODO setStepSound(Block.soundStoneFootstep)
this.func_149672_a(Block.field_149780_i); this.func_149672_a(Block.field_149780_i);
} }
//TODO: FEATURE Blocks.fire.setFireInfo(this, 5, 20);
//TODO: useNeighborBrightness? //TODO: useNeighborBrightness?
field_149783_u = true; field_149783_u = true;

1
src/main/java/biomesoplenty/common/blocks/BlockBamboo.java
View file

@ -31,7 +31,6 @@ public class BlockBamboo extends Block
//TODO setStepSound(Block.soundWoodFootstep) //TODO setStepSound(Block.soundWoodFootstep)
this.func_149672_a(Block.field_149766_f); this.func_149672_a(Block.field_149766_f);
//TODO: FEATURE Blocks.fire.setFireInfo(this, 5, 5);
//TODO: setTickRandomly() //TODO: setTickRandomly()
this.func_149675_a(true); this.func_149675_a(true);

1
src/main/java/biomesoplenty/common/blocks/BlockMoss.java
View file

@ -24,7 +24,6 @@ public class BlockMoss extends BlockVine
//TODO setStepSound(Block.soundGrassFootstep) //TODO setStepSound(Block.soundGrassFootstep)
this.func_149672_a(Block.field_149779_h); this.func_149672_a(Block.field_149779_h);
//TODO: FEATURE Blocks.fire.setFireInfo(this, 15, 100);
//TODO: setTickRandomly() //TODO: setTickRandomly()
this.func_149675_a(true); this.func_149675_a(true);

1
src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java
View file

@ -18,7 +18,6 @@ public class BlockTreeMoss extends BlockVine
//TODO: setTickRandomly() //TODO: setTickRandomly()
this.func_149675_a(true); this.func_149675_a(true);
//TODO: FEATURE Blocks.fire.setFireInfo(this, 15, 100);
//TODO: this.setCreativeTab() //TODO: this.setCreativeTab()
this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty);

1
src/main/java/biomesoplenty/common/blocks/BlockWillow.java
View file

@ -16,7 +16,6 @@ public class BlockWillow extends BlockVine
//TODO setStepSound(Block.soundGrassFootstep) //TODO setStepSound(Block.soundGrassFootstep)
this.func_149672_a(Block.field_149779_h); this.func_149672_a(Block.field_149779_h);
//TODO: FEATURE Blocks.fire.setFireInfo(this, 15, 100);
//TODO: setTickRandomly() //TODO: setTickRandomly()
this.func_149675_a(true); this.func_149675_a(true);

38
src/main/java/biomesoplenty/common/core/BOPBlocks.java
View file

@ -2,6 +2,7 @@ package biomesoplenty.common.core;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Level;
@ -95,7 +96,7 @@ public class BOPBlocks
public static void init() public static void init()
{ {
initializeBlocks(); initializeBlocks();
registerShearBlocks(); setFireInfo();
} }
private static void initializeBlocks() private static void initializeBlocks()
@ -231,9 +232,40 @@ public class BOPBlocks
registerBlock(new BlockBOPColorizedLeaves(ColourizedLeafCategory.CAT2).func_149663_c("colorizedLeaves2"), ItemBlockColorizedLeaves.class); registerBlock(new BlockBOPColorizedLeaves(ColourizedLeafCategory.CAT2).func_149663_c("colorizedLeaves2"), ItemBlockColorizedLeaves.class);
} }
private static void registerShearBlocks() private static void setFireInfo()
{ {
//BOPBlockHelper.addShearBlock(block, speed); Blocks.fire.setFireInfo(BOPBlockHelper.get("bamboo"), 5, 5);
Blocks.fire.setFireInfo(BOPBlockHelper.get("appleLeaves"), 30, 60);
Blocks.fire.setFireInfo(BOPBlockHelper.get("colorizedLeaves1"), 30, 60);
Blocks.fire.setFireInfo(BOPBlockHelper.get("colorizedLeaves2"), 30, 60);
Blocks.fire.setFireInfo(BOPBlockHelper.get("foliage"), 60, 100);
Blocks.fire.setFireInfo(BOPBlockHelper.get("persimmonLeaves"), 30, 60);
Blocks.fire.setFireInfo(BOPBlockHelper.get("petals"), 30, 60);
Blocks.fire.setFireInfo(BOPBlockHelper.get("planks"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("plants"), 60, 100);
Blocks.fire.setFireInfo(BOPBlockHelper.get("woodenSingleSlab1"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("woodenDoubleSlab1"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("woodenSingleSlab2"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("woodenDoubleSlab2"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("sacredoakStairs"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("cherryStairs"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("darkStairs"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("firStairs"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("holyStairs"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("magicStairs"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("mangroveStairs"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("palmStairs"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("redwoodStairs"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("willowStairs"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("pineStairs"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("hellBarkStairs"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("jacarandaStairs"), 5, 20);
Blocks.fire.setFireInfo(BOPBlockHelper.get("moss"), 15, 100);
Blocks.fire.setFireInfo(BOPBlockHelper.get("treeMoss"), 15, 100);
Blocks.fire.setFireInfo(BOPBlockHelper.get("willow"), 15, 100);
} }
public static void registerBlock(Block block) public static void registerBlock(Block block)