feat: Add descriptions for config options
This commit is contained in:
@@ -49,6 +49,7 @@ import moe.nea.firmament.util.SBData
|
||||
import moe.nea.firmament.util.data.IDataHolder
|
||||
|
||||
object Firmament {
|
||||
val modContainer by lazy { FabricLoader.getInstance().getModContainer(MOD_ID).get() }
|
||||
const val MOD_ID = "firmament"
|
||||
|
||||
val DEBUG = System.getProperty("firmament.debug") == "true"
|
||||
|
||||
@@ -1,12 +1,16 @@
|
||||
package moe.nea.firmament.features.debug
|
||||
|
||||
import java.io.File
|
||||
import java.nio.file.Path
|
||||
import java.util.concurrent.CompletableFuture
|
||||
import kotlinx.serialization.json.encodeToStream
|
||||
import kotlin.io.path.absolute
|
||||
import kotlin.io.path.exists
|
||||
import net.minecraft.client.MinecraftClient
|
||||
import net.minecraft.text.Text
|
||||
import moe.nea.firmament.Firmament
|
||||
import moe.nea.firmament.annotations.Subscribe
|
||||
import moe.nea.firmament.events.TickEvent
|
||||
import moe.nea.firmament.features.FirmamentFeature
|
||||
import moe.nea.firmament.gui.config.ManagedConfig
|
||||
import moe.nea.firmament.util.MC
|
||||
@@ -14,41 +18,57 @@ import moe.nea.firmament.util.TimeMark
|
||||
import moe.nea.firmament.util.iterate
|
||||
|
||||
object DeveloperFeatures : FirmamentFeature {
|
||||
override val identifier: String
|
||||
get() = "developer"
|
||||
override val config: TConfig
|
||||
get() = TConfig
|
||||
override val defaultEnabled: Boolean
|
||||
get() = Firmament.DEBUG
|
||||
override val identifier: String
|
||||
get() = "developer"
|
||||
override val config: TConfig
|
||||
get() = TConfig
|
||||
override val defaultEnabled: Boolean
|
||||
get() = Firmament.DEBUG
|
||||
|
||||
val gradleDir =
|
||||
Path.of(".").absolute()
|
||||
.iterate { it.parent }
|
||||
.find { it.resolve("settings.gradle.kts").exists() }
|
||||
val gradleDir =
|
||||
Path.of(".").absolute()
|
||||
.iterate { it.parent }
|
||||
.find { it.resolve("settings.gradle.kts").exists() }
|
||||
|
||||
object TConfig : ManagedConfig("developer", Category.DEV) {
|
||||
val autoRebuildResources by toggle("auto-rebuild") { false }
|
||||
}
|
||||
object TConfig : ManagedConfig("developer", Category.DEV) {
|
||||
val autoRebuildResources by toggle("auto-rebuild") { false }
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
fun hookOnBeforeResourceReload(client: MinecraftClient): CompletableFuture<Void> {
|
||||
val reloadFuture = if (TConfig.autoRebuildResources && isEnabled && gradleDir != null) {
|
||||
val builder = ProcessBuilder("./gradlew", ":processResources")
|
||||
builder.directory(gradleDir.toFile())
|
||||
builder.inheritIO()
|
||||
val process = builder.start()
|
||||
MC.sendChat(Text.translatable("firmament.dev.resourcerebuild.start"))
|
||||
val startTime = TimeMark.now()
|
||||
process.toHandle().onExit().thenApply {
|
||||
MC.sendChat(Text.stringifiedTranslatable(
|
||||
"firmament.dev.resourcerebuild.done",
|
||||
startTime.passedTime()))
|
||||
Unit
|
||||
}
|
||||
} else {
|
||||
CompletableFuture.completedFuture(Unit)
|
||||
}
|
||||
return reloadFuture.thenCompose { client.reloadResources() }
|
||||
}
|
||||
var missingTranslations: Set<String>? = null
|
||||
|
||||
@JvmStatic
|
||||
fun hookMissingTranslations(missingTranslations: Set<String>) {
|
||||
this.missingTranslations = missingTranslations
|
||||
}
|
||||
|
||||
@Subscribe
|
||||
fun dumpMissingTranslations(tickEvent: TickEvent) {
|
||||
val toDump = missingTranslations ?: return
|
||||
missingTranslations = null
|
||||
File("missing_translations.json").outputStream().use {
|
||||
Firmament.json.encodeToStream(toDump.associateWith { "Mis" + "sing translation" }, it)
|
||||
}
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
fun hookOnBeforeResourceReload(client: MinecraftClient): CompletableFuture<Void> {
|
||||
val reloadFuture = if (TConfig.autoRebuildResources && isEnabled && gradleDir != null) {
|
||||
val builder = ProcessBuilder("./gradlew", ":processResources")
|
||||
builder.directory(gradleDir.toFile())
|
||||
builder.inheritIO()
|
||||
val process = builder.start()
|
||||
MC.sendChat(Text.translatable("firmament.dev.resourcerebuild.start"))
|
||||
val startTime = TimeMark.now()
|
||||
process.toHandle().onExit().thenApply {
|
||||
MC.sendChat(Text.stringifiedTranslatable(
|
||||
"firmament.dev.resourcerebuild.done",
|
||||
startTime.passedTime()))
|
||||
Unit
|
||||
}
|
||||
} else {
|
||||
CompletableFuture.completedFuture(Unit)
|
||||
}
|
||||
return reloadFuture.thenCompose { client.reloadResources() }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -44,6 +44,7 @@ abstract class ManagedConfig(
|
||||
;
|
||||
|
||||
val labelText: Text = Text.translatable("firmament.config.category.${name.lowercase()}")
|
||||
val description: Text = Text.translatable("firmament.config.category.${name.lowercase()}.description")
|
||||
val configs: MutableList<ManagedConfig> = mutableListOf()
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
|
||||
|
||||
package moe.nea.firmament.gui.config
|
||||
|
||||
import io.github.notenoughupdates.moulconfig.observer.GetSetter
|
||||
@@ -9,54 +7,57 @@ import kotlin.properties.ReadWriteProperty
|
||||
import kotlin.reflect.KProperty
|
||||
import net.minecraft.text.Text
|
||||
import moe.nea.firmament.Firmament
|
||||
import moe.nea.firmament.util.ErrorUtil
|
||||
|
||||
class ManagedOption<T : Any>(
|
||||
val element: ManagedConfig,
|
||||
val propertyName: String,
|
||||
val default: () -> T,
|
||||
val handler: ManagedConfig.OptionHandler<T>
|
||||
val element: ManagedConfig,
|
||||
val propertyName: String,
|
||||
val default: () -> T,
|
||||
val handler: ManagedConfig.OptionHandler<T>
|
||||
) : ReadWriteProperty<Any?, T>, GetSetter<T> {
|
||||
override fun set(newValue: T) {
|
||||
this.value = newValue
|
||||
}
|
||||
override fun set(newValue: T) {
|
||||
this.value = newValue
|
||||
}
|
||||
|
||||
override fun get(): T {
|
||||
return this.value
|
||||
}
|
||||
override fun get(): T {
|
||||
return this.value
|
||||
}
|
||||
|
||||
val rawLabelText = "firmament.config.${element.name}.${propertyName}"
|
||||
val labelText = Text.translatable(rawLabelText)
|
||||
val rawLabelText = "firmament.config.${element.name}.${propertyName}"
|
||||
val labelText: Text = Text.translatable(rawLabelText)
|
||||
val descriptionTranslationKey = "firmament.config.${element.name}.${propertyName}.description"
|
||||
val labelDescription: Text = Text.translatable(descriptionTranslationKey)
|
||||
|
||||
lateinit var value: T
|
||||
lateinit var value: T
|
||||
|
||||
override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
|
||||
this.value = value
|
||||
}
|
||||
override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
|
||||
this.value = value
|
||||
}
|
||||
|
||||
override fun getValue(thisRef: Any?, property: KProperty<*>): T {
|
||||
return value
|
||||
}
|
||||
override fun getValue(thisRef: Any?, property: KProperty<*>): T {
|
||||
return value
|
||||
}
|
||||
|
||||
fun load(root: JsonElement) {
|
||||
if (root is JsonObject && root.containsKey(propertyName)) {
|
||||
try {
|
||||
value = handler.fromJson(root[propertyName]!!)
|
||||
return
|
||||
} catch (e: Exception) {
|
||||
Firmament.logger.error(
|
||||
"Exception during loading of config file ${element.name}. This will reset this config.",
|
||||
e
|
||||
)
|
||||
}
|
||||
}
|
||||
value = default()
|
||||
}
|
||||
fun load(root: JsonElement) {
|
||||
if (root is JsonObject && root.containsKey(propertyName)) {
|
||||
try {
|
||||
value = handler.fromJson(root[propertyName]!!)
|
||||
return
|
||||
} catch (e: Exception) {
|
||||
ErrorUtil.softError(
|
||||
"Exception during loading of config file ${element.name}. This will reset this config.",
|
||||
e
|
||||
)
|
||||
}
|
||||
}
|
||||
value = default()
|
||||
}
|
||||
|
||||
fun toJson(): JsonElement? {
|
||||
return handler.toJson(value)
|
||||
}
|
||||
fun toJson(): JsonElement? {
|
||||
return handler.toJson(value)
|
||||
}
|
||||
|
||||
fun appendToGui(guiapp: GuiAppender) {
|
||||
handler.emitGuiElements(this, guiapp)
|
||||
}
|
||||
fun appendToGui(guiapp: GuiAppender) {
|
||||
handler.emitGuiElements(this, guiapp)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package moe.nea.firmament.util
|
||||
import io.github.moulberry.repo.data.Coordinate
|
||||
import java.util.concurrent.ConcurrentLinkedQueue
|
||||
import net.minecraft.client.MinecraftClient
|
||||
import net.minecraft.client.gui.hud.InGameHud
|
||||
import net.minecraft.client.gui.screen.Screen
|
||||
import net.minecraft.client.gui.screen.ingame.HandledScreen
|
||||
import net.minecraft.client.network.ClientPlayerEntity
|
||||
@@ -28,9 +29,10 @@ object MC {
|
||||
|
||||
init {
|
||||
TickEvent.subscribe("MC:push") {
|
||||
while (true) {
|
||||
inGameHud.chatHud.addMessage(messageQueue.poll() ?: break)
|
||||
}
|
||||
if (inGameHud.chatHud != null && world != null)
|
||||
while (true) {
|
||||
inGameHud.chatHud.addMessage(messageQueue.poll() ?: break)
|
||||
}
|
||||
while (true) {
|
||||
(nextTickTodos.poll() ?: break).invoke()
|
||||
}
|
||||
@@ -41,7 +43,7 @@ object MC {
|
||||
}
|
||||
|
||||
fun sendChat(text: Text) {
|
||||
if (instance.isOnThread)
|
||||
if (instance.isOnThread && inGameHud.chatHud != null && world != null)
|
||||
inGameHud.chatHud.addMessage(text)
|
||||
else
|
||||
messageQueue.add(text)
|
||||
@@ -86,7 +88,7 @@ object MC {
|
||||
inline val interactionManager get() = instance.interactionManager
|
||||
inline val textureManager get() = instance.textureManager
|
||||
inline val options get() = instance.options
|
||||
inline val inGameHud get() = instance.inGameHud
|
||||
inline val inGameHud: InGameHud get() = instance.inGameHud
|
||||
inline val font get() = instance.textRenderer
|
||||
inline val soundManager get() = instance.soundManager
|
||||
inline val player: ClientPlayerEntity? get() = instance.player
|
||||
|
||||
Reference in New Issue
Block a user