From dee071050e2624e30cebd8a91eb5557055a26074 Mon Sep 17 00:00:00 2001 From: Chavalit P Date: Wed, 25 Aug 2021 22:26:49 +0700 Subject: [PATCH] Fix Tool Station and Tool Forge button not respect the resource domain setting Before the fix, Tool Station and Tool Forge buttons always use the image file from "tinker" resource domain (It's from the repair button resource domain). This prevents ability to use images added by other mods. This fix makes said GUI respect the resource domain setting of the buttons. --- src/main/java/tconstruct/tools/gui/GuiButtonTool.java | 2 +- src/main/java/tconstruct/tools/gui/ToolForgeGui.java | 4 ++-- src/main/java/tconstruct/tools/gui/ToolStationGui.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/tconstruct/tools/gui/GuiButtonTool.java b/src/main/java/tconstruct/tools/gui/GuiButtonTool.java index 091e7ca2..2c02f6e9 100644 --- a/src/main/java/tconstruct/tools/gui/GuiButtonTool.java +++ b/src/main/java/tconstruct/tools/gui/GuiButtonTool.java @@ -18,7 +18,7 @@ public class GuiButtonTool extends GuiButton int textureY; public String texture; public ToolGuiElement element; - private static ResourceLocation background;// = new + private ResourceLocation background;// = new // ResourceLocation("tinker", // "textures/gui/armorextended.png"); diff --git a/src/main/java/tconstruct/tools/gui/ToolForgeGui.java b/src/main/java/tconstruct/tools/gui/ToolForgeGui.java index 46dd352f..486d3074 100644 --- a/src/main/java/tconstruct/tools/gui/ToolForgeGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolForgeGui.java @@ -33,14 +33,14 @@ public class ToolForgeGui extends ToolStationGui for (int iter = 0; iter < TConstructClientRegistry.tierTwoButtons.size(); iter++) { ToolGuiElement element = TConstructClientRegistry.tierTwoButtons.get(iter); - GuiButtonTool button = new GuiButtonTool(iter + 1, this.guiLeft + 22 * ((iter + 1) % 5), this.guiTop + 22 * ((iter + 1) / 5), element.buttonIconX, element.buttonIconY, repair.domain, element.texture, element); + GuiButtonTool button = new GuiButtonTool(iter + 1, this.guiLeft + 22 * ((iter + 1) % 5), this.guiTop + 22 * ((iter + 1) / 5), element.buttonIconX, element.buttonIconY, element.domain, element.texture, element); this.buttonList.add(button); } for (int iter = 1; iter < TConstructClientRegistry.toolButtons.size(); iter++) { ToolGuiElement element = TConstructClientRegistry.toolButtons.get(iter); - GuiButtonTool button = new GuiButtonTool(iter + offset, this.guiLeft + 22 * ((iter + offset) % 5), this.guiTop + 22 * ((iter + offset) / 5), element.buttonIconX, element.buttonIconY, repair.domain, element.texture, element); + GuiButtonTool button = new GuiButtonTool(iter + offset, this.guiLeft + 22 * ((iter + offset) % 5), this.guiTop + 22 * ((iter + offset) / 5), element.buttonIconX, element.buttonIconY, element.domain, element.texture, element); this.buttonList.add(button); } } diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGui.java b/src/main/java/tconstruct/tools/gui/ToolStationGui.java index 4fae2170..ba347688 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGui.java @@ -98,7 +98,7 @@ public class ToolStationGui extends GuiContainer implements INEIGuiHandler for (int iter = 1; iter < TConstructClientRegistry.toolButtons.size(); iter++) { ToolGuiElement element = TConstructClientRegistry.toolButtons.get(iter); - GuiButtonTool button = new GuiButtonTool(iter, this.guiLeft + 22 * (iter % 5), this.guiTop + 22 * (iter / 5), element.buttonIconX, element.buttonIconY, repair.domain, element.texture, element); + GuiButtonTool button = new GuiButtonTool(iter, this.guiLeft + 22 * (iter % 5), this.guiTop + 22 * (iter / 5), element.buttonIconX, element.buttonIconY, element.domain, element.texture, element); this.buttonList.add(button); } }