From eae8f719a7cfa17dd8429e8756cb2bff48fd6aa4 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 9 Mar 2016 23:56:15 -0800 Subject: [PATCH] Fix broken block registration --- src/main/java/forestry/apiculture/items/ItemBlockCandle.java | 3 ++- .../java/forestry/arboriculture/items/ItemBlockLeaves.java | 3 ++- src/main/java/forestry/arboriculture/items/ItemBlockWood.java | 2 +- src/main/java/forestry/core/items/ItemBlockForestry.java | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/forestry/apiculture/items/ItemBlockCandle.java b/src/main/java/forestry/apiculture/items/ItemBlockCandle.java index 81c064c46..2fc468451 100644 --- a/src/main/java/forestry/apiculture/items/ItemBlockCandle.java +++ b/src/main/java/forestry/apiculture/items/ItemBlockCandle.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.apiculture.items; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -21,7 +22,7 @@ import forestry.core.items.ItemBlockForestry; public class ItemBlockCandle extends ItemBlockForestry { - public ItemBlockCandle(BlockCandle block) { + public ItemBlockCandle(Block block) { super(block); } diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java b/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java index e371944ef..4c3fb1c35 100644 --- a/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.items; +import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -27,7 +28,7 @@ import forestry.core.utils.StringUtil; public class ItemBlockLeaves extends ItemBlockForestry { - public ItemBlockLeaves(BlockForestryLeaves block) { + public ItemBlockLeaves(Block block) { super(block); } diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockWood.java b/src/main/java/forestry/arboriculture/items/ItemBlockWood.java index a958d5466..d1e685b18 100644 --- a/src/main/java/forestry/arboriculture/items/ItemBlockWood.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockWood.java @@ -19,7 +19,7 @@ import forestry.arboriculture.WoodHelper; import forestry.core.items.ItemBlockForestry; public class ItemBlockWood extends ItemBlockForestry { - public ItemBlockWood(B block) { + public ItemBlockWood(Block block) { super(block); } diff --git a/src/main/java/forestry/core/items/ItemBlockForestry.java b/src/main/java/forestry/core/items/ItemBlockForestry.java index 7fdf51c4d..5e1f0db54 100644 --- a/src/main/java/forestry/core/items/ItemBlockForestry.java +++ b/src/main/java/forestry/core/items/ItemBlockForestry.java @@ -25,7 +25,7 @@ import forestry.core.tiles.TileUtil; public class ItemBlockForestry extends ItemBlock { - public ItemBlockForestry(B block) { + public ItemBlockForestry(Block block) { super(block); setMaxDamage(0); setHasSubtypes(true);