Address reservoir hatch review

Author: Zorbatron

src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityReservoirHatch.java

@@ -11,7 +11,6 @@
 import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.mui.GTGuis;
 import gregtech.api.mui.sync.GTFluidSyncHandler;
-import gregtech.api.util.TextFormattingUtil;
 import gregtech.client.renderer.texture.Textures;
 import gregtech.common.mui.widget.GTFluidSlot;
 
@@ -37,9 +36,12 @@
 import com.cleanroommc.modularui.api.drawable.IKey;
 import com.cleanroommc.modularui.factory.PosGuiData;
 import com.cleanroommc.modularui.screen.ModularPanel;
+import com.cleanroommc.modularui.utils.Alignment;
+import com.cleanroommc.modularui.utils.Color;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import com.cleanroommc.modularui.value.sync.SyncHandlers;
 import com.cleanroommc.modularui.widgets.ItemSlot;
+import com.cleanroommc.modularui.widgets.RichTextWidget;
 import com.cleanroommc.modularui.widgets.SlotGroupWidget;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -130,7 +132,8 @@ public boolean usesMui2() {
     public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
         guiSyncManager.registerSlotGroup("item_inv", 2);
 
-        GTFluidSyncHandler tankSyncHandler = new GTFluidSyncHandler(this.fluidTank)
+        GTFluidSyncHandler tankSyncHandler = GTFluidSlot.sync(this.fluidTank)
+                .showAmount(false)
                 .accessibility(true, false);
 
         // TODO: Change the position of the name when it's standardized.
@@ -143,15 +146,23 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager)
                 .child(GTGuiTextures.TANK_ICON.asWidget()
                         .left(92).top(36)
                         .size(14, 15))
-                .child(IKey.lang("gregtech.gui.fluid_amount").color(0xFFFFFF).asWidget().pos(11, 20))
-                .child(IKey.dynamic(() -> getFluidAmountFormatted(tankSyncHandler))
-                        .color(0xFFFFFF)
-                        .asWidget().pos(11, 30))
-                .child(IKey.dynamic(() -> getFluidNameTranslated(tankSyncHandler))
-                        .color(0xFFFFFF)
-                        .asWidget().pos(11, 40))
+                .child(new RichTextWidget()
+                        .size(75, 47)
+                        .pos(10, 20)
+                        .textColor(Color.WHITE.main)
+                        .alignment(Alignment.TopLeft)
+                        .autoUpdate(true)
+                        .textBuilder(richText -> {
+                            richText.addLine(IKey.lang("gregtech.gui.fluid_amount"));
+                            String name = tankSyncHandler.getFluidLocalizedName();
+                            if (name == null) return;
+
+                            richText.addLine(IKey.str(name));
+                            richText.addLine(IKey.str(tankSyncHandler.getFormattedFluidAmount()));
+                        }))
                 .child(new GTFluidSlot().syncHandler(tankSyncHandler)
-                        .pos(69, 52))
+                        .pos(69, 52)
+                        .disableBackground())
                 .child(new ItemSlot().slot(SyncHandlers.itemSlot(this.importItems, 0)
                         .slotGroup("item_inv")
                         .filter(itemStack -> FluidUtil.getFluidHandler(itemStack) != null))
@@ -164,22 +175,6 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager)
                         .pos(90, 53));
     }
 
-    private String getFluidNameTranslated(GTFluidSyncHandler tankSyncHandler) {
-        if (tankSyncHandler.getFluid() == null) {
-            return "";
-        } else {
-            return tankSyncHandler.getFluid().getLocalizedName();
-        }
-    }
-
-    private String getFluidAmountFormatted(GTFluidSyncHandler tankSyncHandler) {
-        if (tankSyncHandler.getFluid() == null) {
-            return "0";
-        } else {
-            return TextFormattingUtil.formatNumbers(tankSyncHandler.getFluid().amount);
-        }
-    }
-
     @Override
     public void addInformation(ItemStack stack, @Nullable World player, @NotNull List<String> tooltip,
                                boolean advanced) {