From d5b4a817e2b9e7e5c88eb0c8212b9a6e678bd92f Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Mon, 11 Dec 2023 13:59:52 -0800 Subject: Internal: Migrate Deprecated Config Values to Enums (#790) Migrate Deprecated Config Values to Enums. #790 --- .../hannibal2/skyhanni/features/misc/HideArmor.kt | 18 +++++++++++---- .../skyhanni/features/misc/PlayerChatSymbols.kt | 15 ++++++++++-- .../misc/compacttablist/AdvancedPlayerList.kt | 27 +++++++++++++++++----- 3 files changed, 48 insertions(+), 12 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/misc') diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt index 96301ee7c..e3e6d62b3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt @@ -1,6 +1,9 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator +import at.hannibal2.skyhanni.config.features.misc.HideArmorConfig.ModeEntry +import at.hannibal2.skyhanni.utils.ConfigUtils import at.hannibal2.skyhanni.utils.EntityUtils.getArmorInventory import at.hannibal2.skyhanni.utils.EntityUtils.hasPotionEffect import at.hannibal2.skyhanni.utils.EntityUtils.isNPC @@ -24,10 +27,10 @@ class HideArmor { if (entity.isNPC()) return false return when (config.mode) { - 0 -> true + ModeEntry.ALL -> true - 1 -> entity is EntityPlayerSP - 2 -> entity !is EntityPlayerSP + ModeEntry.OWN -> entity is EntityPlayerSP + ModeEntry.OTHERS -> entity !is EntityPlayerSP else -> false } @@ -61,4 +64,11 @@ class HideArmor { armorInventory[index] = stack } } -} \ No newline at end of file + + @SubscribeEvent + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { + event.transform(14, "misc.hideArmor2.mode") { element -> + ConfigUtils.migrateIntToEnum(element, ModeEntry::class.java) + } + } +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt index 5133e65be..a406ce169 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt @@ -1,9 +1,12 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator +import at.hannibal2.skyhanni.config.features.chat.ChatSymbols.SymbolLocationEntry import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.features.misc.compacttablist.TabStringType import at.hannibal2.skyhanni.mixins.transformers.AccessorChatComponentText +import at.hannibal2.skyhanni.utils.ConfigUtils import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.StringUtils import at.hannibal2.skyhanni.utils.StringUtils.getPlayerNameAndRankFromChatMessage @@ -79,8 +82,16 @@ class PlayerChatSymbols { private fun getNewText(emblemText: String, oldText: String, rankAndName: String): String = when (config.symbolLocation) { - 0 -> oldText.replace(rankAndName, "$emblemText $rankAndName") - 1 -> oldText.replace(rankAndName, "$rankAndName $emblemText ") + SymbolLocationEntry.LEFT -> oldText.replace(rankAndName, "$emblemText $rankAndName") + SymbolLocationEntry.RIGHT -> oldText.replace(rankAndName, "$rankAndName $emblemText ") + SymbolLocationEntry.HIDDEN -> oldText else -> oldText } + + @SubscribeEvent + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { + event.transform(14, "chat.chatSymbols.symbolLocation") { element -> + ConfigUtils.migrateIntToEnum(element, SymbolLocationEntry::class.java) + } + } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt index ab2b31777..d4dc00449 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt @@ -1,6 +1,8 @@ package at.hannibal2.skyhanni.features.misc.compacttablist import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator +import at.hannibal2.skyhanni.config.features.misc.compacttablist.AdvancedPlayerListConfig.PlayerSortEntry import at.hannibal2.skyhanni.data.FriendAPI import at.hannibal2.skyhanni.data.GuildAPI import at.hannibal2.skyhanni.data.IslandType @@ -10,6 +12,7 @@ import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.features.bingo.BingoAPI import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests +import at.hannibal2.skyhanni.utils.ConfigUtils import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland @@ -107,21 +110,26 @@ object AdvancedPlayerList { val sorted = when (config.playerSortOrder) { - // Rank (Default) - 1 -> prepare.sortedBy { -(it.value.sbLevel) } + // SB Level + PlayerSortEntry.SB_LEVEL -> prepare.sortedBy { -(it.value.sbLevel) } // Name (Abc) - 2 -> prepare.sortedBy { it.value.name.lowercase().replace("_", "") } + PlayerSortEntry.NAME -> prepare.sortedBy { + it.value.name.lowercase().replace("_", "") + } // Ironman/Bingo - 3 -> prepare.sortedBy { -if (it.value.ironman) 10 else it.value.bingoLevel ?: -1 } + PlayerSortEntry.PROFILE_TYPE -> prepare.sortedBy { + -if (it.value.ironman) 10 else it.value.bingoLevel ?: -1 + } // Party/Friends/Guild First - 4 -> prepare.sortedBy { -socialScore(it.value.name) } + PlayerSortEntry.SOCIAL_STATUS -> prepare.sortedBy { -socialScore(it.value.name) } // Random - 5 -> prepare.sortedBy { getRandomOrder(it.value.name) } + PlayerSortEntry.RANDOM -> prepare.sortedBy { getRandomOrder(it.value.name) } + // Rank (Default) else -> prepare } @@ -238,4 +246,11 @@ object AdvancedPlayerList { MAGE(" §5ቾ"), NONE("") } + + @SubscribeEvent + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { + event.transform(14, "misc.compactTabList.advancedPlayerList.playerSortOrder") { element -> + ConfigUtils.migrateIntToEnum(element, PlayerSortEntry::class.java) + } + } } -- cgit