make power into overlay

title margin for GTFluidSlot
work on multiblock tank slot

Author: ghzdude

src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java

@@ -23,7 +23,6 @@
 import com.cleanroommc.modularui.factory.PosGuiData;
 import com.cleanroommc.modularui.screen.ModularPanel;
 import com.cleanroommc.modularui.utils.Alignment;
-import com.cleanroommc.modularui.value.BoolValue;
 import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
 import com.cleanroommc.modularui.value.sync.IntSyncValue;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
@@ -365,11 +364,8 @@ protected Flow createButtons(@NotNull ModularPanel mainPanel, @NotNull PanelSync
     protected IWidget createDistinctButton(@NotNull ModularPanel mainPanel,
                                            @NotNull PanelSyncManager panelSyncManager) {
         if (!(mte instanceof IDistinctBusController distinct) || !distinct.canBeDistinct()) {
-            return new ToggleButton()
+            return new ButtonWidget<>()
                     .size(18)
-                    .disableHoverOverlay()
-                    .disableHoverBackground()
-                    .value(new BoolValue.Dynamic(() -> false, b -> {}))
                     .overlay(GTGuiTextures.OVERLAY_DISTINCT_BUSES[0])
                     .addTooltipLine(IKey.lang("gregtech.multiblock.universal.distinct_not_supported"));
         }

src/main/java/gregtech/api/mui/GTGuiTextures.java

@@ -273,8 +273,11 @@ private static String id(String path) {
             "textures/gui/primitive/overlay_primitive_dust.png");
     public static final UITexture PRIMITIVE_INGOT_OVERLAY = fullImage(
             "textures/gui/primitive/overlay_primitive_ingot.png");
-    public static final UITexture PRIMITIVE_LARGE_FLUID_TANK = fullImage(
-            "textures/gui/primitive/primitive_large_fluid_tank.png");
+    public static final UITexture PRIMITIVE_LARGE_FLUID_TANK = new UITexture.Builder()
+            .location(GTValues.MODID, "textures/gui/primitive/primitive_large_fluid_tank.png")
+            .fullImage()
+            .adaptable(2)
+            .build();
     public static final UITexture PRIMITIVE_LARGE_FLUID_TANK_OVERLAY = fullImage(
             "textures/gui/primitive/primitive_large_fluid_tank_overlay.png");
     public static final UITexture PRIMITIVE_BLAST_FURNACE_PROGRESS_BAR = fullImage(

src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityMultiblockTank.java

@@ -10,7 +10,6 @@
 import gregtech.api.metatileentity.multiblock.ui.MultiblockUIFactory;
 import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.mui.GTGuiTheme;
-import gregtech.api.mui.GTGuis;
 import gregtech.api.pattern.BlockPattern;
 import gregtech.api.pattern.FactoryBlockPattern;
 import gregtech.client.renderer.ICubeRenderer;
@@ -39,9 +38,7 @@
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Matrix4;
 import com.cleanroommc.modularui.api.drawable.IKey;
-import com.cleanroommc.modularui.factory.PosGuiData;
-import com.cleanroommc.modularui.screen.ModularPanel;
-import com.cleanroommc.modularui.value.sync.PanelSyncManager;
+import com.cleanroommc.modularui.utils.Alignment;
 import com.cleanroommc.modularui.widgets.TextWidget;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -142,26 +139,24 @@ protected boolean openGUIOnRightClick() {
 
     @Override
     protected MultiblockUIFactory createUIFactory() {
-        return new MultiblockUIFactory(this) {
-
-            @Override
-            public @NotNull ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager) {
-                var panel = GTGuis.createPanel(MetaTileEntityMultiblockTank.this, 176, 166);
-
-                panel.child(new TextWidget(IKey.lang(getMetaFullName()))
-                        .pos(5, 5));
-                panel.child(new GTFluidSlot()
-                        .pos(52, 18)
-                        .size(72, 61)
-                        .background(GTGuiTextures.SLOT)
-                        .syncHandler(GTFluidSlot.sync(importFluids.getTankAt(0))
-                                .showAmountOnSlot(false)
-                                .drawAlwaysFull(false)));
-                panel.bindPlayerInventory();
-
-                return panel;
-            }
-        };
+        return new MultiblockUIFactory(this)
+                .setSize(176, 166)
+                .disableDisplay()
+                .disableButtons()
+                .addScreenChildren((parent, syncManager) -> {
+                    parent.child(new TextWidget(IKey.lang(getMetaFullName()))
+                            .pos(5, 5));
+                    parent.child(new GTFluidSlot()
+                            .pos(52, 18)
+                            .size(72, 61)
+                            // todo this looks ugly
+                            .overlay(GTGuiTextures.PRIMITIVE_LARGE_FLUID_TANK_OVERLAY.asIcon()
+                                    .alignment(Alignment.CenterLeft)
+                                    .size(30, 58))
+                            .syncHandler(GTFluidSlot.sync(importFluids.getTankAt(0))
+                                    .showAmountOnSlot(false)
+                                    .drawAlwaysFull(false)));
+                });
     }
 
     @Override

src/main/java/gregtech/common/mui/widget/GTFluidSlot.java

@@ -44,8 +44,7 @@ public final class GTFluidSlot extends Widget<GTFluidSlot> implements Interactab
     private boolean disableBackground = false;
 
     public GTFluidSlot() {
-        tooltip().setAutoUpdate(true);
-        // .setHasTitleMargin(true);
+        tooltip().setAutoUpdate(true).titleMargin();
         tooltipBuilder(tooltip -> {
             if (!isSynced()) return;
             var fluid = this.syncHandler.getFluid();