From 4322910614b68fa7a56465b76486271014863243 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 19 Jul 2020 23:50:18 +0200 Subject: [PATCH] Added labels that specify the unit of power (AE) and the unit of fluid (mB) for the level emitters. --- .../java/appeng/client/gui/AEBaseScreen.java | 3 ++ .../implementations/LevelEmitterScreen.java | 12 ++++++-- .../LevelEmitterContainer.java | 27 +++++++++--------- .../appeng/core/localization/GuiText.java | 2 +- .../client/gui/FluidLevelEmitterScreen.java | 11 +++++-- .../appliedenergistics2/lang/en_us.json | 1 + .../textures/guis/lvlemitter.png | Bin 2948 -> 1166 bytes 7 files changed, 37 insertions(+), 19 deletions(-) diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java index 6ffac2ee5..ef6e9548f 100644 --- a/src/main/java/appeng/client/gui/AEBaseScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseScreen.java @@ -87,6 +87,9 @@ import java.util.Set; import java.util.concurrent.TimeUnit; public abstract class AEBaseScreen extends ContainerScreen { + + public static final int COLOR_DARK_GRAY = 4210752; + private final List meSlots = new ArrayList<>(); // drag y private final Set drag_click = new HashSet<>(); diff --git a/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java b/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java index dc1321b89..c6ac708bf 100644 --- a/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java +++ b/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java @@ -20,6 +20,7 @@ package appeng.client.gui.implementations; import appeng.api.config.FuzzyMode; import appeng.api.config.LevelType; +import appeng.api.config.PowerUnits; import appeng.api.config.RedstoneMode; import appeng.api.config.Settings; import appeng.api.config.Upgrades; @@ -49,7 +50,7 @@ public class LevelEmitterScreen extends UpgradeableScreen super.init(); this.level = new NumberEntryWidget(this, 20, 17, 138, 62, NumberEntryType.LEVEL_ITEM_COUNT, this::onLevelChange); - this.level.setTextFieldBounds(25, 44, 79); + this.level.setTextFieldBounds(25, 44, 75); this.level.addButtons(children::add, this::addButton); container.setTextField(this.level); } @@ -89,7 +90,14 @@ public class LevelEmitterScreen extends UpgradeableScreen } if (this.levelMode != null) { - this.levelMode.set(((LevelEmitterContainer) this.cvb).getLevelMode()); + LevelType currentLevelMode = ((LevelEmitterContainer) this.cvb).getLevelMode(); + this.levelMode.set(currentLevelMode); + + if (notCraftingMode) { + if (currentLevelMode == LevelType.ENERGY_LEVEL) { + this.font.drawString(PowerUnits.AE.textComponent().getString(), 110, 44, COLOR_DARK_GRAY); + } + } } } diff --git a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java index 4297ea77f..24a24da53 100644 --- a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java +++ b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java @@ -18,7 +18,19 @@ package appeng.container.implementations; +import appeng.api.config.FuzzyMode; +import appeng.api.config.LevelType; +import appeng.api.config.RedstoneMode; +import appeng.api.config.SecurityPermissions; +import appeng.api.config.Settings; +import appeng.api.config.YesNo; import appeng.client.gui.implementations.NumberEntryWidget; +import appeng.container.ContainerLocator; +import appeng.container.guisync.GuiSync; +import appeng.container.slot.FakeTypeOnlySlot; +import appeng.container.slot.RestrictedInputSlot; +import appeng.parts.automation.LevelEmitterPart; +import appeng.util.Platform; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; @@ -27,19 +39,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.IItemHandler; -import appeng.api.config.FuzzyMode; -import appeng.api.config.LevelType; -import appeng.api.config.RedstoneMode; -import appeng.api.config.SecurityPermissions; -import appeng.api.config.Settings; -import appeng.api.config.YesNo; -import appeng.container.ContainerLocator; -import appeng.container.guisync.GuiSync; -import appeng.container.slot.FakeTypeOnlySlot; -import appeng.container.slot.RestrictedInputSlot; -import appeng.parts.automation.LevelEmitterPart; -import appeng.util.Platform; - public class LevelEmitterContainer extends UpgradeableContainer { public static ContainerType TYPE; @@ -104,7 +103,7 @@ public class LevelEmitterContainer extends UpgradeableContainer { final IItemHandler inv = this.getUpgradeable().getInventoryByName("config"); final int y = 40; - final int x = 80 + 44; + final int x = 80 + 57; this.addSlot(new FakeTypeOnlySlot(inv, 0, x, y)); } diff --git a/src/main/java/appeng/core/localization/GuiText.java b/src/main/java/appeng/core/localization/GuiText.java index dd4c201ef..86f38e73c 100644 --- a/src/main/java/appeng/core/localization/GuiText.java +++ b/src/main/java/appeng/core/localization/GuiText.java @@ -27,7 +27,7 @@ public enum GuiText { Chest, StoredEnergy, Of, Condenser, Drive, GrindStone, SkyChest, - VibrationChamber, SpatialIOPort, LevelEmitter, FluidLevelEmitter, Terminal, + VibrationChamber, SpatialIOPort, LevelEmitter, FluidLevelEmitter, FluidLevelEmitterUnit, Terminal, Interface, FluidInterface, Config, StoredItems, StoredFluids, Patterns, ImportBus, ImportBusFluids, ExportBus, ExportBusFluids, diff --git a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java index 61856ec09..9c64b7b45 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java @@ -29,12 +29,12 @@ public class FluidLevelEmitterScreen extends UpgradeableScreenuhpu^;O)qbzk_N zYdukx_s>KR<>Mc23oYRJIJ-W+>`PqNj1#Gmcm9hMT|BmQszhdZX3 zvoHuSED(}k)*$tzcD}8fmu5+0}}%WR>pxm zOa2C}B~uO=@TfU4tO&eb%Ez^pl>ub(iNfCj0_PbL|XFmTaV7^?GA*aLP_O|@m zgF*IUXSf;;yCuw0lNZ!uxFW+CoWPB+f+>M(L0ld0iBtYNmvREJR8_ipsDdnAU>JF2MZ}K!_-opu;y}DQ&`r&`vFMGz>%RV;t z1Y|SRC@9}xVlZ9Dpb_t-Imb_3Sdrn%3A1xz3<3-epqK=?o&p9V*!vC)4N^5TnE29G z{;2L}a=2>#f76xf|Hmb!yDKMfH_ZO8@T{_~f;ENpfMV?W>#z1bFO)g_vxe`o$=?dq z1lESx`;(X$m>8~Pe3f*#|NW-^gdnczr;l13yJ_Qhy)-ge=Bw4YxzqER3#u2&95!e< z{WMADagN+`$?B@lNw9Fl8EXMEu6||+@=BCwdn0bxSNKo$^QWy6|1A7|{%c@VXOc|k ze|%?tjd5Qxhhj_Sti0<5D?VENd$=bjp7BncM!Rr+&t&U9;l?;~{dtTIM_HhLWq^4a zm2txwWZ?J5Gp1iJRGLs&X5S~=xanEyZ>|U5oGj;5B+t21IEUlQuF8)*3|eYf;teV7 z9k^#Hc*0`0{P8_|&b{h%*x=qjk0a#go*STG;$V;||M`E#)%FHIRAsHyZLvaT*V6U+uLH#JulvB{zaLepm&KPZH2*ff!UFyPPR_j_&gN(4ZFC`{%i(UDM@|g}+1{a&BMC3E<&pnE$wrNj%tT h;dMO*>VOF^#nXRJTJ!1At2H14Jzf1=);T3K0RVlCfDQlv literal 2948 zcmeAS@N?(olHy`uVBq!ia0y~yU}OMc4mJh`hM1xiX$%YuEa{HEjtmSN`?>!lvNA9* za29w(7BevL?EqoMEXS|W3=9lXC9V-A!TD(=<%vb93;~Imc_n&&t|1C##(JiDhKBB+ zoy-{+xEVZM978JN-rjzgD`P3<`tanbi9R8GX`5zjDf_7LE$Od|n5${D!s`9ZbL=;j zMwfQ)nP>Q5|G)nK6WT2neYIWxN$d~1MXSYn`QzI>|Hj%o*W5dPe4cl$$OE2#f4|?q zcXajs$Io~Ci0oTvcZ&U^!;^C$(W4f-<=ubOUkU!>__{j0`r~F9=e4JwK9{UZWr(`} zor{;@=V7UatyfO*Fr2@@ux4pk8bd|feaVLS{dKl)-{0SF|5S?MQ~Td{3`bb&j)kpb zRH%<&-Z1S`f@7UUkvs2!s8h|XKOdfuHD$=waf5O6p_Ig-g%>{&8b^(E9z14Mt+D`44*apWZp`{m0gjp22Vp zq5@>ug9^k0^_nSX#JMtJ@9&NWj@?J ziy15S;Zbil#t84)wd93mMH|839$8BG z*dBcRTK**(l9I)l1N=W#3!VQTcv$A^ZC-}+8;lvgitN|F==iA#>~W1R=2}2X>38FMr=> z`7=hUVP#y~lnn~(_qJMC)|Q_+`TP=t&sU=*Ev%Lw)*U_ha(A+y-E_8uRnrw!bxt&v z>-zcKmo5IZ(}W>-FOO!TBj29v!lGaAW=uZ6lySzZR1Z$>q6e|vlP{MapHrj9dmu#L z*(+iK^ZTedbM{$3ds3Xqu&hcl=uneP#q~!|zT7obpYP3VaCLAv>Bo-+=@W~4=VXIJ z(foa?NAGVL3Gc6KK5kgM{=C-nTh`B?6kA#|ti2P-|1Q;I?b_IwnhVBkMZZq%G&}M9 zlQr{&Q}YZhwhaG(A~)_nI-Xa0E@gQg9E$n(PEU~fZfP*>RpjHu==k}e=eCxgJNdk* zj3H|0X1P13CqzZ>-tl8WI?t0YQ;TyaoPS!*wqUAlazVxrN>Stn6q)(%aq~RabEZY> zz@d0=&vZr8cf|@j7jI_%peMz!ua#}VTE+*_84S0;oCllx{ig9b{KjT%lw9AV|E*X3YHDif{G?|ml^y%wX-Z0T#D(^&LQ&p z4v1Gl*1>X{E1n=oXryndhI0}r%iap(T=r{)aVKST6(?k>!; y@6!*vpfmH%MNs=uOuJIV`<)&G{XoR2`1-%%(I-2D3$B3M+YFwrelF{r5}E*O!c55k