Splitting many utils functions from LorenzUtils up into other classes: ChatUtils, CollectionUtils, ConditionalUtils. And code cleanup #978

4 files changed, 17 insertions, 10 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt
index 7aa2cf4f9..8aeec5f32 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt
@@ -36,6 +36,7 @@ abstract class ItemTrackerData : TrackerData() {
     var items: MutableMap<NEUInternalName, TrackedItem> = HashMap()
 
     class TrackedItem {
+
         @Expose
         var internalName: NEUInternalName? = null
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
index b831ade3f..ce10ecbee 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
@@ -5,12 +5,13 @@ import at.hannibal2.skyhanni.config.Storage
 import at.hannibal2.skyhanni.config.features.misc.TrackerConfig.PriceFromEntry
 import at.hannibal2.skyhanni.data.SlayerAPI
 import at.hannibal2.skyhanni.test.PriceSource
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
+import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.ItemUtils.getNameWithEnchantment
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.LorenzUtils.addSelector
-import at.hannibal2.skyhanni.utils.LorenzUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil
@@ -27,6 +28,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
 ) : SkyHanniTracker<Data>(name, createNewSession, getStorage, drawDisplay) {
 
     companion object {
+
         val SKYBLOCK_COIN by lazy { "SKYBLOCK_COIN".asInternalName() }
     }
 
@@ -47,7 +49,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
 
         val (itemName, price) = SlayerAPI.getItemNameAndPrice(internalName, amount)
         if (config.warnings.chat && price >= config.warnings.minimumChat) {
-            LorenzUtils.chat("§a+Tracker Drop§7: §r$itemName")
+            ChatUtils.chat("§a+Tracker Drop§7: §r$itemName")
         }
         if (config.warnings.title && price >= config.warnings.minimumTitle) {
             LorenzUtils.sendTitle("§a+ $itemName", 5.seconds)
@@ -71,7 +73,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
     fun drawItems(
         data: Data,
         filter: (NEUInternalName) -> Boolean,
-        lists: MutableList<List<Any>>
+        lists: MutableList<List<Any>>,
     ): Double {
         var profit = 0.0
         val items = mutableMapOf<Renderable, Long>()
@@ -106,7 +108,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
                 if (System.currentTimeMillis() > lastClickDelay + 150) {
                     if (KeyboardManager.isModifierKeyDown()) {
                         data.items.remove(internalName)
-                        LorenzUtils.chat("Removed $cleanName §efrom $name.")
+                        ChatUtils.chat("Removed $cleanName §efrom $name.")
                         lastClickDelay = System.currentTimeMillis() + 500
                     } else {
                         modify {
@@ -152,7 +154,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
         item: ItemTrackerData.TrackedItem,
         hidden: Boolean,
         newDrop: Boolean,
-        internalName: NEUInternalName
+        internalName: NEUInternalName,
     ) = buildList {
         if (internalName == SKYBLOCK_COIN) {
             addAll(data.getCoinDescription(item))
@@ -185,5 +187,4 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
         val text = "§eTotal Profit: $profitPrefix$profitFormat coins"
         return Renderable.hoverTips(text, tips)
     }
-
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
index 4a78641ef..b4f7bfef0 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
@@ -8,8 +8,9 @@ import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.data.TrackerManager
 import at.hannibal2.skyhanni.features.bazaar.BazaarApi.Companion.getBazaarData
 import at.hannibal2.skyhanni.features.misc.items.EstimatedItemValue
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
@@ -26,6 +27,7 @@ open class SkyHanniTracker<Data : TrackerData>(
     private val getStorage: (Storage.ProfileSpecific) -> Data,
     private val drawDisplay: (Data) -> List<List<Any>>,
 ) {
+
     private var inventoryOpen = false
     private var displayMode: DisplayMode? = null
     private val currentSessions = mutableMapOf<Storage.ProfileSpecific, Data>()
@@ -34,6 +36,7 @@ open class SkyHanniTracker<Data : TrackerData>(
     private var dirty = false
 
     companion object {
+
         val config get() = SkyHanniMod.feature.misc.tracker
         private val storedTrackers get() = SkyHanniMod.feature.storage.trackerDisplayModes
 
@@ -53,7 +56,7 @@ open class SkyHanniTracker<Data : TrackerData>(
             return
         }
 
-        LorenzUtils.clickableChat(
+        ChatUtils.clickableChat(
             "Are you sure you want to reset your total $name? Click here to confirm.",
             "$command confirm"
         )
@@ -145,7 +148,7 @@ open class SkyHanniTracker<Data : TrackerData>(
     private fun reset(displayMode: DisplayMode, message: String) {
         getSharedTracker()?.let {
             it.get(displayMode).reset()
-            LorenzUtils.chat(message)
+            ChatUtils.chat(message)
             update()
         }
     }
@@ -163,6 +166,7 @@ open class SkyHanniTracker<Data : TrackerData>(
     }
 
     class SharedTracker<Data : TrackerData>(private val total: Data, private val currentSession: Data) {
+
         fun modify(modifyFunction: (Data) -> Unit) {
             modifyFunction(total)
             modifyFunction(currentSession)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/TrackerData.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/TrackerData.kt
index 3c4a8bbd0..24f417850 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/TrackerData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/TrackerData.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.utils.tracker
 
 abstract class TrackerData {
+
     abstract fun reset()
 }