From d9ccf2acda2812906286f6a338398a2f92b273dc Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 22 Jun 2023 16:58:25 +0200
Subject: Fixed Pocket Sack-In-A-Sack Replace In Lore

---
 .../at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/features/misc')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt
index 721248658..17f248753 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt
@@ -7,6 +7,7 @@ import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getAppliedPocketSackInASack
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -53,7 +54,7 @@ class PocketSackInASackDisplay {
         val it = event.toolTip.listIterator()
         for (line in it) {
             valPattern.matchMatcher(line) {
-                val replace = when (group("number")) {
+                val replace = when (group("number").removeColor()) {
                     "a" -> "§c1"
                     "two" -> "§62"
                     "three" -> "§a3"
-- 
cgit 


From c4acb66a4b6ab9498659613b5193a06044d3fd47 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 22 Jun 2023 17:26:56 +0200
Subject: Fixed Pocket Sack-In-A-Sack Replace In Lore v2

---
 .../at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/features/misc')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt
index 17f248753..8507deb6e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt
@@ -7,14 +7,13 @@ import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getAppliedPocketSackInASack
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
-import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class PocketSackInASackDisplay {
 
     private val config get() = SkyHanniMod.feature.misc.pocketSackInASack
-    private val valPattern = "§5§o§7This sack is stitched with (?<number>.*)".toPattern()
+    private val valPattern = "§5§o§7This sack is stitched with (?<number>.*)§7.".toPattern()
 
     @SubscribeEvent
     fun onRenderItemOverlayPost(event: GuiRenderItemEvent.RenderOverlayEvent.GuiRenderItemPost) {
@@ -54,7 +53,7 @@ class PocketSackInASackDisplay {
         val it = event.toolTip.listIterator()
         for (line in it) {
             valPattern.matchMatcher(line) {
-                val replace = when (group("number").removeColor()) {
+                val replace = when (group("number")) {
                     "a" -> "§c1"
                     "two" -> "§62"
                     "three" -> "§a3"
-- 
cgit 


From 46968a541e2231caadd9a9fc471277054bd012cd Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 23 Jun 2023 00:11:03 +0200
Subject: Fixed rare error with estimated wardrobe price

---
 .../at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt  | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/java/at/hannibal2/skyhanni/features/misc')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt
index 3b6470660..b31a7f574 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt
@@ -29,6 +29,7 @@ class EstimatedWardrobePrice {
 
         var index = 3
         val toolTip = event.toolTip
+        if (toolTip.size < 4) return
         toolTip.add(index++, "")
         toolTip.add(index++, "§aEstimated Armor Value:")
 
-- 
cgit