From 93a159c342ed8674f2ba4189fc47fd4ee3eb9cb4 Mon Sep 17 00:00:00 2001 From: DaSH Date: Thu, 30 Apr 2026 12:08:01 +0200 Subject: [PATCH] First work on Numitron GUI --- .../inventory/gui/GUIScreenRBMKDisplay.java | 18 +++++++++++------- .../gui/machine/gui_rbmk_numitron.png | Bin 2618 -> 1630 bytes 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/hbm/inventory/gui/GUIScreenRBMKDisplay.java b/src/main/java/com/hbm/inventory/gui/GUIScreenRBMKDisplay.java index 3a69051be..b3e04c134 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIScreenRBMKDisplay.java +++ b/src/main/java/com/hbm/inventory/gui/GUIScreenRBMKDisplay.java @@ -21,7 +21,7 @@ public class GUIScreenRBMKDisplay extends GuiScreen { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/machine/gui_rbmk_numitron.png"); public TileEntityRBMKNumitron display; protected int xSize = 256; - protected int ySize = 114; + protected int ySize = 150; protected int guiLeft; protected int guiTop; @@ -29,6 +29,8 @@ public class GUIScreenRBMKDisplay extends GuiScreen { protected GuiTextField[] rtty = new GuiTextField[2]; protected boolean[] active = new boolean[2]; protected boolean[] polling = new boolean[2]; + protected boolean[] shorten_number = new boolean[2]; + protected boolean[] leading_zeroes = new boolean[2]; public GUIScreenRBMKDisplay(TileEntityRBMKNumitron display) { this.display = display; @@ -46,13 +48,15 @@ public class GUIScreenRBMKDisplay extends GuiScreen { int oY = 4; for(int i = 0; i < 2; i++) { - label[i] = new GuiTextField(this.fontRendererObj, guiLeft + 175 + oX, guiTop + 55 + oY + i * 36, 72 - oX * 2, 14); + label[i] = new GuiTextField(this.fontRendererObj, guiLeft + 27 + oX, guiTop + 73 + oY + i * 54, 72 - oX * 2, 14); GUIScreenRBMKKeyPad.setupTextFieldStandard(label[i], 30, display.displays[i].label); - rtty[i] = new GuiTextField(this.fontRendererObj, guiLeft + 27 + oX, guiTop + 55 + oY + i * 36, 72 - oX * 2, 14); + rtty[i] = new GuiTextField(this.fontRendererObj, guiLeft + 27 + oX, guiTop + 55 + oY + i * 54, 72 - oX * 2, 14); GUIScreenRBMKKeyPad.setupTextFieldStandard(rtty[i], 10, display.displays[i].rtty); active[i] = display.displays[i].active; polling[i] = display.displays[i].polling; + shorten_number[i] = display.displays[i].shorten_number; + leading_zeroes[i] = display.displays[i].leading_zeroes; } } @@ -76,8 +80,8 @@ public class GUIScreenRBMKDisplay extends GuiScreen { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); for(int i = 0; i < 2; i++) { - if(this.active[i]) drawTexturedModalRect(guiLeft + 111, guiTop + i * 36 + 54, 18, 114, 16, 16); - if(this.polling[i]) drawTexturedModalRect(guiLeft + 128, guiTop + i * 36 + 53, 0, 114, 18, 18); + if(this.active[i]) drawTexturedModalRect(guiLeft + 111, guiTop + i * 54 + 54, 18, 150, 16, 16); + if(this.polling[i]) drawTexturedModalRect(guiLeft + 128, guiTop + i * 54 + 53, 0, 150, 18, 18); } for(int i = 0; i < 2; i++) { @@ -91,13 +95,13 @@ public class GUIScreenRBMKDisplay extends GuiScreen { super.mouseClicked(x, y, b); for(int i = 0; i < 2; i++) { - if(guiLeft + 111 <= x && guiLeft + 111 + 16 > x && guiTop + i * 36 + 54 < y && guiTop + i * 36 + 54 + 16 >= y) { + if(guiLeft + 111 <= x && guiLeft + 111 + 16 > x && guiTop + i * 54 + 54 < y && guiTop + i * 54 + 54 + 16 >= y) { this.active[i] = !this.active[i]; mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 0.5F + (this.active[i] ? 0.25F : 0F))); return; } - if(guiLeft + 128 <= x && guiLeft + 128 + 18 > x && guiTop + i * 36 + 53 < y && guiTop + i * 36 + 53 + 18 >= y) { + if(guiLeft + 128 <= x && guiLeft + 128 + 18 > x && guiTop + i * 54 + 53 < y && guiTop + i * 54 + 53 + 18 >= y) { this.polling[i] = !this.polling[i]; mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 0.5F + (this.polling[i] ? 0.25F : 0F))); return; diff --git a/src/main/resources/assets/hbm/textures/gui/machine/gui_rbmk_numitron.png b/src/main/resources/assets/hbm/textures/gui/machine/gui_rbmk_numitron.png index f340bfb02c4ca8c20a73e4b818294d2923be3d0b..924fbaf7d56eb9437b44135852e6681dee5e41b7 100644 GIT binary patch literal 1630 zcmdT^Yfw{16yAHuEtm*c6i^x^#Sk=Th++VrTr6lJ1PKO2DiF$3WGqh!Nq`Fl1S=py zEu(<(RV-v^Km{g(#`3I15Jf10fHIb1#n)6tf^07x{o$|9^j~+*neTja=Inm^?abzS zd2TnPT2KK1h628;HvkA(BEUe8g#9W%@f?fy-o6!7chM(ELWyt@x&Tm9K${81NUrhn z5WA7se*J85L9&mJk5Z|`aU22wA>?woVzKyUNQhD>T+B0%jEqclc3$FQ?g0To5U?*a z4S;kC$TR@i^Fhu6K%gK41BVPjo;fJA1mCd$OiP14p76^ZFw_kmaE1prK)E9%Qee0% zjN1f>b?`6;9<_z(a+sD1Gwfj@8=kO+r#^?7Nsv&$GAnp~8N5J;Ik7N92CF`UDhv2+ zG|Z2LS&5|V8rG>-By36W_S{7Z{_hKDbg>TPPV-{;d*T5wYMx7^{p$;%q-SFSR~NA~ zaPnlX=NNa9+h#ps@QO=iYP+zJ{#x@62>VtDt6J(47Krlh56Lx*0PDlD8NO9}H#7Hv zwZNpPB&e|@VQNk2!}?z+GvQ(3ZRb$#?=C14e;*%+G7b$dv^Y?>ONj8aqh{+(7>J3N z2oZ@3&Rpo?Fzj(QV>yq3G`Qtc#C~{F;7{?ij$sq6Eujli=1}Gayxb7p-cNpJjc()< zl=lJJHhoNRj-+d)bQEnkGoI!yV|j`|C$pU5mQZhc5+J=#OJ zl?3lw!FXw>+*e3d7rp!qHKVS|Vk&zgFW=rdJz0xpnBI!6^PjMJH~W^_@q#7sLk1#l zn{w|&G!g`xq4Ut7S51zN35h}K;3wtLCamU!y%_vjjy_pXs3s zM&E2<0K_S(q}?&9P#p7ggIfxbSj3Fe(du{FMxA^O%02-tN}RW{kXrgpIu`qj&1~xcdNtP;PGDXAsjndTX0hO&brfN-!G*vfs z@6VeRo z7z?{)qLnTWrAe-scF9d^&sWAKCV|S9U;IztsxIkH{sp*Vn zV!R4*R%@KIN`Wc9EN09ZfofjZ!mSS;jX z&Tl`3P@5a=_i`VIqPhPpp>H*L5?y}FEU*$gF20_p^W>WGxOb)4G$v|AgKh}%)PGKXu3y?d7BwdZp<6<<<^_jFw$$b_boD8CR{#?mfdd&--bEoq_Pr7cfs(TS;j)Z zJ8zL0Nl4&jts`q%VQ$-vWKGqrc}B?c3UXamtV%f(tWrxLb!mPiv{&O!mec4A8r33^ z#QWe0_ve2I{BGhjgyaVWw08oAKmCvJ4H9cKMp3ptCugF#>YzrcU>Z*VSkO>o)^=R*isFIl2rECI}SY8UrDovoGVo9d;tKw127U zAI1IY=W*o2CVaDMuLD=rU{eH?iHE(CjA_H8fSHgqh(?W@1VT zGCm=p0_XJ|UV+P}%Qz#M%;}jCoHPA`wb2cjbB;4>SCeTWzUZC@Ke99lDqmp+d(}bD z-(#+HYZPB{sGL$Hb-m*<7)#6YwWXmu%kc}cDY?Yd8zZvzKpy=X7#Q&Gt*D!vt7}YZ zpI$FZR>-q^!}jtc!6RP-LbcZEGouOw9IjaA1>aj4?kU+H?eLIX<#-IkaXPLQ;=ge7 za9C!_i_X$jgZWF}U`OfJ7e-h!$$Qxs?C+jj1g@vd%)&QJuXh(rG>C*B*JwF?!KC+6 z7GKwu_SODGQCq)S6qYiYfnnTaxw6Zzk`bX#8&ALIS)#!-Qve2HWWB~5q|>N zb?jRtG4@{j(bH7$+~@RxfdP;&3irU&2`Om@a+r3i-5kLb#LAn-mZrbj_aZKj2cA85 z&JEQCL{){$g@V4`;!? zH~%vJ-em7;!~0suT~t8aebOV|0C9tD)(oMA6Bm;*(bfUFG>YD$-j9WOf{rnS+-45; zeeCBRO_d7P^zz19N7%3AG_8@B){+M%ebaX1911L*h%dq^O+CY_@4gL+fd%JW3FFMq zC+KUPXHX~x&JSbbNQ>LM zjRr@#%SJ{zE(;s(FlLs15em;qRj(F&Ih~b EdVH&i@0!H~2Yq}X2)ILsx#!;jEL zQ>5H$WOXZ-p`jr-JfPQ(!63##K3QgEbm--@b>}p(BU;d-4ZnL@lm?pP%uCoX@|*GC zTG8P1AFGZMbRjmrS!TRfo3@uo158W3bNmCc{8Ow;>vfJNJy;qTGk~Y(8cPh&`p!2a zY>lJqjmAH9WdzY41*&~qg56Xdek;m|Z|wg;ch2!FHqkeezC25Ct3sfQ9WoMQT|$M1 zq2&RcF~@QeUuw_C*p9P3TT(5?XBE^5h~{2)t84xfpRx!UVKCQz)qb3no3+VbsM?(R zJVN$7997QY*ZQJ@W({;6)B%sXZ$uM{9nAC;4Ts}8TDL=;`c@DtiBJ z{lN5AP;UQN=g_KFR7r|la@_KMiQ7K&R+i*x>&vb{)R3(QRlU4qUBov!Y00Ew9${>5 ziWn?445`(gr~76@66t}RL)h3&n{*!50TBotV;RYTH7ao0xD;VJ&OB{2L)juiRHN&} zKnUDZ2vPpA(#uj3PjRx@_5SJ^xK{5CPzY^)UEruq?a2;JJm10w<>^n$(xEi-F-JrH z>|KzU;tHnZ!%z}+F5LV^&04@ydxqbTUF@pY55#q?{SHjqym-2VNj zFDmxOV5b{pYr-mfx?cd&ku_TVH79UOP^v$)TnG(=-#v^UE2!+77EYa|Rmjwoudx4D bJN81MQYo&;)DCr2e5t|1%?nk1FyzV~^u*s|