From 2d5ddd049d590a3928aabea1d96a7884d06aef32 Mon Sep 17 00:00:00 2001 From: Lazzzycatwastaken Date: Sat, 5 Apr 2025 18:33:06 +0200 Subject: [PATCH 1/3] =?UTF-8?q?SAD-slime=20ahh=20dih=20=F0=9F=91=8C=20PAD-?= =?UTF-8?q?P.Diddy=20ahh=20dih=20=F0=9F=92=80=20RAD-radioactive=20ahh=20di?= =?UTF-8?q?h=20=E2=98=A2=20DAD-Doofenshmirtz=20ahh=20dih=20=F0=9F=8E=A9=20?= =?UTF-8?q?GAD-gurt=20ahh=20dih=20=F0=9F=8D=A6=20VAD-veiny=20ahh=20dih=20?= =?UTF-8?q?=F0=9F=8D=87=20UAD-united=20arab=20emirates=20=F0=9F=87=A6?= =?UTF-8?q?=F0=9F=87=AA=20CAD-creative=20ahh=20dih=20=F0=9F=A7=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../container/ContainerMachineRTG.java | 72 +++++++++--------- .../com/hbm/inventory/gui/GUIMachineRTG.java | 46 ++++++----- .../assets/hbm/textures/gui/gui_rtg.png | Bin 1411 -> 4891 bytes 3 files changed, 58 insertions(+), 60 deletions(-) diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineRTG.java b/src/main/java/com/hbm/inventory/container/ContainerMachineRTG.java index 07e1f070e..d14121ce0 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineRTG.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineRTG.java @@ -13,60 +13,60 @@ public class ContainerMachineRTG extends Container { private TileEntityMachineRTG testNuke; private int heat; - + public ContainerMachineRTG(InventoryPlayer invPlayer, TileEntityMachineRTG tedf) { heat = 0; - + testNuke = tedf; - - this.addSlotToContainer(new Slot(tedf, 0, 26, 17)); - this.addSlotToContainer(new Slot(tedf, 1, 44, 17)); - this.addSlotToContainer(new Slot(tedf, 2, 62, 17)); - this.addSlotToContainer(new Slot(tedf, 3, 80, 17)); - this.addSlotToContainer(new Slot(tedf, 4, 98, 17)); - this.addSlotToContainer(new Slot(tedf, 5, 26, 35)); - this.addSlotToContainer(new Slot(tedf, 6, 44, 35)); - this.addSlotToContainer(new Slot(tedf, 7, 62, 35)); - this.addSlotToContainer(new Slot(tedf, 8, 80, 35)); - this.addSlotToContainer(new Slot(tedf, 9, 98, 35)); - this.addSlotToContainer(new Slot(tedf, 10, 26, 53)); - this.addSlotToContainer(new Slot(tedf, 11, 44, 53)); - this.addSlotToContainer(new Slot(tedf, 12, 62, 53)); - this.addSlotToContainer(new Slot(tedf, 13, 80, 53)); - this.addSlotToContainer(new Slot(tedf, 14, 98, 53)); - + + this.addSlotToContainer(new Slot(tedf, 0, 16, 18)); + this.addSlotToContainer(new Slot(tedf, 1, 34, 18)); + this.addSlotToContainer(new Slot(tedf, 2, 52, 18)); + this.addSlotToContainer(new Slot(tedf, 3, 70, 18)); + this.addSlotToContainer(new Slot(tedf, 4, 88, 18)); + this.addSlotToContainer(new Slot(tedf, 5, 16, 36)); + this.addSlotToContainer(new Slot(tedf, 6, 34, 36)); + this.addSlotToContainer(new Slot(tedf, 7, 52, 36)); + this.addSlotToContainer(new Slot(tedf, 8, 70, 36)); + this.addSlotToContainer(new Slot(tedf, 9, 88, 36)); + this.addSlotToContainer(new Slot(tedf, 10, 16, 54)); + this.addSlotToContainer(new Slot(tedf, 11, 34, 54)); + this.addSlotToContainer(new Slot(tedf, 12, 52, 54)); + this.addSlotToContainer(new Slot(tedf, 13, 70, 54)); + this.addSlotToContainer(new Slot(tedf, 14, 88, 54)); + for(int i = 0; i < 3; i++) { for(int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 106 + i * 18)); } } - + for(int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142)); + this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 164)); } } - + @Override public void addCraftingToCrafters(ICrafting crafting) { super.addCraftingToCrafters(crafting); crafting.sendProgressBarUpdate(this, 0, this.testNuke.heat); } - + @Override - public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) - { + public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) + { ItemStack var3 = null; Slot var4 = (Slot) this.inventorySlots.get(par2); - + if (var4 != null && var4.getHasStack()) { ItemStack var5 = var4.getStack(); var3 = var5.copy(); - - if (par2 <= 14) { + + if (par2 <= 14) { if (!this.mergeItemStack(var5, 15, this.inventorySlots.size(), true)) { return null; @@ -74,9 +74,9 @@ public class ContainerMachineRTG extends Container { } else if (!this.mergeItemStack(var5, 0, 15, false)) { - return null; + return null; } - + if (var5.stackSize == 0) { var4.putStack((ItemStack) null); @@ -86,19 +86,19 @@ public class ContainerMachineRTG extends Container { var4.onSlotChanged(); } } - + return var3; - } + } @Override public boolean canInteractWith(EntityPlayer player) { return testNuke.isUseableByPlayer(player); } - + @Override public void detectAndSendChanges() { super.detectAndSendChanges(); - + for(int i = 0; i < this.crafters.size(); i++) { ICrafting par1 = (ICrafting)this.crafters.get(i); @@ -111,7 +111,7 @@ public class ContainerMachineRTG extends Container { this.heat = this.testNuke.heat; } - + @Override public void updateProgressBar(int i, int j) { if(i == 0) diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java b/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java index 2dc166fa4..3293177b1 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java @@ -19,61 +19,59 @@ public class GUIMachineRTG extends GuiInfoContainer { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_rtg.png"); private TileEntityMachineRTG rtg; - + public GUIMachineRTG(InventoryPlayer invPlayer, TileEntityMachineRTG tedf) { super(new ContainerMachineRTG(invPlayer, tedf)); rtg = tedf; - + this.xSize = 176; - this.ySize = 166; + this.ySize = 188; } - + @Override public void drawScreen(int mouseX, int mouseY, float f) { super.drawScreen(mouseX, mouseY, f); - this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 152, guiTop + 69 - 52, 16, 52, rtg.power, rtg.powerMax); - + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 146, guiTop + 9, 16, 51, rtg.power, rtg.powerMax); String[] heatText = I18nUtil.resolveKeyArray("desc.gui.rtg.heat", rtg.heat); - this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 134, guiTop + 17, 16, 52, mouseX, mouseY, heatText); - + this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 124, guiTop + 9, 16, 51, mouseX, mouseY, heatText); + List pellets = ItemRTGPellet.pelletList; String[] pelletText = new String[pellets.size() + 1]; pelletText[0] = I18nUtil.resolveKey("desc.gui.rtg.pellets"); - + for(int i = 0; i < pellets.size(); i++) { ItemRTGPellet pellet = pellets.get(i); pelletText[i + 1] = I18nUtil.resolveKey("desc.gui.rtg.pelletPower", I18nUtil.resolveKey(pellet.getUnlocalizedName() + ".name"), pellet.getHeat() * 5); } - - this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, pelletText); + + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 8, guiTop + 25, 16, 16, guiLeft - 8, guiTop + 36 + 16, pelletText); } @Override protected void drawGuiContainerForegroundLayer( int i, int j) { String name = this.rtg.hasCustomInventoryName() ? this.rtg.getInventoryName() : I18n.format(this.rtg.getInventoryName()); - - this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + + this.fontRendererObj.drawString(name, 13 ,7, 10925486); this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); } - + @Override protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - if(rtg.hasHeat()) - { - int i = rtg.getHeatScaled(52); - drawTexturedModalRect(guiLeft + 134, guiTop + 69 - i, 176, 52 - i, 16, i); + if (rtg.hasHeat()) { + int i = rtg.getHeatScaled(51); + drawTexturedModalRect(guiLeft + 124, guiTop + 60 - i, 176, 10 + (51 - i), 16, i); } - if(rtg.hasPower()) - { - int i = (int)rtg.getPowerScaled(52); - drawTexturedModalRect(guiLeft + 152, guiTop + 69 - i, 192, 52 - i, 16, i); + + if (rtg.hasPower()) { + int i = (int) rtg.getPowerScaled(51); + drawTexturedModalRect(guiLeft + 146, guiTop + 60 - i, 192, 10 + (51 - i), 16, i); } - - this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 2); + + this.drawInfoPanel(guiLeft - 8, guiTop + 25, 16, 16, 2); } } diff --git a/src/main/resources/assets/hbm/textures/gui/gui_rtg.png b/src/main/resources/assets/hbm/textures/gui/gui_rtg.png index 308cd12a621bc84774e91a63254f268a1797205e..30cadbdd9fb0e46452233e9cc66766764e3e342a 100644 GIT binary patch literal 4891 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 literal 1411 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6%N?Bp530R%N1DIE+9tX7^b zjv*Cu-rhZ!dnZhQ?ZI)Ele!L39*mg|S;^9Z3+zHVw(+fOVA#2=m0{;mz8B6qM{cNS z-*$di^rQa1tJMkRKAnG$9`BR&do2ICL2lV~|7VZhzcu+EVl(OfvhDjbcIVmE&3S(F zr$7H?le3SLIrgj;tNx$+v%+e(q+i{v%DOta?c2A1mPlU3e&Fow_|3_eEjSydPoMr; zmba$u`0?Y0$0Ypy{U3i%S}Xtm$Ih?^?eS$BStODze!g5@!}>w*HRX#xR-Ak{ z@7pWJ4|j#yFHU1vu=RBu(W{snFf7iO(JV0!cJ<$0DCD6UhV)6^PNhe~2D9_l+B5 zNv-yWzU_?tiVPWfQ&kU~`*&(S&{???RUIyH)_XBrh_Yn(cgl`+)9&TA$_KMR)NckD z#lo<5ClfgC?l6O?b-P$@96a5w#`JcD-=c0k#E+)IVjnR;KP-HqQL|H7aO zCKCAh>{fn;9de8e2U!?cgc$^U7#s`;ag0I6P1|&R-;eE?J%;B$-(TFvGi5rE^T2}}%4oD3Xl3<@(CaB*(jEN8w4Od9(SzJ9#^YT)zi*DZG6{wUq6vHmbk zu70gwn(X_a*nU-_9S8BlhRvTDwtbtCQEK#h!@SM??B;?Vb9Jv+&gFRW@xf_BAm{9L zL%|H&cZ`I6ixMctV6BO^YD_CP|FlwLT6^3@q0}t?xXXgCJJ?AHL!hZ=z*^hC&Y8=> z5}l%Sp-6`j7EW{ba%O04u!>$$Y$ZD5=?tzl=bpXZVYye%n?PV<1oJYc)j)TyIUbU5 z%TTn!avC&(9kka^|F82nt;f*!vWdOD{qKiPGp=hly!`g<+bVXZ_(Qx0Qs?|*c)nVO jwZ>B29$4bh23UV#bW?wQ@r`TfE|3MDu6{1-oD!M Date: Sat, 5 Apr 2025 19:02:44 +0200 Subject: [PATCH 2/3] =?UTF-8?q?SAD-slime=20ahh=20dih=20=F0=9F=91=8C=20PAD-?= =?UTF-8?q?P.Diddy=20ahh=20dih=20=F0=9F=92=80=20RAD-radioactive=20ahh=20di?= =?UTF-8?q?h=20=E2=98=A2=20DAD-Doofenshmirtz=20ahh=20dih=20=F0=9F=8E=A9=20?= =?UTF-8?q?GAD-gurt=20ahh=20dih=20=F0=9F=8D=A6=20VAD-veiny=20ahh=20dih=20?= =?UTF-8?q?=F0=9F=8D=87=20UAD-united=20arab=20emirates=20=F0=9F=87=A6?= =?UTF-8?q?=F0=9F=87=AA=20CAD-creative=20ahh=20dih=20=F0=9F=A7=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hbm/inventory/gui/GUIMachineRTG.java | 4 ++-- .../assets/hbm/textures/gui/gui_rtg.png | Bin 4891 -> 7512 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java b/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java index 3293177b1..52ac5c2d6 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java @@ -45,7 +45,7 @@ public class GUIMachineRTG extends GuiInfoContainer { pelletText[i + 1] = I18nUtil.resolveKey("desc.gui.rtg.pelletPower", I18nUtil.resolveKey(pellet.getUnlocalizedName() + ".name"), pellet.getHeat() * 5); } - this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 8, guiTop + 25, 16, 16, guiLeft - 8, guiTop + 36 + 16, pelletText); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 12, guiTop + 25, 16, 16, guiLeft - 8, guiTop + 36 + 16, pelletText); } @Override @@ -72,6 +72,6 @@ public class GUIMachineRTG extends GuiInfoContainer { drawTexturedModalRect(guiLeft + 146, guiTop + 60 - i, 192, 10 + (51 - i), 16, i); } - this.drawInfoPanel(guiLeft - 8, guiTop + 25, 16, 16, 2); + this.drawInfoPanel(guiLeft - 12, guiTop + 25, 16, 16, 2); } } diff --git a/src/main/resources/assets/hbm/textures/gui/gui_rtg.png b/src/main/resources/assets/hbm/textures/gui/gui_rtg.png index 30cadbdd9fb0e46452233e9cc66766764e3e342a..4d5bcb9f34bbf17ce939e0f72107c6f5952e3f96 100644 GIT binary patch literal 7512 zcmbVx2UJsCv-U{>1Zkm11PMhcf;169T0n{d3W6_1I;bE5K~U)lO(CEZMT#Iz1@sL~ zF!WvpBp^r&O^_lzQW8jjKfK@l*ShOp|F`b??pf<(&z?PdX7=o7W}kC{HM?QR&T@(c z008!DSM|&R07NH205cQ4vGXmwcii(cH`E1+`-FbeI}C0**L47(EP<8g%t-H_@VRQ^ z2LK$c$2X`GRd|QaJo!l9`jG|d-Xni!-@AaB^L_6}ayRsEiCmOZlvASCLGW}L{9Ws7 z_pV(#2Qbq+jKC=n<3Fa2=sm&zqUqiMQXt4bd@!9>1c3ogdV8CG-;ZYahwnkBk1r?s zeeC-GZT}ym00aOMp#TG2LP6<*0x0KST90Qi=KM=jGMzrYz;r#}eN1N) zrSYimD1SXGUw?QIcz|I_jw>8L%$Y|p;?G4!YPi0Z6K7AlPPJ=tCD zx48WMFS)9ji1u=VmaY5;>~6Z4M~_)fyXIFUhi1PH$SLYSY4lp1gk9Xcb#_7_U$TZJ?a(?Pf5L zph0X&k&@Z8dzvGCN#ao0VYwS&*pCn%bTbg17n*<4BU{>N{JWmFIs)@+z~fXJ(wyc* zWCyw!IwWaxT1Sk8>Clm2RMA3q!0cC#H<4|P4x~sS$maA<&NZPG6c(>Z`*HMf;ld4+ zo~c}6flQ|MwAQa(J?Ia+wuC3i6(6vQL^WR5SPV<{kpfrE%2vGa^iLm3kw*(SzUOpa_~reMM(~;1Rj3#LD6=__-+xl1QNr7QFbt z1my1gyr{j$6Q_Q(JGk>*_{!pI5H4YpR|Jl2)ON)WDBTL~%&&M`i>Vu3wHohO%ULCjJ-gfOIaHyon zjlpzy%(0g=mhI1~zC9Pv!j;rI=J#8*(qw=?&aY>q!qg^FBpNt|peiR;t+DwFh5z z5W}VqThZE2_LFQ;pB69swtu}gozEtSLNIDQUjFFek!u0lX+Ij+n9kKWfm0Bx18E!# z4aW5pSB0oB`7D#)u;+X`Er%h~(PM9YuW@ac)iqs+D%C{xj}U1qOzUvgRpw?;4lHYt z;v39kza?br{lL{CP;5C1vpDn$YUpJF9?8jDG2=RGMdO+h;jsHr`4BDbD+pzC65x?k z4qGCVt7i+$G%cIFZUv^~A#b^=^3drV4#tJ=IOY=ejLvebhO`J;{jJysxV@De@Mcrj zE#Qi($kLYaoHOO|O_NMqEs#VxfIo#)ayMALiBln&pJ~pQ8Ia JEoC@j|%SyP?7 zokF~ksxG(N(8w;oeM^XQd+e^Dk<09v5>R3?<=vm<-{(whU5t_|{NH95#aVNRCl!Y3 ziGw;o5UCefo>M?pOVC0z;nvSnxqw1N7lq z15x5o;^&R)L)C?gjvsnTr{7!&AeGQXJc00_XS_#3Pt_UxI5EE!?->GGxPC9|3(P3; z>$bKN>`l{*U0jV(>T=we=chrGQe9L1e*iQX#O2eK<;XdD*8-;mCHbG_eta%(0Qt|@ zD`i0IgcK=QtXXNitLT!3YiL4-O2LG)wwTh>QY!+BhNQv)vE&*gV3$_@*Dv317fY-& zwL^%}uDni*XdE!IbYo%qaC1}*rX zh9H$v^j%ey_@bgyTigA5CNma}nR-a5X#iWwBKP7L&(%teU~su^hHuvO&(}wu*052% za52@}$I=2505fc<0gC_QiLj()G%)qw9Ywk7_YS;k@KSteu6^p-VWoM>N^$UCJL>BV zA@hw5I1ToR9rBSGp$IIhQg;QjeFP7iMeJ)r&Tc>`Jv_}%)3-moflTZhH`)>&|I$Qc zufj@@-vKR366~)F2|u9L42^|aGfe}6;on6FS74gv@%p*@M_@Q(xF$g{F7t9o?@{7Yo`O+eylvWms8g&l zFM%B1LqvLB*?@`NH00VjjM@CCjhF&B2E3ZYAXl-Dxa_N8EBgsL9sHQD5Bhwg50a!s zTAVe-7NwDGZC_OYEC#87M8)#sKafvHexJkjlp=IoN8z7O4~yfvGF)cw2!yqvViTkOU{AAO*UP?V_+zoJl*5LO*eY(~IQ`m|Ru(W0U&){l%Il$)`O*vvSW~Q?^$>2^jE{t>AvaBeZjxgfhx|bOt}uU zIH$m6)K@An_2_P6PlbPD@p$Jsbw=rp8ua%KNS8`j;o>6v2UJKkNZjnyufWabl3`;g zmM!O;H9C42@LBO*g8L_4Kh^XtbzT7Z>AM@s`q0amVPmhr3gHb2pyY1L4?f$UrQ27w zJjrD#E8n=hd|(k4yj~NGVenZVvUnX1JAaFwO_V+37kKq0ir*y-J9-k9kC==DFGqk) ztv#)c%^zlHM|y= zqUDs3TurH3yzIp{EI3&7&d1FJ&^ymr*-(Y|6bw_hW+$WDvfDJMAtbmlq)-EPe(P7= zQ}~Px?Lnog>AD|ayh^qSjaFrBYPCDG%xRSC-?98@7ASj`0E$7I1TmDZX?iPCkm4bQ z(pW@t9iR2Kt2k5tqvxiULu%{=O%^wq8Ac`ej}%h**51(znx?Q&xI>!eL%m{3dVzFm z`y$_*QX1%yD!L#N?!o(jNjH4S$RT^aeHuSmHrL57iQY*G`mN^MZi?Q1ZDqwZ|M@Cy z#Z3Xyq$bm6Pb^)mETrtj3}DRm1*<)boGh^CUKVjS(zZTUqo1cbokC?+pz^A}yk~i}`PK0Ujy978>v2=eLu^5F$&`nRFpbT2dFPiQ9Dp*G zHLq^X-@9ai%0@l$=OG0_>ho`OCHZI5Zq-*n{akHx7J&{)A|O_|-h#gzGEKO&uxNxu z{5pmF6e^vYM|)#+5Kv!X_|;7hwqeMloFYMj2sG_?U1m(AT#DwySmmvWD(NlD0mU*Q z8^mdwy0tY_QMVDXi8V$g@zTC6YUQCK^fo(k7UhN`EVOSBV;_6Ld*4hgGms4ZLHpaZ z>rJ+Cg~$@Nb{A`NLQbeZPOj0{tfNWnD@jwAyvQfOOr8vr&(Q&S#81~#GMmyS`RVst z|0yii0IX@fcQL0;zOBwZL^OtT)<+z|>C({!M5QSz0iySwvms*y{zq1CcM0eqAzW*J zAYs^VvU)znmOuM&d-+IvnsNUAg2G~8tKgKG{93Lfgv0P}&Vr?ff_Q=(=h!T_BO-2=3^G03pI%n-FyUkY^!g=h;=;9kvyJL1}Dn& z?H=zWtYtsL91L_Cj1j_eu zML=EvQKOtFEmDd-^F-Vc--v_7b?vRMrhg4q)*Tf6;4SqmObRmqbUgt!>R9cSO#a;W2)l2vWT$8_l# z9cK$zgX~r^ab~zn3O9P{U^^7N?L6 zSe><|bmV3Wd55{DnlND-L3f4e47Y<(#dRma+S92P68-lSr0IFc2K3c(oqXme6)&yN zT9*S_F#sE+pYIGwhWH3uOkJmRb)w53^BxC9M1l5yP;09 z4YImSB6_gVtxMRn`6r>Dd(%!dsbqOCo$@JbN z{{%fs7x5#}Y0`2sI0=%)`^<5NYW7tb?u$-ZO_$sH{B`Ka<0h`yCIu_r7C{f~}W+hcDT(fUQG|X#4He&cF~fJ z*X9f|j!zrghB9QAHlKA9ATq2T<~_+{D*!$o806EfmY@A$Y;MQal!e&j1t_B0xy;g2 zyiYXA?FW8uy`Y;bYljvk;H?trIk!|$%oyaRwJ2DY_<6}ri(9Mf_nxN1W?I3f&H6}d zR6kRr_HbmE0KRCLf$nEYDfD?8>i%uGb9;I=r8N1wyZ-fqWH8@ zlX#j#^D<{qRE>{Z^lIG86q6m1Yb}D47=L!io6Cn_4~PGjRYB7cvIg}bnaj0-2<+WDvW!}RUM0;2uY&ei)AOc?|$$=OQb;j4$ zg8G6zgK>!`i0oBa)X(#HVZYDkaWFGOabSQoCjBP-ulL;wJ4|I9Ri?3!mZoIgG9P%_~)Uh1W$jgDzpuL3W@ zt-RjKu{ROldI)`i^v$n#F3B3KEonXDQ%q?347X&Fe{Ux;#QZC=U&NASSWwp^yZ2i2 zcu<#)qU&R*fRazbi>SoHAhI zm=Mko^7C@Mg!TG;Ztc;oy);f&XZ9vAC|C9@TIREg)VUY};R1|oI#{+ffc7Msb$WO1 z_Y#75wR?0t?1v;w0v~=QYYnF zZ%2Z7b~Zv&L5Fhm!<Wnwv=FjtTvIJjd?UCYOWlWBQrxKuC zzHh%7lU%#^3Wa=5w?qP_tl zA~K&Oc-$k1^&j|!3iuaH=R1O8-)`A03=PjEp5DSw#AOr5lfc7@h-JUi&T>&~$TMa2 zMcJqoEU{_#LxeZD6~n^kqt(eEmBKt6U0BMV?+~K`pHX^h*v!@Imo2-eQl~R_)r|P6>8&8uhUz<^}HmnjZ&7|Jx0`$15>l;f3^;fIaR@=38NdR** z3t&B&=p_d9kXbQT8=G;_ty79jX(7+&efq1-5M&0#c<@+=bSt}H{pS+D*VF`+zN>bX*hkx0~RyRoR;9lgqI^qKsei-q`XTY zqq%B?wd$;`h8vnhK@2GYss{7v+iD_fezb>H2}gXH=N~GYH57JaDrE~1_~WaMXUF%p z5Wu4n)IDUy`DLf+hF-KB{pm9@QQTulz?>#5!|T$c08=#MF66#fBnKeZs!*kTVcFfsvE7{du8ax-a5xZPpgO*s-8TQ38IviC}1* z<|b$%6nRSl#KL^n(!`ocnI(2CcHk6fWRTh1385nEDcGIVx=ZObrQ!K;u2dV;nqyR& z)?tX&?ffpajg_JDdeR6Wt1*h@i*_^=QBY@@QTe#v<_!(M{nIw-HV-oJjCHNNEn<`~ zJ}lAnWQ+i=Dq=&Lyy1oboH|CTycv9+a=bMJ=N_*qcSqTBv%2>m54g~cf6MY8!4|D1 WH=Db4I*$JyyrzFcuUOY9;{O14%D$=q literal 4891 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 From 574c4f1ca2c77086d826fda28d653799ef36639b Mon Sep 17 00:00:00 2001 From: Lazzzycatwastaken Date: Sat, 5 Apr 2025 23:47:16 +0200 Subject: [PATCH 3/3] Top 5 people i'd scam out of all their money: 1. You 2. You 3. You 4. You 5. You --- .../com/hbm/inventory/gui/GUIMachineRTG.java | 8 ++++---- .../assets/hbm/textures/gui/gui_rtg.png | Bin 7512 -> 7552 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java b/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java index 52ac5c2d6..22fa883f6 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java @@ -63,13 +63,13 @@ public class GUIMachineRTG extends GuiInfoContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if (rtg.hasHeat()) { - int i = rtg.getHeatScaled(51); - drawTexturedModalRect(guiLeft + 124, guiTop + 60 - i, 176, 10 + (51 - i), 16, i); + int i = rtg.getHeatScaled(51); // was 50 + drawTexturedModalRect(guiLeft + 124, guiTop + 61 - i, 176, 10 + (51 - i), 16, i); } if (rtg.hasPower()) { - int i = (int) rtg.getPowerScaled(51); - drawTexturedModalRect(guiLeft + 146, guiTop + 60 - i, 192, 10 + (51 - i), 16, i); + int i = (int) rtg.getPowerScaled(51); // was 50 + drawTexturedModalRect(guiLeft + 146, guiTop + 61 - i, 192, 10 + (51 - i), 16, i); } this.drawInfoPanel(guiLeft - 12, guiTop + 25, 16, 16, 2); diff --git a/src/main/resources/assets/hbm/textures/gui/gui_rtg.png b/src/main/resources/assets/hbm/textures/gui/gui_rtg.png index 4d5bcb9f34bbf17ce939e0f72107c6f5952e3f96..ce99dbca6b052a46364cbaf1af6bf2cabcb23770 100644 GIT binary patch delta 6268 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 delta 6126 zcmZ`+c{tQv*#3>dNErJhGNde#EhO6vk&2@9TC!7-7bD)X&isU8s3e85D@(nTB^vwM zSVD%#Hn!~9C(8^o#y7p+Ki@y!`Qu#Yx}N8p=Q+>0@B3U&r2ep8sR0CpT{1Pk5#q9% z=|?zi=g>~O8(z&Ny!Pnwufy-fZ$ev7mBnbCJcZmkuPu18Ugl^1@rP(0p%;US@)7C{ z5k-ewwKR^RytNd~u7A9Qe=!_0KPaf}mMcv8o^rFQqHe4U@s2hjO#^$FR@wU*Uf&4X zYT@hWHV;mcGhb`}o#nt-0e26E-lQ4^%f<+r@W{rbiRf=@eLbmGe~Y%*icovz^v|t( zYhxp=Jw03r392>T_gKv8*4O=B;*+S&{hE2rksg{;*lM|Z--b&Bx9|< zB+F6jb<-LH#e5j{;MI#pyZAEJGxaK11N~%oC+7uuCe)D{t&q*UV>r~4BnN}D%Du>g zLF9*F*Fq6_*n%UVPqxzK(eI}I`bcoL&*x|w`a08%!Vh$Cwka@Yj1IWSlh~nf%*Xlc zkm;{JZ=y+!F4Sl#=*Hwv!Bwec44!Dn{BiJp{>)X3sg-I`p>hUl(r9+a6!yc3l=$Ff zMLu4Ga!%AU9^}nFP#3CM-h3uKzW|j#e|NM`e~X#~q|_hj zkL&-I07Ei;>MPoNLl0lId(8NI;9EfeF*pH>q(wsSV6^sy+*-tUB3 z?aJ*}hYYr#7B0WI+c&o!wB~@YxRz?FOHjk(MJ7DJ(B{LgRg4~2&`vwi@uCtHe*b`$ zRlEK^wI(QSlg?NZ50?xWVc2m8w04y^Mf{w_9vCeL8k znwjbxde=FS{<9aQ*Jy6~1t`0!8EM3t_Ef$WmIKdP zpa+JFIB!Zh`v2`|6MB3p3tSjThMD`>fE+_PdCS&9C+(O*6EXr$KPvCxlmaDTd~OmV z3R;niG+Om^p|zoHli!WdlsxnePhAoAI!AzO{yTxEgg?E#9B-f`gVWDEo{w<0Qw82^ zn0SSp*Ogh^w3uurz{;kF2Ae@&dmOpU@st- zRD?B^gS0`Qicj$(M}e%Cu=!Z>jh~nBV5jA`mjbnPi!9C+&6P@__?i>)R}DDqvy7+r zajew_iabmH=hZ6%)kO=g`CX;p!URK`yY2pDyAlSQFFzsNwj5i zPf_4VlPnT4m2i4LP$?z4g(BjcK73J+oaI(K=OCsQlcG$lHwfQ0Oz*I1u|EiHCuSVI z&_eua4$&zEakq6batj)6B+}h_ZfjnFsd^~ZDugd(L3m+A z)$lR=2yxY0f4n8e03P^a1C03F7ir5(Z{Y5|J&f@*>+XBo;HPo#I_l^pR^|1S<>K(a zw)NK0Khtk6v%(zk!bJSu{G5 z@6Q?{vsd6H=;0 zkS7oL0o2{kePVMX{yJEV4H$VVp%t#Wh7c(%hrCl|ZA2R3m}Y-yq)gr^ze|N4$OwLM zU9m6=Ib6zyjRMqL7zOuEH0-5VXGN@7dBM9tzUxt-V4To6B+g?_741Jvc_dOe42+T{ zFHnq&4d&$0gS*IR-}CG60;&#(NZU0ubo)YdQ|Sh<7DqUyNMdOEhj12fzN^ z6BxUnq$JbgZg_k_2~8q>)dBDzS{;pv7boV^jzxc;A#{}@jXj4EpNJe$WfPyORpZ}V(bZrul4MevhV4^czm)}V=Im=kVN!#|qGWp0{KFGP)ylVyd$__flx5$?z0pxx->eI5*t&i`(>%H6v) zcfQWHX{Sl`T$O`sC^6Ab2&H&zM~-kVrasJuzQ84awG1+g+cn5xNDp@=lWQeg$ndqAaF8=#X~5>yL-^?%Y*Nv8EuIqf7wJJ~4V>6q zEFZEQ1zrpR8%DcE>n~&P4KK$3o)sDAHdr~RO|CycX0BJ7g-o~#i+GhT{E-FEcGn8w zd|1uzIH|nDk&H6Y5J#!14!ffwUe?f37_nV?(NB>a5Fi@72;v6*D%a%L_~Q~o+hN0! z?+##4Me)|}cvV1iuM~`0z7v6{YE0>t?#r7R{b3v?EiH()*z&ZZHCYx(KoWt_s2kNO}t8dxTW+*N7 z&?U|Ao@p`tb)iyf>w?&fW*X!lU0h)_!bkLPZj*pgA^9~wieuM5d6fSc_^{FNQ7XeQWHcrrYw}DC{eWr3 z@}0cpt<~psq|@G1+KddLtF4Uw?dmXIxRx-%Gr$)%^OAl~18%UQhS0MJ*mOj%p3I;upm#zoCTmwfdU+_Tx%ifMNE><&M#cXBWI7I zKVU(n+&tzRyZw;*3iGdCrto!h5v>$?DpaCruS1XPIsI&`7-*NbDywO_qzV)(N32sO z9qLwBF&{fGQ<@IP={!HX=ZIOprvbakkDkVO5yy-HWeu(Zj6HA;_^I*u{7V}Ee z4L3z1ZE|qNL-hndaK3$!HxMDPnQAcT1$GI6Nc9y|(4J-emed#-gJo7Ckn{~00^GL) zZBEl#E0GtO=?bCzQ+q?Kf$67>8*Q(KqJrJi8)p}DRNN&=lK~A%fi>P zn~P7;Gr4~!-xEHYJS8Y_q`R2`oMNWiZ56z^!?x%Crq5i*a2^#%Ruc*}(P|Jhjq@{A zZZWtHSEqdA^ zPaz?>B93b`$KyB|sNiuZWf>aZOKTvNK<(k@H@4$S;K$FGZePFfl5xP@0mOLcUSSex zTuIOIVvSss(X7mOfxARtu(c**g54&^c+2QbE|eNAef`K&e=V{DP{g6&RozU|5M&ts zR2Ccp{z0JQ0G`RLO`CuuI)voa3YW2ToiB@`Z9W*`o#=ThP%59S{3nwZ_i!vPqQwe7 znew(l%v-W(xwU8a;v(_cIQKitf|O?srB zU}J6>k}zf2F)3W*rVMUiy8s~2--6pQQ40fWi5@h+sZVOKlV3n~pgei)2=mv+xHkT2 z;!QWyh{;yQ39iD`k)@lFT@6x<&u`PDZUG)UXm!ylgjlZi>T_g{Q6>H{(hJq02^E;fBN7(3hBA?ncyLbcY1-;~*zH(Uely6B6d`O@w=EoZrW^ z^wRqg*m;=;_2aG;aF9Ur<6wS_aL&ape(fBoHqQSN2y4*NSfPv+7t z7@|rU&0(tLszDprhnj$f{xAcooW>LXkze`3K&8hw$hNODF=39F*X3Z+2mkf zTWrU}{u!OJBm-|Vtkq-N(X&9O@LdQ%K?3d z<6d7wfPcN~RNv+<6R5I^hqg4mG${*kMwZr#IiB!N@JlR7Fi0wTojvErC_NX)hbD+& zc$beCo~^9FA2N+HS?|H_-oJJ=?sZg~mN4qKI$~*P2>dM9x!u^_CvIC zmRajcE0+pie=Kz9#eF~hQmaPSG`wG-pX6p{0(}WL$jDbgq22vJ zcrM(%^|qOa(4jJX!Jci^Fp~DGlG-Jx%t0BEBA7#e>OGUUU%M-e8t&Ll6ZCZFZ{mP} zxhf}d%Aa%;PsNeRXW%re{<6(JoG-N56m9+0vLVpESM7&hr~=3dQHG=Gwrp_{>eG z`GLWi=f^gQV+q-m(Ik#R4dhbLF?ZD%KJ)9h9xIAWHGj=gru*7Z~Q|?5sjnykd9=`a^xI*$3e{<3Gv9 zBuHVeoM?%cfMH{_A@K@P;P&(6Z5e4^p=F0>N=pu30MQc#4<=H|vcz=V3>}{_RmxYV zbnMNmq)Rgxw>kh*q3Zg^l76$5>T@ftC=)8c)65Il_nFG0WzDxC^VO=IGfyEo{22K=I}kr827QI9TlxQ4Z$AU|i6QnY z-F70bwh^7kdYoO6e@Of!YL$9g(dy&!VR%S*Bv_a;oCoNbpF(o-8HYEE6r0Py%*cDv z1MWcl7^te^`14HRWKY!X+N@2s?D67;F%m(d&pBXqh8vK1Ec%8zgqP>Gt))G;7H|AW zeBV*XP(ROgH>8e=uViP^mmPYy6_Y4V@MJh(R$XJ#j93vyHw!w>tuGIh*Hec86$9^K zyjZNOxs19#@08B_J(54{;mx0pNjF8%p(pHX)f|z-ln6Ij64cWcRZ^GMErQEvi-TQqZT;sng;s@{ryYY?YPUAL!JuaDDH7z!Ai~1ka CpTw>J