From 2f9bc96ee5f2b093ab45e68ca778676ad1b0afc6 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 19 Dec 2015 00:02:44 +0100 Subject: [PATCH] add whitelist / blacklist to importer and fix some code --- .../container/ContainerImporter.java | 2 +- .../java/storagecraft/gui/GuiImporter.java | 21 ++++++------ .../java/storagecraft/gui/GuiMachine.java | 2 +- .../network/MessageImporterUpdate.java | 30 +++++++++++------ .../network/MessageRedstoneModeUpdate.java | 9 +---- .../java/storagecraft/tile/ImporterMode.java | 31 ++++++++++++++++++ .../java/storagecraft/tile/RedstoneMode.java | 10 ++++++ src/main/java/storagecraft/tile/TileBase.java | 2 +- .../java/storagecraft/tile/TileImporter.java | 31 ++++++++++++++++-- .../java/storagecraft/tile/TileMachine.java | 2 +- .../assets/storagecraft/lang/en_US.lang | 3 ++ .../assets/storagecraft/lang/nl_NL.lang | 3 ++ .../storagecraft/textures/blocks/exporter.png | Bin 0 -> 278 bytes .../storagecraft/textures/gui/exporter.png | Bin 1812 -> 1808 bytes .../storagecraft/textures/gui/importer.png | Bin 1803 -> 1803 bytes 15 files changed, 110 insertions(+), 36 deletions(-) create mode 100644 src/main/java/storagecraft/tile/ImporterMode.java create mode 100644 src/main/resources/assets/storagecraft/textures/blocks/exporter.png 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, IMessageHandlerk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h7I;J!GcfQS24TkI`72U@f)XXJ5hcO-X(i=}MX3x0iJ5sNdU>fO3MP66 zdS-umlJ5i6w0pWZhIn|to#4pTV8FxjTPpsM<@yh+{_lTzsHr7nQqwgr-7^bwF3Eb# za$WUlTEfk1$0eI4ykk9c+VDQ(=W9(SZ`I5b6f-^?udv|j`_mS|5K!W|Z)M^?RYqZ7 zAZ_QDVrF{gf5D>78tuya6$LEbvT!>#+v^>#VLx-5^PMq^;#|&GfsqPD4Ep-{f^)lc R_5+>7;OXk;vd$@?2>?BeV|xGq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/storagecraft/textures/gui/exporter.png b/src/main/resources/assets/storagecraft/textures/gui/exporter.png index 54d461b7a7d75969af7b742ff3e2fc4ccea17c9b..76e3bbb4d8a5db3f3158f281b02867aa2289831f 100644 GIT binary patch literal 1808 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!7ujG`J|4M0JO64!{5;QX|b^2DN4hJwV*yb`^<)Di^~Jp(c32;AzJBn6L0f7J2TynHo%hG> z?moAEcRY8#7>A7Y-#^>?D;w`K$nP%M*~4wa@aYRL69a?8J6kbOGJNtxW&F6zlFr2vT&NN~EZ^?$5WMGssJh_+5$Y8)-@b^z}-~LnP zZnqc`a)H7p_8tcs&Cp;|+YF>8RQCgmLI#G)Uu?hvQ{lTDH;9MFdY~=l8Hx`7E`EJ8 z%l7wq_0^1@mhU~EcmFNWgL{CUuF2Y#5Vdz zV%>XeIySuXJ$L0~Qp28d%jh3@>eb&aoy=;exinArkHP+Okh?(u>IE=6;=5YTcUa|KNVRR~W1q5u_mQfnD2o2CH{7e&b+h$ZI$) z)bRM@o!nXMKfX>)e}7>k(}RziH38$lZxy-8q?;Kn_c~qpu?a z!^VE@KZ&di49pAxJ|V6^adUI?(9qEC?(Sp9j{X1tA1E>kMnhnPgh10{aTQRmDGBlm z1}6TI3>bpHv#SE5owL9rvY3H^?=T269?xHq0u+=eag8Vm&QB{TPb^AhC`ioAE78kK zEm1JhGte{p)02Fkfq^O4)5S5QBJS<&i(OKV5-k@y*S-ILLhW7HoDJbhe<$a@s$t>! zmGnZUrPZ(S?;J99_-f31jhRR=Tz`{)7dz=_3 z89sR_&BDOYaHl#F$oawYhNx_4v2T+vN;Ek+WCDGh^OFxUjaxVX=G#k z#C&!0LHUDe=i{tqvYiMon$KJJ`ukpCka8e^nFC@s?3}-6os}fpiR$T_50+cs+&tZH z8RI9Yv`CHPP<)3}`gD8hP z4a|LZ@5vgV1u)gTe~DWM4fI*uBy diff --git a/src/main/resources/assets/storagecraft/textures/gui/importer.png b/src/main/resources/assets/storagecraft/textures/gui/importer.png index 18efb12d50a029aa9351d464cc8b36634ee5ca2e..867ad0abedc31e6e4c5619ebac1745a8616a9ff5 100644 GIT binary patch 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) 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!7ujG`J|4M0JO64!{5;QX|b^2DN4hJwV*yb`^<)Di^~Jp(0{_w~Qmi2q>vacAl2r7;iqCM?ev0NPpfeiM*nQ1HL60HmJWO9hr` z54ayZPQU)mbp_^!td;(hwU3smFqE>;Z0d-7761!3Qb z%jO(F!JXxi3=B35pVro{K9CHdF==L+r7eIvk{&HaUJg8zO!m_T7xYULxS0XrK}Hj*q6_K#rW^vlbhBh zB@B1$S$BWgQIg8re@C0)=0?U7eY_53ISiYUnJ36fH@vyQkaC<&!P<