refactor(config): move migration related classes to `config.migration…

…` package
rvbsm · Apr 24, 2024 · ec0b6cd · ec0b6cd
1 parent b014e5e
commit ec0b6cd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/...v/rvbsm/fsit/config/FSitConfigMigrator.kt → ...n/dev/rvbsm/fsit/config/ConfigMigrator.kt b/...v/rvbsm/fsit/config/FSitConfigMigrator.kt → ...n/dev/rvbsm/fsit/config/ConfigMigrator.kt
@@ -2,6 +2,10 @@ package dev.rvbsm.fsit.config
 
 import com.charleskorn.kaml.*
 import dev.rvbsm.fsit.config.container.BlockContainer
+import dev.rvbsm.fsit.config.migration.BooleanProperty
+import dev.rvbsm.fsit.config.migration.ContainerProperty
+import dev.rvbsm.fsit.config.migration.DoubleProperty
+import dev.rvbsm.fsit.config.migration.LongProperty
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.jsonObject
 import net.minecraft.block.Block

diff --git a/...ev/rvbsm/fsit/config/ContainerProperty.kt → ...sit/config/migration/ContainerProperty.kt b/...ev/rvbsm/fsit/config/ContainerProperty.kt → ...sit/config/migration/ContainerProperty.kt
@@ -1,4 +1,4 @@
-package dev.rvbsm.fsit.config
+package dev.rvbsm.fsit.config.migration
 
 import com.charleskorn.kaml.YamlList
 import com.charleskorn.kaml.YamlMap
@@ -15,7 +15,7 @@ internal class ContainerProperty<E : ItemConvertible, C : Container<E, *>>(
     private val key: String,
     private val type: Type,
     internal var container: C? = null,
-) : MigratedField {
+) : MigratedProperty {
     override fun toString() = key
 
     override fun migrate(yamlMap: YamlMap): Boolean {

diff --git a/...in/dev/rvbsm/fsit/config/MigratedField.kt → ...fsit/config/migration/MigratedProperty.kt b/...in/dev/rvbsm/fsit/config/MigratedField.kt → ...fsit/config/migration/MigratedProperty.kt
@@ -1,9 +1,9 @@
-package dev.rvbsm.fsit.config
+package dev.rvbsm.fsit.config.migration
 
 import com.charleskorn.kaml.YamlMap
 import kotlinx.serialization.json.JsonObject
 
-internal interface MigratedField {
+internal interface MigratedProperty {
     override fun toString(): String
 
     fun migrate(yamlMap: YamlMap): Boolean

diff --git a/...ev/rvbsm/fsit/config/PrimitiveProperty.kt → ...sit/config/migration/PrimitiveProperty.kt b/...ev/rvbsm/fsit/config/PrimitiveProperty.kt → ...sit/config/migration/PrimitiveProperty.kt
@@ -1,7 +1,8 @@
-package dev.rvbsm.fsit.config
+package dev.rvbsm.fsit.config.migration
 
 import com.charleskorn.kaml.YamlMap
 import com.charleskorn.kaml.YamlScalar
+import dev.rvbsm.fsit.config.ModConfig
 import kotlinx.serialization.json.*
 import kotlin.reflect.KMutableProperty
 
@@ -13,7 +14,7 @@ internal sealed class PrimitiveProperty<T>(
     private val fromYaml: (YamlScalar) -> T,
     private val fromJson: (JsonPrimitive) -> T,
     internal var config: ModConfig? = null,
-) : MigratedField {
+) : MigratedProperty {
     private val property: KMutableProperty<T> get() = propertyProvider(config!!)
 
     override fun toString() = key