From ace4f77e1bdf8a1f6bd9fb95765d7ed223dd01d2 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Wed, 15 Jan 2014 15:47:48 +1100 Subject: [PATCH] Fixed the flammability of all of the blocks --- .../common/blocks/BlockBOPAppleLeaves.java | 1 - .../blocks/BlockBOPColorizedLeaves.java | 1 - .../common/blocks/BlockBOPFoliage.java | 1 - .../common/blocks/BlockBOPGeneric.java | 2 - .../blocks/BlockBOPPersimmonLeaves.java | 1 - .../common/blocks/BlockBOPPetals.java | 1 - .../common/blocks/BlockBOPPlank.java | 2 - .../common/blocks/BlockBOPPlant.java | 1 - .../common/blocks/BlockBOPSlab.java | 1 - .../common/blocks/BlockBOPStairs.java | 2 - .../common/blocks/BlockBamboo.java | 3 +- .../common/blocks/BlockMoss.java | 1 - .../common/blocks/BlockTreeMoss.java | 1 - .../common/blocks/BlockWillow.java | 1 - .../biomesoplenty/common/core/BOPBlocks.java | 38 +++++++++++++++++-- 15 files changed, 36 insertions(+), 21 deletions(-) diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPAppleLeaves.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPAppleLeaves.java index 37c39a52a..63d89d713 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPAppleLeaves.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPAppleLeaves.java @@ -37,7 +37,6 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable //TODO: Material.leaves super(Material.field_151584_j, false); - //TODO: FEATURE Blocks.fire.setFireInfo(this, 30, 60); //TODO: setTickRandomly() this.func_149675_a(true); //TODO: this.setHardness diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java index b247860c0..85f254d21 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java @@ -52,7 +52,6 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab //TODO: setTickRandomly() this.func_149675_a(true); - //TODO: FEATURE Blocks.fire.setFireInfo(this, 30, 60); //TODO: this.setHardness this.func_149711_c(0.2F); //TODO setStepSound(Block.soundGrassFootstep) diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java index 0af749c79..fa90b3566 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java @@ -57,7 +57,6 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable //TODO setStepSound(Block.soundGrassFootstep) this.func_149672_a(Block.field_149779_h); - //TODO: FEATURE Blocks.fire.setFireInfo(this, 60, 100); //TODO: setBlockBounds this.func_149676_a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f); diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPGeneric.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPGeneric.java index aa42eeaee..4b8363e3e 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPGeneric.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPGeneric.java @@ -12,8 +12,6 @@ import biomesoplenty.api.BOPItemHelper; public class BlockBOPGeneric extends Block { - //TODO: FEATURE KILL THIS AWFUL CLASS - public enum BlockType { ASH_STONE, HARD_SAND, HARD_DIRT, HARD_ICE, DRIED_DIRT, CRAG_ROCK, MUD_BRICK, HOLY_DIRT, CRYSTAL; diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPPersimmonLeaves.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPPersimmonLeaves.java index d9543c322..5de440d9f 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPPersimmonLeaves.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPPersimmonLeaves.java @@ -38,7 +38,6 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab //TODO: Material.leaves super(Material.field_151584_j, false); - //TODO: FEATURE Blocks.fire.setFireInfo(this, 30, 60); //TODO: setTickRandomly() this.func_149675_a(true); //TODO: this.setHardness diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPPetals.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPPetals.java index e17cc6b40..678820756 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPPetals.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPPetals.java @@ -28,7 +28,6 @@ public class BlockBOPPetals extends BlockLeavesBase implements IShearable //TODO: Material.leaves super(Material.field_151584_j, false); - //TODO: FEATURE Blocks.fire.setFireInfo(this, 30, 60); //TODO: setTickRandomly() this.func_149675_a(true); //TODO: this.setHardness diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java index f1fc3994a..58935c1bb 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java @@ -29,8 +29,6 @@ public class BlockBOPPlank extends Block //TODO setStepSound(Block.soundWoodFootstep) this.func_149672_a(Block.field_149766_f); - //TODO: FEATURE Blocks.fire.setFireInfo(this, 5, 20); - //TODO: this.setCreativeTab() this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java index 919b52fec..1db7aa521 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java @@ -55,7 +55,6 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable //TODO: setTickRandomly() this.func_149675_a(true); float var3 = 0.4F; - //TODO: FEATURE Blocks.fire.setFireInfo(this, 60, 100); //TODO: setBlockBounds this.func_149676_a(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, 0.8F, 0.5F + var3); diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java index 11bb2dbae..c778385b7 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java @@ -40,7 +40,6 @@ public class BlockBOPSlab extends BlockSlab //TODO: Material.wood if (material == Material.field_151575_d) { - //TODO: FEATURE Blocks.fire.setFireInfo(this, 5, 20); //TODO: this.setHardness this.func_149711_c(2.0F); //TODO: this.setResistance diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java index 1adec9a1f..0308f74ae 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java @@ -54,8 +54,6 @@ public class BlockBOPStairs extends BlockStairs //TODO setStepSound(Block.soundStoneFootstep) this.func_149672_a(Block.field_149780_i); } - //TODO: FEATURE Blocks.fire.setFireInfo(this, 5, 20); - //TODO: useNeighborBrightness? field_149783_u = true; diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBamboo.java b/src/main/java/biomesoplenty/common/blocks/BlockBamboo.java index 7857510f0..0c8a0ae43 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBamboo.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBamboo.java @@ -30,8 +30,7 @@ public class BlockBamboo extends Block //TODO setStepSound(Block.soundWoodFootstep) this.func_149672_a(Block.field_149766_f); - - //TODO: FEATURE Blocks.fire.setFireInfo(this, 5, 5); + //TODO: setTickRandomly() this.func_149675_a(true); diff --git a/src/main/java/biomesoplenty/common/blocks/BlockMoss.java b/src/main/java/biomesoplenty/common/blocks/BlockMoss.java index abf3ad631..3cc86a3c8 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockMoss.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockMoss.java @@ -24,7 +24,6 @@ public class BlockMoss extends BlockVine //TODO setStepSound(Block.soundGrassFootstep) this.func_149672_a(Block.field_149779_h); - //TODO: FEATURE Blocks.fire.setFireInfo(this, 15, 100); //TODO: setTickRandomly() this.func_149675_a(true); diff --git a/src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java b/src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java index 4dd7fcdea..d37bfc5c7 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java @@ -18,7 +18,6 @@ public class BlockTreeMoss extends BlockVine //TODO: setTickRandomly() this.func_149675_a(true); - //TODO: FEATURE Blocks.fire.setFireInfo(this, 15, 100); //TODO: this.setCreativeTab() this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); diff --git a/src/main/java/biomesoplenty/common/blocks/BlockWillow.java b/src/main/java/biomesoplenty/common/blocks/BlockWillow.java index 6b43bd4ba..6e0aae2b2 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockWillow.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockWillow.java @@ -16,7 +16,6 @@ public class BlockWillow extends BlockVine //TODO setStepSound(Block.soundGrassFootstep) this.func_149672_a(Block.field_149779_h); - //TODO: FEATURE Blocks.fire.setFireInfo(this, 15, 100); //TODO: setTickRandomly() this.func_149675_a(true); diff --git a/src/main/java/biomesoplenty/common/core/BOPBlocks.java b/src/main/java/biomesoplenty/common/core/BOPBlocks.java index 713514282..8380652d9 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBlocks.java +++ b/src/main/java/biomesoplenty/common/core/BOPBlocks.java @@ -2,6 +2,7 @@ package biomesoplenty.common.core; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import org.apache.logging.log4j.Level; @@ -95,7 +96,7 @@ public class BOPBlocks public static void init() { initializeBlocks(); - registerShearBlocks(); + setFireInfo(); } private static void initializeBlocks() @@ -231,9 +232,40 @@ public class BOPBlocks 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)