diff --git a/src/main/java/forestry/apiculture/items/ItemBlockAlveary.java b/src/main/java/forestry/apiculture/items/ItemBlockAlveary.java deleted file mode 100644 index ebda1b667..000000000 --- a/src/main/java/forestry/apiculture/items/ItemBlockAlveary.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.apiculture.items; - -import net.minecraft.block.Block; - -import forestry.core.items.IStructureBlockItem; -import forestry.core.items.ItemBlockForestry; - -/** - * @author CovertJaguar - */ -public class ItemBlockAlveary extends ItemBlockForestry implements IStructureBlockItem { - - public ItemBlockAlveary(Block block) { - super(block); - } -} diff --git a/src/main/java/forestry/core/items/IStructureBlockItem.java b/src/main/java/forestry/core/items/IStructureBlockItem.java deleted file mode 100644 index cf876b788..000000000 --- a/src/main/java/forestry/core/items/IStructureBlockItem.java +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.items; - -/** - * @author CovertJaguar - */ -public interface IStructureBlockItem { - -} diff --git a/src/main/java/forestry/farming/items/ItemBlockFarm.java b/src/main/java/forestry/farming/items/ItemBlockFarm.java index c5e879414..d8c4f8f10 100644 --- a/src/main/java/forestry/farming/items/ItemBlockFarm.java +++ b/src/main/java/forestry/farming/items/ItemBlockFarm.java @@ -17,10 +17,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import forestry.core.items.IStructureBlockItem; import forestry.farming.render.EnumFarmBlockTexture; -public class ItemBlockFarm extends ItemBlock implements IStructureBlockItem { +public class ItemBlockFarm extends ItemBlock { public ItemBlockFarm(Block block) { super(block); diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 1a1dca7b6..95095626b 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -101,7 +101,6 @@ import forestry.apiculture.genetics.alleles.AlleleEffectSnowing; import forestry.apiculture.items.ItemArmorApiarist; import forestry.apiculture.items.ItemBeeGE; import forestry.apiculture.items.ItemBeealyzer; -import forestry.apiculture.items.ItemBlockAlveary; import forestry.apiculture.items.ItemBlockCandle; import forestry.apiculture.items.ItemHabitatLocator; import forestry.apiculture.items.ItemHiveFrame; @@ -267,7 +266,7 @@ public class PluginApiculture extends ForestryPlugin { ForestryBlock.stump.registerBlock(new BlockStump(), ItemBlockForestry.class, "stump"); // Alveary and Components - ForestryBlock.alveary.registerBlock(new BlockAlveary(), ItemBlockAlveary.class, "alveary"); + ForestryBlock.alveary.registerBlock(new BlockAlveary(), ItemBlockForestry.class, "alveary"); ForestryBlock.alveary.block().setHarvestLevel("axe", 0); // Add triggers