From 5b6cc1471bb21d0d8e79f85086354ef56e40c86a Mon Sep 17 00:00:00 2001
From: asdflj <854865755@qq.com>
Date: Wed, 30 Nov 2022 12:08:01 +0800
Subject: [PATCH] fix terminal fluid stack tooltip display error

---
 dependencies.gradle                                |  2 +-
 .../crossmod/waila/FCTooltipHandlerWaila.java      |  9 +++------
 .../glodblock/github/crossmod/waila/Tooltip.java   | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 1a0a09c4..b5d9277a 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -4,7 +4,7 @@ dependencies {
     compile('com.github.GTNewHorizons:NotEnoughItems:2.3.10-GTNH:dev')
     compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-117-GTNH:dev')
     compile('curse.maven:cofh-core-69162:2388751')
-    compile('com.github.GTNewHorizons:waila:1.5.22')
+    compile('com.github.GTNewHorizons:waila:1.5.22:dev')
     compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.25:dev') { transitive = false }
     compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.9.2:dev")
 
diff --git a/src/main/java/com/glodblock/github/crossmod/waila/FCTooltipHandlerWaila.java b/src/main/java/com/glodblock/github/crossmod/waila/FCTooltipHandlerWaila.java
index 4766016a..c38752d7 100644
--- a/src/main/java/com/glodblock/github/crossmod/waila/FCTooltipHandlerWaila.java
+++ b/src/main/java/com/glodblock/github/crossmod/waila/FCTooltipHandlerWaila.java
@@ -6,6 +6,7 @@ import mcp.mobius.waila.handlers.nei.TooltipHandlerWaila;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.fluids.FluidStack;
 
 import java.util.List;
@@ -21,14 +22,10 @@ public class FCTooltipHandlerWaila extends TooltipHandlerWaila {
         if (itemstack != null && itemstack.getItem() instanceof ItemFluidDrop && currenttip.size() > 0) {
             FluidStack fs = ItemFluidDrop.getFluidStack(itemstack);
             if (fs == null) return currenttip;
-
-            int fsid = Util.getFluidID(fs.getFluid());
+            currenttip.set(0, Tooltip.partFluidTerminalFluidFormat(fs));
             if (Minecraft.getMinecraft().gameSettings.advancedItemTooltips) {
-                currenttip.set(0, String.format("%s (#%s) %s", fs.getFluid().getLocalizedName(), fsid, fsid));
-            } else {
-                currenttip.set(0, String.format("%s %s", fs.getFluid().getLocalizedName(), fsid));
+                currenttip.set(1, EnumChatFormatting.GRAY + String.format("%s:%s", Util.getFluidModID(fs.getFluid()), fs.getFluid().getName()) + EnumChatFormatting.RESET);
             }
-
             String modName = Util.getFluidModName(fs.getFluid());
             if (modName != null && !modName.equals(""))
                 currenttip.set(currenttip.size() - 1, "\u00a79\u00a7o" + modName);
diff --git a/src/main/java/com/glodblock/github/crossmod/waila/Tooltip.java b/src/main/java/com/glodblock/github/crossmod/waila/Tooltip.java
index 5931edd1..e5b23016 100644
--- a/src/main/java/com/glodblock/github/crossmod/waila/Tooltip.java
+++ b/src/main/java/com/glodblock/github/crossmod/waila/Tooltip.java
@@ -2,7 +2,10 @@ package com.glodblock.github.crossmod.waila;
 
 import appeng.util.Utility;
 import com.glodblock.github.util.NameConst;
+import com.glodblock.github.util.Util;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.I18n;
+import net.minecraftforge.fluids.FluidStack;
 
 public class Tooltip {
     public static String fluidFormat(String name, int amount) {
@@ -23,4 +26,15 @@ public class Tooltip {
             isEnable ? I18n.format(NameConst.WAILA_ENABLE) : I18n.format(NameConst.WAILA_DISABLE)
         );
     }
+
+    public static String partFluidTerminalFluidFormat(FluidStack fs) {
+        int fid = Util.getFluidID(fs.getFluid());
+        if (fid == -1) {
+            return fs.getFluid().getLocalizedName();
+        } else if (Minecraft.getMinecraft().gameSettings.advancedItemTooltips) {
+            return String.format("%s (#%s) %s", fs.getFluid().getLocalizedName(), fid, fid);
+        } else {
+            return String.format("%s %s", fs.getFluid().getLocalizedName(), fid);
+        }
+    }
 }