actually port steam machines to mui2

ghzdude · ghzdude · commit b81de362bdbb · 2025-05-18T20:27:09.000-07:00
add todos for fluid slot
diff --git a/src/main/java/gregtech/api/mui/sync/GTFluidSyncHandler.java b/src/main/java/gregtech/api/mui/sync/GTFluidSyncHandler.java
@@ -142,6 +142,8 @@ public boolean isPhantom() {
         return phantom;
     }
 
+    // todo decouple show amount from drawn amount and tooltip amount
+    // probably already done in the mui2 multis pr
     public GTFluidSyncHandler showAmount(boolean showAmount) {
         this.showAmount = () -> showAmount;
         return this;
diff --git a/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java b/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java
@@ -7,13 +7,12 @@
 import gregtech.api.gui.GuiTextures;
 import gregtech.api.gui.ModularUI;
 import gregtech.api.gui.resources.TextureArea;
-import gregtech.api.gui.widgets.FluidContainerSlotWidget;
-import gregtech.api.gui.widgets.ProgressWidget;
-import gregtech.api.gui.widgets.ProgressWidget.MoveType;
-import gregtech.api.gui.widgets.TankWidget;
 import gregtech.api.items.itemhandlers.GTItemStackHandler;
 import gregtech.api.metatileentity.IDataInfoProvider;
 import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.mui.GTGuiTextures;
+import gregtech.api.mui.GTGuiTheme;
+import gregtech.api.mui.GTGuis;
 import gregtech.api.unification.material.Materials;
 import gregtech.api.util.GTTransferUtils;
 import gregtech.api.util.GTUtility;
@@ -23,6 +22,7 @@
 import gregtech.client.renderer.texture.Textures;
 import gregtech.client.renderer.texture.cube.SimpleSidedCubeRenderer;
 import gregtech.common.ConfigHolder;
+import gregtech.common.mui.widget.GTFluidSlot;
 import gregtech.core.sound.GTSoundEvents;
 
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -47,6 +47,17 @@
 import codechicken.lib.render.pipeline.ColourMultiplier;
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Matrix4;
+import com.cleanroommc.modularui.api.drawable.IDrawable;
+import com.cleanroommc.modularui.api.drawable.IKey;
+import com.cleanroommc.modularui.drawable.UITexture;
+import com.cleanroommc.modularui.factory.PosGuiData;
+import com.cleanroommc.modularui.screen.ModularPanel;
+import com.cleanroommc.modularui.value.sync.DoubleSyncValue;
+import com.cleanroommc.modularui.value.sync.PanelSyncManager;
+import com.cleanroommc.modularui.widget.Widget;
+import com.cleanroommc.modularui.widgets.ItemSlot;
+import com.cleanroommc.modularui.widgets.ProgressWidget;
+import com.cleanroommc.modularui.widgets.slot.ModularSlot;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.jetbrains.annotations.NotNull;
@@ -331,20 +342,91 @@ protected TextureArea getGuiTexture(String pathTemplate) {
                 type, STRING_SUBSTITUTION_PATTERN.matcher(pathTemplate).replaceAll(Matcher.quoteReplacement(type))));
     }
 
