From 820da70e5f548dad55b4565b792f9387af7e50eb Mon Sep 17 00:00:00 2001 From: DaSH Date: Thu, 30 Apr 2026 13:09:12 +0200 Subject: [PATCH] Numitron GUI --- .../inventory/gui/GUIScreenRBMKDisplay.java | 32 ++++++++++++++---- .../machine/rbmk/TileEntityRBMKNumitron.java | 4 +++ .../gui/machine/gui_rbmk_numitron.png | Bin 1630 -> 1809 bytes 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hbm/inventory/gui/GUIScreenRBMKDisplay.java b/src/main/java/com/hbm/inventory/gui/GUIScreenRBMKDisplay.java index b3e04c134..71583b47f 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIScreenRBMKDisplay.java +++ b/src/main/java/com/hbm/inventory/gui/GUIScreenRBMKDisplay.java @@ -48,9 +48,9 @@ public class GUIScreenRBMKDisplay extends GuiScreen { int oY = 4; for(int i = 0; i < 2; i++) { - label[i] = new GuiTextField(this.fontRendererObj, guiLeft + 27 + oX, guiTop + 73 + oY + i * 54, 72 - oX * 2, 14); + label[i] = new GuiTextField(this.fontRendererObj, guiLeft + 27 + oX, guiTop + 73 + oY + i * 54, 85 - 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 * 54, 72 - oX * 2, 14); + rtty[i] = new GuiTextField(this.fontRendererObj, guiLeft + 27 + oX, guiTop + 55 + oY + i * 54, 85 - oX * 2, 14); GUIScreenRBMKKeyPad.setupTextFieldStandard(rtty[i], 10, display.displays[i].rtty); active[i] = display.displays[i].active; @@ -80,8 +80,10 @@ 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 * 54 + 54, 18, 150, 16, 16); - if(this.polling[i]) drawTexturedModalRect(guiLeft + 128, guiTop + i * 54 + 53, 0, 150, 18, 18); + if(this.active[i]) drawTexturedModalRect(guiLeft + 124, guiTop + i * 54 + 54, 18, 150, 16, 16); + if(this.polling[i]) drawTexturedModalRect(guiLeft + 159, guiTop + i * 54 + 53, 0, 150, 18, 18); + if(this.shorten_number[i]) drawTexturedModalRect(guiLeft + 195, guiTop + i * 54 + 53, 34, 150, 18, 18); + if(this.leading_zeroes[i]) drawTexturedModalRect(guiLeft + 231, guiTop + i * 54 + 53, 52, 150, 18, 18); } for(int i = 0; i < 2; i++) { @@ -95,17 +97,29 @@ 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 * 54 + 54 < y && guiTop + i * 54 + 54 + 16 >= y) { + if(guiLeft + 124 <= x && guiLeft + 124 + 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 * 54 + 53 < y && guiTop + i * 54 + 53 + 18 >= y) { + if(guiLeft + 159 <= x && guiLeft + 159 + 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; } + + if(guiLeft + 195 <= x && guiLeft + 195 + 18 > x && guiTop + i * 54 + 53 < y && guiTop + i * 54 + 53 + 18 >= y) { + this.shorten_number[i] = !this.shorten_number[i]; + mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 0.5F + (this.shorten_number[i] ? 0.25F : 0F))); + return; + } + + if(guiLeft + 231 <= x && guiLeft + 231 + 18 > x && guiTop + i * 54 + 53 < y && guiTop + i * 54 + 53 + 18 >= y) { + this.leading_zeroes[i] = !this.leading_zeroes[i]; + mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 0.5F + (this.leading_zeroes[i] ? 0.25F : 0F))); + return; + } } if(guiLeft + 209 <= x && guiLeft + 209 + 18 > x && guiTop + 17 < y && guiTop + 17 + 18 >= y) { @@ -113,12 +127,18 @@ public class GUIScreenRBMKDisplay extends GuiScreen { NBTTagCompound data = new NBTTagCompound(); byte active = 0; byte polling = 0; + byte shorten_number = 0; + byte leading_zeroes = 0; for(int i = 0; i < 2; i++) { if(this.active[i]) active |= 1 << i; if(this.polling[i]) polling |= 1 << i; + if(this.shorten_number[i]) shorten_number |= 1 << i; + if(this.leading_zeroes[i]) leading_zeroes |= 1 << i; } data.setByte("active", active); data.setByte("polling", polling); + data.setByte("shorten_number", shorten_number); + data.setByte("leading_zeroes", leading_zeroes); for(int i = 0; i < 2; i++) { data.setString("label" + i, this.label[i].getText()); diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKNumitron.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKNumitron.java index c7fe719c2..c9897aa3d 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKNumitron.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKNumitron.java @@ -179,9 +179,13 @@ public class TileEntityRBMKNumitron extends TileEntityLoadedBase implements IGUI int active = data.getByte("active"); int polling = data.getByte("polling"); + int shorten_number = data.getByte("shorten_number"); + int leading_zeroes = data.getByte("leading_zeroes"); for(int i = 0; i < 2; i++) { this.displays[i].active = (active & (1 << i)) != 0; this.displays[i].polling = (polling & (1 << i)) != 0; + this.displays[i].shorten_number = (shorten_number & (1 << i)) != 0; + this.displays[i].leading_zeroes = (leading_zeroes & (1 << i)) != 0; } for(int i = 0; i < 2; i++) { 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 924fbaf7d56eb9437b44135852e6681dee5e41b7..99a8d67032d140f9a54a29a17388a14f58722913 100644 GIT binary patch delta 1320 zcmZuudsLDK6zBVplp#q#?)lw6e)ryUAHO?s$y2O!Mp zh^?V$hxg{+t11O^RYQYk);8jpt5)!Z&i^t^t!=9m4Bb5;4HaqX?Ia*84bM&BGH zZf1&JPch2xFbNFK$fBaex;772ts5hQolV}p?T5=%Fp zm68~SGz2EOAzJjX7R?8Q01Lo20a&D%fK6)>IGBKkfu0bo(h6C$yh{SuJ+$0C*0nYbLG-Vg?H>ZX!l+d zHsr%jL~dESLj-9{jUnELoXAub(p-P#;eeC^wxF8bMUYmew(bG$-Mh(ID3S$E2m-Kw z@^fzLEFejWF@mHI5cqU8e8Bkr>gsJsy{Sn+XjyPEj};u^?J+4B+0<_ebLf#OIi@?| zNK|AK>LigW>JaD@(}}Axo&(Tck$Ksv<08(+9o1P^t#y&I+kqbiy}h?$s8NDN5v!KqzgvQydUpJ#SYRmw*%x6f!nr6KC=Nc=GWtyFc?XxBEAiy zHzt&{o9~<$cuURrnpQ~Md5`E=5l}Z5xQ$h8CQi-ysk_p;E@dyCf9kopQi>K0`z40a zE5v{X16PV&Ck07Rr$ODir!(ke69iu%?)k|L7LUbEJ%kxe^R9jr zaP{`}6|i5m;jAk&;J;cv0eXQ!nooY#qcVQ!foCwkl-xUnIknvCFL!!-cMI=+Pz=nz z)CtaRP2D3LT#0CVY!b)js$0*zf8D)?FOT>fgxyJn1z%yLxu+X;TjJ}tGyOzz@YRpVET7Guhq9T_O zEdMRtv`4NBRnvmtjE^7tR6Xxrym;56>eFV10fAqIczR025{ai*p55zL(3qKTt+L?F}4eo-y z_|Z@Z3-}|esJcq%VF8s<=#lZ4qs`5oynblIhDR^epP`ooI=I&kMl%9kU{KEOMUggD?p&*sJ<+E2bU~24^X#oe(C%zwSNvm;&Q3i`(L~j*` Har6HMi3(EK delta 1120 zcmbQpcaLX7Dq}s%V^0^ykczmsvpfAB8;H2tGW#ZKY?-@3KlT3gP2wm1|G%c;yZXrX z5`n9?-753J%@cgS1ZdlyrS*gRw?Jf534*MDXTW5Mzo@#P5+?Sugu>3(IcTKwI z`6HZ;4dH8w8+unuF5K{;K$L@0T^f(p#clP6;@Ca8AMupx*kZvtd@MS4s@jCDbbT zHn{Ol{^ZliAYM)@i|hW++y`UI=>tm7!! z;^q;X+_CFeP10QEoS3s5t*z~=9U>}raJ95*F=#o&CNoD=w_Pz^w$8A$H}ygs>zcsB zOKgIbfD*5yHoJrTT94PW1>7?{Syj?LJeVY$Jn2Y+M~kP=B$Xd2O&uzRJAz8Li5)N8 zvuD$;ZQFKjk~v;DB}B^jSB_rab#t@r+sezfZ8tN&wwUi-kggG9plx+3)3x&N-}w3Z z`}p|3eJ|_hWX*Xqch0=}x$!Y`=Fgq?CN}P&-qlCKjHhS+UVhztdwKbG^Xtoh->ts0 zG^(bEFXE<^#qP?AnyRXr9hTM=bq8Zt9aR_Iu&cJB?)Q&dulL&BnoO(gX?m&fd3U|V8 z(R0