From 63a48b2ea20f7bf63fd0ccd63b9cc23994b90e55 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 7 Nov 2015 15:15:54 -0800 Subject: [PATCH] Tidy bee cart code --- .../entities/EntityMinecartBeeHousingBase.java | 3 ++- .../core/entities/EntityMinecartForestry.java | 17 +---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java b/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java index 2406c724e..98b739f23 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java @@ -35,10 +35,11 @@ import forestry.core.entities.EntityMinecartContainerForestry; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IForestryPacketServer; +import forestry.core.network.IStreamableGui; import forestry.core.proxy.Proxies; import forestry.core.tiles.IClimatised; -public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContainerForestry implements IBeeHousing, IGuiBeeHousingInventory, IClimatised { +public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContainerForestry implements IBeeHousing, IGuiBeeHousingInventory, IClimatised, IStreamableGui { private static final Random random = new Random(); private static final int beeFXInterval = 4; private static final int pollenFXInterval = 50; diff --git a/src/main/java/forestry/core/entities/EntityMinecartForestry.java b/src/main/java/forestry/core/entities/EntityMinecartForestry.java index da3881ee8..409a18e34 100644 --- a/src/main/java/forestry/core/entities/EntityMinecartForestry.java +++ b/src/main/java/forestry/core/entities/EntityMinecartForestry.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.core.entities; -import java.io.IOException; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.player.EntityPlayer; @@ -31,13 +29,10 @@ import forestry.core.access.EnumAccess; import forestry.core.access.IAccessHandler; import forestry.core.access.IRestrictedAccess; import forestry.core.gui.IHintSource; -import forestry.core.network.DataInputStreamForestry; -import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; -import forestry.core.network.IStreamableGui; import forestry.core.tiles.ITitled; -public abstract class EntityMinecartForestry extends EntityMinecart implements IStreamableGui, ITitled, IRestrictedAccess, IHintSource { +public abstract class EntityMinecartForestry extends EntityMinecart implements ITitled, IRestrictedAccess, IHintSource { private final AccessHandler accessHandler = new AccessHandler(this); @SuppressWarnings("unused") @@ -74,16 +69,6 @@ public abstract class EntityMinecartForestry extends EntityMinecart implements I return -1; } - @Override - public void writeGuiData(DataOutputStreamForestry data) throws IOException { - - } - - @Override - public void readGuiData(DataInputStreamForestry data) throws IOException { - - } - @Override protected void readEntityFromNBT(NBTTagCompound nbtTagCompound) { super.readEntityFromNBT(nbtTagCompound);