From 2d5ddd049d590a3928aabea1d96a7884d06aef32 Mon Sep 17 00:00:00 2001 From: Lazzzycatwastaken Date: Sat, 5 Apr 2025 18:33:06 +0200 Subject: [PATCH] =?UTF-8?q?SAD-slime=20ahh=20dih=20=F0=9F=91=8C=20PAD-P.Di?= =?UTF-8?q?ddy=20ahh=20dih=20=F0=9F=92=80=20RAD-radioactive=20ahh=20dih=20?= =?UTF-8?q?=E2=98=A2=20DAD-Doofenshmirtz=20ahh=20dih=20=F0=9F=8E=A9=20GAD-?= =?UTF-8?q?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