diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java index 2cf39527..52398422 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java @@ -167,6 +167,18 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I return getConnectionMode(dir) == ConnectionMode.INPUT; } + @Override + protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { + setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]); + setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir); + } + + @Override + protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { + dataRoot.setShort("extractionSignalColor", (short)getExtractionSignalColor(dir).ordinal()); + dataRoot.setShort("extractionRedstoneMode", (short)getExtractionRedstoneMode(dir).ordinal()); + } + @Override public void writeToNBT(NBTTagCompound nbtRoot) { super.writeToNBT(nbtRoot); diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java index 677205f4..553d5aad 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java @@ -7,7 +7,6 @@ import java.util.Set; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -27,11 +26,9 @@ import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.config.Config; -import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.network.PacketHandler; import crazypants.render.IconUtil; import crazypants.util.BlockCoord; -import crazypants.util.DyeColor; public class LiquidConduit extends AbstractTankConduit { @@ -115,18 +112,6 @@ public class LiquidConduit extends AbstractTankConduit { lastSyncRatio = tank.getFilledRatio(); } } - - @Override - protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { - setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]); - setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir); - } - - @Override - protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { - dataRoot.setShort("extractionSignalColor", (short)getExtractionSignalColor(dir).ordinal()); - dataRoot.setShort("extractionRedstoneMode", (short)getExtractionRedstoneMode(dir).ordinal()); - } private void doExtract() {