fix and reorganize fluid slot tooltips to match item slot tooltips

hide phantom slot controls if the slot is empty
add todo

Author: ghzdude

src/main/java/gregtech/api/mui/sync/GTFluidSyncHandler.java

@@ -17,6 +17,7 @@
 import net.minecraftforge.fluids.IFluidTank;
 import net.minecraftforge.fluids.capability.IFluidHandlerItem;
 
+import com.cleanroommc.modularui.api.MCHelper;
 import com.cleanroommc.modularui.api.drawable.IKey;
 import com.cleanroommc.modularui.network.NetworkUtils;
 import com.cleanroommc.modularui.screen.RichTooltip;
@@ -247,31 +248,25 @@ public int getFluidAmount() {
     }
 
     public void handleTooltip(@NotNull RichTooltip tooltip) {
-        IKey nameKey = getFluidNameKey();
-
-        if (nameKey != IKey.EMPTY) {
-            tooltip.addLine(nameKey);
-        }
-
-        if (showAmountInTooltip()) {
-            tooltip.addLine(IKey.lang("gregtech.fluid.amount", getFluidAmount(), getCapacity()));
-        }
-
-        if (isPhantom() && showAmountInTooltip()) {
-            tooltip.addLine(IKey.lang("modularui.fluid.phantom.control"));
-        }
-
         FluidStack tankFluid = getFluid();
-        if (tankFluid == null) {
+        if (GTUtility.isEmpty(tankFluid)) {
             tankFluid = getLockedFluid();
         }
 
-        if (tankFluid != null) {
+        if (!GTUtility.isEmpty(tankFluid)) {
+            tooltip.addLine(KeyUtil.fluid(tankFluid));
+
             FluidTooltipUtil.handleFluidTooltip(tooltip, tankFluid);
 
             if (showAmountInTooltip()) {
                 FluidTooltipUtil.addIngotMolFluidTooltip(tooltip, tankFluid);
             }
+
+            tooltip.addLine(MCHelper.getFluidModName(tankFluid));
+
+            if (isPhantom() && showAmountInTooltip()) {
+                tooltip.addLine(IKey.lang("modularui.fluid.phantom.control"));
+            }
         }
     }
 

src/main/java/gregtech/api/util/FluidTooltipUtil.java

@@ -142,7 +142,7 @@ public static void addIngotMolFluidTooltip(@NotNull RichTooltip tooltip, @NotNul
             if (extra != 0) {
                 fluidAmount += String.format(" + %d L", extra);
             }
-            tooltip.add(TextFormatting.GRAY + LocalizationUtils.format("gregtech.gui.amount_raw") + fluidAmount);
+            tooltip.addLine(TextFormatting.GRAY + LocalizationUtils.format("gregtech.gui.amount_raw") + fluidAmount);
         }
     }
 }

src/main/java/gregtech/common/covers/filter/SimpleItemFilter.java

@@ -127,21 +127,20 @@ public void initUI(Consumer<gregtech.api.gui.Widget> widgetGroup) {
                                                 markDirty();
                                             }
                                         }))
-                                .tooltip(tooltip -> {
-                                    tooltip.setAutoUpdate(true);
-                                    tooltip.textColor(Color.GREY.main);
-                                })
+                                .tooltipAutoUpdate(true)
+                                .tooltipTextColor(Color.GREY.main)
                                 .tooltipBuilder(tooltip -> {
                                     if (dirtyNotifiable instanceof CoverRoboticArm coverArm &&
                                             coverArm.getTransferMode() != TransferMode.TRANSFER_ANY ||
                                             dirtyNotifiable instanceof CoverItemVoidingAdvanced coverItem &&
                                                     coverItem.getVoidingMode() != VoidingMode.VOID_ANY) {
-                                        tooltip.addLine(IKey.lang("cover.item_filter.config_amount"));
                                         int count = this.filterReader.getTagAt(index)
                                                 .getInteger(SimpleItemFilterReader.COUNT);
-                                        if (count > 0)
+                                        if (count > 0) {
+                                            tooltip.addLine(IKey.lang("cover.item_filter.config_amount"));
                                             tooltip.addLine(
                                                     IKey.str("Count: %s", TextFormattingUtil.formatNumbers(count)));
+                                        }
                                     }
                                 }))
                         .build().marginRight(4))

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

@@ -327,6 +327,7 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager,
                         .pos(124, 62))
 
                 // common ui
+                // todo split up these lines into their own widgets and use a scrolling text widget for the name
                 .child(new RichTextWidget()
                         .size(81 - 6, (isExportHatch ? 46 : 55) - 8)
                         // .padding(3, 4)

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

@@ -36,6 +36,11 @@ public final class GTFluidSlot extends Widget<GTFluidSlot> implements Interactab
 
     public GTFluidSlot() {
         tooltip().titleMargin();
+        tooltipBuilder(tooltip -> {
+            if (isSynced()) {
+                syncHandler.handleTooltip(tooltip);
+            }
+        });
     }
 
     public static GTFluidSyncHandler sync(IFluidTank tank) {
@@ -50,8 +55,6 @@ public void onInit() {
         if (syncHandler.canLockFluid() || syncHandler.isPhantom()) {
             getContext().getRecipeViewerSettings().addGhostIngredientSlot(this);
         }
-        tooltipBuilder(syncHandler::handleTooltip);
-        syncHandler.setChangeConsumer($ -> markTooltipDirty());
     }
 
     public GTFluidSlot syncHandler(IFluidTank fluidTank) {
@@ -60,7 +63,7 @@ public GTFluidSlot syncHandler(IFluidTank fluidTank) {
 
     public GTFluidSlot syncHandler(GTFluidSyncHandler syncHandler) {
         setSyncHandler(syncHandler);
-        this.syncHandler = syncHandler;
+        syncHandler.setChangeConsumer($ -> markTooltipDirty());
         return this;
     }
 
@@ -73,6 +76,12 @@ public boolean isValidSyncHandler(SyncHandler syncHandler) {
         return syncHandler instanceof GTFluidSyncHandler;
     }
 
+    @Override
+    protected void setSyncHandler(@Nullable SyncHandler syncHandler) {
+        super.setSyncHandler(syncHandler);
+        this.syncHandler = (GTFluidSyncHandler) syncHandler;
+    }
+
     @Override
     public void draw(ModularGuiContext context, WidgetThemeEntry<?> widgetTheme) {
         FluidStack content = this.syncHandler.getFluid();