From 58a6dabb2038b45dd10f9cfd6cf1cda2b8829d41 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Thu, 2 Feb 2023 14:50:23 -0300 Subject: [PATCH] wip --- .../implementations/ContainerMEPortableCell.java | 3 ++- .../ContainerWirelessPatternTerminal.java | 2 +- .../client/gui/GuiMEPortableFluidCell.java | 2 +- .../tools/powered/ToolWirelessTerminal.java | 2 +- .../textures/guis/wirelessupgrades.png | Bin 0 -> 2791 bytes 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/appliedenergistics2/textures/guis/wirelessupgrades.png diff --git a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java index 525db0fe3..b546c6065 100644 --- a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java +++ b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java @@ -130,8 +130,9 @@ public class ContainerMEPortableCell extends ContainerMEMonitorable implements I this.powerMultiplier = powerMultiplier; } + @Override public int availableUpgrades() { - return 2; + return 1; } @Override diff --git a/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java b/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java index 23753b534..e6aefca4e 100644 --- a/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java +++ b/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java @@ -251,7 +251,7 @@ public class ContainerWirelessPatternTerminal extends ContainerPatternEncoder im @Override public int availableUpgrades() { - return 2; + return 1; } @Override diff --git a/src/main/java/appeng/fluids/client/gui/GuiMEPortableFluidCell.java b/src/main/java/appeng/fluids/client/gui/GuiMEPortableFluidCell.java index 3660f1f42..9b6aa48be 100644 --- a/src/main/java/appeng/fluids/client/gui/GuiMEPortableFluidCell.java +++ b/src/main/java/appeng/fluids/client/gui/GuiMEPortableFluidCell.java @@ -121,7 +121,7 @@ public class GuiMEPortableFluidCell extends AEBaseMEGui implements ISortSource, @Override public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { - this.fontRenderer.drawString(this.getGuiDisplayName("Fluid Terminal"), 8, 6, 4210752); + this.fontRenderer.drawString(this.getGuiDisplayName(GuiText.WirelessTerminal.getLocal()), 8, 6, 4210752); this.fontRenderer.drawString(GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752); } diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java index 8d12c604e..68daf4dad 100644 --- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java +++ b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java @@ -213,7 +213,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless continue; } - if (i.getThrower().equals(entityIn.getName()) && i.cannotPickup()) { + if (i.getThrower() != null && i.getThrower().equals(entityIn.getName()) && i.cannotPickup()) { continue; } diff --git a/src/main/resources/assets/appliedenergistics2/textures/guis/wirelessupgrades.png b/src/main/resources/assets/appliedenergistics2/textures/guis/wirelessupgrades.png new file mode 100644 index 0000000000000000000000000000000000000000..ed7b89c109c8c63edd106c9b9ca3cd22f563c17c GIT binary patch literal 2791 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tG8#A4q13aCb6#|O#(=u~X z85lIqPo3zi;SwlwwBEQwZE}*B&{wgDnL?9PojrSJv88VKa8KI!%AWM9{FLOCIa6Ev zd)K%2nnrU+FP+jqY3WqajT7hnuU(uLwD``hyYbKO74P~U!y)&?=k(flY^U`sPF|d0 zHh0#=tofXRY*Lw*ea-EscpO=2VVB3b;;Y)KO+W5)EEkUvW}5Y3!OU{5L!S@*UER9p zk?g~cohz2N`nT?u*}34u-b=ko`!&w}k_nk9m~LdLBO`ciQ)!TXPX z3qLYCvb9CCPjK4C3$^yI`0L7Fr&U#Vd44rqQTb`lcD@yNo7VfD|84VS&wAw*RW01R zpTyfWG?rg9_m28)XR_w-%~Vh0Z4YahXUTuswfJ|?)H4Zc%|WiX!q+=)xSUY+?U^&FDF~n`XpYIfq{WRG{7gsm4Sib|NsBT zjvWgP4K+76@9yqqU|>kyJYAZBfq}gw$S?Rm7%)hAGrKV`FmM)lL>4nJ@a+d-Mhn(p z6$S>5lFX2Zk_cZPtK|G#y~LFKq*T3%+yaml3^w)^1&PVosU-?Ysp*+{wo31J?^jaD zOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbW>qvZ=7D$SufCElE_U$j!+swyLmI z0vl|VS8N3m)>l#hD=EpgRf_NpP;kyKN>wn?Gto29b*;!OGg7kSIbD3=a&{Gr@EG<=9MVJEK5m->n$iP$^rW#C0Rc;Cp9-U zucTPtP|pxNCxbDnB^6@1#t6FRKolT zQdr>YYvq!kTnciJr;Du;$Wp76{N&6OD+trr+{837)k4=e&DcoSB-JuS*V51^Q8(Ej zDb3K>$kf;}*#c&cXI^nhVqS78$efDY0=>-46sr^y%QOq4)HL0sBuf)rljKAr-9*de zL|r3ua|=sLQRm#jwOi$G>$V*pJ0EMiTV}Pfvl98SP zlpBzfSdx}slxwTxlbKgq0Tm6&%uNk0NdyI)p_!SfnUR5+iJ7^Xskx;gR7F^7QE_H| z9>^#|13hCSB?VBpTlp7drskC-f)bsrk|EebR?bDKi6!|(A^G_^wn`v3C>ZG(8bIWH zQ%e$45=#*k2`L3EK5yMf(j;QB<7{3rr0X! z!$dN%#I#XLiiMf6Ws{iLH`*W^MsEa1=Dav7rf5SDujy3Tgu*BV9uST|>hVBO@ylGb>YbSn%l6#xEvD zhUTfs7RI`1DMm)RCPqfax)$aZsk(_4h9-tdsY$5@#uhL)lJ6H|D+5z2LsJ_2#mvAY zDbXm=RM*nL#6Z`?+{{QfF(uhp*E}`Z$lNp~&Ct{|jVgYzv@$lLv0n@ljSN%M5)*YT z5={(sO-zkVbS=}8Ep!ttO-+;1(#(=gjS{Kh7eiw!16unf)yN>#)ZEZgH#sfQRM*5P z*-SUdz|2@T)xs<-$uuoBH7U)2Lcd@ZC&>B5Mjuo?B9{j?`q+vNh&rTd6`bcFqCqZh zpjLoBxQ++a_aGj;DUq6&Vyjf7WN)|g$o3)z28IYv7sn6_|F@G3g&GVvSk5ba|F3@f zs0bf(Sky~1gAL}HOdekhwjH@<{CKs#