diff options
| -rw-r--r-- | build.gradle.kts | 2 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 2 | ||||
| -rw-r--r-- | src/main/kotlin/moe/nea/firmament/gui/config/AllConfigsGui.kt | 16 | ||||
| -rw-r--r-- | src/main/kotlin/moe/nea/firmament/modmenu/FirmamentModMenuPlugin.kt | 12 | ||||
| -rw-r--r-- | src/main/resources/fabric.mod.json | 46 |
5 files changed, 56 insertions, 22 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index c6d5387..6f5e93a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -78,6 +78,7 @@ dependencies { // Fabric dependencies modImplementation(libs.fabric.loader) modImplementation(libs.fabric.kotlin) + modImplementation(libs.modmenu) modImplementation(libs.libgui) include(libs.libgui) modApi(libs.fabric.api) @@ -119,6 +120,7 @@ tasks.withType<JavaCompile> { tasks.shadowJar { configurations = listOf(shadowMe) archiveClassifier.set("dev-thicc") + relocate("io.github.moulberry.repo", "moe.nea.firmament.deps.repo") } tasks.remapJar { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4696ca2..80aba74 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -40,7 +40,7 @@ ncr = { module = "maven.modrinth:no-chat-reports", version.ref = "ncr" } [bundles] dbus = ["dbus_java_core", "dbus_java_unixsocket"] runtime_required = ["architectury_fabric", "rei_fabric"] -runtime_optional = ["devauth", "modmenu", "qolify", "citresewn", "ncr"] +runtime_optional = ["devauth", "qolify", "citresewn", "ncr"] diff --git a/src/main/kotlin/moe/nea/firmament/gui/config/AllConfigsGui.kt b/src/main/kotlin/moe/nea/firmament/gui/config/AllConfigsGui.kt index 411d7bd..dd8108f 100644 --- a/src/main/kotlin/moe/nea/firmament/gui/config/AllConfigsGui.kt +++ b/src/main/kotlin/moe/nea/firmament/gui/config/AllConfigsGui.kt @@ -27,15 +27,17 @@ import io.github.cottonmc.cotton.gui.widget.WLabel import io.github.cottonmc.cotton.gui.widget.WListPanel import io.github.cottonmc.cotton.gui.widget.data.Insets import io.ktor.http.* +import net.minecraft.client.gui.screen.Screen import net.minecraft.text.Text import moe.nea.firmament.features.FeatureManager import moe.nea.firmament.gui.WFixedPanel import moe.nea.firmament.repo.RepoManager +import moe.nea.firmament.util.MC import moe.nea.firmament.util.ScreenUtil.setScreenLater object AllConfigsGui { - fun showAllGuis() { + fun makeScreen(parent: Screen? = null): CottonClientScreen { val lwgd = LightweightGuiDescription() var screen: CottonClientScreen? = null lwgd.setRootPanel(WListPanel( @@ -56,7 +58,15 @@ object AllConfigsGui { }.also { it.setSize(10 * 18 + 14 + 16, 300) }) - screen = CottonClientScreen(lwgd) - setScreenLater(screen) + screen = object : CottonClientScreen(lwgd) { + override fun close() { + MC.screen = parent + } + } + return screen + } + + fun showAllGuis() { + setScreenLater(makeScreen()) } } diff --git a/src/main/kotlin/moe/nea/firmament/modmenu/FirmamentModMenuPlugin.kt b/src/main/kotlin/moe/nea/firmament/modmenu/FirmamentModMenuPlugin.kt new file mode 100644 index 0000000..44e491e --- /dev/null +++ b/src/main/kotlin/moe/nea/firmament/modmenu/FirmamentModMenuPlugin.kt @@ -0,0 +1,12 @@ +package moe.nea.firmament.modmenu + +import com.terraformersmc.modmenu.api.ConfigScreenFactory +import com.terraformersmc.modmenu.api.ModMenuApi +import moe.nea.firmament.gui.config.AllConfigsGui + +class FirmamentModMenuPlugin : ModMenuApi { + override fun getModConfigScreenFactory(): ConfigScreenFactory<*> { + return ConfigScreenFactory { AllConfigsGui.makeScreen(it) } + } +} + diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c08adb9..063bda7 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,23 +26,33 @@ "value": "moe.nea.firmament.Firmament" } ], - "client": [ - { - "adapter": "kotlin", - "value": "moe.nea.firmament.Firmament" - } - ], - "rei_client": [ - "moe.nea.firmament.rei.FirmamentReiPlugin" - ] + "client": [ + { + "adapter": "kotlin", + "value": "moe.nea.firmament.Firmament" + } + ], + "rei_client": [ + "moe.nea.firmament.rei.FirmamentReiPlugin" + ], + "modmenu": [ + "moe.nea.firmament.modmenu.FirmamentModMenuPlugin" + ] }, - "mixins": [ - "firmament.mixins.json" - ], - "depends": { - "fabric": "*", - "fabric-language-kotlin": ">=${fabric_kotlin_version}", - "minecraft": ">=${minecraft_version}", - "fabric-key-binding-api-v1": "*" - } + "mixins": [ + "firmament.mixins.json" + ], + "depends": { + "fabric": "*", + "fabric-language-kotlin": ">=${fabric_kotlin_version}", + "minecraft": ">=${minecraft_version}", + "fabric-key-binding-api-v1": "*" + }, + "custom": { + "modmenu": { + "links": { + "modmenu.discord": "https://discord.gg/64pFP94AWA" + } + } + } } |