Transform Main class to use kotlin (#74)

1 files changed, 9 insertions, 4 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
index 4218eabc5..0855a4855 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
@@ -22,13 +22,18 @@ class ConfigManager {
             .create()
     }
 
-    val logger = LorenzLogger("config_manager")
+    lateinit var features: Features
+        private set
+    private val logger = LorenzLogger("config_manager")
 
     var configDirectory = File("config/skyhanni")
     private var configFile: File? = null
     lateinit var processor: MoulConfigProcessor<Features>
 
     fun firstLoad() {
+        if (::features.isInitialized) {
+            logger.log("Loading config despite config being already loaded?")
+        }
         configDirectory.mkdir()
 
         configFile = File(configDirectory, "config.json")
@@ -52,7 +57,7 @@ class ConfigManager {
 
 
                 logger.log("load-config-now")
-                SkyHanniMod.feature = gson.fromJson(
+                features = gson.fromJson(
                     builder.toString(),
                     Features::class.java
                 )
@@ -72,9 +77,9 @@ class ConfigManager {
             }
         }
 
-        if (SkyHanniMod.feature == null) {
+        if (::features.isInitialized) {
             logger.log("Creating blank config and saving to file")
-            SkyHanniMod.feature = Features()
+            features = Features()
             saveConfig("blank config")
         }