diff --git a/src/main/java/storagecraft/container/ContainerImporter.java b/src/main/java/storagecraft/container/ContainerImporter.java index 58c41b55c..d00a9ec43 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, 100); + addPlayerInventory(8, 119); } } diff --git a/src/main/java/storagecraft/gui/GuiImporter.java b/src/main/java/storagecraft/gui/GuiImporter.java index 14a5e5dd5..cc48a34d0 100644 --- a/src/main/java/storagecraft/gui/GuiImporter.java +++ b/src/main/java/storagecraft/gui/GuiImporter.java @@ -15,16 +15,15 @@ public class GuiImporter extends GuiMachine { private TileImporter importer; - private int compareFlags; - private GuiButton compareNBT; private GuiButton compareDamage; + private GuiButton mode; public GuiImporter(ContainerImporter container, TileImporter importer) { super(container, importer); this.xSize = 176; - this.ySize = 182; + this.ySize = 201; this.importer = importer; } @@ -36,18 +35,18 @@ public class GuiImporter extends GuiMachine { int x = (this.width - xSize) / 2; int y = (this.height - ySize) / 2; - buttonList.add(compareNBT = new GuiButton(1, x + 7, y + 41, 100, 20, "...")); - buttonList.add(compareDamage = new GuiButton(2, x + 7, y + 63, 120, 20, "...")); + buttonList.add(compareNBT = new GuiButton(1, x + 7, y + 41, 100, 20, "")); + buttonList.add(compareDamage = new GuiButton(2, x + 7, y + 63, 120, 20, "")); + buttonList.add(mode = new GuiButton(3, x + 7, y + 85, 80, 20, "")); } @Override public void updateScreen() { super.updateScreen(); - compareFlags = importer.getCompareFlags(); - compareNBT.displayString = getTextForCompareToggle("NBT", InventoryUtils.COMPARE_NBT); compareDamage.displayString = getTextForCompareToggle("Damage", InventoryUtils.COMPARE_DAMAGE); + mode.displayString = StatCollector.translateToLocal("misc.storagecraft:importer.mode." + importer.getMode().id); } private String getTextForCompareToggle(String which, int flag) { @@ -56,7 +55,7 @@ public class GuiImporter extends GuiMachine { builder.append(StatCollector.translateToLocal("misc.storagecraft:compare" + which)); builder.append(": "); - if ((compareFlags & flag) == flag) { + if ((importer.getCompareFlags() & flag) == flag) { builder.append(StatCollector.translateToLocal("misc.storagecraft:on")); } else { builder.append(StatCollector.translateToLocal("misc.storagecraft:off")); @@ -79,14 +78,14 @@ public class GuiImporter extends GuiMachine { super.drawGuiContainerForegroundLayer(mouseX, mouseY); fontRendererObj.drawString(StatCollector.translateToLocal("gui.storagecraft:importer"), 7, 7, 4210752); - fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 7, 89, 4210752); + fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 7, 108, 4210752); } @Override protected void actionPerformed(GuiButton button) { super.actionPerformed(button); - int flags = compareFlags; + int flags = importer.getCompareFlags(); if (button.id == compareNBT.id) { flags ^= InventoryUtils.COMPARE_NBT; @@ -94,6 +93,6 @@ public class GuiImporter extends GuiMachine { flags ^= InventoryUtils.COMPARE_DAMAGE; } - StorageCraft.NETWORK.sendToServer(new MessageImporterUpdate(importer.xCoord, importer.yCoord, importer.zCoord, flags)); + StorageCraft.NETWORK.sendToServer(new MessageImporterUpdate(importer.xCoord, importer.yCoord, importer.zCoord, flags, button.id == mode.id)); } } diff --git a/src/main/java/storagecraft/gui/GuiMachine.java b/src/main/java/storagecraft/gui/GuiMachine.java index 4cf22f4e0..2b90d8749 100644 --- a/src/main/java/storagecraft/gui/GuiMachine.java +++ b/src/main/java/storagecraft/gui/GuiMachine.java @@ -46,7 +46,7 @@ public abstract class GuiMachine extends GuiContainer { lines.add(StatCollector.translateToLocal("misc.storagecraft:redstoneMode." + machine.getRedstoneMode().id)); - this.drawHoveringText(lines, mx, my, fontRendererObj); + drawHoveringText(lines, mx, my, fontRendererObj); } } diff --git a/src/main/java/storagecraft/network/MessageImporterUpdate.java b/src/main/java/storagecraft/network/MessageImporterUpdate.java index 9c71ea3f3..9a13a02de 100644 --- a/src/main/java/storagecraft/network/MessageImporterUpdate.java +++ b/src/main/java/storagecraft/network/MessageImporterUpdate.java @@ -13,43 +13,53 @@ public class MessageImporterUpdate implements IMessage, IMessageHandler { @@ -46,13 +45,7 @@ public class MessageRedstoneModeUpdate implements IMessage, IMessageHandler