+    @Override
+    public boolean usesMui2() {
+        return true;
+    }
+
+    @Override
+    public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
+        return GTGuis.defaultPanel(this)
+                .child(IKey.lang(getMetaFullName()).asWidget().pos(5, 5))
+                .child(new ProgressWidget()
+                        .texture(getEmptyBarDrawable(), GTGuiTextures.PROGRESS_BAR_BOILER_HEAT, -1)
+                        .direction(ProgressWidget.Direction.UP)
+                        .debugName("temp")
+                        .value(new DoubleSyncValue(this::getTemperaturePercent))
+                        .pos(96, 26)
+                        .size(10, 54))
+                .child(new GTFluidSlot()
+                        .debugName("water")
+                        .background(getEmptyBarDrawable())
+                        .syncHandler(GTFluidSlot.sync(waterFluidTank)
+                                .showAmount(false)
+                                .accessibility(false, false))
+                        .pos(83, 26)
+                        .size(10, 54))
+                .child(new GTFluidSlot()
+                        .debugName("steam")
+                        .background(getEmptyBarDrawable())
+                        .syncHandler(GTFluidSlot.sync(steamFluidTank)
+                                .showAmount(false)
+                                .accessibility(false, false))
+                        .pos(70, 26)
+                        .size(10, 54))
+                .child(new ItemSlot()
+                        .debugName("fluid in")
+                        .background(getSlotBackground(false))
+                        .slot(new ModularSlot(containerInventory, 0)
+                                .singletonSlotGroup())
+                        .pos(43, 26))
+                .child(new ItemSlot()
+                        .debugName("fluid out")
+                        .background(getSlotBackground(true))
+                        .slot(new ModularSlot(containerInventory, 1)
+                                .accessibility(false, true))
+                        .pos(43, 62))
+                .child(new Widget<>()
+                        .pos(43, 44)
+                        .size(18)
+                        .background(isHighPressure ? GTGuiTextures.CANISTER_OVERLAY_STEEL :
+                                GTGuiTextures.CANISTER_OVERLAY_BRONZE))
+                .bindPlayerInventory();
+    }
+
+    @Override
+    public GTGuiTheme getUITheme() {
+        return isHighPressure ? GTGuiTheme.STEEL : GTGuiTheme.BRONZE;
+    }
+
+    protected UITexture getEmptyBarDrawable() {
+        return isHighPressure ? GTGuiTextures.PROGRESS_BAR_BOILER_EMPTY_STEEL :
+                GTGuiTextures.PROGRESS_BAR_BOILER_EMPTY_BRONZE;
+    }
+
+    protected IDrawable getSlotBackground(boolean output) {
+        UITexture base = isHighPressure ? GTGuiTextures.SLOT_STEEL : GTGuiTextures.SLOT_BRONZE;
+        UITexture overlay;
+        if (isHighPressure)
+            overlay = output ? GTGuiTextures.OUT_SLOT_OVERLAY_STEEL : GTGuiTextures.IN_SLOT_OVERLAY_STEEL;
+        else overlay = output ? GTGuiTextures.OUT_SLOT_OVERLAY_BRONZE : GTGuiTextures.IN_SLOT_OVERLAY_BRONZE;
+        return IDrawable.of(base, overlay);
+    }
+
     public ModularUI.Builder createUITemplate(EntityPlayer player) {
         return ModularUI.builder(GuiTextures.BACKGROUND_STEAM.get(isHighPressure), 176, 166)
                 .label(6, 6, getMetaFullName()).shouldColor(false)
-                .widget(new ProgressWidget(this::getTemperaturePercent, 96, 26, 10, 54)
+                .widget(new gregtech.api.gui.widgets.ProgressWidget(this::getTemperaturePercent, 96, 26, 10, 54)
                         .setProgressBar(GuiTextures.PROGRESS_BAR_BOILER_EMPTY.get(isHighPressure),
                                 GuiTextures.PROGRESS_BAR_BOILER_HEAT,
-                                MoveType.VERTICAL))
+                                gregtech.api.gui.widgets.ProgressWidget.MoveType.VERTICAL))
 
