From d1c37f282ea82af014f162b7fbfd8001ca66cab0 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Wed, 1 Jul 2020 00:45:28 +0800
Subject: Try fixing up entry tooltip duplications.

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java | 5 ++---
 src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java  | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java b/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java
index b038fe07b..0b32405a9 100644
--- a/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java
+++ b/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java
@@ -197,16 +197,15 @@ public class FluidEntryStack extends AbstractEntryStack {
         toolTip.addAll(get(Settings.TOOLTIP_APPEND_EXTRA).apply(this));
         if (get(Settings.TOOLTIP_APPEND_MOD).get() && ConfigObject.getInstance().shouldAppendModNames()) {
             Identifier id = Registry.FLUID.getId(fluid);
-            final Text modString = ClientHelper.getInstance().getFormattedModFromIdentifier(id);
             final String modId = ClientHelper.getInstance().getModFromIdentifier(id);
             boolean alreadyHasMod = false;
             for (Text s : toolTip)
-                if (s.asString().equalsIgnoreCase(modId)) {
+                if (s.getString().equalsIgnoreCase(modId)) {
                     alreadyHasMod = true;
                     break;
                 }
             if (!alreadyHasMod)
-                toolTip.add(modString);
+                toolTip.add(ClientHelper.getInstance().getFormattedModFromIdentifier(id));
         }
         return Tooltip.create(toolTip);
     }
diff --git a/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java b/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java
index 1f881c174..96c2cfd4a 100644
--- a/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java
+++ b/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java
@@ -277,19 +277,18 @@ public class ItemEntryStack extends AbstractEntryStack implements OptimalEntrySt
     public Tooltip getTooltip(Point point) {
         if (isEmpty() || !get(Settings.TOOLTIP_ENABLED).get())
             return null;
-        List<Text> toolTip = Lists.newArrayList(tryGetItemStackToolTip(true));
+        List<Text> toolTip = tryGetItemStackToolTip(true);
         toolTip.addAll(get(Settings.TOOLTIP_APPEND_EXTRA).apply(this));
         if (get(Settings.TOOLTIP_APPEND_MOD).get() && ConfigObject.getInstance().shouldAppendModNames()) {
-            final Text modString = ClientHelper.getInstance().getFormattedModFromItem(getItem());
             final String modId = ClientHelper.getInstance().getModFromItem(getItem());
             boolean alreadyHasMod = false;
             for (Text s : toolTip)
-                if (s.asString().equalsIgnoreCase(modId)) {
+                if (s.getString().equalsIgnoreCase(modId)) {
                     alreadyHasMod = true;
                     break;
                 }
             if (!alreadyHasMod)
-                toolTip.add(modString);
+                toolTip.add(ClientHelper.getInstance().getFormattedModFromItem(getItem()));
         }
         return Tooltip.create(toolTip);
     }
@@ -377,6 +376,6 @@ public class ItemEntryStack extends AbstractEntryStack implements OptimalEntrySt
                 e.printStackTrace();
                 SEARCH_BLACKLISTED.add(getItem());
             }
-        return Collections.singletonList(asFormattedText());
+        return Lists.newArrayList(asFormattedText());
     }
 }
-- 
cgit