updated to new gui refactor, still are a couple things to sl[lit out …

…into their own textures

common/src/main/java/muramasa/gregtech/gui/widgets/FusionButtonWidget.java

@@ -16,8 +16,8 @@
 import javax.annotation.Nullable;
 
 public class FusionButtonWidget extends Widget {
-    ResourceLocation middle = new ResourceLocation(GTIRef.ID, "textures/gui/machine/fusion_computer_middle_overlay.png");
-    ResourceLocation top_bottom = new ResourceLocation(GTIRef.ID, "textures/gui/machine/fusion_computer_top_bottom_overlay.png");
+    ResourceLocation middle = new ResourceLocation(GTIRef.ID, "textures/gui/background/fusion_computer_middle_overlay.png");
+    ResourceLocation top_bottom = new ResourceLocation(GTIRef.ID, "textures/gui/background/fusion_computer_top_bottom_overlay.png");
 
     TileEntityFusionReactor.Display display = TileEntityFusionReactor.Display.REGULAR;
 

common/src/main/java/muramasa/gregtech/machine/SteamMachine.java

@@ -3,11 +3,18 @@
 import com.google.common.collect.ImmutableMap;
 import muramasa.antimatter.Data;
 import muramasa.antimatter.gui.BarDir;
+import muramasa.antimatter.gui.SlotData;
+import muramasa.antimatter.gui.SlotType;
 import muramasa.antimatter.gui.screen.AntimatterContainerScreen;
+import muramasa.antimatter.gui.slot.ISlotProvider;
 import muramasa.antimatter.gui.widget.*;
 import muramasa.antimatter.machine.Tier;
 import muramasa.antimatter.machine.types.Machine;
+import muramasa.gregtech.GTIRef;
 import muramasa.gregtech.tile.single.TileEntitySteamMachine;
+import net.minecraft.resources.ResourceLocation;
+
+import java.util.List;
 
 import static muramasa.antimatter.machine.MachineFlag.*;
 import static muramasa.antimatter.machine.Tier.*;
@@ -20,19 +27,44 @@ public SteamMachine(String domain, String id) {
         addFlags(BASIC, STEAM, COVERABLE);
         setGUI(Data.BASIC_MENU_HANDLER);
         setClientTick();
-        setGuiTiers(ImmutableMap.<Tier, Tier>builder().put(BRONZE, BRONZE).put(STEEL, STEEL));
+        getGui().getMachineData().setMachineStateLocation(BRONZE, "bronze_machine_state").setMachineStateLocation(STEEL, "steel_machine_state");
+        String suffix = id.contains("furnace") || id.contains("smelter") || id.contains("boiler") ? "default" : id.replace("steam_", "");
+        getGui().getMachineData().setProgressLocation(BRONZE, "bronze_" + suffix).setProgressLocation(STEEL, "steel_" + suffix);
+        String bSuffix = id.contains("macerator") || id.contains("forge_hammer") ? id.replace("steam", "") : "";
+        if (id.contains("boiler")){
+            getGui().setBackgroundTexture(BRONZE, id + "_bronze").setBackgroundTexture(STEEL, id + "_steel");
+        } else {
+            getGui().setBackgroundTexture(BRONZE, "machine_bronze" + bSuffix).setBackgroundTexture(STEEL, "machine_steel" + bSuffix);
+        }
     }
 
     protected void setupGui() {
         super.setupGui();
         addGuiCallback(t -> {
             t.addWidget(WidgetSupplier.build((a, b) -> TextWidget.build(((AntimatterContainerScreen<?>) b).getTitle().getString(), 4210752).build(a, b)).setPos(9, 5).clientSide());
-            if (has(RECIPE)) {
-                t.addWidget(ProgressWidget.build(BarDir.LEFT, true))
-                        .addWidget(MachineStateWidget.build().setPos(84, 46).setWH(8, 8));
+            if (has(RECIPE) && !getId().contains("boiler")) {
+                t.addWidget(ProgressWidget.build())
+                        .addWidget(MachineStateWidget.build());
             }
-           // if ((has(ITEM) || has(FLUID)))
-           //     t.addWidget(IOWidget.build(9, 63, 16, 16).onlyIf(u -> u.handler.getClass() == TileEntityMachine.class));
         });
     }
+
+    @Override
+    public Machine<SteamMachine> add(ISlotProvider<?> provider) {
+        List<SlotData<?>> list = provider.getAnySlots();
+        for (SlotData<?> slot : list) {
+            String suffix = slot.getType() == SlotType.FL_IN ? "fluid" : "item";
+            add(BRONZE, slot.getType(), slot.getX(), slot.getY(), new ResourceLocation(GTIRef.ID, "bronze_"+suffix));
+            add(STEEL, slot.getType(), slot.getX(), slot.getY(), new ResourceLocation(GTIRef.ID, "steel_"+suffix));
+        }
+        return this;
+    }
+
+    @Override
+    public Machine<SteamMachine> add(SlotType<?> type, int x, int y) {
+        String suffix = type == SlotType.FL_IN ? "fluid" : "item";
+        add(BRONZE, type, x, y, new ResourceLocation(GTIRef.ID, "bronze_"+suffix));
+        add(STEEL, type, x, y, new ResourceLocation(GTIRef.ID, "steel_"+suffix));
+        return this;
+    }
 }