-                .widget(new TankWidget(waterFluidTank, 83, 26, 10, 54)
+                .widget(new gregtech.api.gui.widgets.TankWidget(waterFluidTank, 83, 26, 10, 54)
                         .setBackgroundTexture(GuiTextures.PROGRESS_BAR_BOILER_EMPTY.get(isHighPressure)))
-                .widget(new TankWidget(steamFluidTank, 70, 26, 10, 54)
+                .widget(new gregtech.api.gui.widgets.TankWidget(steamFluidTank, 70, 26, 10, 54)
                         .setBackgroundTexture(GuiTextures.PROGRESS_BAR_BOILER_EMPTY.get(isHighPressure)))
 
-                .widget(new FluidContainerSlotWidget(containerInventory, 0, 43, 26, true)
+                .widget(new gregtech.api.gui.widgets.FluidContainerSlotWidget(containerInventory, 0, 43, 26, true)
                         .setBackgroundTexture(GuiTextures.SLOT_STEAM.get(isHighPressure),
                                 GuiTextures.IN_SLOT_OVERLAY_STEAM.get(isHighPressure)))
                 .slot(containerInventory, 1, 43, 62, true, false,
diff --git a/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamCoalBoiler.java b/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamCoalBoiler.java
@@ -6,6 +6,7 @@
 import gregtech.api.items.itemhandlers.GTItemStackHandler;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
+import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.recipes.ModHandler;
 import gregtech.api.recipes.category.ICategoryOverride;
 import gregtech.client.renderer.texture.Textures;
@@ -17,6 +18,13 @@
 import net.minecraftforge.fluids.FluidUtil;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
+import com.cleanroommc.modularui.factory.PosGuiData;
+import com.cleanroommc.modularui.screen.ModularPanel;
+import com.cleanroommc.modularui.value.sync.DoubleSyncValue;
+import com.cleanroommc.modularui.value.sync.PanelSyncManager;
+import com.cleanroommc.modularui.widgets.ItemSlot;
+import com.cleanroommc.modularui.widgets.ProgressWidget;
+import com.cleanroommc.modularui.widgets.slot.ModularSlot;
 import org.jetbrains.annotations.NotNull;
 
 public class SteamCoalBoiler extends SteamBoiler implements ICategoryOverride {
@@ -82,6 +90,26 @@ public ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate
         };
     }
 
+    @Override
+    public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
+        return super.buildUI(guiData, guiSyncManager)
+                .child(new ItemSlot()
+                        .slot(this.importItems, 0)
+                        .pos(115, 62))
+                .child(new ItemSlot()
+                        .slot(new ModularSlot(this.exportItems, 0)
+                                .accessibility(false, true))
+                        .pos(115, 26))
+                .child(new ProgressWidget()
+                        .value(new DoubleSyncValue(this::getFuelLeftPercent))
+                        .pos(115, 44)
+                        .size(18)
+                        .texture(isHighPressure ?
+                                GTGuiTextures.PROGRESS_BAR_BOILER_FUEL_STEEL :
+                                GTGuiTextures.PROGRESS_BAR_BOILER_FUEL_BRONZE, 18)
+                        .direction(ProgressWidget.Direction.UP));
+    }
+
     @Override
     public ModularUI createUI(EntityPlayer player) {
         return createUITemplate(player)
diff --git a/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamLavaBoiler.java b/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamLavaBoiler.java
@@ -10,10 +10,12 @@
 import gregtech.api.gui.widgets.TankWidget;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
+import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.unification.material.Materials;
 import gregtech.client.particle.VanillaParticleEffects;
 import gregtech.client.renderer.texture.Textures;
 import gregtech.common.ConfigHolder;
+import gregtech.common.mui.widget.GTFluidSlot;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.SoundEvents;
@@ -26,6 +28,9 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import com.cleanroommc.modularui.factory.PosGuiData;
+import com.cleanroommc.modularui.screen.ModularPanel;
+import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntMaps;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
@@ -120,6 +125,19 @@ protected int getCoolDownRate() {
         return 1;
     }
 
+    @Override
+    public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
+        return super.buildUI(guiData, guiSyncManager)
+                .child(new GTFluidSlot()
+                        .syncHandler(GTFluidSlot.sync(fuelFluidTank)
+                                .showAmount(true))
+                        .pos(119, 26)
+                        .size(10, 54)
+                        .overlay(isHighPressure ?
+                                GTGuiTextures.PROGRESS_BAR_BOILER_EMPTY_STEEL :
+                                GTGuiTextures.PROGRESS_BAR_BOILER_EMPTY_BRONZE));
+    }
+
     @Override
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         return createUITemplate(entityPlayer)
diff --git a/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamSolarBoiler.java b/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamSolarBoiler.java
@@ -5,6 +5,7 @@
 import gregtech.api.gui.widgets.ProgressWidget.MoveType;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
+import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.util.GTUtility;
 import gregtech.client.renderer.texture.Textures;
 
@@ -13,6 +14,12 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import com.cleanroommc.modularui.factory.PosGuiData;
+import com.cleanroommc.modularui.screen.ModularPanel;
+import com.cleanroommc.modularui.value.sync.DoubleSyncValue;
+import com.cleanroommc.modularui.value.sync.PanelSyncManager;
+import com.cleanroommc.modularui.widgets.ProgressWidget;
+
 public class SteamSolarBoiler extends SteamBoiler {
 
     public SteamSolarBoiler(ResourceLocation metaTileEntityId, boolean isHighPressure) {
@@ -46,6 +53,18 @@ protected int getCoolDownRate() {
         return 3;
     }
 
+    @Override
+    public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
+        return super.buildUI(guiData, guiSyncManager)
+                .child(new ProgressWidget()
+                        .value(new DoubleSyncValue(() -> GTUtility.canSeeSunClearly(getWorld(), getPos()) ? 1.0 : 0.0))
+                        .pos(114, 44)
+                        .size(20)
+                        .texture(isHighPressure ?
+                                GTGuiTextures.PROGRESS_BAR_SOLAR_STEEL :
+                                GTGuiTextures.PROGRESS_BAR_SOLAR_BRONZE, -1));
+    }
+
     @Override
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         return createUITemplate(entityPlayer)
diff --git a/src/main/java/gregtech/common/mui/widget/GTFluidSlot.java b/src/main/java/gregtech/common/mui/widget/GTFluidSlot.java
@@ -123,6 +123,8 @@ public void draw(ModularGuiContext context, WidgetSlotTheme widgetTheme) {
         if (content == null)
             content = this.syncHandler.getLockedFluid();
 
+        // todo add option for drawing partial fluid instead of always full
+        // probably already done in the mui2 multis pr
         GuiDraw.drawFluidTexture(content, 1, 1, getArea().w() - 2, getArea().h() - 2, 0);
 
         if (content != null && this.syncHandler.showAmount()) {

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,8 @@ public boolean isPhantom() {`
`142`	`142`	`return phantom;`
`143`	`143`	`}`
`144`	`144`
	`145`	`+ // todo decouple show amount from drawn amount and tooltip amount`
	`146`	`+ // probably already done in the mui2 multis pr`
`145`	`147`	`public GTFluidSyncHandler showAmount(boolean showAmount) {`
`146`	`148`	`this.showAmount = () -> showAmount;`
`147`	`149`	`return this;`