diff options
Diffstat (limited to 'src/main/kotlin/moe/nea/notenoughupdates/util')
| -rw-r--r-- | src/main/kotlin/moe/nea/notenoughupdates/util/config/ManagedConfig.kt | 206 | ||||
| -rw-r--r-- | src/main/kotlin/moe/nea/notenoughupdates/util/data/DataHolder.kt (renamed from src/main/kotlin/moe/nea/notenoughupdates/util/config/ConfigHolder.kt) | 20 | ||||
| -rw-r--r-- | src/main/kotlin/moe/nea/notenoughupdates/util/data/IDataHolder.kt (renamed from src/main/kotlin/moe/nea/notenoughupdates/util/config/IConfigHolder.kt) | 14 | ||||
| -rw-r--r-- | src/main/kotlin/moe/nea/notenoughupdates/util/data/ProfileSpecificDataHolder.kt (renamed from src/main/kotlin/moe/nea/notenoughupdates/util/config/ProfileSpecificConfigHolder.kt) | 22 |
4 files changed, 234 insertions, 28 deletions
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/util/config/ManagedConfig.kt b/src/main/kotlin/moe/nea/notenoughupdates/util/config/ManagedConfig.kt new file mode 100644 index 0000000..a149bf2 --- /dev/null +++ b/src/main/kotlin/moe/nea/notenoughupdates/util/config/ManagedConfig.kt @@ -0,0 +1,206 @@ +package moe.nea.notenoughupdates.util.config + +import io.github.cottonmc.cotton.gui.client.CottonClientScreen +import io.github.cottonmc.cotton.gui.client.LibGui +import io.github.cottonmc.cotton.gui.client.LightweightGuiDescription +import io.github.cottonmc.cotton.gui.widget.WButton +import io.github.cottonmc.cotton.gui.widget.WLabel +import io.github.cottonmc.cotton.gui.widget.WToggleButton +import io.github.cottonmc.cotton.gui.widget.WWidget +import io.github.cottonmc.cotton.gui.widget.data.Insets +import kotlinx.serialization.decodeFromString +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.JsonElement +import kotlinx.serialization.json.JsonObject +import kotlinx.serialization.json.JsonPrimitive +import kotlinx.serialization.json.boolean +import kotlinx.serialization.json.jsonPrimitive +import kotlin.io.path.createDirectories +import kotlin.io.path.readText +import kotlin.io.path.writeText +import kotlin.properties.ReadOnlyProperty +import kotlin.reflect.KProperty +import net.minecraft.client.MinecraftClient +import net.minecraft.text.Text +import moe.nea.notenoughupdates.NotEnoughUpdates +import moe.nea.notenoughupdates.gui.WGridPanelWithPadding +import moe.nea.notenoughupdates.util.ScreenUtil.setScreenLater + +abstract class ManagedConfig(val name: String) { + + class GuiAppender(val width: Int) { + private var row = 0 + internal val panel = WGridPanelWithPadding(verticalPadding = 4, horizontalPadding = 4) + internal val reloadables = mutableListOf<(() -> Unit)>() + fun set(x: Int, y: Int, w: Int, h: Int, widget: WWidget) { + panel.add(widget, x, y, w, h) + } + + + fun onReload(reloadable: () -> Unit) { + reloadables.add(reloadable) + } + + fun skipRows(r: Int) { + row += r + } + + fun appendSplitRow(left: WWidget, right: WWidget) { + val lw = width / 2 + set(0, row, lw, 1, left) + set(lw, row, width - lw, 1, right) + skipRows(1) + } + + fun appendFullRow(widget: WWidget) { + set(0, row, width, 1, widget) + skipRows(1) + } + } + + interface OptionHandler<T : Any> { + fun toJson(element: T): JsonElement? + fun fromJson(element: JsonElement): T + fun emitGuiElements(opt: Option<T>, guiAppender: GuiAppender) + } + + inner class Option<T : Any> internal constructor( + val propertyName: String, + val default: () -> T, + val handler: OptionHandler<T> + ) : ReadOnlyProperty<Any?, T> { + + private lateinit var _value: T + private var loaded = false + var value: T + get() { + if (!loaded) + load() + return _value + } + set(value) { + loaded = true + _value = value + } + + override fun getValue(thisRef: Any?, property: KProperty<*>): T { + return value + } + + private fun load() { + if (data.containsKey(propertyName)) { + try { + value = handler.fromJson(data[propertyName]!!) + } catch (e: Exception) { + NotEnoughUpdates.logger.error( + "Exception during loading of config file $name. This will reset this config.", + e + ) + } + } + value = default() + } + + internal fun toJson(): JsonElement? { + return handler.toJson(value) + } + + fun appendToGui(guiapp: GuiAppender) { + handler.emitGuiElements(this, guiapp) + } + } + + val file = NotEnoughUpdates.CONFIG_DIR.resolve("$name.json") + val data: JsonObject by lazy { + try { + NotEnoughUpdates.json.decodeFromString( + file.readText() + ) + } catch (e: Exception) { + NotEnoughUpdates.logger.info("Could not read config $name. Loading empty config.") + JsonObject(mutableMapOf()) + } + } + + fun save() { + val data = JsonObject(allOptions.mapNotNull { (key, value) -> + value.toJson()?.let { + key to it + } + }.toMap()) + file.parent.createDirectories() + file.writeText(NotEnoughUpdates.json.encodeToString(data)) + } + + + val allOptions = mutableMapOf<String, Option<*>>() + val sortedOptions = mutableListOf<Option<*>>() + + protected fun <T : Any> option(propertyName: String, default: () -> T, handler: OptionHandler<T>): Option<T> { + if (propertyName in allOptions) error("Cannot register the same name twice") + return Option(propertyName, default, handler).also { + allOptions[propertyName] = it + sortedOptions.add(it) + } + } + + class BooleanHandler(val config: ManagedConfig) : OptionHandler<Boolean> { + override fun toJson(element: Boolean): JsonElement? { + return JsonPrimitive(element) + } + + override fun fromJson(element: JsonElement): Boolean { + return element.jsonPrimitive.boolean + } + + override fun emitGuiElements(opt: Option<Boolean>, guiAppender: GuiAppender) { + guiAppender.appendFullRow( + WToggleButton(Text.translatable("neu.config.${config.name}.${opt.propertyName}")).apply { + guiAppender.onReload { toggle = opt.value } + setOnToggle { + opt.value = it + config.save() + } + } + ) + } + } + + class ClickHandler(val config: ManagedConfig, val runnable: () -> Unit) : OptionHandler<Unit> { + override fun toJson(element: Unit): JsonElement? { + return null + } + + override fun fromJson(element: JsonElement) {} + + override fun emitGuiElements(opt: Option<Unit>, guiAppender: GuiAppender) { + guiAppender.appendSplitRow( + WLabel(Text.translatable("neu.config.${config.name}.${opt.propertyName}")), + WButton(Text.translatable("neu.config.${config.name}.${opt.propertyName}")).apply { + setOnClick { + runnable() + } + }, + ) + } + } + + protected fun toggle(propertyName: String, default: () -> Boolean): Option<Boolean> { + return option(propertyName, default, BooleanHandler(this)) + } + + fun showConfigEditor() { + val lwgd = LightweightGuiDescription() + val guiapp = GuiAppender(20) + guiapp.panel.insets = Insets.ROOT_PANEL + sortedOptions.forEach { it.appendToGui(guiapp) } + guiapp.reloadables.forEach { it() } + lwgd.setRootPanel(guiapp.panel) + setScreenLater(CottonClientScreen(lwgd)) + } + + protected fun button(propertyName: String, runnable: () -> Unit): Option<Unit> { + return option(propertyName, { }, ClickHandler(this, runnable)) + } + +} diff --git a/src/main/kotlin/moe/nea/notenoughupdates/util/config/ConfigHolder.kt b/src/main/kotlin/moe/nea/notenoughupdates/util/data/DataHolder.kt index e8a9649..6c9d8e8 100644 --- a/src/main/kotlin/moe/nea/notenoughupdates/util/config/ConfigHolder.kt +++ b/src/main/kotlin/moe/nea/notenoughupdates/util/data/DataHolder.kt @@ -1,4 +1,4 @@ -package moe.nea.notenoughupdates.util.config +package moe.nea.notenoughupdates.util.data import java.nio.file.Path import kotlinx.serialization.KSerializer @@ -7,19 +7,19 @@ import kotlin.io.path.readText import kotlin.io.path.writeText import moe.nea.notenoughupdates.NotEnoughUpdates -abstract class ConfigHolder<T>( +abstract class DataHolder<T>( val serializer: KSerializer<T>, val name: String, val default: () -> T -) : IConfigHolder<T> { +) : IDataHolder<T> { - final override var config: T + final override var data: T private set init { - config = readValueOrDefault() - IConfigHolder.putConfig(this::class, this) + data = readValueOrDefault() + IDataHolder.putDataHolder(this::class, this) } private val file: Path get() = NotEnoughUpdates.CONFIG_DIR.resolve("$name.json") @@ -32,7 +32,7 @@ abstract class ConfigHolder<T>( file.readText() ) } catch (e: Exception) {/* Expecting IOException and SerializationException, but Kotlin doesn't allow multi catches*/ - IConfigHolder.badLoads.add(name) + IDataHolder.badLoads.add(name) NotEnoughUpdates.logger.error( "Exception during loading of config file $name. This will reset this config.", e @@ -46,15 +46,15 @@ abstract class ConfigHolder<T>( } override fun save() { - writeValue(config) + writeValue(data) } override fun load() { - config = readValueOrDefault() + data = readValueOrDefault() } override fun markDirty() { - IConfigHolder.markDirty(this::class) + IDataHolder.markDirty(this::class) } } diff --git a/src/main/kotlin/moe/nea/notenoughupdates/util/config/IConfigHolder.kt b/src/main/kotlin/moe/nea/notenoughupdates/util/data/IDataHolder.kt index 2acc99d..ccbf676 100644 --- a/src/main/kotlin/moe/nea/notenoughupdates/util/config/IConfigHolder.kt +++ b/src/main/kotlin/moe/nea/notenoughupdates/util/data/IDataHolder.kt @@ -1,4 +1,4 @@ -package moe.nea.notenoughupdates.util.config +package moe.nea.notenoughupdates.util.data import java.util.concurrent.CopyOnWriteArrayList import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents @@ -9,17 +9,17 @@ import net.minecraft.text.Text import moe.nea.notenoughupdates.NotEnoughUpdates import moe.nea.notenoughupdates.events.ScreenOpenEvent -interface IConfigHolder<T> { +interface IDataHolder<T> { companion object { internal var badLoads: MutableList<String> = CopyOnWriteArrayList() - private val allConfigs: MutableMap<KClass<out IConfigHolder<*>>, IConfigHolder<*>> = mutableMapOf() - private val dirty: MutableSet<KClass<out IConfigHolder<*>>> = mutableSetOf() + private val allConfigs: MutableMap<KClass<out IDataHolder<*>>, IDataHolder<*>> = mutableMapOf() + private val dirty: MutableSet<KClass<out IDataHolder<*>>> = mutableSetOf() - internal fun <T : IConfigHolder<K>, K> putConfig(kClass: KClass<T>, inst: IConfigHolder<K>) { + internal fun <T : IDataHolder<K>, K> putDataHolder(kClass: KClass<T>, inst: IDataHolder<K>) { allConfigs[kClass] = inst } - fun <T : IConfigHolder<K>, K> markDirty(kClass: KClass<T>) { + fun <T : IDataHolder<K>, K> markDirty(kClass: KClass<T>) { if (kClass !in allConfigs) { NotEnoughUpdates.logger.error("Tried to markDirty '${kClass.qualifiedName}', which isn't registered as 'IConfigHolder'") return @@ -68,7 +68,7 @@ interface IConfigHolder<T> { } - val config: T + val data: T fun save() fun markDirty() fun load() diff --git a/src/main/kotlin/moe/nea/notenoughupdates/util/config/ProfileSpecificConfigHolder.kt b/src/main/kotlin/moe/nea/notenoughupdates/util/data/ProfileSpecificDataHolder.kt index 6a39e0a..a2f78b1 100644 --- a/src/main/kotlin/moe/nea/notenoughupdates/util/config/ProfileSpecificConfigHolder.kt +++ b/src/main/kotlin/moe/nea/notenoughupdates/util/data/ProfileSpecificDataHolder.kt @@ -1,4 +1,4 @@ -package moe.nea.notenoughupdates.util.config +package moe.nea.notenoughupdates.util.data import java.nio.file.Path import kotlinx.serialization.KSerializer @@ -13,15 +13,15 @@ import kotlin.io.path.writeText import moe.nea.notenoughupdates.NotEnoughUpdates import moe.nea.notenoughupdates.util.SBData -abstract class ProfileSpecificConfigHolder<S>( - private val configSerializer: KSerializer<S>, +abstract class ProfileSpecificDataHolder<S>( + private val dataSerializer: KSerializer<S>, val configName: String, private val configDefault: () -> S -) : IConfigHolder<S?> { +) : IDataHolder<S?> { var allConfigs: MutableMap<String, S> - override val config: S? + override val data: S? get() = SBData.profileCuteName?.let { allConfigs.computeIfAbsent(it) { configDefault() } } @@ -29,10 +29,10 @@ abstract class ProfileSpecificConfigHolder<S>( init { allConfigs = readValues() readValues() - IConfigHolder.putConfig(this::class, this) + IDataHolder.putDataHolder(this::class, this) } - private val configDirectory: Path get() = NotEnoughUpdates.CONFIG_DIR.resolve("profiles") + private val configDirectory: Path get() = NotEnoughUpdates.CONFIG_DIR.resolve("profiles").resolve(configName) private fun readValues(): MutableMap<String, S> { if (!configDirectory.exists()) { @@ -43,9 +43,9 @@ abstract class ProfileSpecificConfigHolder<S>( .filter { it.extension == "json" } .mapNotNull { try { - it.nameWithoutExtension to NotEnoughUpdates.json.decodeFromString(configSerializer, it.readText()) + it.nameWithoutExtension to NotEnoughUpdates.json.decodeFromString(dataSerializer, it.readText()) } catch (e: Exception) { /* Expecting IOException and SerializationException, but Kotlin doesn't allow multi catches*/ - IConfigHolder.badLoads.add(configName) + IDataHolder.badLoads.add(configName) NotEnoughUpdates.logger.error( "Exception during loading of profile specific config file $it ($configName). This will reset that profiles config.", e @@ -67,12 +67,12 @@ abstract class ProfileSpecificConfigHolder<S>( } c.forEach { (name, value) -> val f = configDirectory.resolve("$name.json") - f.writeText(NotEnoughUpdates.json.encodeToString(configSerializer, value)) + f.writeText(NotEnoughUpdates.json.encodeToString(dataSerializer, value)) } } override fun markDirty() { - IConfigHolder.markDirty(this::class) + IDataHolder.markDirty(this::class) } override fun load() { |