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

22 files changed, 73 insertions, 46 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt
index 78fbbe836..2442027e2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt
@@ -27,6 +27,7 @@ import net.minecraftforge.event.entity.EntityJoinWorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 object UniqueGiftingOpportunitiesFeatures {
+
     private val playerList: MutableSet<String>?
         get() = ProfileStorageData.playerSpecific?.winter?.playersThatHaveBeenGifted
 
@@ -62,7 +63,6 @@ object UniqueGiftingOpportunitiesFeatures {
         val matchedPlayer = EntityUtils.getEntitiesNearby<EntityPlayer>(entity.getLorenzVec(), 2.0)
             .singleOrNull { !it.isNPC() } ?: return
         addGiftedPlayer(matchedPlayer.name)
-
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/Year300RaffleEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/Year300RaffleEvent.kt
index 71d8040f3..0123e94d1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/Year300RaffleEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/Year300RaffleEvent.kt
@@ -21,6 +21,7 @@ import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
 object Year300RaffleEvent {
+
     private val config get() = SkyHanniMod.feature.event.century
     val displayItem by lazy { NEUItems.getItemStackOrNull("EPOCH_CAKE_ORANGE") ?: ItemStack(Items.clock) }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowAPI.kt
index db6de093f..8fabffb8d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowAPI.kt
@@ -5,5 +5,4 @@ import at.hannibal2.skyhanni.utils.SimpleTimeMark
 object BurrowAPI {
 
     var lastBurrowRelatedChatMessage = SimpleTimeMark.farPast()
-
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
index 1b9e12195..43ae77b5a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
@@ -6,10 +6,11 @@ import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzKeyPressEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
-import at.hannibal2.skyhanni.utils.LorenzUtils.sorted
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import net.minecraft.client.Minecraft
@@ -50,8 +51,8 @@ class BurrowWarpHelper {
             if (lastWarpTime.passedSince() < 1.seconds) {
                 lastWarp?.let {
                     it.unlocked = false
-                    LorenzUtils.chat("Detected not having access to warp point §b${it.displayName}§e!")
-                    LorenzUtils.chat("Use §c/shresetburrowwarps §eonce you have activated this travel scroll.")
+                    ChatUtils.chat("Detected not having access to warp point §b${it.displayName}§e!")
+                    ChatUtils.chat("Use §c/shresetburrowwarps §eonce you have activated this travel scroll.")
                     lastWarp = null
                     currentWarp = null
                 }
@@ -89,6 +90,7 @@ class BurrowWarpHelper {
     }
 
     companion object {
+
         private val config get() = SkyHanniMod.feature.event.diana
         var currentWarp: WarpPoint? = null
 
@@ -116,7 +118,7 @@ class BurrowWarpHelper {
 
         fun resetDisabledWarps() {
             WarpPoint.entries.forEach { it.unlocked = true }
-            LorenzUtils.chat("Reset disabled burrow warps.")
+            ChatUtils.chat("Reset disabled burrow warps.")
         }
     }
 
@@ -127,6 +129,7 @@ class BurrowWarpHelper {
         val ignored: () -> Boolean = { false },
         var unlocked: Boolean = true,
     ) {
+
         HUB("Hub", LorenzVec(-3, 70, -70), 2),
         CASTLE("Castle", LorenzVec(-250, 130, 45), 10),
         CRYPT("Crypt", LorenzVec(-190, 74, -88), 15, { config.ignoredWarps.crypt }),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
index 1ab8c0154..a41ee2689 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
@@ -6,8 +6,9 @@ import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.ItemAddEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+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.NumberUtil
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -23,6 +24,7 @@ import com.google.gson.annotations.Expose
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 object DianaProfitTracker {
+
     private val config get() = SkyHanniMod.feature.event.diana.dianaProfitTracker
     private var allowedDrops = listOf<NEUInternalName>()
 
@@ -41,6 +43,7 @@ object DianaProfitTracker {
         { it.diana.dianaProfitTracker }) { drawDisplay(it) }
 
     class Data : ItemTrackerData() {
+
         override fun resetItems() {
             burrowsDug = 0
         }
@@ -94,7 +97,7 @@ object DianaProfitTracker {
         val internalName = event.internalName
 
         if (!isAllowedItem(internalName)) {
-            LorenzUtils.debug("Ignored non-diana item pickup: '$internalName'")
+            ChatUtils.debug("Ignored non-diana item pickup: '$internalName'")
             return
         }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
index 468dadc18..5d53ce823 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
@@ -16,13 +16,14 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.features.event.diana.DianaAPI.isDianaSpade
 import at.hannibal2.skyhanni.utils.BlockUtils.getBlockAt
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils.editCopy
 import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.editCopy
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
@@ -38,6 +39,7 @@ import org.lwjgl.input.Keyboard
 import kotlin.time.Duration.Companion.seconds
 
 object GriffinBurrowHelper {
+
     private val config get() = SkyHanniMod.feature.event.diana
 
     var targetLocation: LorenzVec? = null
@@ -280,7 +282,6 @@ object GriffinBurrowHelper {
                     }
                 }
             }
-
         }
     }
 
@@ -303,28 +304,28 @@ object GriffinBurrowHelper {
 
     fun setTestBurrow(strings: Array<String>) {
         if (!IslandType.HUB.isInIsland()) {
-            LorenzUtils.userError("You can only create test burrows on the hub island!")
+            ChatUtils.userError("You can only create test burrows on the hub island!")
             return
         }
 
         if (!isEnabled()) {
             if (!config.alwaysDiana) {
-                LorenzUtils.clickableChat("§cEnable Always Diana in the config!", "sh always diana")
+                ChatUtils.clickableChat("§cEnable Always Diana in the config!", "sh always diana")
             } else {
-                LorenzUtils.userError("Have an Ancestral Spade in the inventory!")
+                ChatUtils.userError("Have an Ancestral Spade in the inventory!")
             }
             return
         }
 
         if (strings.size != 1) {
-            LorenzUtils.userError("/shtestburrow <type>")
+            ChatUtils.userError("/shtestburrow <type>")
             return
         }
 
         val type: BurrowType = when (strings[0].lowercase()) {
             "reset" -> {
                 resetAllData()
-                LorenzUtils.chat("Manually reset all burrow waypoints.")
+                ChatUtils.chat("Manually reset all burrow waypoints.")
                 return
             }
 
@@ -332,7 +333,7 @@ object GriffinBurrowHelper {
             "2", "mob" -> BurrowType.MOB
             "3", "treasure" -> BurrowType.TREASURE
             else -> {
-                LorenzUtils.userError("Unknown burrow type! Try 1-3 instead.")
+                ChatUtils.userError("Unknown burrow type! Try 1-3 instead.")
                 return
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
index c49f6c551..9c83dfeda 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
@@ -23,6 +23,7 @@ import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
 class GriffinBurrowParticleFinder {
+
     private val config get() = SkyHanniMod.feature.event.diana
 
     private val recentlyDugParticleBurrows = TimeLimitedSet<LorenzVec>(1.minutes)
@@ -180,7 +181,6 @@ class GriffinBurrowParticleFinder {
                     burrows.remove(location)
                 }
             }
-
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinPetWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinPetWarning.kt
index d49e3199a..587522c00 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinPetWarning.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinPetWarning.kt
@@ -2,12 +2,14 @@ package at.hannibal2.skyhanni.features.event.diana
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.seconds
 
 class GriffinPetWarning {
+
     private var lastWarnTime = SimpleTimeMark.farPast()
 
     @SubscribeEvent
@@ -20,7 +22,7 @@ class GriffinPetWarning {
         if (!DianaAPI.hasGriffinPet() && lastWarnTime.passedSince() > 30.seconds) {
             lastWarnTime = SimpleTimeMark.now()
             LorenzUtils.sendTitle("§cGriffin Pet!", 3.seconds)
-            LorenzUtils.chat("Reminder to use a Griffin pet for Mythological Ritual!")
+            ChatUtils.chat("Reminder to use a Griffin pet for Mythological Ritual!")
         }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt
index 44f95cfcd..534dc4c91 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt
@@ -10,6 +10,7 @@ import net.minecraftforge.event.entity.EntityJoinWorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class HighlightInquisitors {
+
     private val config get() = SkyHanniMod.feature.event.diana
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
index d7a161957..9276823fe 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
@@ -8,11 +8,12 @@ import at.hannibal2.skyhanni.events.LorenzKeyPressEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.PacketEvent
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils.editCopy
 import at.hannibal2.skyhanni.utils.EntityUtils
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzLogger
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.editCopy
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SoundUtils
@@ -28,6 +29,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.seconds
 
 object InquisitorWaypointShare {
+
     private val config get() = SkyHanniMod.feature.event.diana.inquisitorSharing
 
     // TODO USE SH-REPO
@@ -50,14 +52,14 @@ object InquisitorWaypointShare {
         val fromPlayer: String,
         val displayName: String,
         val location: LorenzVec,
-        val spawnTime: SimpleTimeMark
+        val spawnTime: SimpleTimeMark,
     )
 
     private var test = false
 
     fun test() {
         test = !test
-        LorenzUtils.chat("Inquisitor Test " + if (test) "Enabled" else "Disabled")
+        ChatUtils.chat("Inquisitor Test " + if (test) "Enabled" else "Disabled")
     }
 
     @SubscribeEvent
@@ -149,7 +151,7 @@ object InquisitorWaypointShare {
             val keyName = KeyboardManager.getKeyName(config.keyBindShare)
             val message =
                 "§l§bYou found a Inquisitor! Press §l§chere §l§bor §c$keyName to share the location!"
-            LorenzUtils.clickableChat(message, "shshareinquis")
+            ChatUtils.clickableChat(message, "shshareinquis")
         }
     }
 
@@ -193,18 +195,18 @@ object InquisitorWaypointShare {
         lastShareTime = System.currentTimeMillis()
 
         if (inquisitor == -1) {
-            LorenzUtils.error("No Inquisitor Found!")
+            ChatUtils.error("No Inquisitor Found!")
             return
         }
 
         val inquisitor = EntityUtils.getEntityByID(inquisitor)
         if (inquisitor == null) {
-            LorenzUtils.chat("§cInquisitor out of range!")
+            ChatUtils.chat("§cInquisitor out of range!")
             return
         }
 
         if (inquisitor.isDead) {
-            LorenzUtils.chat("§cInquisitor is dead")
+            ChatUtils.chat("§cInquisitor is dead")
             return
         }
         val location = inquisitor.getLorenzVec()
@@ -234,7 +236,7 @@ object InquisitorWaypointShare {
             val name = rawName.cleanPlayerName()
             val displayName = rawName.cleanPlayerName(displayName = true)
             if (!waypoints.containsKey(name)) {
-                LorenzUtils.chat("$displayName §l§efound an inquisitor at §l§c$x $y $z!")
+                ChatUtils.chat("$displayName §l§efound an inquisitor at §l§c$x $y $z!")
                 if (name != LorenzUtils.getPlayerName()) {
                     LorenzUtils.sendTitle("§dINQUISITOR §efrom §b$displayName", 5.seconds)
                     SoundUtils.playBeepSound()
@@ -259,7 +261,7 @@ object InquisitorWaypointShare {
     fun maybeRemove(inquis: SharedInquisitor) {
         if (inquisitorsNearby.isEmpty()) {
             waypoints = waypoints.editCopy { remove(inquis.fromPlayer) }
-            LorenzUtils.chat("Inquisitor from ${inquis.displayName} not found, deleting.")
+            ChatUtils.chat("Inquisitor from ${inquis.displayName} not found, deleting.")
         }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
index 1d2884bc1..dbcc1574e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
@@ -4,10 +4,11 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.CollectionUtils.sumAllValues
+import at.hannibal2.skyhanni.utils.ConditionalUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
-import at.hannibal2.skyhanni.utils.LorenzUtils.addOrPut
-import at.hannibal2.skyhanni.utils.LorenzUtils.sumAllValues
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.StringUtils.matches
@@ -34,10 +35,12 @@ object MythologicalCreatureTracker {
 
     private val config get() = SkyHanniMod.feature.event.diana.mythologicalMobtracker
 
-    private val tracker = SkyHanniTracker("Mythological Creature Tracker", { Data() }, { it.diana.mythologicalMobTracker })
-    { drawDisplay(it) }
+    private val tracker =
+        SkyHanniTracker("Mythological Creature Tracker", { Data() }, { it.diana.mythologicalMobTracker })
+        { drawDisplay(it) }
 
     class Data : TrackerData() {
+
         override fun reset() {
             count.clear()
         }
@@ -86,7 +89,7 @@ object MythologicalCreatureTracker {
 
     @SubscribeEvent
     fun onConfigLoad(event: ConfigLoadEvent) {
-        LorenzUtils.onToggle(config.showPercentage) {
+        ConditionalUtils.onToggle(config.showPercentage) {
             tracker.update()
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
index 2fa31408d..125bf718f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
@@ -5,7 +5,7 @@ import at.hannibal2.skyhanni.events.BurrowGuessEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.PlaySoundEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
-import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.toLorenzVec
 import net.minecraft.util.EnumParticleTypes
@@ -109,7 +109,7 @@ class SoopyGuessBurrow {
         distance2 = (Math.E / slope) - firstParticlePoint?.distance(pos)!!
 
         if (distance2!! > 1000) {
-            LorenzUtils.debug("Soopy distance2 is $distance2")
+            ChatUtils.debug("Soopy distance2 is $distance2")
             distance2 = null
             guessPoint = null
 
@@ -227,7 +227,7 @@ class SoopyGuessBurrow {
                         i++
                     }
 
-                    //Why does this happen?
+                    // Why does this happen?
                     if (pr1.isEmpty()) return
 
                     val p1 = pr1.last()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/HighlightJerries.kt b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/HighlightJerries.kt
index fb2852cea..4bc5225b9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/HighlightJerries.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/HighlightJerries.kt
@@ -10,9 +10,10 @@ import net.minecraft.entity.passive.EntityVillager
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class HighlightJerries {
+
     private val config get() = SkyHanniMod.feature.event.jerry
 
-    //RED RED WHITE LIGHT_PURPLE are fallbacks in case Hypixel admins do a little trolling
+    // RED RED WHITE LIGHT_PURPLE are fallbacks in case Hypixel admins do a little trolling
     private val listOfLorenzColors = listOf(
         LorenzColor.RED,
         LorenzColor.RED,
@@ -37,4 +38,4 @@ class HighlightJerries {
             RenderLivingEntityHelper.setEntityColor(entity, color) { config.highlightJerries }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasure.kt b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasure.kt
index de1b9df1a..219a22285 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasure.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasure.kt
@@ -8,6 +8,7 @@ enum class FrozenTreasure(
     val defaultAmount: Int,
     val iceMultiplier: Int = 0,
 ) {
+
     WHITE_GIFT("WHITE_GIFT", "§fWhite Gift", 1),
     GREEN_GIFT("GREEN_GIFT", "§aGreen Gift", 1),
     RED_GIFT("RED_GIFT", "§9§cRed Gift", 1),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
index f628c8a4b..7b3f236f0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
@@ -9,9 +9,9 @@ import at.hannibal2.skyhanni.data.ScoreboardData
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.ConfigUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
-import at.hannibal2.skyhanni.utils.LorenzUtils.addOrPut
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.NumberUtil
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -25,6 +25,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.concurrent.fixedRateTimer
 
 object FrozenTreasureTracker {
+
     private val config get() = SkyHanniMod.feature.event.winter.frozenTreasureTracker
     private var estimatedIce = 0L
     private var lastEstimatedIce = 0L
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt
index da537d4c0..af2c17be0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt
@@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.utils.LorenzVec
 data class EventWaypoint(
     val name: String,
     val position: LorenzVec,
-    var isFound: Boolean = false
+    var isFound: Boolean = false,
 )
 
 fun loadEventWaypoints(waypoints: Map<String, List<EventWaypointsJson.Waypoint>>): Map<String, MutableSet<EventWaypoint>> {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt
index 39ff40765..a6fa577e4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt
@@ -11,6 +11,7 @@ import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.features.event.lobby.waypoints.EventWaypoint
 import at.hannibal2.skyhanni.features.event.lobby.waypoints.loadEventWaypoints
 import at.hannibal2.skyhanni.test.GriffinUtils.drawWaypointFilled
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceSqToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -20,6 +21,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 // todo: create abstract class for this and BasketWaypoints
 class PresentWaypoints {
+
     private val config get() = SkyHanniMod.feature.event.lobbyWaypoints.christmasPresent
     private var presentLocations = mapOf<String, MutableSet<EventWaypoint>>()
     private var presentEntranceLocations = mapOf<String, MutableSet<EventWaypoint>>()
@@ -67,7 +69,7 @@ class PresentWaypoints {
 
     private fun handleAllPresentsFound() {
         // If all presents are found, disable the feature
-        LorenzUtils.chat("Congratulations! As all presents are found, we are disabling the Christmas Present Waypoints feature.")
+        ChatUtils.chat("Congratulations! As all presents are found, we are disabling the Christmas Present Waypoints feature.")
         config.allWaypoints = false
         config.allEntranceWaypoints = false
     }
@@ -90,7 +92,7 @@ class PresentWaypoints {
     }
 
     private fun LorenzRenderWorldEvent.drawWaypoints(
-        waypoints: Set<EventWaypoint>, shouldDraw: Boolean, color: LorenzColor, prefix: String
+        waypoints: Set<EventWaypoint>, shouldDraw: Boolean, color: LorenzColor, prefix: String,
     ) {
         if (!shouldDraw) return
         waypoints.forEach { waypoint ->
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/halloween/BasketEntrances.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/halloween/BasketEntrances.kt
index e2904f99e..3907986d9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/halloween/BasketEntrances.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/halloween/BasketEntrances.kt
@@ -5,8 +5,9 @@ import at.hannibal2.skyhanni.utils.LorenzVec