fixed compile error, fixed torch on button overlay texture

GregTech-Intergalactical · Sep 14, 2023 · 49ecfd8 · 49ecfd8
1 parent 9413718
commit 49ecfd8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/common/src/main/java/muramasa/antimatter/gui/ButtonOverlay.java b/common/src/main/java/muramasa/antimatter/gui/ButtonOverlay.java
@@ -8,8 +8,7 @@ public class ButtonOverlay implements IAntimatterObject {
 
     public static ButtonOverlay STOP = new ButtonOverlay(Ref.ID,"stop",16, 16);
     public static ButtonOverlay TORCH_OFF = new ButtonOverlay(Ref.ID,"torch_off",16, 16);
-    public static ButtonOverlay TORCH_ON = new ButtonOverlay(Ref.ID,"torch_on",16, 16)
-            .setTextureOverride(new ResourceLocation("textures/item/redstone_torch.png"));
+    public static ButtonOverlay TORCH_ON = new ButtonOverlay(Ref.ID,"torch_on",16, 16);
     public static ButtonOverlay REDSTONE = new ButtonOverlay(Ref.ID, "redstone", 16, 16)
             .setTextureOverride(new ResourceLocation("textures/item/redstone.png"));
     public static ButtonOverlay EXPORT = new ButtonOverlay(Ref.ID,"export",16, 16);

diff --git a/common/src/main/java/muramasa/antimatter/gui/widget/CycleButtonWidget.java b/common/src/main/java/muramasa/antimatter/gui/widget/CycleButtonWidget.java
@@ -48,6 +48,6 @@ public static WidgetSupplier build(ToIntFunction<IGuiHandler> syncFunction, IGui
     }
 
     public static WidgetSupplier build(ToIntFunction<IGuiHandler> syncFunction, IGuiEvent.IGuiEventFactory ev, int id, IntFunction<String> tooltipKey, ButtonOverlay... buttons) {
-        return builder(((a, b) -> new CycleButtonWidget(a, b, but -> but.gui.sendPacket(but.gui.handler.createGuiPacket(new GuiEvents.GuiEvent(ev, Screen.hasShiftDown() ? 1 : 0, id))), syncFunction, buttons).setTooltipKey(tooltipKey)));
+        return builder(((a, b) -> new CycleButtonWidget(a, b, but -> but.gui.sendPacket(but.gui.handler.createGuiPacket(new GuiEvents.GuiEvent(ev, Screen.hasShiftDown() ? 1 : 0, id))), syncFunction, buttons).setTooltipKeyFunction(tooltipKey)));
     }
 }
diff --git a/common/src/main/resources/assets/antimatter/textures/gui/button/torch_on.png b/common/src/main/resources/assets/antimatter/textures/gui/button/torch_on.png