From c28c1c429841dbb207ac8dcdfbe74ad417f70dd2 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 12 Mar 2016 17:49:56 +0100 Subject: [PATCH] Fix Alveary --- .../apiculture/blocks/BlockAlveary.java | 1 + .../multiblock/TileAlvearyPlain.java | 24 ------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/src/main/java/forestry/apiculture/blocks/BlockAlveary.java b/src/main/java/forestry/apiculture/blocks/BlockAlveary.java index 9181aaee7..d10fed310 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockAlveary.java +++ b/src/main/java/forestry/apiculture/blocks/BlockAlveary.java @@ -152,6 +152,7 @@ public abstract class BlockAlveary extends BlockStructure implements IStateMappe public void registerModel(Item item, IModelManager manager) { manager.registerItemModel(item, 0, "apiculture/alveary." + getAlvearyType()); } + @Override protected BlockState createBlockState() { BlockAlvearyType alvearyType = getAlvearyType(); diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java index 34a55bdb4..9c353bc40 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java @@ -31,30 +31,6 @@ import buildcraft.api.statements.ITriggerProvider; @Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraftAPI|statements") public class TileAlvearyPlain extends TileAlveary implements ITriggerProvider { - @Override - public void onMachineAssembled(IMultiblockController multiblockController, BlockPos minCoord, BlockPos maxCoord) { - super.onMachineAssembled(multiblockController, minCoord, maxCoord); - - if (!worldObj.isRemote) { - // set alveary entrance block meta - if (getPos().getY() == maxCoord.getY()) { - if ((getPos().getX() > minCoord.getX() && getPos().getX() < maxCoord.getX()) || (getPos().getZ() > minCoord.getZ() && getPos().getZ() < maxCoord.getZ())) { - this.worldObj.setBlockState(getPos(), getBlockType().getStateFromMeta(BlockAlveary.AlvearyType.ENTRANCE.ordinal()), 2); - } - } - } - } - - @Override - public void onMachineBroken() { - super.onMachineBroken(); - - if (!worldObj.isRemote) { - // set alveary entrance block meta back to normal - this.worldObj.setBlockState(getPos(), getBlockType().getStateFromMeta(BlockAlveary.AlvearyType.PLAIN.ordinal()), 2); - } - } - @Override public boolean allowsAutomation() { return true;