From 30ecf3e856d4d10a4dfe1b0050ec71e70e4647a9 Mon Sep 17 00:00:00 2001
From: Rime <81419447+Emirlol@users.noreply.github.com>
Date: Wed, 15 May 2024 05:21:13 +0300
Subject: Add tooltips for the chocolate factory

Also fix unemployed coach crashing the game
---
 .../java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de/hysky/skyblocker/skyblock/item')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
index c6caaf41..6e269790 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
@@ -398,11 +398,15 @@ public class ItemTooltip {
         for (int i = 0; i < lines.size(); i++) {
             Text line = lines.get(i);
             if (line.getString().equals("-----------------")) {
-                lines.set(i, Text.literal("                    ").formatted(Formatting.DARK_GRAY, Formatting.STRIKETHROUGH, Formatting.BOLD));
+                lines.set(i, createSmoothLine());
             }
         }
     }
 
+    public static Text createSmoothLine() {
+        return Text.literal("                    ").formatted(Formatting.DARK_GRAY, Formatting.STRIKETHROUGH, Formatting.BOLD);
+    }
+
     // If these options is true beforehand, the client will get first data of these options while loading.
     // After then, it will only fetch the data if it is on Skyblock.
     public static int minute = 0;
-- 
cgit 


From 475be1aa49068ce46e46c112842f72f28e5e680b Mon Sep 17 00:00:00 2001
From: Rime <81419447+Emirlol@users.noreply.github.com>
Date: Sun, 19 May 2024 09:21:34 +0300
Subject: Narrow the scope of the line smoother in ItemTooltip

Not necessarily related to the chocolate factory, but it was also added by me so should be fine
---
 .../de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/main/java/de/hysky/skyblocker/skyblock/item')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
index 6e269790..70586d89 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
@@ -394,10 +394,14 @@ public class ItemTooltip {
         return message;
     }
 
+    //This is static to not create a new text object for each line in every item
+    private static final Text bumpyLine = Text.literal("-----------------").formatted(Formatting.DARK_GRAY, Formatting.STRIKETHROUGH);
+
     private static void smoothenLines(List<Text> lines) {
         for (int i = 0; i < lines.size(); i++) {
-            Text line = lines.get(i);
-            if (line.getString().equals("-----------------")) {
+            List<Text> lineSiblings = lines.get(i).getSiblings();
+            //Compare the first sibling rather than the whole object as the style of the root object can change while visually staying the same
+            if (lineSiblings.size() == 1 && lineSiblings.getFirst().equals(bumpyLine)) {
                 lines.set(i, createSmoothLine());
             }
         }
-- 
cgit 


From 2bbeccd147b715f1eb766d2c34f9326986160557 Mon Sep 17 00:00:00 2001
From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Date: Thu, 23 May 2024 02:01:32 -0400
Subject: Clean up small formatting

---
 .../java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/main/java/de/hysky/skyblocker/skyblock/item')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
index 70586d89..8c083e25 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
@@ -2,7 +2,6 @@ package de.hysky.skyblocker.skyblock.item.tooltip;
 
 import com.google.gson.JsonObject;
 import de.hysky.skyblocker.SkyblockerMod;
-import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.config.configs.GeneralConfig;
 import de.hysky.skyblocker.skyblock.item.MuseumItemCache;
@@ -395,13 +394,13 @@ public class ItemTooltip {
     }
 
     //This is static to not create a new text object for each line in every item
-    private static final Text bumpyLine = Text.literal("-----------------").formatted(Formatting.DARK_GRAY, Formatting.STRIKETHROUGH);
+    private static final Text BUMPY_LINE = Text.literal("-----------------").formatted(Formatting.DARK_GRAY, Formatting.STRIKETHROUGH);
 
     private static void smoothenLines(List<Text> lines) {
         for (int i = 0; i < lines.size(); i++) {
             List<Text> lineSiblings = lines.get(i).getSiblings();
             //Compare the first sibling rather than the whole object as the style of the root object can change while visually staying the same
-            if (lineSiblings.size() == 1 && lineSiblings.getFirst().equals(bumpyLine)) {
+            if (lineSiblings.size() == 1 && lineSiblings.getFirst().equals(BUMPY_LINE)) {
                 lines.set(i, createSmoothLine());
             }
         }
-- 
cgit