aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/moe/nea/firmament/init/AutoDiscoveryPlugin.java4
-rw-r--r--src/main/kotlin/gui/config/AllConfigsGui.kt10
-rw-r--r--src/main/kotlin/gui/config/BuiltInConfigScreenProvider.kt14
-rw-r--r--src/main/kotlin/gui/config/FirmamentConfigScreenProvider.kt27
-rw-r--r--src/main/kotlin/gui/config/ManagedConfig.kt3
-rw-r--r--src/main/resources/assets/firmament/lang/en_us.json1
-rw-r--r--src/main/resources/fabric.mod.json5
-rw-r--r--src/main/resources/firmament.mixins.json7
-rw-r--r--src/main/resources/firmament.mixins.json.license3
9 files changed, 69 insertions, 5 deletions
diff --git a/src/main/java/moe/nea/firmament/init/AutoDiscoveryPlugin.java b/src/main/java/moe/nea/firmament/init/AutoDiscoveryPlugin.java
index e3644c0..9b891a4 100644
--- a/src/main/java/moe/nea/firmament/init/AutoDiscoveryPlugin.java
+++ b/src/main/java/moe/nea/firmament/init/AutoDiscoveryPlugin.java
@@ -146,7 +146,9 @@ public class AutoDiscoveryPlugin {
*/
private void walkDir(Path classRoot) {
System.out.println("Trying to find mixins from directory");
- try (Stream<Path> classes = Files.walk(classRoot.resolve(getMixinBaseDir()))) {
+ var path = classRoot.resolve(getMixinBaseDir());
+ if (!Files.exists(path)) return;
+ try (Stream<Path> classes = Files.walk(path)) {
classes.map(it -> classRoot.relativize(it).toString())
.forEach(this::tryAddMixinClass);
} catch (IOException e) {
diff --git a/src/main/kotlin/gui/config/AllConfigsGui.kt b/src/main/kotlin/gui/config/AllConfigsGui.kt
index 4f7731c..3091b2a 100644
--- a/src/main/kotlin/gui/config/AllConfigsGui.kt
+++ b/src/main/kotlin/gui/config/AllConfigsGui.kt
@@ -1,5 +1,3 @@
-
-
package moe.nea.firmament.gui.config
import io.github.notenoughupdates.moulconfig.observer.ObservableList
@@ -36,10 +34,16 @@ object AllConfigsGui {
}
}
- fun makeScreen(parent: Screen? = null): Screen {
+ fun makeBuiltInScreen(parent: Screen? = null): Screen {
return MoulConfigUtils.loadScreen("config/main", MainMapping(allConfigs), parent)
}
+ fun makeScreen(parent: Screen? = null): Screen {
+ val provider = FirmamentConfigScreenProvider.providers.find { it.key == "builtin" }
+ ?: FirmamentConfigScreenProvider.providers.first()
+ return provider.open(parent)
+ }
+
fun showAllGuis() {
setScreenLater(makeScreen())
}
diff --git a/src/main/kotlin/gui/config/BuiltInConfigScreenProvider.kt b/src/main/kotlin/gui/config/BuiltInConfigScreenProvider.kt
new file mode 100644
index 0000000..19e7383
--- /dev/null
+++ b/src/main/kotlin/gui/config/BuiltInConfigScreenProvider.kt
@@ -0,0 +1,14 @@
+package moe.nea.firmament.gui.config
+
+import com.google.auto.service.AutoService
+import net.minecraft.client.gui.screen.Screen
+
+@AutoService(FirmamentConfigScreenProvider::class)
+class BuiltInConfigScreenProvider : FirmamentConfigScreenProvider {
+ override val key: String
+ get() = "builtin"
+
+ override fun open(parent: Screen?): Screen {
+ return AllConfigsGui.makeBuiltInScreen(parent)
+ }
+}
diff --git a/src/main/kotlin/gui/config/FirmamentConfigScreenProvider.kt b/src/main/kotlin/gui/config/FirmamentConfigScreenProvider.kt
new file mode 100644
index 0000000..582f701
--- /dev/null
+++ b/src/main/kotlin/gui/config/FirmamentConfigScreenProvider.kt
@@ -0,0 +1,27 @@
+package moe.nea.firmament.gui.config
+
+import java.util.ServiceLoader
+import kotlin.streams.asSequence
+import net.minecraft.client.gui.screen.Screen
+import moe.nea.firmament.Firmament
+
+interface FirmamentConfigScreenProvider {
+ val key: String
+ val isEnabled: Boolean get() = true
+
+ fun open(parent: Screen?): Screen
+
+ companion object {
+ private val loader = ServiceLoader.load(FirmamentConfigScreenProvider::class.java)
+
+ val providers by lazy {
+ loader.stream().asSequence().mapNotNull { service ->
+ kotlin.runCatching { service.get() }
+ .getOrElse {
+ Firmament.logger.warn("Could not load config provider ${service.type()}", it)
+ null
+ }
+ }.filter { it.isEnabled }.toList()
+ }
+ }
+}
diff --git a/src/main/kotlin/gui/config/ManagedConfig.kt b/src/main/kotlin/gui/config/ManagedConfig.kt
index aa6e3c8..0d942e2 100644
--- a/src/main/kotlin/gui/config/ManagedConfig.kt
+++ b/src/main/kotlin/gui/config/ManagedConfig.kt
@@ -145,7 +145,8 @@ abstract class ManagedConfig(override val name: String) : ManagedConfigElement()
latestGuiAppender?.reloadables?.forEach { it() }
}
- val labelText = Text.translatable("firmament.config.${name}")
+ val translationKey get() = "firmament.config.${name}"
+ val labelText = Text.translatable(translationKey)
fun getConfigEditor(parent: Screen? = null): Screen {
var screen: Screen? = null
diff --git a/src/main/resources/assets/firmament/lang/en_us.json b/src/main/resources/assets/firmament/lang/en_us.json
index dd514fe..2e516df 100644
--- a/src/main/resources/assets/firmament/lang/en_us.json
+++ b/src/main/resources/assets/firmament/lang/en_us.json
@@ -20,6 +20,7 @@
"firmament.poweruser.entity.armor": "Entity Armor:",
"firmament.poweruser.entity.armor.item": " - %s",
"firmament.poweruser.entity.passengers": "%s Passengers",
+ "firmament.config.all-configs": "- All Configs -",
"firmament.config.anniversary": "Anniversary Features",
"firmament.config.anniversary.shiny-pigs": "Shiny Pigs Tracker",
"firmament.config.anniversary.pig-hud": "Pig Tracker Hud",
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index ef2920e..e027783 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -50,6 +50,11 @@
"roughlyenoughitems": ">=${rei_version}"
},
"custom": {
+ "configured": {
+ "providers": [
+ "moe.nea.firmament.compat.configured.ConfiguredCompat"
+ ]
+ },
"modmenu": {
"links": {
"modmenu.discord": "https://discord.gg/64pFP94AWA"
diff --git a/src/main/resources/firmament.mixins.json b/src/main/resources/firmament.mixins.json
new file mode 100644
index 0000000..dbb8290
--- /dev/null
+++ b/src/main/resources/firmament.mixins.json
@@ -0,0 +1,7 @@
+{
+ "required": true,
+ "plugin": "moe.nea.firmament.init.MixinPlugin",
+ "package": "moe.nea.firmament.mixins",
+ "compatibilityLevel": "JAVA_21",
+ "refmap": "Firmament-refmap.json"
+}
diff --git a/src/main/resources/firmament.mixins.json.license b/src/main/resources/firmament.mixins.json.license
new file mode 100644
index 0000000..5f0659f
--- /dev/null
+++ b/src/main/resources/firmament.mixins.json.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe>
+
+SPDX-License-Identifier: CC0-1.0