Internal Change: Auto-Prefix Chat Messages (#622)

Add auto prefix to chat message methods. #622

14 files changed, 49 insertions, 45 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt
index ebc00c989..1ddcb40e7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt
@@ -39,32 +39,32 @@ class CollectionTracker {
         fun command(args: Array<String>) {
             if (args.isEmpty()) {
                 if (internalName == null) {
-                    LorenzUtils.chat("§c/shtrackcollection <item name>")
+                    LorenzUtils.userError("/shtrackcollection <item name>")
                     return
                 }
-                LorenzUtils.chat("§e[SkyHanni] Stopped collection tracker.")
+                LorenzUtils.chat("Stopped collection tracker.")
                 resetData()
                 return
             }
 
             val rawName = fixTypo(args.joinToString(" ").lowercase().replace("_", " "))
             if (rawName == "gemstone") {
-                LorenzUtils.chat("§c[SkyHanni] Gemstone collection is not supported!")
+                LorenzUtils.userError("Gemstone collection is not supported!")
                 return
             } else if (rawName == "mushroom") {
-                LorenzUtils.chat("§c[SkyHanni] Mushroom collection is not supported!")
+                LorenzUtils.userError("Mushroom collection is not supported!")
                 return
             }
 
             val foundInternalName = NEUItems.getInternalNameOrNullIgnoreCase(rawName)
             if (foundInternalName == null) {
-                LorenzUtils.chat("§c[SkyHanni] Item '$rawName' does not exist!")
+                LorenzUtils.error("Item '$rawName' does not exist!")
                 return
             }
 
             val stack = foundInternalName.getItemStackOrNull()
             if (stack == null) {
-                LorenzUtils.chat("§c[SkyHanni] Item '$rawName' does not exist!")
+                LorenzUtils.error("Item '$rawName' does not exist!")
                 return
             }
             setNewCollection(foundInternalName, stack.name!!.removeColor())
@@ -97,7 +97,7 @@ class CollectionTracker {
         private fun setNewCollection(internalName: NEUInternalName, name: String) {
             val foundAmount = CollectionAPI.getCollectionCounter(internalName)
             if (foundAmount == null) {
-                LorenzUtils.chat("§c[SkyHanni] $name collection not found. Try to open the collection inventory!")
+                LorenzUtils.userError("$name collection not found. Try to open the collection inventory!")
                 return
             }
             this.internalName = internalName
@@ -106,7 +106,7 @@ class CollectionTracker {
 
             lastAmountInInventory = countCurrentlyInInventory()
             updateDisplay()
-            LorenzUtils.chat("§e[SkyHanni] Started tracking $itemName §ecollection.")
+            LorenzUtils.chat("Started tracking $itemName §ecollection.")
         }
 
         private fun resetData() {
@@ -201,4 +201,4 @@ class CollectionTracker {
 
         SkyHanniMod.feature.misc.collectionCounterPos.renderStringsAndItems(display, posLabel = "Collection Tracker")
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/FandomWikiFromMenus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/FandomWikiFromMenus.kt
index eb658b865..dbc3725bf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/FandomWikiFromMenus.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FandomWikiFromMenus.kt
@@ -42,7 +42,7 @@ class FandomWikiFromMenus {
         val inWikiInventory = // TODO better name for this inventory
             event.slotId == 11 && itemClickedName.contains("Wiki Command") && chestName.contains("Wiki")
         if ((itemInHandName == "") || inWikiInventory) {
-            LorenzUtils.clickableChat("§e[SkyHanni] Click here to visit the Hypixel Skyblock Fandom Wiki!", "wiki")
+            LorenzUtils.clickableChat("Click here to visit the Hypixel Skyblock Fandom Wiki!", "wiki")
             return
         }
 
@@ -65,11 +65,11 @@ class FandomWikiFromMenus {
 
         if (!config.skipWikiChat) {
             LorenzUtils.clickableChat(
-                "§e[SkyHanni] Click here to search for $wikiDisplayName §eon the Hypixel Skyblock Fandom Wiki!",
+                "Click here to search for $wikiDisplayName §eon the Hypixel Skyblock Fandom Wiki!",
                 "wiki $wikiInternalName"
             )
         } else {
-            LorenzUtils.chat("§e[SkyHanni] Searching the Fandom Wiki for §a$wikiDisplayName")
+            LorenzUtils.chat("Searching the Fandom Wiki for §a$wikiDisplayName")
             val wikiUrlCustom = "${WikiManager.urlSearchPrefix}$wikiInternalName&scope=internal"
             OSUtils.openBrowser(wikiUrlCustom.replace(' ', '+'))
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/FixNEUHeavyPearls.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/FixNEUHeavyPearls.kt
index 7afbf475c..8f3920844 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/FixNEUHeavyPearls.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FixNEUHeavyPearls.kt
@@ -20,7 +20,7 @@ class FixNEUHeavyPearls {
             if (change.internalName == heavyPearl && change.delta == 3) {
                 val specific = NotEnoughUpdates.INSTANCE.config.getProfileSpecific()
                 if (System.currentTimeMillis() > specific.dailyHeavyPearlCompleted + 1.hours.inWholeMilliseconds) {
-                    LorenzUtils.chat("§e[SkyHanni] Mark NEU Heavy Pearls as done.")
+                    LorenzUtils.chat("Mark NEU Heavy Pearls as done.")
                     specific.dailyHeavyPearlCompleted = System.currentTimeMillis()
                 }
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/JoinCrystalHollows.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/JoinCrystalHollows.kt
index 8b7114127..4064ed341 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/JoinCrystalHollows.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/JoinCrystalHollows.kt
@@ -24,13 +24,13 @@ class JoinCrystalHollows {
         if (message == "§cYou do not have an active Crystal Hollows pass!") {
             lastWrongPassTime = System.currentTimeMillis()
             if (LorenzUtils.skyBlockIsland != IslandType.DWARVEN_MINES) {
-                LorenzUtils.clickableChat("§e[SkyHanni] Click here to warp to Dwarven Mines!", "warp mines")
+                LorenzUtils.clickableChat("Click here to warp to Dwarven Mines!", "warp mines")
             } else {
-                LorenzUtils.chat("§e[SkyHanni] Buy a §2Crystal Hollows Pass §efrom §5Gwendolyn")
+                LorenzUtils.chat("Buy a §2Crystal Hollows Pass §efrom §5Gwendolyn")
             }
         }
         if (message == "§e[NPC] §5Gwendolyn§f: §rGreat! Now hop on into the Minecart and I'll get you on your way!" && inTime()) {
-            LorenzUtils.clickableChat("§e[SkyHanni] Click here to warp to Crystal Hollows!", "warp ch")
+            LorenzUtils.clickableChat("Click here to warp to Crystal Hollows!", "warp ch")
         }
     }
 
@@ -39,7 +39,7 @@ class JoinCrystalHollows {
         if (!isEnabled()) return
 
         if (event.newIsland == IslandType.DWARVEN_MINES && inTime()) {
-                LorenzUtils.chat("§e[SkyHanni] Buy a §2Crystal Hollows Pass §efrom §5Gwendolyn§e!")
+                LorenzUtils.chat("Buy a §2Crystal Hollows Pass §efrom §5Gwendolyn§e!")
         }
         if (event.newIsland == IslandType.CRYSTAL_HOLLOWS) {
             lastWrongPassTime = 0
@@ -62,4 +62,4 @@ class JoinCrystalHollows {
     private fun inTime() = lastWrongPassTime + 1000 * 60 * 2 > System.currentTimeMillis()
 
     fun isEnabled() = SkyHanniMod.feature.misc.crystalHollowsJoin
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/LimboTimeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/LimboTimeTracker.kt
index 4aed71557..cc88ae4d1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/LimboTimeTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/LimboTimeTracker.kt
@@ -49,8 +49,8 @@ class LimboTimeTracker {
         if (!isEnabled()) return
         val passedSince = limboJoinTime.passedSince()
         val duration = passedSince.format()
-        LorenzUtils.run { chat("§e[SkyHanni] You left the limbo after §b$duration") }
+        LorenzUtils.run { chat("You left the limbo after §b$duration") }
     }
 
     fun isEnabled() = config.showTimeInLimbo
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/LockMouseLook.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/LockMouseLook.kt
index 4c51d3c3c..14b430d19 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/LockMouseLook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/LockMouseLook.kt
@@ -19,7 +19,7 @@ object LockMouseLook {
         val gameSettings = Minecraft.getMinecraft().gameSettings
         if (gameSettings.mouseSensitivity == lockedPosition) {
             gameSettings.mouseSensitivity = SkyHanniMod.feature.storage.savedMouseSensitivity
-            LorenzUtils.chat("§e[SkyHanni] §bMouse rotation is now unlocked because you left it locked.")
+            LorenzUtils.chat("§bMouse rotation is now unlocked because you left it locked.")
         }
     }
 
@@ -31,12 +31,12 @@ object LockMouseLook {
             SkyHanniMod.feature.storage.savedMouseSensitivity = gameSettings.mouseSensitivity
             gameSettings.mouseSensitivity = lockedPosition
             if (config.lockMouseLookChatMessage) {
-                LorenzUtils.chat("§e[SkyHanni] §bMouse rotation is now locked. Type /shmouselock to unlock your rotation")
+                LorenzUtils.chat("§bMouse rotation is now locked. Type /shmouselock to unlock your rotation")
             }
         } else {
             gameSettings.mouseSensitivity = SkyHanniMod.feature.storage.savedMouseSensitivity
             if (config.lockMouseLookChatMessage) {
-                LorenzUtils.chat("§e[SkyHanni] §bMouse rotation is now unlocked.")
+                LorenzUtils.chat("§bMouse rotation is now unlocked.")
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
index 94ba46efd..66e379747 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
@@ -22,7 +22,7 @@ class MarkedPlayerManager {
 
         fun command(args: Array<String>) {
             if (args.size != 1) {
-                LorenzUtils.chat("§cUsage: /shmarkplayer <name>")
+                LorenzUtils.userError("Usage: /shmarkplayer <name>")
                 return
             }
 
@@ -31,18 +31,18 @@ class MarkedPlayerManager {
 
 
             if (name == LorenzUtils.getPlayerName().lowercase()) {
-                LorenzUtils.chat("§c[SkyHanni] You can't add or remove yourself this way! Go to the settings and toggle 'Mark your own name'.")
+                LorenzUtils.userError("You can't add or remove yourself this way! Go to the settings and toggle 'Mark your own name'.")
                 return
             }
 
             if (name !in playerNamesToMark) {
                 playerNamesToMark.add(name)
                 findPlayers()
-                LorenzUtils.chat("§e[SkyHanni] §aMarked §eplayer §b$displayName§e!")
+                LorenzUtils.chat("§aMarked §eplayer §b$displayName§e!")
             } else {
                 playerNamesToMark.remove(name)
                 markedPlayers.remove(name)
-                LorenzUtils.chat("§e[SkyHanni] §cUnmarked §eplayer §b$displayName§e!")
+                LorenzUtils.chat("§cUnmarked §eplayer §b$displayName§e!")
             }
         }
 
@@ -119,4 +119,4 @@ class MarkedPlayerManager {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt
index 2890e8593..e6ce5d8f9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt
@@ -152,7 +152,7 @@ object QuickModMenuSwitch {
                         } catch (_: Exception) {
                         }
                     }
-                    LorenzUtils.chat("§c[SkyHanni] Error trying to open the gui for mod " + mod.name + "!")
+                    LorenzUtils.error("Error trying to open the gui for mod " + mod.name + "!")
                 }
 
                 "hytil" -> {
@@ -168,7 +168,7 @@ object QuickModMenuSwitch {
                         } catch (_: Exception) {
                         }
                     }
-                    LorenzUtils.chat("§c[SkyHanni] Error trying to open the gui for mod " + mod.name + "!")
+                    LorenzUtils.chat("Error trying to open the gui for mod " + mod.name + "!")
                 }
 
                 else -> {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/SuperpairsClicksAlert.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/SuperpairsClicksAlert.kt
index c8882a1b8..f4da6126b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/SuperpairsClicksAlert.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/SuperpairsClicksAlert.kt
@@ -53,7 +53,7 @@ class SuperpairsClicksAlert {
                 .any { it.value.stackSize > roundsNeeded })
         ) {
             SoundUtils.playBeepSound()
-            LorenzUtils.chat("§e[SkyHanni] You have reached the maximum possible clicks!")
+            LorenzUtils.chat("You have reached the maximum possible clicks!")
             roundsNeeded = -1
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt
index 31ad1cef8..e358b3f28 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt
@@ -9,6 +9,7 @@ import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.LorenzKeyPressEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.onToggle
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
@@ -58,11 +59,11 @@ object DiscordRPCManager : IPCListener {
 
                 try {
                     client?.connect()
-                    if (fromCommand) LorenzUtils.chat("§a[SkyHanni] Successfully started Rich Presence!") // confirm that /shrpcstart worked
+                    if (fromCommand) LorenzUtils.chat("Successfully started Rich Presence!", prefixColor = "§a") // confirm that /shrpcstart worked
                 } catch (ex: Exception) {
                     consoleLog("Warn: Failed to connect to RPC!")
                     consoleLog(ex.toString())
-                    LorenzUtils.clickableChat("§e[SkyHanni] Discord Rich Presence was unable to start! " +
+                    LorenzUtils.clickableChat("Discord Rich Presence was unable to start! " +
                             "This usually happens when you join SkyBlock when Discord is not started. " +
                             "Please run /shrpcstart to retry once you have launched Discord.", "shrpcstart")
                 }
@@ -183,20 +184,23 @@ object DiscordRPCManager : IPCListener {
 
     fun startCommand() {
         if (!config.enabled.get()) {
-            LorenzUtils.chat("§c[SkyHanni] Discord Rich Presence is disabled. Enable it in the config §e/sh discord")
+            LorenzUtils.userError("Discord Rich Presence is disabled. Enable it in the config §e/sh discord")
             return
         }
 
         if (isActive()) {
-            LorenzUtils.chat("§e[SkyHanni] Discord Rich Presence is already active!")
+            LorenzUtils.userError("Discord Rich Presence is already active!")
             return
         }
 
-        LorenzUtils.chat("§e[SkyHanni] Attempting to start Discord Rich Presence...")
+        LorenzUtils.chat("Attempting to start Discord Rich Presence...")
         try {
             start(true)
         } catch (e: Exception) {
-            LorenzUtils.chat("§c[SkyHanni] Unable to start Discord Rich Presence! Please report this on Discord and ping @netheriteminer.")
+            ErrorManager.logError(
+                e,
+                "Unable to start Discord Rich Presence! Please report this on Discord and ping @netheriteminer."
+            )
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
index ddd6896d8..2565b2222 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
@@ -51,7 +51,7 @@ object EstimatedItemValue {
                     object : TypeToken<HashMap<NEUInternalName, HashMap<String, List<String>>>>() {}.type
                 )
         else
-            LorenzUtils.error("Gemstone Slot Unlock Costs failed to load")
+            LorenzUtils.error("Gemstone Slot Unlock Costs failed to load!")
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt
index 6c5be7ec9..1f153ed69 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt
@@ -33,7 +33,7 @@ object DefaultConfigFeatures {
         if (!SkyHanniMod.feature.storage.hasPlayedBefore) {
             SkyHanniMod.feature.storage.hasPlayedBefore = true
             LorenzUtils.clickableChat(
-                "§e[SkyHanni] Looks like this is the first time you are using SkyHanni. " +
+                "Looks like this is the first time you are using SkyHanni. " +
                     "Click here to configure default options, or run /shdefaultoptions.",
                 "shdefaultoptions"
             )
@@ -41,8 +41,8 @@ object DefaultConfigFeatures {
             val lastVersion = knownToggles.keys.last { it != SkyHanniMod.version }
             val command = "/shdefaultoptions $lastVersion ${SkyHanniMod.version}"
             LorenzUtils.clickableChat(
-                "§e[SkyHanni] Looks like you updated SkyHanni. " +
-                    "Click here to configure the newly introduced options, or run $command.",
+                "Looks like you updated SkyHanni. " +
+                        "Click here to configure the newly introduced options, or run $command.",
                 command
             )
         }
@@ -55,12 +55,12 @@ object DefaultConfigFeatures {
         val knownToggles = SkyHanniMod.knownFeaturesData.knownFeatures
         val togglesInNewVersion = knownToggles[new]
         if (new != "null" && togglesInNewVersion == null) {
-            LorenzUtils.chat("§e[SkyHanni] Unknown version $new")
+            LorenzUtils.chat("Unknown version $new")
             return
         }
         val togglesInOldVersion = knownToggles[old]
         if (old != "null" && togglesInOldVersion == null) {
-            LorenzUtils.chat("§e[SkyHanni] Unknown version $old")
+            LorenzUtils.chat("Unknown version $old")
             return
         }
         optionList = optionList
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt
index 84362576c..ab32d9aa7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt
@@ -96,7 +96,7 @@ object UpdateManager {
                 if (it.isUpdateAvailable) {
                     updateState = UpdateState.AVAILABLE
                     LorenzUtils.clickableChat(
-                        "§e[SkyHanni] §aSkyHanni found a new update: ${it.update.versionName}. " +
+                        "§aSkyHanni found a new update: ${it.update.versionName}. " +
                                 "Check §b/sh download update §afor more info.",
                         "sh"
                     )
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt
index deafe3cb3..49c22b26d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt
@@ -526,7 +526,7 @@ open class VisualWordGui : GuiScreen() {
                 }
             }
             if (importedWords > 0 || skippedWords > 0) {
-                chat("§e[SkyHanni] §aSuccessfully imported §e$importedWords §aand skipped §e$skippedWords §aVisualWords from SkyBlockExtras !")
+                chat("§aSuccessfully imported §e$importedWords §aand skipped §e$skippedWords §aVisualWords from SkyBlockExtras !")
                 SkyHanniMod.feature.storage.visualWordsImported = true
                 drawImport = false
             }