SpawnModelBase.kt cleanup.

`UseExperimental` annotation removed for SpawnModelBase class.
Usings `jsonInstance` from core module.
`createConfigDirs` method removed.

Signed-off-by: Pavel Erokhin (MairwunNx) <[email protected]>

Author: MairwunNx

src/main/kotlin/com/mairwunnx/projectessentials/spawn/models/SpawnModelBase.kt

@@ -1,45 +1,30 @@
 package com.mairwunnx.projectessentials.spawn.models
 
-import com.mairwunnx.projectessentialscore.helpers.MOD_CONFIG_FOLDER
-import kotlinx.serialization.UnstableDefault
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
+import com.mairwunnx.projectessentials.core.helpers.MOD_CONFIG_FOLDER
+import com.mairwunnx.projectessentials.core.helpers.jsonInstance
 import net.minecraft.server.MinecraftServer
 import net.minecraft.util.math.BlockPos
 import net.minecraft.world.dimension.DimensionType
 import org.apache.logging.log4j.LogManager
 import java.io.File
 
-@UseExperimental(UnstableDefault::class)
 object SpawnModelBase {
     private val spawnConfig = MOD_CONFIG_FOLDER + File.separator + "spawn.json"
     private val logger = LogManager.getLogger()
     var spawnModel = SpawnModel()
-    private val json = Json(
-        JsonConfiguration(
-            encodeDefaults = true,
-            strictMode = true,
-            unquoted = false,
-            allowStructuredMapKeys = true,
-            prettyPrint = true,
-            useArrayPolymorphism = false
-        )
-    )
 
     fun loadData() {
-        logger.info("    - loading world spawn data ...")
-        logger.debug("        - setup json configuration for parsing ...")
+        logger.info("Loading world spawn data")
         if (!File(spawnConfig).exists()) {
-            logger.warn("        - spawn config not exist! creating it now!")
-            createConfigDirs(MOD_CONFIG_FOLDER)
-            val defaultConfig = json.stringify(
-                SpawnModel.serializer(),
-                spawnModel
+            logger.warn("Spawn config not exist! creating it now!")
+            File(MOD_CONFIG_FOLDER).mkdirs()
+            val defaultConfig = jsonInstance.stringify(
+                SpawnModel.serializer(), spawnModel
             )
             File(spawnConfig).writeText(defaultConfig)
         }
         val spawnConfigRaw = File(spawnConfig).readText()
-        spawnModel = Json.parse(SpawnModel.serializer(), spawnConfigRaw)
+        spawnModel = jsonInstance.parse(SpawnModel.serializer(), spawnConfigRaw)
         logger.info("Spawn config loaded: $spawnModel")
     }
 
@@ -53,19 +38,10 @@ object SpawnModelBase {
     }
 
     fun saveData() {
-        logger.info("    - saving world spawn data ...")
-        createConfigDirs(MOD_CONFIG_FOLDER)
-        val spawnConfig = json.stringify(
-            SpawnModel.serializer(),
-            spawnModel
+        File(MOD_CONFIG_FOLDER).mkdirs()
+        val spawnConfig = jsonInstance.stringify(
+            SpawnModel.serializer(), spawnModel
         )
         File(this.spawnConfig).writeText(spawnConfig)
     }
-
-    @Suppress("SameParameterValue")
-    private fun createConfigDirs(path: String) {
-        logger.info("        - creating config directory for world spawn data ($path)")
-        val configDirectory = File(path)
-        if (!configDirectory.exists()) configDirectory.mkdirs()
-    }
 }