Internal Change: Config deprecations (#542)

migrate the config, removed id system entirely #542

3 files changed, 35 insertions, 4 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index cbe4d4f56..6772e67cf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.chat
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.StringUtils.matchRegex
@@ -9,7 +10,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.trimWhiteSpaceAndResets
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class ChatFilter {
-    private val config get() = SkyHanniMod.feature.chat
+    private val config get() = SkyHanniMod.feature.chat.filterType
 
     @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
@@ -348,4 +349,18 @@ class ChatFilter {
 
         else -> false
     }
+
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(3, "chat.hypixelHub", "chat.filterType.hypixelHub")
+        event.move(3, "chat.empty", "chat.filterType.empty")
+        event.move(3, "chat.warping", "chat.filterType.warping")
+        event.move(3, "chat.guildExp", "chat.filterType.guildExp")
+        event.move(3, "chat.friendJoinLeft", "chat.filterType.friendJoinLeft")
+        event.move(3, "chat.winterGift", "chat.filterType.winterGift")
+        event.move(3, "chat.powderMining", "chat.filterType.powderMining")
+        event.move(3, "chat.killCombo", "chat.filterType.killCombo")
+        event.move(3, "chat.profileJoin", "chat.filterType.profileJoin")
+        event.move(3, "chat.others", "chat.filterType.others")
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/WatchdogHider.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/WatchdogHider.kt
index 099d52067..739eaa123 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/WatchdogHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/WatchdogHider.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.chat
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.ChatManager
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -15,7 +16,7 @@ class WatchdogHider {
 
     @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
-        if (!LorenzUtils.onHypixel || !SkyHanniMod.feature.chat.watchDog) return
+        if (!LorenzUtils.onHypixel || !SkyHanniMod.feature.chat.filterType.watchDog) return
 
         when (event.message) {
             watchdogStartLine -> {
@@ -48,6 +49,11 @@ class WatchdogHider {
         private const val watchdogAnnouncementLine = "§4[WATCHDOG ANNOUNCEMENT]"
         private const val watchdogEndLine = "§c"
     }
+
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(3, "chat.watchDog", "chat.filterType.watchDog")
+    }
 }
 
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt
index e63c925df..60ed955a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.chat.playerchat
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.features.dungeon.DungeonMilestonesDisplay
 import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager
@@ -10,6 +11,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class PlayerChatModifier {
 
+    private val config get() = SkyHanniMod.feature.chat.playerMessage
     private val patterns = mutableListOf<Regex>()
 
     init {
@@ -58,7 +60,7 @@ class PlayerChatModifier {
     private fun cutMessage(input: String): String {
         var string = input
 
-        if (SkyHanniMod.feature.chat.playerRankHider) {
+        if (config.playerRankHider) {
             for (pattern in patterns) {
                 string = string.replace(pattern, "§b$1")
             }
@@ -72,7 +74,7 @@ class PlayerChatModifier {
             }
         }
 
-        if (SkyHanniMod.feature.chat.chatFilter && string.contains("§r§f: ") && PlayerChatFilter.shouldChatFilter(string)) {
+        if (config.chatFilter && string.contains("§r§f: ") && PlayerChatFilter.shouldChatFilter(string)) {
             string = string.replace("§r§f: ", "§r§7: ")
         }
 
@@ -84,4 +86,12 @@ class PlayerChatModifier {
 
         return string
     }
+
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(3, "chat.playerRankHider", "chat.playerMessage.playerRankHider")
+        event.move(3, "chat.chatFilter", "chat.playerMessage.chatFilter")
+    }
+
+
 }