aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle.kts4
-rw-r--r--src/compat/modmenu/java/moe/nea/firmament/compat/modmenu/FirmamentModMenuPlugin.kt (renamed from src/main/kotlin/modmenu/FirmamentModMenuPlugin.kt)5
-rw-r--r--src/main/resources/fabric.mod.json2
3 files changed, 5 insertions, 6 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index 31952d6..244b01d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -184,6 +184,7 @@ val citResewnSourceSet = createIsolatedSourceSet("citresewn")
val yaclSourceSet = createIsolatedSourceSet("yacl")
val explosiveEnhancementSourceSet = createIsolatedSourceSet("explosiveEnhancement")
val wildfireGenderSourceSet = createIsolatedSourceSet("wildfireGender")
+val modmenuSourceSet = createIsolatedSourceSet("modmenu")
dependencies {
// Minecraft dependencies
@@ -196,9 +197,9 @@ dependencies {
// Fabric dependencies
modImplementation(libs.fabric.loader)
modImplementation(libs.fabric.kotlin)
- modImplementation(libs.modmenu)
modImplementation(libs.moulconfig)
modImplementation(libs.manninghamMills)
+ (modmenuSourceSet.modImplementationConfigurationName)(libs.modmenu)
(explosiveEnhancementSourceSet.modImplementationConfigurationName)(libs.explosiveenhancement)
modImplementation(libs.hypixelmodapi)
include(libs.hypixelmodapi.fabric)
@@ -251,6 +252,7 @@ dependencies {
modLocalRuntime(libs.bundles.runtime.required)
modLocalRuntime(libs.bundles.runtime.optional)
modLocalRuntime(libs.jarvis.fabric)
+ modLocalRuntime(libs.modmenu)
transInclude.resolvedConfiguration.resolvedArtifacts.forEach {
include(it.moduleVersion.id.toString())
diff --git a/src/main/kotlin/modmenu/FirmamentModMenuPlugin.kt b/src/compat/modmenu/java/moe/nea/firmament/compat/modmenu/FirmamentModMenuPlugin.kt
index f889bf3..b734e2c 100644
--- a/src/main/kotlin/modmenu/FirmamentModMenuPlugin.kt
+++ b/src/compat/modmenu/java/moe/nea/firmament/compat/modmenu/FirmamentModMenuPlugin.kt
@@ -1,6 +1,4 @@
-
-
-package moe.nea.firmament.modmenu
+package moe.nea.firmament.compat.modmenu
import com.terraformersmc.modmenu.api.ConfigScreenFactory
import com.terraformersmc.modmenu.api.ModMenuApi
@@ -11,4 +9,3 @@ class FirmamentModMenuPlugin : ModMenuApi {
return ConfigScreenFactory { AllConfigsGui.makeScreen(it) }
}
}
-
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index cb623dc..08072ef 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -34,7 +34,7 @@
"moe.nea.firmament.rei.FirmamentReiPlugin"
],
"modmenu": [
- "moe.nea.firmament.modmenu.FirmamentModMenuPlugin"
+ "moe.nea.firmament.compat.modmenu.FirmamentModMenuPlugin"
],
"jarvis": [
"moe.nea.firmament.jarvis.JarvisIntegration"