From ce9081249fe356bc0ec7c2486de99f52d85c62ae Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 14 Jun 2016 16:17:12 -0700 Subject: [PATCH] Fix compatibility with Chisels & Bits --- gradle.properties | 2 +- .../blocks/BlockForestryFenceGate.java | 5 ----- .../arboriculture/blocks/BlockForestryStairs.java | 5 ----- .../arboriculture/blocks/MaterialArbWood.java | 15 --------------- .../blocks/fence/BlockForestryFence.java | 3 +-- .../blocks/log/BlockForestryLog.java | 6 ------ .../blocks/planks/BlockForestryPlanks.java | 4 ++-- .../blocks/slab/BlockForestrySlab.java | 4 ++-- 8 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 src/main/java/forestry/arboriculture/blocks/MaterialArbWood.java diff --git a/gradle.properties b/gradle.properties index 94ec7e4c9..4d817d4e5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ ic2_version=2.5.5-ex19 version_major=5 version_minor=0 -version_patch=13 +version_patch=14 diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java index 75fab7ab3..67734a796 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java @@ -59,11 +59,6 @@ public class BlockForestryFenceGate & IWoodType> extends Block setCreativeTab(Tabs.tabArboriculture); } - @Override - public Material getMaterial(IBlockState state) { - return MaterialArbWood.ARB_WOOD; - } - @Override public boolean isFireproof() { return fireproof; diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryStairs.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryStairs.java index ab37b0c49..703f023c5 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryStairs.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryStairs.java @@ -38,11 +38,6 @@ public class BlockForestryStairs & IWoodType> extends BlockSta setHarvestLevel("axe", 0); } - @Override - public Material getMaterial(IBlockState state) { - return MaterialArbWood.ARB_WOOD; - } - /* MODELS */ @SideOnly(Side.CLIENT) @Override diff --git a/src/main/java/forestry/arboriculture/blocks/MaterialArbWood.java b/src/main/java/forestry/arboriculture/blocks/MaterialArbWood.java deleted file mode 100644 index dade33f8c..000000000 --- a/src/main/java/forestry/arboriculture/blocks/MaterialArbWood.java +++ /dev/null @@ -1,15 +0,0 @@ -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(); - } - -} diff --git a/src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java b/src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java index 41f08ada3..a28884595 100644 --- a/src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java +++ b/src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java @@ -35,7 +35,6 @@ import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.WoodHelper; -import forestry.arboriculture.blocks.MaterialArbWood; import forestry.arboriculture.blocks.WoodTypeStateMapper; import forestry.arboriculture.blocks.property.PropertyWoodType; import forestry.core.proxy.Proxies; @@ -48,7 +47,7 @@ public abstract class BlockForestryFence & IWoodType> extends private final int blockNumber; protected BlockForestryFence(boolean fireproof, int blockNumber) { - super(MaterialArbWood.ARB_WOOD, BlockPlanks.EnumType.OAK.getMapColor()); + super(Material.WOOD, BlockPlanks.EnumType.OAK.getMapColor()); this.fireproof = fireproof; this.blockNumber = blockNumber; diff --git a/src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java b/src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java index b7cd77e62..e32064a32 100644 --- a/src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java +++ b/src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java @@ -29,7 +29,6 @@ import forestry.api.core.IStateMapperRegister; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodHelper; -import forestry.arboriculture.blocks.MaterialArbWood; import forestry.arboriculture.blocks.WoodTypeStateMapper; import forestry.arboriculture.blocks.property.PropertyWoodType; import forestry.core.proxy.Proxies; @@ -67,11 +66,6 @@ public abstract class BlockForestryLog & IWoodType> extends Bl return blockNumber; } - @Override - public final Material getMaterial(IBlockState state) { - return MaterialArbWood.ARB_WOOD; - } - private static EnumAxis getAxis(int meta) { switch (meta & 12) { case 0: diff --git a/src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java b/src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java index 7e224304a..1216504fc 100644 --- a/src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java +++ b/src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java @@ -6,6 +6,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -29,7 +30,6 @@ import forestry.api.core.IStateMapperRegister; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodHelper; -import forestry.arboriculture.blocks.MaterialArbWood; import forestry.arboriculture.blocks.WoodTypeStateMapper; import forestry.arboriculture.blocks.property.PropertyWoodType; import forestry.core.proxy.Proxies; @@ -42,7 +42,7 @@ public abstract class BlockForestryPlanks & IWoodType> extends private final int blockNumber; protected BlockForestryPlanks(boolean fireproof, int blockNumber) { - super(MaterialArbWood.ARB_WOOD); + super(Material.WOOD); this.fireproof = fireproof; this.blockNumber = blockNumber; diff --git a/src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java b/src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java index 193f32abc..7c79839b3 100644 --- a/src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java +++ b/src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java @@ -7,6 +7,7 @@ import java.util.Random; import net.minecraft.block.BlockSlab; import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -30,7 +31,6 @@ import forestry.api.core.IStateMapperRegister; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodHelper; -import forestry.arboriculture.blocks.MaterialArbWood; import forestry.arboriculture.blocks.WoodTypeStateMapper; import forestry.arboriculture.blocks.property.PropertyWoodType; import forestry.core.proxy.Proxies; @@ -43,7 +43,7 @@ public abstract class BlockForestrySlab & IWoodType> extends B private final int blockNumber; protected BlockForestrySlab(boolean fireproof, int blockNumber) { - super(MaterialArbWood.ARB_WOOD); + super(Material.WOOD); this.fireproof = fireproof; this.blockNumber = blockNumber;