Refactor source layout

Introduce compat source sets and move all kotlin sources to the main directory

[no changelog]

3 files changed, 0 insertions, 223 deletions

diff --git a/src/main/kotlin/moe/nea/firmament/util/data/DataHolder.kt b/src/main/kotlin/moe/nea/firmament/util/data/DataHolder.kt
deleted file mode 100644
index 21a6014..0000000
--- a/src/main/kotlin/moe/nea/firmament/util/data/DataHolder.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-package moe.nea.firmament.util.data
-
-import java.nio.file.Path
-import kotlinx.serialization.KSerializer
-import kotlin.io.path.exists
-import kotlin.io.path.readText
-import kotlin.io.path.writeText
-import moe.nea.firmament.Firmament
-
-abstract class DataHolder<T>(
-    val serializer: KSerializer<T>,
-    val name: String,
-    val default: () -> T
-) : IDataHolder<T> {
-
-
-    final override var data: T
-        private set
-
-    init {
-        data = readValueOrDefault()
-        IDataHolder.putDataHolder(this::class, this)
-    }
-
-    private val file: Path get() = Firmament.CONFIG_DIR.resolve("$name.json")
-
-    protected fun readValueOrDefault(): T {
-        if (file.exists())
-            try {
-                return Firmament.json.decodeFromString(
-                    serializer,
-                    file.readText()
-                )
-            } catch (e: Exception) {/* Expecting IOException and SerializationException, but Kotlin doesn't allow multi catches*/
-                IDataHolder.badLoads.add(name)
-                Firmament.logger.error(
-                    "Exception during loading of config file $name. This will reset this config.",
-                    e
-                )
-            }
-        return default()
-    }
-
-    private fun writeValue(t: T) {
-        file.writeText(Firmament.json.encodeToString(serializer, t))
-    }
-
-    override fun save() {
-        writeValue(data)
-    }
-
-    override fun load() {
-        data = readValueOrDefault()
-    }
-
-    override fun markDirty() {
-        IDataHolder.markDirty(this::class)
-    }
-
-}
diff --git a/src/main/kotlin/moe/nea/firmament/util/data/IDataHolder.kt b/src/main/kotlin/moe/nea/firmament/util/data/IDataHolder.kt
deleted file mode 100644
index 5d09bcd..0000000
--- a/src/main/kotlin/moe/nea/firmament/util/data/IDataHolder.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-package moe.nea.firmament.util.data
-
-import java.util.concurrent.CopyOnWriteArrayList
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents
-import kotlin.reflect.KClass
-import net.minecraft.client.MinecraftClient
-import net.minecraft.server.command.CommandOutput
-import net.minecraft.text.Text
-import moe.nea.firmament.Firmament
-import moe.nea.firmament.events.ScreenChangeEvent
-
-interface IDataHolder<T> {
-    companion object {
-        internal var badLoads: MutableList<String> = CopyOnWriteArrayList()
-        private val allConfigs: MutableMap<KClass<out IDataHolder<*>>, IDataHolder<*>> = mutableMapOf()
-        private val dirty: MutableSet<KClass<out IDataHolder<*>>> = mutableSetOf()
-
-        internal fun <T : IDataHolder<K>, K> putDataHolder(kClass: KClass<T>, inst: IDataHolder<K>) {
-            allConfigs[kClass] = inst
-        }
-
-        fun <T : IDataHolder<K>, K> markDirty(kClass: KClass<T>) {
-            if (kClass !in allConfigs) {
-                Firmament.logger.error("Tried to markDirty '${kClass.qualifiedName}', which isn't registered as 'IConfigHolder'")
-                return
-            }
-            dirty.add(kClass)
-        }
-
-        private fun performSaves() {
-            val toSave = dirty.toList().also {
-                dirty.clear()
-            }
-            for (it in toSave) {
-                val obj = allConfigs[it]
-                if (obj == null) {
-                    Firmament.logger.error("Tried to save '${it}', which isn't registered as 'ConfigHolder'")
-                    continue
-                }
-                obj.save()
-            }
-        }
-
-        private fun warnForResetConfigs(player: CommandOutput) {
-            if (badLoads.isNotEmpty()) {
-                player.sendMessage(
-                    Text.literal(
-                        "The following configs have been reset: ${badLoads.joinToString(", ")}. " +
-                            "This can be intentional, but probably isn't."
-                    )
-                )
-                badLoads.clear()
-            }
-        }
-
-        fun registerEvents() {
-            ScreenChangeEvent.subscribe { event ->
-                performSaves()
-                val p = MinecraftClient.getInstance().player
-                if (p != null) {
-                    warnForResetConfigs(p)
-                }
-            }
-            ClientLifecycleEvents.CLIENT_STOPPING.register(ClientLifecycleEvents.ClientStopping {
-                performSaves()
-            })
-        }
-
-    }
-
-    val data: T
-    fun save()
-    fun markDirty()
-    fun load()
-}
diff --git a/src/main/kotlin/moe/nea/firmament/util/data/ProfileSpecificDataHolder.kt b/src/main/kotlin/moe/nea/firmament/util/data/ProfileSpecificDataHolder.kt
deleted file mode 100644
index 1cd4f22..0000000
--- a/src/main/kotlin/moe/nea/firmament/util/data/ProfileSpecificDataHolder.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-package moe.nea.firmament.util.data
-
-import java.nio.file.Path
-import java.util.UUID
-import kotlinx.serialization.KSerializer
-import kotlin.io.path.createDirectories
-import kotlin.io.path.deleteExisting
-import kotlin.io.path.exists
-import kotlin.io.path.extension
-import kotlin.io.path.listDirectoryEntries
-import kotlin.io.path.nameWithoutExtension
-import kotlin.io.path.readText
-import kotlin.io.path.writeText
-import moe.nea.firmament.Firmament
-import moe.nea.firmament.util.SBData
-
-abstract class ProfileSpecificDataHolder<S>(
-    private val dataSerializer: KSerializer<S>,
-    val configName: String,
-    private val configDefault: () -> S
-) : IDataHolder<S?> {
-
-    var allConfigs: MutableMap<UUID, S>
-
-    override val data: S?
-        get() = SBData.profileId?.let {
-            allConfigs.computeIfAbsent(it) { configDefault() }
-        }
-
-    init {
-        allConfigs = readValues()
-        IDataHolder.putDataHolder(this::class, this)
-    }
-
-    private val configDirectory: Path get() = Firmament.CONFIG_DIR.resolve("profiles").resolve(configName)
-
-    private fun readValues(): MutableMap<UUID, S> {
-        if (!configDirectory.exists()) {
-            configDirectory.createDirectories()
-        }
-        val profileFiles = configDirectory.listDirectoryEntries()
-        return profileFiles
-            .filter { it.extension == "json" }
-            .mapNotNull {
-                try {
-                    UUID.fromString(it.nameWithoutExtension) to Firmament.json.decodeFromString(dataSerializer, it.readText())
-                } catch (e: Exception) { /* Expecting IOException and SerializationException, but Kotlin doesn't allow multi catches*/
-                    IDataHolder.badLoads.add(configName)
-                    Firmament.logger.error(
-                        "Exception during loading of profile specific config file $it ($configName). This will reset that profiles config.",
-                        e
-                    )
-                    null
-                }
-            }.toMap().toMutableMap()
-    }
-
-    override fun save() {
-        if (!configDirectory.exists()) {
-            configDirectory.createDirectories()
-        }
-        val c = allConfigs
-        configDirectory.listDirectoryEntries().forEach {
-            if (it.nameWithoutExtension !in c.mapKeys { it.toString() }) {
-                it.deleteExisting()
-            }
-        }
-        c.forEach { (name, value) ->
-            val f = configDirectory.resolve("$name.json")
-            f.writeText(Firmament.json.encodeToString(dataSerializer, value))
-        }
-    }
-
-    override fun markDirty() {
-        IDataHolder.markDirty(this::class)
-    }
-
-    override fun load() {
-        allConfigs = readValues()
-    }
-
-}