Split storage into more files plus code cleanup (#695)

Extracted sacks, friends, known features and jacob contests in to their separate files. #695

1 files changed, 11 insertions, 4 deletions

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 930c67358..067a3a8bf 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
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.misc.massconfiguration
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigFileType
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import io.github.moulberry.moulconfig.processor.ConfigProcessorDriver
@@ -17,12 +18,18 @@ object DefaultConfigFeatures {
         Minecraft.getMinecraft().thePlayer ?: return
         didNotifyOnce = true
 
-        val knownToggles = SkyHanniMod.feature.storage.knownFeatureToggles
+        val oldToggles = SkyHanniMod.feature.storage.knownFeatureToggles
+        if (oldToggles.isNotEmpty()) {
+            SkyHanniMod.knownFeaturesData.knownFeatures = oldToggles
+            SkyHanniMod.feature.storage.knownFeatureToggles = emptyMap()
+        }
+
+        val knownToggles = SkyHanniMod.knownFeaturesData.knownFeatures
         val updated = SkyHanniMod.version !in knownToggles
         val processor = FeatureToggleProcessor()
         ConfigProcessorDriver.processConfig(SkyHanniMod.feature.javaClass, SkyHanniMod.feature, processor)
         knownToggles[SkyHanniMod.version] = processor.allOptions.map { it.path }
-        SkyHanniMod.configManager.saveConfig("Updated known feature flags")
+        SkyHanniMod.configManager.saveConfig(ConfigFileType.KNOWN_FEATURES, "Updated known feature flags")
         if (!SkyHanniMod.feature.storage.hasPlayedBefore) {
             SkyHanniMod.feature.storage.hasPlayedBefore = true
             LorenzUtils.clickableChat(
@@ -46,7 +53,7 @@ object DefaultConfigFeatures {
         val processor = FeatureToggleProcessor()
         ConfigProcessorDriver.processConfig(SkyHanniMod.feature.javaClass, SkyHanniMod.feature, processor)
         var optionList = processor.orderedOptions
-        val knownToggles = SkyHanniMod.feature.storage.knownFeatureToggles
+        val knownToggles = SkyHanniMod.knownFeaturesData.knownFeatures
         val togglesInNewVersion = knownToggles[new]
         if (new != "null" && togglesInNewVersion == null) {
             LorenzUtils.chat("§e[SkyHanni] Unknown version $new")
@@ -95,7 +102,7 @@ object DefaultConfigFeatures {
         if (strings.size <= 2)
             return CommandBase.getListOfStringsMatchingLastWord(
                 strings,
-                SkyHanniMod.feature.storage.knownFeatureToggles.keys + listOf("null")
+                SkyHanniMod.knownFeaturesData.knownFeatures.keys + listOf("null")
             )
         return listOf()
     }