Improvement: Config Move (#1300)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

12 files changed, 44 insertions, 19 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt
index 187641835..97f1ccd5c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.misc
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.InventoryOpenEvent
 import at.hannibal2.skyhanni.events.LorenzToolTipEvent
@@ -20,7 +21,7 @@ import java.awt.Color
 
 class AuctionHousePriceComparison {
 
-    private val config get() = SkyHanniMod.feature.inventory.auctionsPriceComparison
+    private val config get() = SkyHanniMod.feature.inventory.auctions.auctionsPriceComparison
 
     private var slotPriceMap = mapOf<Int, Long>()
     private var bestPrice = 0L
@@ -117,6 +118,11 @@ class AuctionHousePriceComparison {
         }
     }
 
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(31, "inventory.auctionsPriceComparison", "inventory.auctions.auctionsPriceComparison")
+    }
+
     private fun getColorInBetween(color1: Color, color2: Color, percentage: Double): Color {
         val r1 = color1.red
         val g1 = color1.green
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/BetterWikiFromMenus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/BetterWikiFromMenus.kt
index 26addd367..653684d08 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/BetterWikiFromMenus.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/BetterWikiFromMenus.kt
@@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class BetterWikiFromMenus {
 
-    private val config get() = SkyHanniMod.feature.commands.betterWiki
+    private val config get() = SkyHanniMod.feature.misc.commands.betterWiki
 
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
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 86c7ffc92..0adf1d5ec 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.misc
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.enums.OutsideSbFeature
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
@@ -18,7 +19,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 class MarkedPlayerManager {
     companion object {
 
-        private val config get() = SkyHanniMod.feature.markedPlayers
+        val config get() = SkyHanniMod.feature.gui.markedPlayers
 
         val playerNamesToMark = mutableListOf<String>()
         private val markedPlayers = mutableMapOf<String, EntityOtherPlayerMP>()
@@ -117,4 +118,9 @@ class MarkedPlayerManager {
             }
         }
     }
+
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(31, "markedPlayers", "gui.markedPlayers")
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt
index 7e34aa009..f60eb930e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.misc
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.GuiRenderItemEvent
 import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.utils.ItemUtils
@@ -11,7 +12,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class PocketSackInASackDisplay {
 
-    private val config get() = SkyHanniMod.feature.misc.pocketSackInASack
+    private val config get() = SkyHanniMod.feature.inventory.pocketSackInASack
     private val maxedStitched = 3
 
     @SubscribeEvent
@@ -51,4 +52,9 @@ class PocketSackInASackDisplay {
             }
         }
     }
-}
\ No newline at end of file
+
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(31, "misc.pocketSackInASack", "inventory.pocketSackInASack")
+    }
+}
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 4d96b9bc0..021213117 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
@@ -27,7 +27,7 @@ import kotlin.time.Duration.Companion.minutes
 
 object AdvancedPlayerList {
 
-    private val config get() = SkyHanniMod.feature.misc.compactTabList.advancedPlayerList
+    private val config get() = SkyHanniMod.feature.gui.compactTabList.advancedPlayerList
 
     private val levelPattern by RepoPattern.pattern(
         "misc.compacttablist.advanced.level",
@@ -220,7 +220,7 @@ object AdvancedPlayerList {
     private fun getSocialScoreIcon(score: Int) = when (score) {
 //        10 -> "§c§lME"
         10 -> ""
-        8 -> "${SkyHanniMod.feature.markedPlayers.chatColor.getChatColor()}§lMARKED"
+        8 -> "${MarkedPlayerManager.config.chatColor.getChatColor()}§lMARKED"
         5 -> "§9§lP"
         4 -> "§d§lF"
         3 -> "§2§lG"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListReader.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListReader.kt
index bba2ff6aa..42bd78cfc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListReader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListReader.kt
@@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 // heavily inspired by SBA code
 object TabListReader {
 
-    private val config get() = SkyHanniMod.feature.misc.compactTabList
+    private val config get() = SkyHanniMod.feature.gui.compactTabList
 
     private val patternGroup = RepoPattern.group("misc.compacttablist")
     val usernamePattern by patternGroup.pattern(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListRenderer.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListRenderer.kt
index a2eacb07e..ccb70bd8f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListRenderer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListRenderer.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.misc.compacttablist
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.SkipTabListLineEvent
 import at.hannibal2.skyhanni.utils.CollectionUtils.filterToMutable
@@ -19,7 +20,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 object TabListRenderer {
 
-    private val config get() = SkyHanniMod.feature.misc.compactTabList
+    private val config get() = SkyHanniMod.feature.gui.compactTabList
 
     const val maxLines = 22
     private const val lineHeight = 8 + 1
@@ -224,4 +225,9 @@ object TabListRenderer {
             event.cancel()
         }
     }
+
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(31, "misc.compactTabList", "gui.compactTabList")
+    }
 }
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 2fb3e0241..1693c0a5d 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
@@ -39,7 +39,7 @@ object DiscordRPCManager : IPCListener {
     private const val applicationID = 1093298182735282176L
     private const val updatePeriod = 4200L
 
-    private val config get() = feature.misc.discordRPC
+    val config get() = feature.gui.discordRPC
 
     private var client: IPCClient? = null
     private lateinit var secondLine: DiscordStatus
@@ -249,6 +249,8 @@ object DiscordRPCManager : IPCListener {
         event.transform(11, "misc.discordRPC.autoPriority") { element ->
             ConfigUtils.migrateIntArrayListToEnumArrayList(element, PriorityEntry::class.java)
         }
+
+        event.move(31, "misc.discordRPC", "gui.discordRPC")
     }
 
     private fun PriorityEntry.isSelected() = config.autoPriority.contains(this)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
index de93ad491..e5741807b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.misc.discordrpc
 
 // SkyblockAddons code, adapted for SkyHanni with some additions and fixes
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.ActionBarStatsData
 import at.hannibal2.skyhanni.data.GardenCropMilestones.getCounter
 import at.hannibal2.skyhanni.data.GardenCropMilestones.getTierForCropCount
@@ -209,12 +208,12 @@ enum class DiscordStatus(private val displayMessageSupplier: Supplier<String>?)
     }),
 
     CUSTOM({
-        SkyHanniMod.feature.misc.discordRPC.customText.get() // custom field in the config
+        DiscordRPCManager.config.customText.get() // custom field in the config
     }),
 
     AUTO({
         var autoReturn = ""
-        for (statusID in SkyHanniMod.feature.misc.discordRPC.autoPriority) { // for every dynamic that the user wants to see...
+        for (statusID in DiscordRPCManager.config.autoPriority) { // for every dynamic that the user wants to see...
             // TODO, change functionality to use enum rather than ordinals
             val autoStatus = AutoStatus.entries[statusID.ordinal]
             val result =
@@ -227,7 +226,7 @@ enum class DiscordStatus(private val displayMessageSupplier: Supplier<String>?)
         if (autoReturn == "") { // if we didn't find any useful information, display the fallback
             val statusNoAuto = DiscordStatus.entries.toMutableList()
             statusNoAuto.remove(AUTO)
-            autoReturn = statusNoAuto[SkyHanniMod.feature.misc.discordRPC.auto.get().ordinal].getDisplayString()
+            autoReturn = statusNoAuto[DiscordRPCManager.config.auto.get().ordinal].getDisplayString()
         }
         autoReturn
     }),
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 9040abfe0..fdd6db618 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
@@ -38,7 +38,7 @@ import kotlin.math.roundToLong
 
 object EstimatedItemValue {
 
-    private val config get() = SkyHanniMod.feature.misc.estimatedItemValues
+    val config get() = SkyHanniMod.feature.inventory.estimatedItemValues
     private var display = emptyList<List<Any>>()
     private val cache = mutableMapOf<ItemStack, List<List<Any>>>()
     private var lastToolTipTime = 0L
@@ -235,5 +235,7 @@ object EstimatedItemValue {
         event.move(3, "misc.estimatedIemValueEnchantmentsCap", "misc.estimatedItemValues.enchantmentsCap")
         event.move(3, "misc.estimatedIemValueExactPrice", "misc.estimatedItemValues.exactPrice")
         event.move(3, "misc.itemPriceDataPos", "misc.estimatedItemValues.itemPriceDataPos")
+
+        event.move(31, "misc.estimatedItemValues", "inventory.estimatedItemValues")
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index 6b90adba6..a1750e5c0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -1,6 +1,5 @@
 package at.hannibal2.skyhanni.features.misc.items
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
@@ -56,7 +55,7 @@ import java.util.Locale
 
 object EstimatedItemValueCalculator {
 
-    private val config get() = SkyHanniMod.feature.misc.estimatedItemValues
+    private val config get() = EstimatedItemValue.config
     private val additionalCostFunctions = listOf(
         ::addAttributeCost,
         ::addReforgeStone,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt
index d3b226744..c36fdbbf5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt
@@ -1,6 +1,5 @@
 package at.hannibal2.skyhanni.features.misc.items
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.events.LorenzToolTipEvent
@@ -14,7 +13,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class EstimatedWardrobePrice {
 
-    private val config get() = SkyHanniMod.feature.misc.estimatedItemValues
+    private val config get() = EstimatedItemValue.config
     var data = mutableMapOf<Int, MutableList<ItemStack>>()
 
     @SubscribeEvent