From 62c5a1d82f466f676af5a8f9f6a1b082b559197f Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 20 Dec 2015 18:26:07 +0100 Subject: [PATCH] importer + exporter now have side buttons instead of guibuttons --- .../container/ContainerExporter.java | 2 +- .../container/ContainerImporter.java | 2 +- .../java/storagecraft/gui/GuiExporter.java | 35 ++-------- .../java/storagecraft/gui/GuiImporter.java | 42 +++-------- .../gui/sidebutton/SideButtonCompare.java | 43 ++++++++++++ .../sidebutton/SideButtonImporterMode.java | 35 ++++++++++ .../sidebutton/SideButtonRedstoneMode.java | 19 +++-- .../network/MessageCompareUpdate.java | 55 +++++++++++++++ ...te.java => MessageImporterModeUpdate.java} | 26 +++---- .../network/MessageImporterUpdate.java | 65 ------------------ .../network/MessageRedstoneModeUpdate.java | 16 ++--- .../java/storagecraft/proxy/CommonProxy.java | 8 +-- .../storagecraft/tile/ICompareSetting.java | 13 ++++ ...ollable.java => IRedstoneModeSetting.java} | 2 +- .../storagecraft/tile/TileController.java | 2 +- .../java/storagecraft/tile/TileExporter.java | 28 ++++---- .../java/storagecraft/tile/TileImporter.java | 28 ++++---- .../java/storagecraft/tile/TileMachine.java | 2 +- .../storagecraft/textures/gui/exporter.png | Bin 1802 -> 1794 bytes .../storagecraft/textures/gui/importer.png | Bin 1803 -> 1794 bytes 20 files changed, 230 insertions(+), 193 deletions(-) create mode 100644 src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java create mode 100644 src/main/java/storagecraft/gui/sidebutton/SideButtonImporterMode.java create mode 100644 src/main/java/storagecraft/network/MessageCompareUpdate.java rename src/main/java/storagecraft/network/{MessageExporterUpdate.java => MessageImporterModeUpdate.java} (53%) delete mode 100644 src/main/java/storagecraft/network/MessageImporterUpdate.java create mode 100644 src/main/java/storagecraft/tile/ICompareSetting.java rename src/main/java/storagecraft/tile/{IRedstoneControllable.java => IRedstoneModeSetting.java} (77%) diff --git a/src/main/java/storagecraft/container/ContainerExporter.java b/src/main/java/storagecraft/container/ContainerExporter.java index e294271ae..7530ebdc5 100644 --- a/src/main/java/storagecraft/container/ContainerExporter.java +++ b/src/main/java/storagecraft/container/ContainerExporter.java @@ -12,6 +12,6 @@ public class ContainerExporter extends ContainerBase { addSlotToContainer(new SlotSpecimen(exporter, i, 8 + (18 * i), 20)); } - addPlayerInventory(8, 104); + addPlayerInventory(8, 55); } } diff --git a/src/main/java/storagecraft/container/ContainerImporter.java b/src/main/java/storagecraft/container/ContainerImporter.java index d00a9ec43..483c578b6 100644 --- a/src/main/java/storagecraft/container/ContainerImporter.java +++ b/src/main/java/storagecraft/container/ContainerImporter.java @@ -12,6 +12,6 @@ public class ContainerImporter extends ContainerBase { addSlotToContainer(new SlotSpecimen(importer, i, 8 + (18 * i), 20)); } - addPlayerInventory(8, 119); + addPlayerInventory(8, 55); } } diff --git a/src/main/java/storagecraft/gui/GuiExporter.java b/src/main/java/storagecraft/gui/GuiExporter.java index da68a16c9..9beaf46dc 100644 --- a/src/main/java/storagecraft/gui/GuiExporter.java +++ b/src/main/java/storagecraft/gui/GuiExporter.java @@ -1,21 +1,16 @@ package storagecraft.gui; -import net.minecraft.client.gui.GuiButton; -import storagecraft.StorageCraft; import storagecraft.container.ContainerExporter; +import storagecraft.gui.sidebutton.SideButtonCompare; import storagecraft.gui.sidebutton.SideButtonRedstoneMode; -import storagecraft.network.MessageExporterUpdate; import storagecraft.tile.TileExporter; import storagecraft.util.InventoryUtils; public class GuiExporter extends GuiBase { private TileExporter exporter; - private GuiButton compareNBTButton; - private GuiButton compareDamageButton; - public GuiExporter(ContainerExporter container, TileExporter exporter) { - super(container, 176, 186); + super(container, 176, 137); this.exporter = exporter; } @@ -24,17 +19,12 @@ public class GuiExporter extends GuiBase { public void init(int x, int y) { addSideButton(new SideButtonRedstoneMode(exporter)); - compareNBTButton = addButton(x + 7, y + 41, 100, 20); - compareDamageButton = addButton(x + 7, y + 63, 120, 20); + addSideButton(new SideButtonCompare(exporter, "NBT", InventoryUtils.COMPARE_NBT)); + addSideButton(new SideButtonCompare(exporter, "Damage", InventoryUtils.COMPARE_DAMAGE)); } @Override public void update(int x, int y) { - compareNBTButton.displayString = t("misc.storagecraft:compareNBT") + ": "; - compareNBTButton.displayString += t("misc.storagecraft:" + ((exporter.getCompareFlags() & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT ? "on" : "off")); - - compareDamageButton.displayString = t("misc.storagecraft:compareDamage") + ": "; - compareDamageButton.displayString += t("misc.storagecraft:" + ((exporter.getCompareFlags() & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE ? "on" : "off")); } @Override @@ -47,21 +37,6 @@ public class GuiExporter extends GuiBase { @Override public void drawForeground(int mouseX, int mouseY) { drawString(7, 7, t("gui.storagecraft:exporter")); - drawString(7, 93, t("container.inventory")); - } - - @Override - protected void actionPerformed(GuiButton button) { - super.actionPerformed(button); - - int flags = exporter.getCompareFlags(); - - if (button == compareNBTButton) { - flags ^= InventoryUtils.COMPARE_NBT; - } else if (button == compareDamageButton) { - flags ^= InventoryUtils.COMPARE_DAMAGE; - } - - StorageCraft.NETWORK.sendToServer(new MessageExporterUpdate(exporter.xCoord, exporter.yCoord, exporter.zCoord, flags)); + drawString(7, 43, t("container.inventory")); } } diff --git a/src/main/java/storagecraft/gui/GuiImporter.java b/src/main/java/storagecraft/gui/GuiImporter.java index 8a4de1777..560cc545d 100644 --- a/src/main/java/storagecraft/gui/GuiImporter.java +++ b/src/main/java/storagecraft/gui/GuiImporter.java @@ -1,22 +1,17 @@ package storagecraft.gui; -import net.minecraft.client.gui.GuiButton; -import storagecraft.StorageCraft; import storagecraft.container.ContainerImporter; +import storagecraft.gui.sidebutton.SideButtonCompare; +import storagecraft.gui.sidebutton.SideButtonImporterMode; import storagecraft.gui.sidebutton.SideButtonRedstoneMode; -import storagecraft.network.MessageImporterUpdate; import storagecraft.tile.TileImporter; import storagecraft.util.InventoryUtils; public class GuiImporter extends GuiBase { private TileImporter importer; - private GuiButton compareNBTButton; - private GuiButton compareDamageButton; - private GuiButton modeButton; - public GuiImporter(ContainerImporter container, TileImporter importer) { - super(container, 176, 201); + super(container, 176, 137); this.importer = importer; } @@ -25,20 +20,14 @@ public class GuiImporter extends GuiBase { public void init(int x, int y) { addSideButton(new SideButtonRedstoneMode(importer)); - compareNBTButton = addButton(x + 7, y + 41, 100, 20); - compareDamageButton = addButton(x + 7, y + 63, 120, 20); - modeButton = addButton(x + 7, y + 85, 80, 20); + addSideButton(new SideButtonCompare(importer, "NBT", InventoryUtils.COMPARE_NBT)); + addSideButton(new SideButtonCompare(importer, "Damage", InventoryUtils.COMPARE_DAMAGE)); + + addSideButton(new SideButtonImporterMode(importer)); } @Override public void update(int x, int y) { - compareNBTButton.displayString = t("misc.storagecraft:compareNBT") + ": "; - compareNBTButton.displayString += t("misc.storagecraft:" + ((importer.getCompareFlags() & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT ? "on" : "off")); - - compareDamageButton.displayString = t("misc.storagecraft:compareDamage") + ": "; - compareDamageButton.displayString += t("misc.storagecraft:" + ((importer.getCompareFlags() & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE ? "on" : "off")); - - modeButton.displayString = t("misc.storagecraft:importer.mode." + importer.getMode()); } @Override @@ -51,21 +40,6 @@ public class GuiImporter extends GuiBase { @Override public void drawForeground(int mouseX, int mouseY) { drawString(7, 7, t("gui.storagecraft:importer")); - drawString(7, 108, t("container.inventory")); - } - - @Override - protected void actionPerformed(GuiButton button) { - super.actionPerformed(button); - - int flags = importer.getCompareFlags(); - - if (button == compareNBTButton) { - flags ^= InventoryUtils.COMPARE_NBT; - } else if (button == compareDamageButton) { - flags ^= InventoryUtils.COMPARE_DAMAGE; - } - - StorageCraft.NETWORK.sendToServer(new MessageImporterUpdate(importer.xCoord, importer.yCoord, importer.zCoord, flags, button.id == modeButton.id)); + drawString(7, 43, t("container.inventory")); } } diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java new file mode 100644 index 000000000..8af74b3b4 --- /dev/null +++ b/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java @@ -0,0 +1,43 @@ +package storagecraft.gui.sidebutton; + +import net.minecraft.util.EnumChatFormatting; +import storagecraft.StorageCraft; +import storagecraft.gui.GuiBase; +import storagecraft.network.MessageCompareUpdate; +import storagecraft.tile.ICompareSetting; + +public class SideButtonCompare extends SideButton { + private ICompareSetting setting; + private String name; + private int mask; + + public SideButtonCompare(ICompareSetting setting, String name, int mask) { + this.setting = setting; + this.name = name; + this.mask = mask; + } + + @Override + public String getTooltip(GuiBase gui) { + StringBuilder builder = new StringBuilder(); + + builder.append(EnumChatFormatting.YELLOW).append(gui.t("misc.storagecraft:compare" + name)).append(EnumChatFormatting.RESET).append("\n"); + + if ((setting.getCompare() & mask) == mask) { + builder.append(gui.t("misc.storagecraft:on")); + } else { + builder.append(gui.t("misc.storagecraft:off")); + } + + return builder.toString(); + } + + @Override + public void draw(GuiBase gui, int x, int y) { + } + + @Override + public void actionPerformed() { + StorageCraft.NETWORK.sendToServer(new MessageCompareUpdate(setting, setting.getCompare() ^ mask)); + } +} diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonImporterMode.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonImporterMode.java new file mode 100644 index 000000000..ecf0f0ec4 --- /dev/null +++ b/src/main/java/storagecraft/gui/sidebutton/SideButtonImporterMode.java @@ -0,0 +1,35 @@ +package storagecraft.gui.sidebutton; + +import net.minecraft.util.EnumChatFormatting; +import storagecraft.StorageCraft; +import storagecraft.gui.GuiBase; +import storagecraft.network.MessageImporterModeUpdate; +import storagecraft.tile.TileImporter; + +public class SideButtonImporterMode extends SideButton { + private TileImporter importer; + + public SideButtonImporterMode(TileImporter importer) { + this.importer = importer; + } + + @Override + public String getTooltip(GuiBase gui) { + StringBuilder builder = new StringBuilder(); + + builder.append(EnumChatFormatting.GREEN).append("Mode").append(EnumChatFormatting.RESET).append("\n"); + + builder.append(gui.t("misc.storagecraft:importer.mode." + importer.getMode())); + + return builder.toString(); + } + + @Override + public void draw(GuiBase gui, int x, int y) { + } + + @Override + public void actionPerformed() { + StorageCraft.NETWORK.sendToServer(new MessageImporterModeUpdate(importer)); + } +} diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java index f5d48e3f0..69258fbc9 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java +++ b/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java @@ -2,21 +2,28 @@ package storagecraft.gui.sidebutton; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import storagecraft.StorageCraft; import storagecraft.gui.GuiBase; import storagecraft.network.MessageRedstoneModeUpdate; -import storagecraft.tile.IRedstoneControllable; +import storagecraft.tile.IRedstoneModeSetting; public class SideButtonRedstoneMode extends SideButton { - private IRedstoneControllable control; + private IRedstoneModeSetting setting; - public SideButtonRedstoneMode(IRedstoneControllable control) { - this.control = control; + public SideButtonRedstoneMode(IRedstoneModeSetting setting) { + this.setting = setting; } @Override public String getTooltip(GuiBase gui) { - return gui.t("misc.storagecraft:redstoneMode." + control.getRedstoneMode().id); + StringBuilder builder = new StringBuilder(); + + builder.append(EnumChatFormatting.RED).append("Redstone Mode").append(EnumChatFormatting.RESET).append("\n"); + + builder.append(gui.t("misc.storagecraft:redstoneMode." + setting.getRedstoneMode().id)); + + return builder.toString(); } @Override @@ -26,6 +33,6 @@ public class SideButtonRedstoneMode extends SideButton { @Override public void actionPerformed() { - StorageCraft.NETWORK.sendToServer(new MessageRedstoneModeUpdate(control)); + StorageCraft.NETWORK.sendToServer(new MessageRedstoneModeUpdate(setting)); } } diff --git a/src/main/java/storagecraft/network/MessageCompareUpdate.java b/src/main/java/storagecraft/network/MessageCompareUpdate.java new file mode 100644 index 000000000..ecbe967a7 --- /dev/null +++ b/src/main/java/storagecraft/network/MessageCompareUpdate.java @@ -0,0 +1,55 @@ +package storagecraft.network; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; +import storagecraft.tile.ICompareSetting; + +public class MessageCompareUpdate implements IMessage, IMessageHandler { + private int x; + private int y; + private int z; + private int compare; + + public MessageCompareUpdate() { + } + + public MessageCompareUpdate(ICompareSetting setting, int compare) { + this.x = setting.getX(); + this.y = setting.getY(); + this.z = setting.getZ(); + this.compare = compare; + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + compare = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(compare); + } + + @Override + public IMessage onMessage(MessageCompareUpdate message, MessageContext context) { + EntityPlayerMP player = context.getServerHandler().playerEntity; + + TileEntity tile = player.worldObj.getTileEntity(message.x, message.y, message.z); + + if (tile instanceof ICompareSetting) { + ((ICompareSetting) tile).setCompare(message.compare); + } + + return null; + } +} diff --git a/src/main/java/storagecraft/network/MessageExporterUpdate.java b/src/main/java/storagecraft/network/MessageImporterModeUpdate.java similarity index 53% rename from src/main/java/storagecraft/network/MessageExporterUpdate.java rename to src/main/java/storagecraft/network/MessageImporterModeUpdate.java index c94fca069..cc54e443b 100644 --- a/src/main/java/storagecraft/network/MessageExporterUpdate.java +++ b/src/main/java/storagecraft/network/MessageImporterModeUpdate.java @@ -6,22 +6,20 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; -import storagecraft.tile.TileExporter; +import storagecraft.tile.TileImporter; -public class MessageExporterUpdate implements IMessage, IMessageHandler { +public class MessageImporterModeUpdate implements IMessage, IMessageHandler { private int x; private int y; private int z; - private int compareFlags; - public MessageExporterUpdate() { + public MessageImporterModeUpdate() { } - public MessageExporterUpdate(int x, int y, int z, int compareFlags) { - this.x = x; - this.y = y; - this.z = z; - this.compareFlags = compareFlags; + public MessageImporterModeUpdate(TileImporter importer) { + this.x = importer.xCoord; + this.y = importer.yCoord; + this.z = importer.zCoord; } @Override @@ -29,7 +27,6 @@ public class MessageExporterUpdate implements IMessage, IMessageHandler { - private int x; - private int y; - private int z; - private int compareFlags; - private boolean nextMode; - - public MessageImporterUpdate() { - } - - public MessageImporterUpdate(int x, int y, int z, int compareFlags, boolean nextMode) { - this.x = x; - this.y = y; - this.z = z; - this.compareFlags = compareFlags; - this.nextMode = nextMode; - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - compareFlags = buf.readInt(); - nextMode = buf.readBoolean(); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(compareFlags); - buf.writeBoolean(nextMode); - } - - @Override - public IMessage onMessage(MessageImporterUpdate message, MessageContext context) { - EntityPlayerMP player = context.getServerHandler().playerEntity; - - TileEntity tile = player.worldObj.getTileEntity(message.x, message.y, message.z); - - if (tile instanceof TileImporter) { - TileImporter importer = (TileImporter) tile; - - importer.setCompareFlags(message.compareFlags); - - if (message.nextMode) { - importer.setMode(importer.getMode() == TileImporter.MODE_WHITELIST ? TileImporter.MODE_BLACKLIST : TileImporter.MODE_WHITELIST); - } - } - - return null; - } -} diff --git a/src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java b/src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java index 39344cebf..e56c25764 100644 --- a/src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java +++ b/src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java @@ -6,7 +6,7 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; -import storagecraft.tile.IRedstoneControllable; +import storagecraft.tile.IRedstoneModeSetting; public class MessageRedstoneModeUpdate implements IMessage, IMessageHandler { private int x; @@ -16,10 +16,10 @@ public class MessageRedstoneModeUpdate implements IMessage, IMessageHandler items = new ArrayList(); private List storages = new ArrayList(); diff --git a/src/main/java/storagecraft/tile/TileExporter.java b/src/main/java/storagecraft/tile/TileExporter.java index 826c5185f..d33e82141 100644 --- a/src/main/java/storagecraft/tile/TileExporter.java +++ b/src/main/java/storagecraft/tile/TileExporter.java @@ -10,12 +10,12 @@ import net.minecraft.tileentity.TileEntity; import storagecraft.inventory.InventorySimple; import storagecraft.util.InventoryUtils; -public class TileExporter extends TileMachine implements IInventory, ISidedInventory { - public static final String NBT_COMPARE_FLAGS = "CompareFlags"; +public class TileExporter extends TileMachine implements IInventory, ISidedInventory, ICompareSetting { + public static final String NBT_COMPARE = "Compare"; private InventorySimple inventory = new InventorySimple("exporter", 9); - private int compareFlags = 0; + private int compare = 0; @Override public int getEnergyUsage() { @@ -38,7 +38,7 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven toTake.stackSize = 64; - ItemStack took = getController().take(toTake, compareFlags); + ItemStack took = getController().take(toTake, compare); if (took != null) { if (connectedInventory instanceof ISidedInventory) { @@ -73,12 +73,14 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven } } - public int getCompareFlags() { - return compareFlags; + @Override + public int getCompare() { + return compare; } - public void setCompareFlags(int flags) { - this.compareFlags = flags; + @Override + public void setCompare(int flags) { + this.compare = flags; } @Override @@ -160,8 +162,8 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - if (nbt.hasKey(NBT_COMPARE_FLAGS)) { - compareFlags = nbt.getInteger(NBT_COMPARE_FLAGS); + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); } InventoryUtils.restoreInventory(this, nbt); @@ -171,7 +173,7 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger(NBT_COMPARE_FLAGS, compareFlags); + nbt.setInteger(NBT_COMPARE, compare); InventoryUtils.saveInventory(this, nbt); } @@ -180,13 +182,13 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven public void fromBytes(ByteBuf buf) { super.fromBytes(buf); - compareFlags = buf.readInt(); + compare = buf.readInt(); } @Override public void toBytes(ByteBuf buf) { super.toBytes(buf); - buf.writeInt(compareFlags); + buf.writeInt(compare); } } diff --git a/src/main/java/storagecraft/tile/TileImporter.java b/src/main/java/storagecraft/tile/TileImporter.java index 17121ffff..5ecdf9c4f 100644 --- a/src/main/java/storagecraft/tile/TileImporter.java +++ b/src/main/java/storagecraft/tile/TileImporter.java @@ -10,16 +10,16 @@ import net.minecraft.tileentity.TileEntity; import storagecraft.inventory.InventorySimple; import storagecraft.util.InventoryUtils; -public class TileImporter extends TileMachine implements IInventory, ISidedInventory { +public class TileImporter extends TileMachine implements IInventory, ISidedInventory, ICompareSetting { public static final int MODE_WHITELIST = 0; public static final int MODE_BLACKLIST = 1; - public static final String NBT_COMPARE_FLAGS = "CompareFlags"; + public static final String NBT_COMPARE = "Compare"; public static final String NBT_MODE = "Mode"; private InventorySimple inventory = new InventorySimple("importer", 9); - private int compareFlags = 0; + private int compare = 0; private int mode = MODE_WHITELIST; private int currentSlot = 0; @@ -81,7 +81,7 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven if (slot != null) { slots++; - if (InventoryUtils.compareStack(stack, slot, compareFlags)) { + if (InventoryUtils.compareStack(stack, slot, compare)) { if (mode == MODE_WHITELIST) { return true; } else if (mode == MODE_BLACKLIST) { @@ -98,12 +98,14 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven return true; } - public int getCompareFlags() { - return compareFlags; + @Override + public int getCompare() { + return compare; } - public void setCompareFlags(int flags) { - this.compareFlags = flags; + @Override + public void setCompare(int flags) { + this.compare = flags; } public int getMode() { @@ -193,8 +195,8 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - if (nbt.hasKey(NBT_COMPARE_FLAGS)) { - compareFlags = nbt.getInteger(NBT_COMPARE_FLAGS); + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); } if (nbt.hasKey(NBT_MODE)) { @@ -208,7 +210,7 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger(NBT_COMPARE_FLAGS, compareFlags); + nbt.setInteger(NBT_COMPARE, compare); nbt.setInteger(NBT_MODE, mode); InventoryUtils.saveInventory(this, nbt); @@ -218,7 +220,7 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven public void fromBytes(ByteBuf buf) { super.fromBytes(buf); - compareFlags = buf.readInt(); + compare = buf.readInt(); mode = buf.readInt(); } @@ -226,7 +228,7 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven public void toBytes(ByteBuf buf) { super.toBytes(buf); - buf.writeInt(compareFlags); + buf.writeInt(compare); buf.writeInt(mode); } } diff --git a/src/main/java/storagecraft/tile/TileMachine.java b/src/main/java/storagecraft/tile/TileMachine.java index 03622a38c..09dd9846e 100644 --- a/src/main/java/storagecraft/tile/TileMachine.java +++ b/src/main/java/storagecraft/tile/TileMachine.java @@ -3,7 +3,7 @@ package storagecraft.tile; import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; -public abstract class TileMachine extends TileBase implements INetworkTile, IRedstoneControllable { +public abstract class TileMachine extends TileBase implements INetworkTile, IRedstoneModeSetting { protected boolean connected = false; private RedstoneMode redstoneMode = RedstoneMode.LOW; diff --git a/src/main/resources/assets/storagecraft/textures/gui/exporter.png b/src/main/resources/assets/storagecraft/textures/gui/exporter.png index ae7991e99655163b81ebb643ea2bd60ed3d5f3b5..bb750c91ee43fe459de3d593414ac83a55228cbe 100644 GIT binary patch literal 1794 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~62^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;M)(vj25iHzyM;9C~=J_3C>R|DNig)Whh9@%q!8$OD$0_(KFC9`_q$r zpMilX!_&nvq$2L^t&3T=9VA);ulC*lKk=^B%qZ3HV{iO7pZTf5^QJX`zv;lE$94AK zUhdoXxbDukOos8Fbt*&XKX0~S;aC#v6;Jk z`h9z|baG}xP3Czv`)A+%V2Uc=r-DjeFgSDf2|4O-C literal 1802 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~62^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;5z`qj9J$@Ie~%_C9V-A!TD(=<%vb93~dIoxCe|nPd zGcYg}c)B=-RK&f#b1_RgkjM4nO4BCT*=tMb|p%PHUeK(>GY z)It!mVPAe@*jy9lCwosvKHfd|%;xESyBI$$vCXcTao-x|8K`qX>KT6BdlEv1`ZExZ zuG!B}`Mv7ek2>?uZ2^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;5z`qj9J$@Ie~%_C9V-A!TD(=<%vb93~dIoxCe|nPd zGcYh^c)B=-RK&f#busIG0sj%m4MiBlJITe%RF63gLl0C-c60} v??fANav3&lWjt|>O(9x($Z@8X?f=hqE2G+U?W6=AP$+x4`njxgN@xNA!OA2Y literal 1803 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~62^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;5!Jyj5{V~zXb|Pl(rIsj|=o#pl{pm@* z&%nS`=;`7ZQW5v|?!_$WKpxkND`o%xSKnP)^h&eR$Ze5e)a-@_b}>_qHY9RGWmOIK_B*Sc+}RI2)|_$a`lYF+F_zj4Gqaf|>@=ed<-PlUJ#)&IAcMoJGuMLL N<>~6@vd$@?2>`-44B`L)