From fcd404d862b4b051474898076fcc06b406d1ea91 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sun, 7 Apr 2024 21:36:08 +1000
Subject: Backend: Remove a lot of deprecated code (#1371)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/fishing/tracker/FishingProfitTracker.kt       | 5 ++---
 .../hannibal2/skyhanni/features/fishing/trophy/TrophyFishFillet.kt  | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
index dc6246abe..f13ea5824 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
@@ -19,7 +19,7 @@ import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
-import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
+import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
@@ -192,8 +192,7 @@ object FishingProfitTracker {
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
         coinsChatPattern.matchMatcher(event.message) {
-            val coins = group("coins").formatNumber()
-            tracker.addCoins(coins.toInt())
+            tracker.addCoins(group("coins").formatInt())
             addCatch()
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishFillet.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishFillet.kt
index dcafc6603..5409062f5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishFillet.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishFillet.kt
@@ -7,7 +7,8 @@ import at.hannibal2.skyhanni.features.fishing.trophy.TrophyFishManager.getFillet
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.NEUItems
+import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.NumberUtil
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -27,7 +28,8 @@ class TrophyFishFillet {
         val rarity = TrophyRarity.getByName(trophyRarityName) ?: return
         val multiplier = if (Keyboard.KEY_LSHIFT.isKeyHeld()) event.itemStack.stackSize else 1
         val filletValue = info.getFilletValue(rarity) * multiplier
-        val filletPrice = filletValue * NEUItems.getPrice("MAGMA_FISH")
+        // TODO use magma fish member
+        val filletPrice = filletValue * "MAGMA_FISH".asInternalName().getPrice()
         event.toolTip.add("§7Fillet: §8${filletValue.addSeparators()} Magmafish §7(§6${NumberUtil.format(filletPrice)}§7)")
     }
 
-- 
cgit