From 34cc10d7a0ed4fff7a953f007f493f9bc5226db3 Mon Sep 17 00:00:00 2001 From: TheVitya2127 Date: Mon, 20 Jul 2026 07:51:46 +0400 Subject: [PATCH 1/4] Who stole my cigarettes?! --- .../handler/nei/CentrifugeRecipeHandler.java | 2 +- .../com/hbm/handler/nei/MixerHandler.java | 2 +- .../handler/nei/RefineryRecipeHandler.java | 2 +- .../container/ContainerCentrifuge.java | 32 +++++---- .../container/ContainerMachineRefinery.java | 30 ++++----- .../inventory/container/ContainerMixer.java | 18 ++--- .../inventory/gui/GUIMachineCentrifuge.java | 30 ++++++--- .../hbm/inventory/gui/GUIMachineRefinery.java | 62 ++++++++---------- .../java/com/hbm/inventory/gui/GUIMixer.java | 42 +++++++----- .../gui/processing/gui_centrifuge.png | Bin 2397 -> 2766 bytes .../hbm/textures/gui/processing/gui_mixer.png | Bin 3236 -> 3264 bytes .../textures/gui/processing/gui_refinery.png | Bin 8584 -> 3770 bytes 12 files changed, 119 insertions(+), 101 deletions(-) diff --git a/src/main/java/com/hbm/handler/nei/CentrifugeRecipeHandler.java b/src/main/java/com/hbm/handler/nei/CentrifugeRecipeHandler.java index 1acd56e2a..ece0e8f79 100644 --- a/src/main/java/com/hbm/handler/nei/CentrifugeRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/CentrifugeRecipeHandler.java @@ -20,7 +20,7 @@ public class CentrifugeRecipeHandler extends NEIUniversalHandler { @Override public void loadTransferRects() { super.loadTransferRects(); - transferRectsGui.add(new RecipeTransferRect(new Rectangle(56, 0, 80, 38), "ntmCentrifuge")); + transferRectsGui.add(new RecipeTransferRect(new Rectangle(63, 7, 80, 38), "ntmCentrifuge")); guiGui.add(GUIMachineCentrifuge.class); RecipeTransferRectHandler.registerRectsToGuis(guiGui, transferRectsGui); } diff --git a/src/main/java/com/hbm/handler/nei/MixerHandler.java b/src/main/java/com/hbm/handler/nei/MixerHandler.java index b93ff9ca1..3cee3b5a8 100644 --- a/src/main/java/com/hbm/handler/nei/MixerHandler.java +++ b/src/main/java/com/hbm/handler/nei/MixerHandler.java @@ -20,7 +20,7 @@ public class MixerHandler extends NEIUniversalHandler { @Override public void loadTransferRects() { super.loadTransferRects(); - transferRectsGui.add(new RecipeTransferRect(new Rectangle(57, 25, 52, 44), "ntmMixer")); + transferRectsGui.add(new RecipeTransferRect(new Rectangle(66, 20, 52, 44), "ntmMixer")); guiGui.add(GUIMixer.class); RecipeTransferRectHandler.registerRectsToGuis(guiGui, transferRectsGui); } diff --git a/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java b/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java index 2bf1e9e6e..f7d84f28e 100644 --- a/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java @@ -162,7 +162,7 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler implements ICom guiGui = new LinkedList>(); transferRects.add(new RecipeTransferRect(new Rectangle(138 - 1 - 36 - 27, 23, 36, 18), "refinery")); - transferRectsGui.add(new RecipeTransferRect(new Rectangle(48, 5, 31, 101), "refinery")); + transferRectsGui.add(new RecipeTransferRect(new Rectangle(24, 16, 31, 36), "refinery")); guiGui.add(GUIMachineRefinery.class); RecipeTransferRectHandler.registerRectsToGuis(getRecipeTransferRectGuis(), transferRects); RecipeTransferRectHandler.registerRectsToGuis(guiGui, transferRectsGui); diff --git a/src/main/java/com/hbm/inventory/container/ContainerCentrifuge.java b/src/main/java/com/hbm/inventory/container/ContainerCentrifuge.java index 58535bd9b..b06fe6acb 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCentrifuge.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCentrifuge.java @@ -15,29 +15,33 @@ import net.minecraft.item.ItemStack; public class ContainerCentrifuge extends Container { - private TileEntityMachineCentrifuge diFurnace; + private TileEntityMachineCentrifuge centrifuge; public ContainerCentrifuge(InventoryPlayer invPlayer, TileEntityMachineCentrifuge tedf) { - diFurnace = tedf; - - this.addSlotToContainer(new Slot(tedf, 0, 36, 50)); - this.addSlotToContainer(new Slot(tedf, 1, 9, 50)); - this.addSlotToContainer(new SlotCraftingOutput(invPlayer.player, tedf, 2, 63, 50)); - this.addSlotToContainer(new SlotCraftingOutput(invPlayer.player, tedf, 3, 83, 50)); - this.addSlotToContainer(new SlotCraftingOutput(invPlayer.player, tedf, 4, 103, 50)); - this.addSlotToContainer(new SlotCraftingOutput(invPlayer.player, tedf, 5, 123, 50)); - this.addSlotToContainer(new SlotUpgrade(tedf, 6, 149, 22)); - this.addSlotToContainer(new SlotUpgrade(tedf, 7, 149, 40)); + this.centrifuge = tedf; + + // Input + this.addSlotToContainer(new Slot(tedf, 0, 44, 57)); + // Battery + this.addSlotToContainer(new Slot(tedf, 1, 8, 57)); + // Outputs + this.addSlotToContainer(new SlotCraftingOutput(invPlayer.player, tedf, 2, 70, 57)); + this.addSlotToContainer(new SlotCraftingOutput(invPlayer.player, tedf, 3, 90, 57)); + this.addSlotToContainer(new SlotCraftingOutput(invPlayer.player, tedf, 4, 110, 57)); + this.addSlotToContainer(new SlotCraftingOutput(invPlayer.player, tedf, 5, 130, 57)); + // Upgrades + this.addSlotToContainer(new SlotUpgrade(tedf, 6, 156, 31)); + this.addSlotToContainer(new SlotUpgrade(tedf, 7, 156, 49)); 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, 104 + i * 18)); + this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 11 + j * 18, 107 + i * 18)); } } for(int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 162)); + this.addSlotToContainer(new Slot(invPlayer, i, 11 + i * 18, 165)); } } @@ -83,7 +87,7 @@ public class ContainerCentrifuge extends Container { @Override public boolean canInteractWith(EntityPlayer player) { - return diFurnace.isUseableByPlayer(player); + return centrifuge.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java b/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java index b47d2b182..3652425b4 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java @@ -19,40 +19,40 @@ public class ContainerMachineRefinery extends Container { testNuke = tedf; //Battery - this.addSlotToContainer(new Slot(tedf, 0, 186, 72)); + this.addSlotToContainer(new Slot(tedf, 0, 160, 90)); //Canister Input - this.addSlotToContainer(new Slot(tedf, 1, 8, 99)); + this.addSlotToContainer(new Slot(tedf, 1, 12, 72)); //Canister Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 2, 8, 119)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 2, 12, 90)); //Heavy Oil Input - this.addSlotToContainer(new Slot(tedf, 3, 86, 99)); + this.addSlotToContainer(new Slot(tedf, 3, 66, 72)); //Heavy Oil Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 4, 86, 119)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 4, 66, 90)); //Naphtha Input - this.addSlotToContainer(new Slot(tedf, 5, 106, 99)); + this.addSlotToContainer(new Slot(tedf, 5, 84, 72)); //Naphtha Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 6, 106, 119)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 6, 84, 90)); //Light Oil Input - this.addSlotToContainer(new Slot(tedf, 7, 126, 99)); + this.addSlotToContainer(new Slot(tedf, 7, 102, 72)); //Light Oil Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 8, 126, 119)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 8, 102, 90)); //Petroleum Input - this.addSlotToContainer(new Slot(tedf, 9, 146, 99)); + this.addSlotToContainer(new Slot(tedf, 9, 120, 72)); //Petroleum Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 10, 146, 119)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 10, 120, 90)); //Sulfur Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 11, 58, 119)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 11, 38, 72)); //Fluid ID - this.addSlotToContainer(new Slot(tedf, 12, 186, 106)); + this.addSlotToContainer(new Slot(tedf, 12, 38, 90)); 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, 150 + i * 18)); + this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 12 + j * 18, 140 + i * 18)); } } for(int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 208)); + this.addSlotToContainer(new Slot(invPlayer, i, 12 + i * 18, 198)); } } diff --git a/src/main/java/com/hbm/inventory/container/ContainerMixer.java b/src/main/java/com/hbm/inventory/container/ContainerMixer.java index 0242b916b..2640f02bb 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMixer.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMixer.java @@ -18,15 +18,15 @@ public class ContainerMixer extends Container { public ContainerMixer(InventoryPlayer player, TileEntityMachineMixer mixer) { this.mixer = mixer; - //Battery - this.addSlotToContainer(new Slot(mixer, 0, 23, 77)); - //Item Input - this.addSlotToContainer(new Slot(mixer, 1, 43, 77)); - //Fluid ID - this.addSlotToContainer(new Slot(mixer, 2, 117, 77)); - //Upgrades - this.addSlotToContainer(new Slot(mixer, 3, 137, 24)); - this.addSlotToContainer(new Slot(mixer, 4, 137, 42)); + // Battery + this.addSlotToContainer(new Slot(mixer, 0, 12, 72)); + // Item Input + this.addSlotToContainer(new Slot(mixer, 1, 52, 72)); + // Fluid ID + this.addSlotToContainer(new Slot(mixer, 2, 126, 72)); + // Upgrades + this.addSlotToContainer(new Slot(mixer, 3, 148, 18)); + this.addSlotToContainer(new Slot(mixer, 4, 148, 36)); for(int i = 0; i < 3; i++) { for(int j = 0; j < 9; j++) { diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineCentrifuge.java b/src/main/java/com/hbm/inventory/gui/GUIMachineCentrifuge.java index 788b1a4d3..bf64fcaf8 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineCentrifuge.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineCentrifuge.java @@ -5,6 +5,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerCentrifuge; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; +import com.hbm.util.i18n.I18nUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; @@ -18,25 +19,32 @@ public class GUIMachineCentrifuge extends GuiInfoContainer { public GUIMachineCentrifuge(InventoryPlayer invPlayer, TileEntityMachineCentrifuge tedf) { super(new ContainerCentrifuge(invPlayer, tedf)); - centrifuge = tedf; - this.xSize = 176; - this.ySize = 186; + this.centrifuge = tedf; + this.xSize = 182; + this.ySize = 189; } @Override public void drawScreen(int mouseX, int mouseY, float f) { super.drawScreen(mouseX, mouseY, f); - this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 9, guiTop + 13, 16, 34, centrifuge.power, centrifuge.maxPower); + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 18, 16, 37, centrifuge.power, centrifuge.maxPower); + + String[] upgradeText = new String[4]; + upgradeText[0] = I18nUtil.resolveKey("desc.gui.upgrade"); + upgradeText[1] = I18nUtil.resolveKey("desc.gui.upgrade.speed"); + upgradeText[2] = I18nUtil.resolveKey("desc.gui.upgrade.power"); + upgradeText[3] = I18nUtil.resolveKey("desc.gui.upgrade.overdrive"); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 160, guiTop + 16, 8, 8, mouseX, mouseY, upgradeText); } @Override protected void drawGuiContainerForegroundLayer( int i, int j) { - //String name = this.centrifuge.hasCustomInventoryName() ? this.centrifuge.getInventoryName() : I18n.format(this.centrifuge.getInventoryName()); + String name = this.centrifuge.hasCustomInventoryName() ? this.centrifuge.getInventoryName() : I18n.format(this.centrifuge.getInventoryName()); - //this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); - this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); + this.fontRendererObj.drawString(name, this.xSize / 2 + 36 / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 0xffffff); + this.fontRendererObj.drawString(I18n.format("container.inventory"), 11, this.ySize - 96 + 2, 4210752); } @Override @@ -46,8 +54,8 @@ public class GUIMachineCentrifuge extends GuiInfoContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(centrifuge.hasPower()) { - int i1 = (int) centrifuge.getPowerRemainingScaled(35); - drawTexturedModalRect(guiLeft + 9, guiTop + 48 - i1, 176, 35 - i1, 16, i1); + int i1 = (int) centrifuge.getPowerRemainingScaled(37); + drawTexturedModalRect(guiLeft + 8, guiTop + 55 - i1, 182, 37 - i1, 16, i1); } if(centrifuge.isProcessing()) { @@ -55,11 +63,13 @@ public class GUIMachineCentrifuge extends GuiInfoContainer { for(int i = 0; i < 4; i++) { int h = Math.min(p, 36); - drawTexturedModalRect(guiLeft + 65 + i * 20, guiTop + 50 - h, 176, 71 - h, 12, h); + drawTexturedModalRect(guiLeft + 72 + i * 20, guiTop + 57 - h, 182, 73 - h, 12, h); p -= h; if(p <= 0) break; } } + + this.drawInfoPanel(guiLeft + 160, guiTop + 16, 8, 8, 8); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java index b3aae3272..4e78a9cc3 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java @@ -26,53 +26,47 @@ public class GUIMachineRefinery extends GuiInfoContainer { super(new ContainerMachineRefinery(invPlayer, tedf)); refinery = tedf; - this.xSize = 210; - this.ySize = 231; + this.xSize = 184; + this.ySize = 222; } @Override public void drawScreen(int mouseX, int mouseY, float f) { super.drawScreen(mouseX, mouseY, f); - refinery.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 30, guiTop + 27, 21, 104); // Render tooltip for column. - refinery.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 86, guiTop + 42, 16, 52); - refinery.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 106, guiTop + 42, 16, 52); - refinery.tanks[3].renderTankInfo(this, mouseX, mouseY, guiLeft + 126, guiTop + 42, 16, 52); - refinery.tanks[4].renderTankInfo(this, mouseX, mouseY, guiLeft + 146, guiTop + 42, 16, 52); - this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 186, guiTop + 18, 16, 52, refinery.power, refinery.maxPower); + refinery.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 12, guiTop + 17, 16, 52); // Render tooltip for column. + refinery.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 66, guiTop + 17, 16, 52); + refinery.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 84, guiTop + 17, 16, 52); + refinery.tanks[3].renderTankInfo(this, mouseX, mouseY, guiLeft + 102, guiTop + 17, 16, 52); + refinery.tanks[4].renderTankInfo(this, mouseX, mouseY, guiLeft + 120, guiTop + 17, 16, 52); + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 160, guiTop + 18, 16, 70, refinery.power, refinery.maxPower); } @Override protected void drawGuiContainerForegroundLayer(int i, int j) { String name = this.refinery.hasCustomInventoryName() ? this.refinery.getInventoryName() : I18n.format(this.refinery.getInventoryName()); - this.fontRendererObj.drawString(name, this.xSize / 2 - 34/2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); - this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 4, 4210752); + this.fontRendererObj.drawString(name, this.xSize / 2 - 36 / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(I18n.format("container.inventory"), 12, this.ySize - 96 + 4, 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); - func_146110_a(guiLeft, guiTop, 0, 0, xSize, ySize, 350, 256); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); // power - int j = (int)refinery.getPowerScaled(50); - func_146110_a(guiLeft + 186, guiTop + 69 - j, 210, 52 - j, 16, j, 350, 256); + int j = (int)refinery.getPowerScaled(70); + drawTexturedModalRect(guiLeft + 160, guiTop + 88 - j, 184, 70 - j, 16, j); OpenGlHelper.glBlendFunc(770, 771, 1, 0); // default // input tank FluidTank inputOil = refinery.tanks[0]; if (inputOil.getFill() != 0) { - - int targetHeight = inputOil.getFill() * 101 / inputOil.getMaxFill(); - Color color = new Color(inputOil.getTankType().getColor()); - - GL11.glEnable(GL11.GL_BLEND); - GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 33, guiTop + 130 - targetHeight, 226, 101 - targetHeight, 16, targetHeight, 350, 256); - GL11.glDisable(GL11.GL_BLEND); + refinery.tanks[0].renderTank(guiLeft + 12, guiTop + 70, this.zLevel, 16, 52); + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); } // fucking kgjhgdfjgdhjfg @@ -80,14 +74,14 @@ public class GUIMachineRefinery extends GuiInfoContainer { // 350x256 texture by behated (the pipes wouldn't fit) // pipes - + RefineryRecipe recipe = RefineryRecipes.getRefinery(inputOil.getTankType()); if(recipe == null) { - func_146110_a(guiLeft + 52, guiTop + 63, 247, 1, 33, 48, 350, 256); - func_146110_a(guiLeft + 52, guiTop + 32, 247, 50, 66, 52, 350, 256); - func_146110_a(guiLeft + 52, guiTop + 24, 247, 145, 86, 35, 350, 256); - func_146110_a(guiLeft + 36, guiTop + 16, 211, 119, 122, 25, 350, 256); + func_146110_a(guiLeft + 60, guiTop + 54, 184, 104, 6, 2, 256, 256); + func_146110_a(guiLeft + 60, guiTop + 47, 184, 97, 24, 2, 256, 256); + func_146110_a(guiLeft + 60, guiTop + 40, 184, 90, 42, 2, 256, 256); + func_146110_a(guiLeft + 60, guiTop + 33, 184, 83, 60, 2, 256, 256); } else { // Heavy Oil Products @@ -95,31 +89,31 @@ public class GUIMachineRefinery extends GuiInfoContainer { GL11.glEnable(GL11.GL_BLEND); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 52, guiTop + 63, 247, 1, 33, 48, 350, 256); + func_146110_a(guiLeft + 60, guiTop + 54, 184, 104, 6, 2, 256, 256); // Naphtha Oil Products color = new Color(recipe.outputs[1].type.getColor()); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 52, guiTop + 32, 247, 50, 66, 52, 350, 256); + func_146110_a(guiLeft + 60, guiTop + 47, 184, 97, 24, 2, 256, 256); // Light Oil Products color = new Color(recipe.outputs[2].type.getColor()); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 52, guiTop + 24, 247, 145, 86, 35, 350, 256); + func_146110_a(guiLeft + 60, guiTop + 40, 184, 90, 42, 2, 256, 256); // Gaseous Products color = new Color(recipe.outputs[3].type.getColor()); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 36, guiTop + 16, 211, 119, 122, 25, 350, 256); + func_146110_a(guiLeft + 60, guiTop + 33, 184, 83, 60, 2, 256, 256); GL11.glDisable(GL11.GL_BLEND); GL11.glColor4f(1F, 1F, 1F, 1F); } // output tanks - refinery.tanks[1].renderTank(guiLeft + 86, guiTop + 95, this.zLevel, 16, 52); - refinery.tanks[2].renderTank(guiLeft + 106, guiTop + 95, this.zLevel, 16, 52); - refinery.tanks[3].renderTank(guiLeft + 126, guiTop + 95, this.zLevel, 16, 52); - refinery.tanks[4].renderTank(guiLeft + 146, guiTop + 95, this.zLevel, 16, 52); + refinery.tanks[1].renderTank(guiLeft + 66, guiTop + 70, this.zLevel, 16, 52); + refinery.tanks[2].renderTank(guiLeft + 84, guiTop + 70, this.zLevel, 16, 52); + refinery.tanks[3].renderTank(guiLeft + 102, guiTop + 70, this.zLevel, 16, 52); + refinery.tanks[4].renderTank(guiLeft + 120, guiTop + 70, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMixer.java b/src/main/java/com/hbm/inventory/gui/GUIMixer.java index 974e41635..b570d5c5c 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMixer.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMixer.java @@ -12,6 +12,7 @@ import com.hbm.lib.RefStrings; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.toserver.NBTControlPacket; import com.hbm.tileentity.machine.TileEntityMachineMixer; +import com.hbm.util.i18n.I18nUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; @@ -28,8 +29,8 @@ public class GUIMixer extends GuiInfoContainer { public GUIMixer(InventoryPlayer player, TileEntityMachineMixer mixer) { super(new ContainerMixer(player, mixer)); - this.mixer = mixer; + this.mixer = mixer; this.xSize = 176; this.ySize = 204; } @@ -38,7 +39,14 @@ public class GUIMixer extends GuiInfoContainer { public void drawScreen(int x, int y, float interp) { super.drawScreen(x, y, interp); - this.drawElectricityInfo(this, x, y, guiLeft + 23, guiTop + 23, 16, 52, mixer.getPower(), mixer.getMaxPower()); + this.drawElectricityInfo(this, x, y, guiLeft + 12, guiTop + 18, 16, 52, mixer.getPower(), mixer.getMaxPower()); + + String[] upgradeText = new String[4]; + upgradeText[0] = I18nUtil.resolveKey("desc.gui.upgrade"); + upgradeText[1] = I18nUtil.resolveKey("desc.gui.upgrade.speed"); + upgradeText[2] = I18nUtil.resolveKey("desc.gui.upgrade.power"); + upgradeText[3] = I18nUtil.resolveKey("desc.gui.upgrade.overdrive"); + this.drawCustomInfoStat(x, y, guiLeft + 152, guiTop + 55, 8, 8, x, y, upgradeText); MixerRecipe[] recipes = MixerRecipes.getOutput(mixer.tanks[2].getTankType()); @@ -50,19 +58,19 @@ public class GUIMixer extends GuiInfoContainer { if(recipe.input2 != null) label.add("-" + recipe.input2.type.getLocalizedName()); if(recipe.solidInput != null) label.add("-" + recipe.solidInput.extractForCyclingDisplay(20).getDisplayName()); label.add(EnumChatFormatting.RED + "Click to change!"); - this.drawCustomInfoStat(x, y, guiLeft + 62, guiTop + 22, 12, 12, x, y, label); + this.drawCustomInfoStat(x, y, guiLeft + 71, guiTop + 17, 12, 12, x, y, label); } - mixer.tanks[0].renderTankInfo(this, x, y, guiLeft + 43, guiTop + 23, 7, 52); - mixer.tanks[1].renderTankInfo(this, x, y, guiLeft + 52, guiTop + 23, 7, 52); - mixer.tanks[2].renderTankInfo(this, x, y, guiLeft + 117, guiTop + 23, 16, 52); + mixer.tanks[0].renderTankInfo(this, x, y, guiLeft + 52, guiTop + 18, 7, 52); + mixer.tanks[1].renderTankInfo(this, x, y, guiLeft + 61, guiTop + 18, 7, 52); + mixer.tanks[2].renderTankInfo(this, x, y, guiLeft + 126, guiTop + 18, 16, 52); } @Override protected void mouseClicked(int x, int y, int i) { super.mouseClicked(x, y, i); - if(guiLeft + 62 <= x && guiLeft + 62 + 12 > x && guiTop + 22 < y && guiTop + 22 + 12 >= y) { + if(guiLeft + 71 <= x && guiLeft + 71 + 12 > x && guiTop + 17 < y && guiTop + 17 + 12 >= y) { mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); NBTTagCompound data = new NBTTagCompound(); @@ -73,9 +81,9 @@ public class GUIMixer extends GuiInfoContainer { @Override protected void drawGuiContainerForegroundLayer( int i, int j) { - String name = this.mixer.hasCustomInventoryName() ? this.mixer.getInventoryName() : I18n.format(this.mixer.getInventoryName()); - this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + + this.fontRendererObj.drawString(name, this.xSize / 2 + 40 / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); } @@ -85,16 +93,18 @@ public class GUIMixer extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int i = (int) (mixer.getPower() * 53 / mixer.getMaxPower()); - drawTexturedModalRect(guiLeft + 23, guiTop + 75 - i, 176, 52 - i, 16, i); + int i = (int) (mixer.getPower() * 52 / mixer.getMaxPower()); + drawTexturedModalRect(guiLeft + 12, guiTop + 70 - i, 176, 52 - i, 16, i); if(mixer.processTime > 0 && mixer.progress > 0) { - int j = mixer.progress * 53 / mixer.processTime; - drawTexturedModalRect(guiLeft + 62, guiTop + 36, 192, 0, j, 44); + int j = mixer.progress * 52 / mixer.processTime; + drawTexturedModalRect(guiLeft + 71, guiTop + 31, 192, 0, j, 44); } - mixer.tanks[0].renderTank(guiLeft + 43, guiTop + 75, this.zLevel, 7, 52); - mixer.tanks[1].renderTank(guiLeft + 52, guiTop + 75, this.zLevel, 7, 52); - mixer.tanks[2].renderTank(guiLeft + 117, guiTop + 75, this.zLevel, 16, 52); + mixer.tanks[0].renderTank(guiLeft + 52, guiTop + 70, this.zLevel, 7, 52); + mixer.tanks[1].renderTank(guiLeft + 61, guiTop + 70, this.zLevel, 7, 52); + mixer.tanks[2].renderTank(guiLeft + 126, guiTop + 70, this.zLevel, 16, 52); + + this.drawInfoPanel(guiLeft + 152, guiTop + 55, 8, 8, 8); } } diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_centrifuge.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_centrifuge.png index 8852afa9c204dabb5918beec4659274444346d32..a23c402c428ae18602af6d8c283639996d2be1c3 100644 GIT binary patch literal 2766 zcmbtVX;f3!7QTdFB2!2S;J`cxMHcV`2_-<%2t)+|2`B=Bs0@lS2uYYqqJqdEC{h6t zVnId?SQ(Td5}Ep-HK0rqhA?RY8W4emDcDQ9-s+F{qpPd;$JzVrv-h{pxo7Y1q_{d0 zaIlPMfo~#!C#+wFGIw%#l+{T~Z*`tjE#~!)) z$l`;{4&>bkZR|x^^|Fk-F50P<)bu*=*hS3Q*W#E2dfdW>wd>ml%vZa8xB!BXRU(ft(h0QZErc3`M-d=x+z4LB}>3{BA z@iKaBbW|3GP?z=g_AYjSOx6s@lq`T*Kiv8_*)hbG9y0d3*wLS|^iC1DVD!<`ighnO%$t&;%i z)$u~NT@t!k-vSnBw3>K#80gO-0O&BE>Nu5L2TbN4juaq%u|s8Ykm23L<(*PUY~2pA z0<4n1Y9;mtn+u~>Yl+uFa!g3{9Z^!6YddLnZZKTUuxw;xWL$k6rg;VEyio(BJd&q5 z6u;@~Y9dHokZqC&4m1VHX{NL)OMr>@mjWsM3Cb)Ikll*Xyn}~49KK|=Zsto)2eJ%w zfiDk)k!rZn3=?Cy&F4PFheCi9SveYeZ^ED8Sb{cL8F8^#x18YnBCvW z-2Sf)X@RAC_)3&xBs87D^eTsE-$b(D0>t{526fkZqkiF~L;>bGL4EhRkZKDgY04VP zQYa|!??2nW*ijO`bvHAaocfOQcp$@`rRyZ&aQN+R{EL>XAEpG9x}3K`k5yVUuvuy|!i73a4=bYzNTk-{Q0(wAmRenjI7<@wTBfezwrCmOS(H=8eS|IB>Ksc0S5r z`jr`2Ty2L~C{1JV>=}QU@?3&Zrd&${ZPmm@%sEL?{cy`jJ1h zh6%Iy*vvcMD|9!4?9&Fy2OjbqXA>n_AY3Gf_&6V{Ij@ z)8iWxZH<(x5Z&2Ltx<&d_&{dqu=_25lhG^;oEl14o`f~&By zF7tE%+^e!uak}6Y+s`UpJ=~50FODtfOTY#v;%td#km#7L@LcN3twzdq#^|0oiFDZ(XqiahxBkRnqqzq9CgXv%S1l}I3QwGE&``h;n`xatVy%;Ax z(COfg?TAS#9}uFkEgo?}u(nmfwMG`sEpbFH)LP!*-QICdH!4m^8h91n&dZx+n1BXx zIov$q01PKG=`*>Z`#@@!NnVvC-+5|y_!KYLA5tPu`@YRoi)CO4xkYy((#UYx*iwva zk#=u%7YYz(2u~3Jkif@l)@!4d*NmFlp~sQI@#lS^wS0m)7?aF#k#s(1KW<&tfA*q_ z{loPEb)e5+HYP$KXWNLt%z1|yItwIR+ut+O%R1f@{R0B@R54_yGBx6ygli>enOy3@ znv@6_493$J@s-*2=Z*oxl5k})VhdBbgA$Hi#GSM zQ&?~2Qw;MGR@^YM-Z@}MxnQIetAD50;fb`xuXZYmV+}27QT|3RYeNg>wv9Jc1CabZY-Y1)0_JIM&$MMkKAA}%xqx?r5 zvhEg*t$C4rsv7F*1{x3rUTMFUZMt>MfTz=1{_69lWC>eA`aJQfdp!CuFD!()y6&wc zkn6+qT*}y!lq|ojS>VF#Civ)Yf4J-&r_CoJs{4{;s8{%LY6));8MJ5COS^TpO?*HUquymGQT)bQRx;ASpBySeipi9f>)?)?Sxm-cS}PfVraOf%e}-M{?x zFYZMnT|LeS(hp(AJg#;TK-I||qg<92APpcD0fqla{1ZV`^28_($alCY<))MxhTE3@ z55Vb(@H72Wql!dOU|^uv$ts^kx(t$!hUDha>DBQB&HXa8VYv;L5RZD5+nH>{pVjqm b#(`CA>U`)-#$`39ZI~nW&URJ!GuM6x#7x+w literal 2397 zcmbtVdpOkj8vo7=8up06wkI-^nZhQ;+FhE-WkongD3qlPmD?sILW7KRVt*y0U8@LD zl2HxHeUPbibs6{3WN334W5&p3Ow5egU)wq7={)B=`#k44-#@3F&L^Q@hR4p> z5Td{4UD;S$OJp~%y+RZbVyW{JbY)XEl<1{J`T5*9+3yr&n(F+{bZesJRB%NiP4~r% zzc$|$~U)?)4ZYSt*NoC5vOHkjBV0iROxx#>BHT3u#ekpVQMreY~kO7Oy3PmwWlOZroY_ z$??2;JcTewYW-5?8da{$&>FFCrO!}bR*+@*YsrFv28!UYwb-tCsxzXtbZ&d9T9eQ; z&=GV;#s6>->?4Z}JYb!a35ZdVnFJ7S%>ftCfV&6iVL(lO2Gv=Gg*LE0;X~o!u(E7Q zh7TXV@im%i8Ao}1fEV!u=M_g_q};Bi6qv0HEmvS3^*@srJ$}B zzwFYEo((SVt8BR*m_3}_AR;s_5`ce~$3Z8!O=K|yig_I>Tk#;gev1`?r?bHgSa>TI zG}mH>Qc@g;=o7V>`iO?je&?G&$M8dxZ0t>{B6{)3fi32hA^ii%wg@vzWRP)s=hyP_ z60P`yc0H~vXBHkw&D)U>lu{bfGNHR?eLSWL0ztRyu)o?X=I=lWRb#V@5+?#83-tvC zxbx^GNdvQtZ*(k>rg)HB&Iq;;3%S#QsFU$QRM?H;^3Kz4rD{p)5o;YZl#@g{6Cyyq zf!ocT-P0Xf|3GGGm!Om@VwRyb{N<9xEaVT$sBdv=J8g}xoWio^vdh-BsJpip>PzLF zsG(cF1Zsr1VK=gRZ?E;q8%u`y4Q-4H7;hT;_>G^1819+S)I)bVCSa(E?^qM zFDh&tRi#@Y;d=685kdSSMsPf0xT(IW;?5It^xMohmK^4U(wlLE(Rq)sizq*)L-g()D zi=I6ZaF;>O3pZ@a1G(Lkg++&Fdw1PC!!JvnNW6mO=16V}cPj^K_p)VQND)C>R9NTE zE}yYl+GeZQDsSFVmDFo^S0K4IEeU)knP zLhfxt2RUZh&mD~%ZpOfJoHg$j_UN0Iz(X-Yv=auw>gXsXXge1mEqq~4{%OO6j4gSV z%rj7z&&9VEj;fiMfL!KCqvGbM@G47gqZ)K8bOZz8cLR6d7Z~|eMy1UPI}hXFBuX6b zx#y`qC~&^S2yAVPSGn!|Nc4#A0Dh!*~;f0 z;Hruc|oqef1TQlHGZUE*mfS5LM|+RMtNJsyL?o$Be;R`J?t6j-&%Rtr%mpY9%R# zW~EP#>pbND6C2Bg>e^~R|irgBTC@Wt2dUTX&aD9BW))2}U9=K8XczYI_MFMi0mKF$|( zENo-daB>*f&Z;{|Kz9KShmk-h-xTcTiLKPp+>q%7KwYxX0y@WhT#EUZwVus?ww)bv zh`kj@vmRY7qud-k4~ds+*#ta0Nfd1UkRH`z{*Y2wQW41fGoNEuDW96-uH?Y0@rJr) zvOY)qD0ZDfEtIl`Y&C8Gj?@ z!}`t+8<~Hcc67zWIkpI1&uPce{n3)%ClEvNjDB3Gsxv;Xwygepg`z1Pu%f zpb4pXlmdw4mom~fUdjd3HWjeR7;OAlm#h0nSarcCrhBD@s|ykid3)f)^SUN)AEkXZ zO}C0JEOE(N#|dsQL~VRKvc0(NRdv|dKTL+6HA!M&)-?4%w0wB|oZ z^NH!Ba|ey)F#Yud_^vJ?Tq0&xmJqr{4Qe0e^gp$5>v!kJBGC{Aebv>aSP-r8uNb62 zmHyBD3XS_;aX-%$^uX#?1Ofo>~6{ znz~=0sm!C5LQ}ECLh(fV6~#%Tyb*M9b#rrbw`MBwASj?Q>{((*m^#%9sE=g&|8ADM Z0;f&u%ZU`1?fnqR&Dq1L!ZGM?zX2h%OWFVc diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_mixer.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_mixer.png index 871440cc4f80f6397e63912c17032efb0948361f..c8800f0b601f37c61e917f7e9ca3b2ef181c6ef6 100644 GIT binary patch literal 3264 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 diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_refinery.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_refinery.png index 6dbf4ffb16d132e7219a706f7b5c2978f805b159..1b67169eadf123fafc48a68f8fbeadc26926745d 100644 GIT binary patch literal 3770 zcmbVOc{r5o-+yN89KsQkIHZ2+D1>B=!r0ZZr8F25C0Pe!o9tUkXj*Iu87WKl!DKg- zeHmrnV=T!sG-r^pypNo>_x$<(&U0Pg>%Q;jzVGkn^Zk53&viWyO^x+=xkb4F0N}l3 zpkoFA5O4|sIN8C$+B4_Q{>sZtUkfPg7Fz%SKJQC9n%C~8E{{`Uj?Nz;uj%Jz%w)xJ z>D(8JI93cZ9Izc`*KW<2A>Lat^Dj10OEi72g&Bdz3r>gMn8(phkXO~&~roKJ~P91q|%_?MZBc-dma&`l9OReTZ~2YGTyqT+;77v$$hMYVds^Cvww9~M>crt_tm4Mx9av(<%$s>Zc_Fj|(E z`gWX)e4iD_Cbc{cqBWke02k>5_)kDAo&uly9M375uw1VaEE?Jt z5dcAy*y=o!LNyVm)x~oZVZYpli*?r|ifmd@A!R_m0pQW@D^6D2+S$#}awBoe9NSOA ze{aNr#b6%*{$@oLaAPM<_lEgLG!PmRLdyVG@Y35yi-7YaholzNf?x*Soax0xmF>Rr)ha+R)O=Q$Tp5Bv4erqn)u&tTez(~>U%K7l zQr|ylBBat%Ud@zjhnw%#zrDd>8sNQ`92pUD0?2FUB5yZV1lP+K;!h928>Y1+^Sag3 zoVvdGTbCZHR4ufi-qq(Jzb$3uM|XXT&7(#u<8foWj{W}7v&{I0!Bdoq{WCe5;28!h zzmd_cp6k8NF`4Xk!1Y+jxz`1h0$Dr`R0780Xn^X<0~aTN)6IbMr-AtaVSQeZwuc?S zoZLB!Lnk3&&UsGdO;;jVZ4dXsLJL;s7pvI`QC8@t7!JVIgYZ%LOWHr-}bHv#SgYA=qSgg8<~~?a(*qh{x$UDcvLcR_pgi0Kt7C_j_m_=K{}9>} z3cscen+pp2y8e5$%;$s7NkJ^icRLXDU35bDc#{(X*>cz=)fPlKAn`*Vk7G~F;|C$$ zKT*IUbp6B;No8rc!2=ct+h_l#bx=5g@i%Gb9%wNr1cBj(z$h1hf}iDdJp2I`+FT9s z8rd2fncnw`OuIs;oYR4{thR50e<9%Ij9Hu)y<9+BaFH+Xz(TM8UvogI&6Bbr<&4Vx zR#Za@_C-wd$`wgr^dXdb;A%=*B(RqcA6&To`wCC_6i>2{dZp~ z_*+5Y5GB6pNIT}rq`dY|t6YnPTodo?h~uc|A*kR*K_9x?0e({jqm&IJlo4o6QP9{; zFogEcQrek5z_GvRn6myFu(lRSLc)eZs6CTzkB+ow7aV={v(eXVI81Ld9{~~toCm_} zJ5iLyk@{}u#Sf?NcXiojJ$W;E%o$)V?wT zY2kMg1j#EaEW_hLJ&qB1dD+6kpH0-oRYsbLqisLFO-Dzk4Dp0feQ+;}(j||?j$d>s zs+Y0}X862W?kidHZ6_f&DtvJgIryvk{S<+leuYkzgy4X~XWFz7Qzz*5VB=p9q%Q1kbFm3ri%eAy zs=6|!rQd6vs{=v>A)3AZ;u-GfT#X$VVNj?`OL9q>(eg;rE%o9)>r zQyyOeRGwvd>JbVZh#$|hJSM?0U7Th0_3{#dtD2dxhz7*gPF<$jC5Dy2in8K!^zbX3@37+sX_-azir`yl5u}8t`J@=KGZ@mOA9YKgKT*tYb+q* zW{ylW4QzIj$vG0{$~M6WcC2_>D zFq9?|iHb(h@ARy3HnF)NJ%TQap}j&?PDxqUOk8^`g3hgai6B1Vz&f(G@}RQ*JJP2b zb3RVFbA~E|Uq2EStsHXWbC(=sjMGg|GX0&nOG=wQH5PGURHbyJ^7|B+*Tn!0ItMh7N#v(}RJLeOE7OD;SN7zTL4-u=jw{Pto z&Y1olFv*+_k4_1*Mmr7Y#WeKWCX?W~J;5pjcNsx4v3;uw-M1^}d>MlsA*uy01&Ekx zo{k8WOOAZ$#{uBNogp)w;gjp;o-bakj8p@eA6s2T^*GeCL1O(LHNAG)ZkL_T@LQzM`_)YQ3p_oV;%;a&TC;|w41Sw? z^mtxclaUP(NL*f{CTsBGB{bCOa7x_CNqK9V!2QvLCwRB&2z4sceHILd#4bihokoZ{ z4LeaUFU|fd7w~a(bae5sgjbUlN@r%MBy#}Xf)`I?tut52I2quDuGpyFp)Y zX`27Obt`OVb!EOb?&OVl;>J8>UQMo4?dn+v2qDh0gIUK%Xve%ac^Rm2^-I?*aRX^T zuxh^;!&aB8JE|lu@N@#yZE2?<&-sOG)MZ+G!s+3Wkr$MJtT6O!*P}quT@<3i0UDhdm+iQ z#Ja%YZ?87aMBCi&I6u{{sBD}xDQ~<7;s4%S8{#l$w~Hj*(9t0#DOUO|FW6xJ2v}I~ z+#R!amrGfTpE?6P`>Sh*B3!>99}>KUw6616`0TfaonX@MT_NQIT)?I0x#PMsnYco^ z6{#8qsWr3lgM@o+kSUoy*u`j?)o*@%Y>o&$0qD?DnCY@eYD#puU)^@P&6&MjML!-b zEqGT?4 z8=&J@J(iInfjFxQ4gYy(_m9M=sMJL@lo*C-ptMgpQDO~SoGu< zI!$nhbkKg2gix}+oaE{=^%V|nd`yUKu@kV$FORqHN@nf(7%Pjwpin3&;_Ceq@x?bd z5K|n}&5;O1qXF>$51AeKm)VY_qwXF-L1?$hIwP^^KD^h;SY^m8RB27`GR1^)I6{=R2y$9IQS%Gd+@T%c9F83?`i^k0U;aei!g3=8f#2-47W zQ%~|AGZ+gXs0aOb(Hx8Tz$M2wmV53vKS4kV+OPi)c`V*&BJQwBoQP%pmvNA#;(b1u^S4sy;6Ly*J5u&?vR(O$2NxN{wY!}Ucy!!u@DOn8 zOT)%ER>yD%*b%7 literal 8584 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 Date: Mon, 20 Jul 2026 10:57:25 +0400 Subject: [PATCH 2/4] By order from [message has deleted] --- .../handler/nei/RefineryRecipeHandler.java | 2 +- .../container/ContainerMachineRefinery.java | 30 ++++----- .../hbm/inventory/gui/GUIMachineRefinery.java | 62 ++++++++++-------- .../textures/gui/processing/gui_refinery.png | Bin 3770 -> 8584 bytes 4 files changed, 50 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java b/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java index f7d84f28e..2bf1e9e6e 100644 --- a/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java @@ -162,7 +162,7 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler implements ICom guiGui = new LinkedList>(); transferRects.add(new RecipeTransferRect(new Rectangle(138 - 1 - 36 - 27, 23, 36, 18), "refinery")); - transferRectsGui.add(new RecipeTransferRect(new Rectangle(24, 16, 31, 36), "refinery")); + transferRectsGui.add(new RecipeTransferRect(new Rectangle(48, 5, 31, 101), "refinery")); guiGui.add(GUIMachineRefinery.class); RecipeTransferRectHandler.registerRectsToGuis(getRecipeTransferRectGuis(), transferRects); RecipeTransferRectHandler.registerRectsToGuis(guiGui, transferRectsGui); diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java b/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java index 3652425b4..b47d2b182 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java @@ -19,40 +19,40 @@ public class ContainerMachineRefinery extends Container { testNuke = tedf; //Battery - this.addSlotToContainer(new Slot(tedf, 0, 160, 90)); + this.addSlotToContainer(new Slot(tedf, 0, 186, 72)); //Canister Input - this.addSlotToContainer(new Slot(tedf, 1, 12, 72)); + this.addSlotToContainer(new Slot(tedf, 1, 8, 99)); //Canister Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 2, 12, 90)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 2, 8, 119)); //Heavy Oil Input - this.addSlotToContainer(new Slot(tedf, 3, 66, 72)); + this.addSlotToContainer(new Slot(tedf, 3, 86, 99)); //Heavy Oil Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 4, 66, 90)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 4, 86, 119)); //Naphtha Input - this.addSlotToContainer(new Slot(tedf, 5, 84, 72)); + this.addSlotToContainer(new Slot(tedf, 5, 106, 99)); //Naphtha Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 6, 84, 90)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 6, 106, 119)); //Light Oil Input - this.addSlotToContainer(new Slot(tedf, 7, 102, 72)); + this.addSlotToContainer(new Slot(tedf, 7, 126, 99)); //Light Oil Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 8, 102, 90)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 8, 126, 119)); //Petroleum Input - this.addSlotToContainer(new Slot(tedf, 9, 120, 72)); + this.addSlotToContainer(new Slot(tedf, 9, 146, 99)); //Petroleum Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 10, 120, 90)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 10, 146, 119)); //Sulfur Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 11, 38, 72)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 11, 58, 119)); //Fluid ID - this.addSlotToContainer(new Slot(tedf, 12, 38, 90)); + this.addSlotToContainer(new Slot(tedf, 12, 186, 106)); for(int i = 0; i < 3; i++) { for(int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 12 + j * 18, 140 + i * 18)); + this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 150 + i * 18)); } } for(int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(invPlayer, i, 12 + i * 18, 198)); + this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 208)); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java index 4e78a9cc3..b3aae3272 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java @@ -26,47 +26,53 @@ public class GUIMachineRefinery extends GuiInfoContainer { super(new ContainerMachineRefinery(invPlayer, tedf)); refinery = tedf; - this.xSize = 184; - this.ySize = 222; + this.xSize = 210; + this.ySize = 231; } @Override public void drawScreen(int mouseX, int mouseY, float f) { super.drawScreen(mouseX, mouseY, f); - refinery.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 12, guiTop + 17, 16, 52); // Render tooltip for column. - refinery.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 66, guiTop + 17, 16, 52); - refinery.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 84, guiTop + 17, 16, 52); - refinery.tanks[3].renderTankInfo(this, mouseX, mouseY, guiLeft + 102, guiTop + 17, 16, 52); - refinery.tanks[4].renderTankInfo(this, mouseX, mouseY, guiLeft + 120, guiTop + 17, 16, 52); - this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 160, guiTop + 18, 16, 70, refinery.power, refinery.maxPower); + refinery.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 30, guiTop + 27, 21, 104); // Render tooltip for column. + refinery.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 86, guiTop + 42, 16, 52); + refinery.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 106, guiTop + 42, 16, 52); + refinery.tanks[3].renderTankInfo(this, mouseX, mouseY, guiLeft + 126, guiTop + 42, 16, 52); + refinery.tanks[4].renderTankInfo(this, mouseX, mouseY, guiLeft + 146, guiTop + 42, 16, 52); + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 186, guiTop + 18, 16, 52, refinery.power, refinery.maxPower); } @Override protected void drawGuiContainerForegroundLayer(int i, int j) { String name = this.refinery.hasCustomInventoryName() ? this.refinery.getInventoryName() : I18n.format(this.refinery.getInventoryName()); - this.fontRendererObj.drawString(name, this.xSize / 2 - 36 / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); - this.fontRendererObj.drawString(I18n.format("container.inventory"), 12, this.ySize - 96 + 4, 4210752); + this.fontRendererObj.drawString(name, this.xSize / 2 - 34/2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 4, 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); + func_146110_a(guiLeft, guiTop, 0, 0, xSize, ySize, 350, 256); // power - int j = (int)refinery.getPowerScaled(70); - drawTexturedModalRect(guiLeft + 160, guiTop + 88 - j, 184, 70 - j, 16, j); + int j = (int)refinery.getPowerScaled(50); + func_146110_a(guiLeft + 186, guiTop + 69 - j, 210, 52 - j, 16, j, 350, 256); OpenGlHelper.glBlendFunc(770, 771, 1, 0); // default // input tank FluidTank inputOil = refinery.tanks[0]; if (inputOil.getFill() != 0) { - refinery.tanks[0].renderTank(guiLeft + 12, guiTop + 70, this.zLevel, 16, 52); - Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + + int targetHeight = inputOil.getFill() * 101 / inputOil.getMaxFill(); + Color color = new Color(inputOil.getTankType().getColor()); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); + func_146110_a(guiLeft + 33, guiTop + 130 - targetHeight, 226, 101 - targetHeight, 16, targetHeight, 350, 256); + GL11.glDisable(GL11.GL_BLEND); } // fucking kgjhgdfjgdhjfg @@ -74,14 +80,14 @@ public class GUIMachineRefinery extends GuiInfoContainer { // 350x256 texture by behated (the pipes wouldn't fit) // pipes - + RefineryRecipe recipe = RefineryRecipes.getRefinery(inputOil.getTankType()); if(recipe == null) { - func_146110_a(guiLeft + 60, guiTop + 54, 184, 104, 6, 2, 256, 256); - func_146110_a(guiLeft + 60, guiTop + 47, 184, 97, 24, 2, 256, 256); - func_146110_a(guiLeft + 60, guiTop + 40, 184, 90, 42, 2, 256, 256); - func_146110_a(guiLeft + 60, guiTop + 33, 184, 83, 60, 2, 256, 256); + func_146110_a(guiLeft + 52, guiTop + 63, 247, 1, 33, 48, 350, 256); + func_146110_a(guiLeft + 52, guiTop + 32, 247, 50, 66, 52, 350, 256); + func_146110_a(guiLeft + 52, guiTop + 24, 247, 145, 86, 35, 350, 256); + func_146110_a(guiLeft + 36, guiTop + 16, 211, 119, 122, 25, 350, 256); } else { // Heavy Oil Products @@ -89,31 +95,31 @@ public class GUIMachineRefinery extends GuiInfoContainer { GL11.glEnable(GL11.GL_BLEND); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 60, guiTop + 54, 184, 104, 6, 2, 256, 256); + func_146110_a(guiLeft + 52, guiTop + 63, 247, 1, 33, 48, 350, 256); // Naphtha Oil Products color = new Color(recipe.outputs[1].type.getColor()); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 60, guiTop + 47, 184, 97, 24, 2, 256, 256); + func_146110_a(guiLeft + 52, guiTop + 32, 247, 50, 66, 52, 350, 256); // Light Oil Products color = new Color(recipe.outputs[2].type.getColor()); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 60, guiTop + 40, 184, 90, 42, 2, 256, 256); + func_146110_a(guiLeft + 52, guiTop + 24, 247, 145, 86, 35, 350, 256); // Gaseous Products color = new Color(recipe.outputs[3].type.getColor()); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 60, guiTop + 33, 184, 83, 60, 2, 256, 256); + func_146110_a(guiLeft + 36, guiTop + 16, 211, 119, 122, 25, 350, 256); GL11.glDisable(GL11.GL_BLEND); GL11.glColor4f(1F, 1F, 1F, 1F); } // output tanks - refinery.tanks[1].renderTank(guiLeft + 66, guiTop + 70, this.zLevel, 16, 52); - refinery.tanks[2].renderTank(guiLeft + 84, guiTop + 70, this.zLevel, 16, 52); - refinery.tanks[3].renderTank(guiLeft + 102, guiTop + 70, this.zLevel, 16, 52); - refinery.tanks[4].renderTank(guiLeft + 120, guiTop + 70, this.zLevel, 16, 52); + refinery.tanks[1].renderTank(guiLeft + 86, guiTop + 95, this.zLevel, 16, 52); + refinery.tanks[2].renderTank(guiLeft + 106, guiTop + 95, this.zLevel, 16, 52); + refinery.tanks[3].renderTank(guiLeft + 126, guiTop + 95, this.zLevel, 16, 52); + refinery.tanks[4].renderTank(guiLeft + 146, guiTop + 95, this.zLevel, 16, 52); } } diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_refinery.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_refinery.png index 1b67169eadf123fafc48a68f8fbeadc26926745d..6dbf4ffb16d132e7219a706f7b5c2978f805b159 100644 GIT binary patch literal 8584 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 From 7749cf4adfe366d6c69586573e9a900955442d6b Mon Sep 17 00:00:00 2001 From: TheVitya2127 Date: Sat, 25 Jul 2026 22:57:03 +0400 Subject: [PATCH 3/4] I'm listening to you --- .../handler/nei/RefineryRecipeHandler.java | 2 +- .../container/ContainerMachineRefinery.java | 26 ++++---- .../hbm/inventory/gui/GUIMachineRefinery.java | 58 ++++++++---------- .../textures/gui/processing/gui_refinery.png | Bin 8584 -> 3956 bytes 4 files changed, 40 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java b/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java index 2bf1e9e6e..d7f8f1016 100644 --- a/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java @@ -162,7 +162,7 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler implements ICom guiGui = new LinkedList>(); transferRects.add(new RecipeTransferRect(new Rectangle(138 - 1 - 36 - 27, 23, 36, 18), "refinery")); - transferRectsGui.add(new RecipeTransferRect(new Rectangle(48, 5, 31, 101), "refinery")); + transferRectsGui.add(new RecipeTransferRect(new Rectangle(34, 34, 14, 34), "refinery")); guiGui.add(GUIMachineRefinery.class); RecipeTransferRectHandler.registerRectsToGuis(getRecipeTransferRectGuis(), transferRects); RecipeTransferRectHandler.registerRectsToGuis(guiGui, transferRectsGui); diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java b/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java index b47d2b182..e7a311c5f 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java @@ -19,31 +19,31 @@ public class ContainerMachineRefinery extends Container { testNuke = tedf; //Battery - this.addSlotToContainer(new Slot(tedf, 0, 186, 72)); + this.addSlotToContainer(new Slot(tedf, 0, 158, 108)); //Canister Input - this.addSlotToContainer(new Slot(tedf, 1, 8, 99)); + this.addSlotToContainer(new Slot(tedf, 1, 12, 90)); //Canister Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 2, 8, 119)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 2, 12, 108)); //Heavy Oil Input - this.addSlotToContainer(new Slot(tedf, 3, 86, 99)); + this.addSlotToContainer(new Slot(tedf, 3, 64, 90)); //Heavy Oil Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 4, 86, 119)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 4, 64, 108)); //Naphtha Input - this.addSlotToContainer(new Slot(tedf, 5, 106, 99)); + this.addSlotToContainer(new Slot(tedf, 5, 82, 90)); //Naphtha Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 6, 106, 119)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 6, 82, 108)); //Light Oil Input - this.addSlotToContainer(new Slot(tedf, 7, 126, 99)); + this.addSlotToContainer(new Slot(tedf, 7, 100, 90)); //Light Oil Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 8, 126, 119)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 8, 100, 108)); //Petroleum Input - this.addSlotToContainer(new Slot(tedf, 9, 146, 99)); + this.addSlotToContainer(new Slot(tedf, 9, 118, 90)); //Petroleum Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 10, 146, 119)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 10, 118, 108)); //Sulfur Output - this.addSlotToContainer(new SlotTakeOnly(tedf, 11, 58, 119)); + this.addSlotToContainer(new SlotTakeOnly(tedf, 11, 38, 90)); //Fluid ID - this.addSlotToContainer(new Slot(tedf, 12, 186, 106)); + this.addSlotToContainer(new Slot(tedf, 12, 38, 108)); for(int i = 0; i < 3; i++) { for(int j = 0; j < 9; j++) { diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java index b3aae3272..962ca69ec 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java @@ -26,27 +26,27 @@ public class GUIMachineRefinery extends GuiInfoContainer { super(new ContainerMachineRefinery(invPlayer, tedf)); refinery = tedf; - this.xSize = 210; - this.ySize = 231; + this.xSize = 182; + this.ySize = 240; } @Override public void drawScreen(int mouseX, int mouseY, float f) { super.drawScreen(mouseX, mouseY, f); - refinery.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 30, guiTop + 27, 21, 104); // Render tooltip for column. - refinery.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 86, guiTop + 42, 16, 52); - refinery.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 106, guiTop + 42, 16, 52); - refinery.tanks[3].renderTankInfo(this, mouseX, mouseY, guiLeft + 126, guiTop + 42, 16, 52); - refinery.tanks[4].renderTankInfo(this, mouseX, mouseY, guiLeft + 146, guiTop + 42, 16, 52); - this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 186, guiTop + 18, 16, 52, refinery.power, refinery.maxPower); + refinery.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 12, guiTop + 17, 16, 70); // Render tooltip for column. + refinery.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 64, guiTop + 35, 16, 52); + refinery.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 82, guiTop + 35, 16, 52); + refinery.tanks[3].renderTankInfo(this, mouseX, mouseY, guiLeft + 100, guiTop + 35, 16, 52); + refinery.tanks[4].renderTankInfo(this, mouseX, mouseY, guiLeft + 118, guiTop + 35, 16, 52); + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 158, guiTop + 18, 16, 88, refinery.power, refinery.maxPower); } @Override protected void drawGuiContainerForegroundLayer(int i, int j) { String name = this.refinery.hasCustomInventoryName() ? this.refinery.getInventoryName() : I18n.format(this.refinery.getInventoryName()); - this.fontRendererObj.drawString(name, this.xSize / 2 - 34/2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(name, this.xSize / 2 - 36 / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 4, 4210752); } @@ -54,25 +54,19 @@ public class GUIMachineRefinery extends GuiInfoContainer { 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); - func_146110_a(guiLeft, guiTop, 0, 0, xSize, ySize, 350, 256); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); // power - int j = (int)refinery.getPowerScaled(50); - func_146110_a(guiLeft + 186, guiTop + 69 - j, 210, 52 - j, 16, j, 350, 256); + int j = (int)refinery.getPowerScaled(88); + drawTexturedModalRect(guiLeft + 158, guiTop + 106 - j, 182, 88 - j, 16, j); OpenGlHelper.glBlendFunc(770, 771, 1, 0); // default // input tank FluidTank inputOil = refinery.tanks[0]; if (inputOil.getFill() != 0) { - - int targetHeight = inputOil.getFill() * 101 / inputOil.getMaxFill(); - Color color = new Color(inputOil.getTankType().getColor()); - - GL11.glEnable(GL11.GL_BLEND); - GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 33, guiTop + 130 - targetHeight, 226, 101 - targetHeight, 16, targetHeight, 350, 256); - GL11.glDisable(GL11.GL_BLEND); + refinery.tanks[0].renderTank(guiLeft + 12, guiTop + 88, this.zLevel, 16, 70); + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); } // fucking kgjhgdfjgdhjfg @@ -84,10 +78,10 @@ public class GUIMachineRefinery extends GuiInfoContainer { RefineryRecipe recipe = RefineryRecipes.getRefinery(inputOil.getTankType()); if(recipe == null) { - func_146110_a(guiLeft + 52, guiTop + 63, 247, 1, 33, 48, 350, 256); - func_146110_a(guiLeft + 52, guiTop + 32, 247, 50, 66, 52, 350, 256); - func_146110_a(guiLeft + 52, guiTop + 24, 247, 145, 86, 35, 350, 256); - func_146110_a(guiLeft + 36, guiTop + 16, 211, 119, 122, 25, 350, 256); + func_146110_a(guiLeft + 30, guiTop + 30, 0, 248, 43, 4, 256, 256); + func_146110_a(guiLeft + 30, guiTop + 26, 0, 240, 61, 8, 256, 256); + func_146110_a(guiLeft + 30, guiTop + 22, 61, 240, 79, 12, 256, 256); + func_146110_a(guiLeft + 30, guiTop + 18, 140, 240, 97, 16, 256, 256); } else { // Heavy Oil Products @@ -95,31 +89,31 @@ public class GUIMachineRefinery extends GuiInfoContainer { GL11.glEnable(GL11.GL_BLEND); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 52, guiTop + 63, 247, 1, 33, 48, 350, 256); + func_146110_a(guiLeft + 30, guiTop + 30, 0, 248, 43, 4, 256, 256); // Naphtha Oil Products color = new Color(recipe.outputs[1].type.getColor()); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 52, guiTop + 32, 247, 50, 66, 52, 350, 256); + func_146110_a(guiLeft + 30, guiTop + 26, 0, 240, 61, 8, 256, 256); // Light Oil Products color = new Color(recipe.outputs[2].type.getColor()); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 52, guiTop + 24, 247, 145, 86, 35, 350, 256); + func_146110_a(guiLeft + 30, guiTop + 22, 61, 240, 79, 12, 256, 256); // Gaseous Products color = new Color(recipe.outputs[3].type.getColor()); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 36, guiTop + 16, 211, 119, 122, 25, 350, 256); + func_146110_a(guiLeft + 30, guiTop + 18, 140, 240, 97, 16, 256, 256); GL11.glDisable(GL11.GL_BLEND); GL11.glColor4f(1F, 1F, 1F, 1F); } // output tanks - refinery.tanks[1].renderTank(guiLeft + 86, guiTop + 95, this.zLevel, 16, 52); - refinery.tanks[2].renderTank(guiLeft + 106, guiTop + 95, this.zLevel, 16, 52); - refinery.tanks[3].renderTank(guiLeft + 126, guiTop + 95, this.zLevel, 16, 52); - refinery.tanks[4].renderTank(guiLeft + 146, guiTop + 95, this.zLevel, 16, 52); + refinery.tanks[1].renderTank(guiLeft + 64, guiTop + 88, this.zLevel, 16, 52); + refinery.tanks[2].renderTank(guiLeft + 82, guiTop + 88, this.zLevel, 16, 52); + refinery.tanks[3].renderTank(guiLeft + 100, guiTop + 88, this.zLevel, 16, 52); + refinery.tanks[4].renderTank(guiLeft + 118, guiTop + 88, this.zLevel, 16, 52); } } diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_refinery.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_refinery.png index 6dbf4ffb16d132e7219a706f7b5c2978f805b159..0f6a50a39ce401a66b2abce0a35d95355e3131a2 100644 GIT binary patch literal 3956 zcmbtXdpwi-AAdH>s8EyK=F*|ViK3)4=CY)ub7F~7XrWf_#EF<0I>)W(LgiAFYA!L+ z8fHT-J90m&xs#DJx2>?*;`iWJ=lA>X_d37l_4>S?XV3TheShBX_viCG&vyw}I~$qx zD(e9Nkg+{%?EnA}@Dc(@NrETWOL_Q}U%?JGRzPtZasmM4cG+6*cMQv#8n917vXoi8 z3&{N)es+h3H|y#vL6b0H23pD+x5W)NdpK`~-n730*{xq6V_myP5)R9Z4Pe^FY&z7~ zs1#zm5&HZ1oHUrOL+<%fdp}1G##62i*;zJcs~I7hqS3=q z^NU=HWu%#Gxce^ARNzA-#*7^j7>!D)l^z#Zp!vWmdp292>VTc<6^6(Y#;S56+x; z$ZN-!b$!n5{PT}GcLqEaYcN=EwGO!YlELu9<2k%?;uvP#@KqRKFj`=<1JKb1{=CU0s1Bj{vj>s-uSNz#~P^UTO&g4creUDc){+EZ%qaNm^I~ zf2hS5g={kxygm@4p$sk8gkWA>+*`^EGh3in)v`0>a-e}$;0o?LNV$@1+=lB_t_qG; ztJ%G%Lo)v!4d()Rfa?uF(`T=Wv9t8yb;B_ryIyBFRul~2pGgEd{sbY+cDi%W{XG@u za)U3Zvi4UcY6$XuIF-N&sA;|{#8o&ROTD{1BUhb`UYfuynTCoBRjbQD8(-NmMa)lb zXyyCpKHbY*eJlhk6j59$n=?PTB(JIi&j+#`?SL`KY0=`x#-`Ar1v(-Z8u(Wavc_xs zET1zF*Gu3TU!USW&u{c9T)YL6e_RH`Y$w?rgP^?3A*tg4e?7^B6dpuylwj=o8te$z zowf(Qh>1ca`ndEHb^>XAjdU=uv!7Xnvb{DC`4AfT3JEMGq>=3INz4*NPC-ia&};2b zl)G$>*0lljAU^fy6AeuCuc<_e^7g=`kz>CA|-x^NJ;FV`GyNu59B^ z9@+t-Yg@vHed2PNjR{-9x_ndotxqscTc7X}$Xm%Ty&n;e^76X<5F@~%uJv2CH6Z$s%3>8%i`kmk{i+Nx7leeco z6}871KCGQ+LULk6#9z%>1*$!Q(K*%%(LJUbT-YF;yuQXZH5gd`=08_Q_ug{>$%3|~ z$=AHv@T8tS-sO}(_hOA%eil%`#AeLva|Z{x{K(}!YidB*f3`z(tLA9ePPZ3s)j@&F zkF`K_88UhMKAcF>iUl)m;R307t2iZy4rwmn?XX4yEbPr}3G9=1p9|I~Z3zaBe76Fu z#V~(@aTGVFHsXg_GZF;n2LpaT&sJ{8e64U4$FWWV@k>ldJ7nmsGzfQ|FxEF`Z1-Zd zC$Kly1igcx+|@7#|Lu(QM{A-iCaqUA?H#mY4{ypdu?wnEeZNY2n-`r%Duc~-Pa@BDh1sgdwI6^)hNwW@#ZTev&F>Tt z!GM#_XZ~pI0`z0U&014H2b{-mbP3JUNIY#{2#V5!++QKR;>>CX$514&>f@B$Z(M9= zO#n7eT>3Dk+4@nynrEP!hba=erx(;9ZYMT>=kq8-!ubx&N@m;NZAp;LDeyo@nMCER z;lYL+)2JWNe4rHpw(ZO=qVT+BE#lN7>NJyZn4> zGzcNxA1z#GSnSUeK3UE~52NX?50LKP|Ajo>Y*0FKzHpK$j)`3CQB0dACz~!DUl1bI z%x@(hkK+!>1^JjcRh9+k^OBAxP{wn&lK-^%okYB7Cf!X_ytQ)Ug4?9U_CQC@oEwSB z$RU_(P*D|3aW)pmftC2Ss09BoJ4bjkvc+?h_IdY7Qu!6!uC(eLe$U5lVYtQmpw}`? zgJrEZ?APH<;@{uiRlK(X37=&mN&*ZHQ=6)oUn4i)VZ%CTyvM!gT!xmIQtf@4a=MK= ze}M$eo`7s&<$iI*AO#(JZx~VzkO)0H4gi|6g9wc9>v>?&v=6aSC9e(pMi)|^D%$NN z!F-T%I?I%OP(@`%>P=&tk=xWo4p&&e$);)bD}r2fudxn=B~B3+RmeqZ(cpJzav*fb zZ;R(%m7YLUe+cziAn`1IJ`=aRN7Og8yj%Cdhm*R?#J6KYq1hSUC8IJI5hZKMfBBs# z7RwUR28YUbs-U6LGoxMOYSAxgG}Qs3nR;J{sawSTqN1H>3kwT#x3Ru}WuNhOOZq&Y zAM`+z-*<=dS$J~!6pASj2m7R)bhEU~#*qnCpXO=vxTbyEqw_*xuOm#e(fxT-qjkxc zIW-LpxkPe>2gMKXqZ&mN*44G!d+MWc;``}64ddBmeHz3|i}VqpnD3Fx`1)Qa*2BvA za-S1<*8=T`BN|%7-TcSXZv#e7~%y!W#QJ zOh+eiLhd#zwp4|=^ zm5F#e0ZM@zoMGM@vvuzgREs0-@|H_E{D}f?KxNxg0XGaM0H zPZmf)cUo$1WT1}T(wl^v3-b-xKL!I)Rm+rTgp6f4x-y3Z8%*mgN>k$jUar zow3-(lHXpY)lqr`^DxdKv*ozgte=oBlTk1r@HwLL(uo@CXj<5v8xf8_=zUfIya4E6T{0M+N!`kut__Mjnr@WWOtC zSxl_!QfCB;XR<4BQR#Hbi72F6{HHEbvr1SdqdMh*!%jOFaI>ejxJ}>r#HYIv%fEXM zPZxe3($CTuV%$t0Aeg}e*)7w~c(%XnGtpKpHOT5@W)20QF+W2bqr%0 z#-?InD8v{4vIF~>Q_dFV$EC2%*OMMYWo5B=e^ftbNmh@X383p5;}2%yOaUF74(7M55B zZiPtCp1*J^QS?XMoAU}KDKBr^C!(R9!}Nw^%m`Xo54KU-Z@{F~<6H-*61e|rib?67 zCR2iX_aJ3|_Wuy=Z*2qz{1Ul9NqYSe4B(E1I-uUoN z(>ag%FI30Wsp;v)qZZ*AxBeWWT*j-lKN{elXp2 zy{MV3a9soZ&+zTg_ImqBdMj+(R(-M8*@?v|{oJowvazfP|64Hc9Z|@8jVXCZb@hy6 z&)>bAJw@_>o@H;%L!(fJMr66|?g?qCF&%>FB~KeoO?PeJe~&ht>|(DE#h6*fV3^ZG zXVin@kE7et^iHar5exALvU-CAsRg)=5Yp9~z&{I<8F&ee zc0nW(U7xvus*g_QFXUf1btk=NgdJO^wJB)JNNOm|bVXPh=<7>Cc%$T`lyz3#NQu@B zTnhw{*7}D5dNX3J04F{NlRQcUUxoj1wHpp-UxWR_P>YV2cR~ursHNvWfx<(KCG1SX|R;2m=s@peuoS!RKqt zrRhN6v9+3LGqcf@4ccc7mcQO|K2nI|z7 r{}c)Uny0E{q-yjKzzst%N|q&(rlq4xalw06o(J25cGksKXJh^aBcnFd literal 8584 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 Date: Sat, 25 Jul 2026 23:16:06 +0400 Subject: [PATCH 4/4] Hi Ray --- .../com/hbm/inventory/container/ContainerMachineRefinery.java | 4 ++-- src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java b/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java index e7a311c5f..590c67a32 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java @@ -47,12 +47,12 @@ public class ContainerMachineRefinery extends Container { 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, 150 + i * 18)); + this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 11 + j * 18, 158 + i * 18)); } } for(int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 208)); + this.addSlotToContainer(new Slot(invPlayer, i, 11 + i * 18, 216)); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java index 962ca69ec..0dc1383e2 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java @@ -47,7 +47,7 @@ public class GUIMachineRefinery extends GuiInfoContainer { String name = this.refinery.hasCustomInventoryName() ? this.refinery.getInventoryName() : I18n.format(this.refinery.getInventoryName()); this.fontRendererObj.drawString(name, this.xSize / 2 - 36 / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); - this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 4, 4210752); + this.fontRendererObj.drawString(I18n.format("container.inventory"), 11, this.ySize - 96 + 2, 4210752); } @Override