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

6 files changed, 14 insertions, 5 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
index 840253166..6a9c65b8a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
@@ -25,9 +25,11 @@ import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class BazaarApi {
+
     private var loadedNpcPriceData = false
 
     companion object {
+
         val holder = BazaarDataHolder()
         var inBazaarInventory = false
         private var currentSearchedItem = ""
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
index f78b682d7..de37b8b9b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
@@ -18,6 +18,7 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class BazaarBestSellMethod {
+
     private var display = ""
 
     // Working with the last clicked item manually because
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt
index 5df99f31e..b0e96ca1f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.bazaar
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzToolTipEvent
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -42,7 +43,7 @@ class BazaarCancelledBuyOrderClipboard {
         patternCancelledMessage.matchMatcher(event.message) {
             event.blockedReason = "bazaar cancelled buy order clipbaord"
             val coins = group("coins")
-            LorenzUtils.chat("Bazaar buy order cancelled. $latestAmount saved to clipboard. ($coins coins)")
+            ChatUtils.chat("Bazaar buy order cancelled. $latestAmount saved to clipboard. ($coins coins)")
 
             latestAmount?.let { OSUtils.copyToClipboard(it.replace(",", "")) }
             latestAmount = null
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt
index 452003c1e..5a4f956a9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt
@@ -3,8 +3,8 @@ package at.hannibal2.skyhanni.features.bazaar
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.utils.APIUtil
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.name
-import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
@@ -16,6 +16,7 @@ import kotlin.concurrent.fixedRateTimer
 class BazaarDataHolder {
 
     companion object {
+
         private val bazaarData = mutableMapOf<NEUInternalName, BazaarData>()
         private var npcPrices = mapOf<NEUInternalName, Double>()
 
@@ -42,7 +43,7 @@ class BazaarDataHolder {
             RiftAPI.motesPrice = motesPrice
         } catch (e: Throwable) {
             e.printStackTrace()
-            LorenzUtils.error("Error while trying to read bazaar item list from api: " + e.message)
+            ChatUtils.error("Error while trying to read bazaar item list from api: " + e.message)
         }
         return list
     }
@@ -62,7 +63,7 @@ class BazaarDataHolder {
     private fun createNewData(internalName: NEUInternalName): BazaarData? {
         val stack = internalName.getItemStackOrNull()
         if (stack == null) {
-            LorenzUtils.debug("Bazaar data is null: '$internalName'")
+            ChatUtils.debug("Bazaar data is null: '$internalName'")
             return null
         }
         val displayName = stack.name!!.removeColor()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOpenPriceWebsite.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOpenPriceWebsite.kt
index 74922ebe4..0f03c9b0d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOpenPriceWebsite.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOpenPriceWebsite.kt
@@ -14,6 +14,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.seconds
 
 class BazaarOpenPriceWebsite {
+
     private val config get() = SkyHanniMod.feature.bazaar
     private var lastClick = SimpleTimeMark.farPast()
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt
index fa0dd8187..da828ef31 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.bazaar
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiContainerEvent
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.InventoryUtils.getInventoryName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name
@@ -15,11 +16,13 @@ import net.minecraft.inventory.Slot
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class BazaarOrderHelper {
+
     private val bazaarItemNamePattern = "§.§l(?<type>BUY|SELL) (?<name>.*)".toPattern()
     private val filledPattern = "§7Filled: §[a6].*§7/.* §a§l100%!".toPattern()
     private val pricePattern = "§7Price per unit: §6(?<number>.*) coins".toPattern()
 
     companion object {
+
         fun isBazaarOrderInventory(inventoryName: String): Boolean = when (inventoryName) {
             "Your Bazaar Orders" -> true
             "Co-op Bazaar Orders" -> true
@@ -56,7 +59,7 @@ class BazaarOrderHelper {
     private fun highlightItem(itemName: String, slot: Slot, buyOrSell: Pair<Boolean, Boolean>) {
         val data = BazaarApi.getBazaarDataByName(itemName)
         if (data == null) {
-            LorenzUtils.debug("Bazaar data is null for bazaarItemName '$itemName'")
+            ChatUtils.debug("Bazaar data is null for bazaarItemName '$itemName'")
             return
         }