feat: add quilt support

SettingDust · SettingDust · commit d76e95b3d4b3 · 2023-07-30T09:15:51.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -45,3 +45,4 @@ bin/
 */run
 
 .env
+*.log
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -138,21 +138,23 @@ subprojects {
     }
 }
 
-
-val finalJar by tasks.registering(Jar::class) {
-    dependsOn(":fabric:remapJar")
+val fabricIntermediaryJar by tasks.registering(Jar::class) {
+    dependsOn(":fabric:remapJar", ":quilt:remapJar")
     from(zipTree(project(":fabric").tasks.named("remapJar").get().outputs.files.first()))
-//    from(project(":quilt").tasks.getByName("remapJar"))
+    from(zipTree(project(":quilt").tasks.named("remapJar").get().outputs.files.first()))
 
     archiveBaseName.set(archives_name)
     archiveVersion.set("${project.version}")
+    archiveClassifier.set("fabric-intermediary")
+
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 curseforge {
     apiKey = env.CURSEFORGE_TOKEN.value // This should really be in a gradle.properties file
     project {
         id = "890349"
-        mainArtifact(finalJar.get()) {
+        mainArtifact(fabricIntermediaryJar.get()) {
             releaseType = "release"
             addGameVersion("1.19.4")
             addGameVersion("1.20")
@@ -165,30 +167,3 @@ curseforge {
         }
     }
 }
-
-modrinth {
-    token.set(env.MODRINTH_TOKEN.value) // This is the default. Remember to have the MODRINTH_TOKEN environment variable set or else this will fail, or set it to whatever you want - just make sure it stays private!
-    projectId.set("mod-sets") // This can be the project ID or the slug. Either will work!
-    syncBodyFrom.set(rootProject.file("README.md").readText())
-    versionType.set("release") // This is the default -- can also be `beta` or `alpha`
-    uploadFile.set(finalJar) // With Loom, this MUST be set to `remapJar` instead of `jar`!
-    changelog.set(
-        """
-        fix(common): calling save correctly with instant
-        """.trimIndent(),
-    )
-    gameVersions.addAll(
-        "1.19.4",
-        "1.20",
-        "1.20.1",
-    ) // Must be an array, even with only one version
-    loaders.add("fabric") // Must also be an array - no need to specify this if you're using Loom or ForgeGradle
-    dependencies {
-        required.project("fabric-language-kotlin")
-        // https://modrinth.com/mod/yacl
-        required.project("yacl")
-        // https://modrinth.com/mod/kinecraft-serialization
-        embedded.version("kinecraft-serialization", "${libs.versions.kinecraft.serialization.get()}-fabric")
-        optional.project("modmenu")
-    }
-}
diff --git a/common/src/main/kotlin/settingdust/modsets/ModSets.kt b/common/src/main/kotlin/settingdust/modsets/ModSets.kt
@@ -1,8 +1,8 @@
 package settingdust.modsets
 
-import com.mojang.logging.LogUtils
+import org.slf4j.LoggerFactory
 
 object ModSets {
-    val logger by lazy { LogUtils.getLogger()!! }
+    val logger by lazy { LoggerFactory.getLogger(javaClass)!! }
 }
 
diff --git a/common/src/main/kotlin/settingdust/modsets/Rules.kt b/common/src/main/kotlin/settingdust/modsets/Rules.kt
@@ -5,6 +5,7 @@ import dev.isxander.yacl3.api.controller.StringControllerBuilder
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
@@ -24,7 +25,7 @@ object Rules : MutableMap<String, RuleSet> by mutableMapOf() {
 
     val modSets = mutableMapOf<String, ModSet>()
     private val _ModSetsRegisterCallback =
-        MutableSharedFlow<Unit>(replay = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
+        MutableSharedFlow<Unit>()
     val ModSetsRegisterCallback = _ModSetsRegisterCallback.asSharedFlow()
 
     private val definedModSets = mutableMapOf<String, ModSet>()
@@ -47,9 +48,9 @@ object Rules : MutableMap<String, RuleSet> by mutableMapOf() {
 
     private val config: YetAnotherConfigLib
         get() {
-            load()
+            runBlocking { load() }
             val builder = YetAnotherConfigLib.createBuilder().title(Component.translatable("modsets.name"))
-            if (ModSets.config.common.displayModSetsScreen) {
+            if (ModSets.config.common.displayModSetsScreen && modSets.isNotEmpty()) {
                 builder.category(
                     ConfigCategory.createBuilder().apply {
                         name(Component.translatable("modsets.name"))
@@ -122,10 +123,10 @@ object Rules : MutableMap<String, RuleSet> by mutableMapOf() {
         }
 
     init {
-        load()
+        runBlocking { load() }
     }
 
-    private fun load() {
+    private suspend fun load() {
         ModSets.config.load()
         try {
             configDir.createDirectories()
@@ -141,7 +142,7 @@ object Rules : MutableMap<String, RuleSet> by mutableMapOf() {
             definedModSets.putAll(json.decodeFromStream(it))
         }
         modSets.putAll(definedModSets)
-        _ModSetsRegisterCallback.tryEmit(Unit)
+        _ModSetsRegisterCallback.emit(Unit)
 
         clear()
         rulesDir.listDirectoryEntries("*.json").forEach {
diff --git a/common/src/main/resources/assets/mod_sets/icon.png b/common/src/main/resources/assets/mod_sets/icon.png
diff --git a/common/src/main/resources/assets/mod_sets/lang/en_us.json b/common/src/main/resources/assets/mod_sets/lang/en_us.json
diff --git a/common/src/main/resources/assets/mod_sets/lang/zh_cn.json b/common/src/main/resources/assets/mod_sets/lang/zh_cn.json
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -6,6 +6,10 @@
     "UnstableApiUsage",
 )
 
+plugins {
+    alias(libs.plugins.minotaur)
+}
+
 val archives_name: String by rootProject
 val mod_name: String by rootProject
 
@@ -83,3 +87,33 @@ dependencies {
     modRuntimeOnly(kinecraft)
     include(kinecraft)
 }
+
+
+
+modrinth {
+    token.set(env.MODRINTH_TOKEN.value) // This is the default. Remember to have the MODRINTH_TOKEN environment variable set or else this will fail, or set it to whatever you want - just make sure it stays private!
+    projectId.set("mod-sets") // This can be the project ID or the slug. Either will work!
+    syncBodyFrom.set(rootProject.file("README.md").readText())
+    versionType.set("release") // This is the default -- can also be `beta` or `alpha`
+    uploadFile.set(rootProject.tasks.named("fabricIntermediaryJar")) // With Loom, this MUST be set to `remapJar` instead of `jar`!
+    changelog.set(
+        """
+        fix(common): calling save correctly with instant
+        """.trimIndent(),
+    )
+    gameVersions.addAll(
+        "1.19.4",
+        "1.20",
+        "1.20.1",
+    ) // Must be an array, even with only one version
+    loaders.add("fabric") // Must also be an array - no need to specify this if you're using Loom or ForgeGradle
+    loaders.add("quilt")
+    dependencies {
+        required.project("fabric-language-kotlin")
+        // https://modrinth.com/mod/yacl
+        required.project("yacl")
+        // https://modrinth.com/mod/kinecraft-serialization
+        embedded.version("kinecraft-serialization", "${libs.versions.kinecraft.serialization.get()}-fabric")
+        optional.project("modmenu")
+    }
+}
diff --git a/fabric/src/main/java/settingdust/modsets/fabric/FilteredDirectoryModCandidateFinder.java b/fabric/src/main/java/settingdust/modsets/fabric/FilteredDirectoryModCandidateFinder.java
@@ -1,4 +1,4 @@
-package settingdust.modsets;
+package settingdust.modsets.fabric;
 
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.impl.FabricLoaderImpl;
@@ -7,6 +7,8 @@
 import net.fabricmc.loader.impl.discovery.ModDiscoverer;
 import net.fabricmc.loader.impl.metadata.DependencyOverrides;
 import net.fabricmc.loader.impl.metadata.VersionOverrides;
+import settingdust.modsets.ConfigKt;
+import settingdust.modsets.ModSets;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/fabric/src/main/java/settingdust/modsets/fabric/ModContainerModCandidateFinder.java b/fabric/src/main/java/settingdust/modsets/fabric/ModContainerModCandidateFinder.java
@@ -1,8 +1,10 @@
-package settingdust.modsets;
+package settingdust.modsets.fabric;
 
 import net.fabricmc.loader.api.metadata.ModOrigin;
 import net.fabricmc.loader.impl.ModContainerImpl;
 import net.fabricmc.loader.impl.discovery.ClasspathModCandidateFinder;
+import settingdust.modsets.ConfigKt;
+import settingdust.modsets.ModSets;
 
 import java.util.List;
 
diff --git a/fabric/src/main/kotlin/settingdust/modsets/fabric/Entrypoint.kt b/fabric/src/main/kotlin/settingdust/modsets/fabric/Entrypoint.kt
@@ -1,5 +1,6 @@
 package settingdust.modsets.fabric
 
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -9,19 +10,22 @@ import net.fabricmc.loader.api.metadata.ModOrigin
 import net.fabricmc.loader.impl.FabricLoaderImpl
 import net.minecraft.client.resources.language.I18n
 import net.minecraft.network.chat.Component
-import settingdust.modsets.FilteredDirectoryModCandidateFinder
 import settingdust.modsets.ModSet
 import settingdust.modsets.ModSets
+import settingdust.modsets.Rules.ModSetsRegisterCallback
+import settingdust.modsets.config
 import settingdust.modsets.rules
 import kotlin.io.path.div
 
 object Entrypoint : ModInitializer {
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onInitialize() {
         val gameDir = FabricLoaderImpl.INSTANCE.gameDir
         val modsPath = FabricLoaderImpl.INSTANCE.modsDirectory.toPath()
+        val modSets = ModSets.rules.modSets
 
         GlobalScope.launch(Dispatchers.IO) {
-            ModSets.rules.ModSetsRegisterCallback.collect {
+            ModSetsRegisterCallback.collect {
                 for ((key, value) in FilteredDirectoryModCandidateFinder.directoryModSets
                     .mapValues {
                         ModSet(
@@ -30,17 +34,17 @@ object Entrypoint : ModInitializer {
                             it.value.toMutableSet(),
                         )
                     }) {
-                    if (key in ModSets.rules.modSets) ModSets.logger.warn("Duplicate mod set with directory name: $key")
-                    ModSets.rules.modSets.putIfAbsent(key, value)
+                    if (key in modSets) ModSets.logger.warn("Duplicate mod set with directory name: $key")
+                    modSets.putIfAbsent(key, value)
                 }
 
                 for (mod in FabricLoader.getInstance().allMods) {
                     if (mod.origin.kind.equals(ModOrigin.Kind.NESTED)) continue
                     val metadata = mod.metadata
                     if (metadata.type.equals("builtin")) continue
-                    if (metadata.id in ModSets.rules.modSets) ModSets.logger.warn("Duplicate mod set with mod id: ${metadata.id}")
+                    if (metadata.id in modSets) ModSets.logger.warn("Duplicate mod set with mod id: ${metadata.id}")
                     val nameKey = "modmenu.nameTranslation.${metadata.id}"
-                    ModSets.rules.modSets.putIfAbsent(
+                    modSets.putIfAbsent(
                         metadata.id,
                         ModSet(
                             if (try {
@@ -58,6 +62,25 @@ object Entrypoint : ModInitializer {
                         ),
                     )
                 }
+
+                ModSets.config.disabledMods.forEach {
+                    modSets.putIfAbsent(
+                        it, ModSet(
+                            if (try {
+                                    I18n.exists("modmenu.nameTranslation.$it")
+                                } catch (e: Exception) {
+                                    false
+                                }
+                            ) {
+                                Component.translatable("modmenu.nameTranslation.$it")
+                            } else {
+                                Component.literal(it)
+                            },
+                            Component.literal("$it@disabled"),
+                            mutableSetOf(it),
+                        )
+                    )
+                }
             }
         }
     }
diff --git a/fabric/src/main/kotlin/settingdust/modsets/fabric/ModSetsInjector.kt b/fabric/src/main/kotlin/settingdust/modsets/fabric/ModSetsInjector.kt
@@ -16,8 +16,6 @@ import net.fabricmc.loader.impl.metadata.VersionOverrides
 import net.fabricmc.loader.impl.util.SystemProperties
 import net.fabricmc.loader.impl.util.log.Log
 import net.fabricmc.loader.impl.util.log.LogCategory
-import settingdust.modsets.FilteredDirectoryModCandidateFinder
-import settingdust.modsets.ModContainerModCandidateFinder
 import settingdust.modsets.ModSets
 import settingdust.modsets.config
 import java.nio.file.Path
@@ -103,7 +101,9 @@ object ModSetsInjector {
 
     private fun discoverMods(): Collection<ModCandidate> {
         val discoverer = ModDiscoverer(VersionOverrides(), DependencyOverrides(loader.configDir))
-        addCandidateFinderFunction.call(discoverer, ModContainerModCandidateFinder(mods))
+        addCandidateFinderFunction.call(discoverer,
+            ModContainerModCandidateFinder(mods)
+        )
         val modsDir = loader.modsDirectory.toPath()
         modsDir
             .listDirectoryEntries()
diff --git a/gradle.properties b/gradle.properties
@@ -1,10 +1,10 @@
 kotlin.code.style=official
 kotlin.stdlib.default.dependency=false
 # Gradle Properties
-org.gradle.jvmargs=-Xmx2G
-org.gradle.parallel=true
+org.gradle.jvmargs=-Xmx4G
+#org.gradle.parallel=true
 # Mod Properties
-mod_version=1.1.2
+mod_version=1.2.0
 maven_group=settingdust.modsets
 archives_name=mod_sets
 mod_name=Mod Sets
diff --git a/quilt/src/main/kotlin/settingdust/modsets/quilt/Entrypoint.kt b/quilt/src/main/kotlin/settingdust/modsets/quilt/Entrypoint.kt
@@ -1,5 +1,6 @@
 package settingdust.modsets.quilt
 
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -13,10 +14,12 @@ import org.quiltmc.loader.impl.QuiltLoaderImpl
 import org.quiltmc.qsl.base.api.entrypoint.ModInitializer
 import settingdust.modsets.ModSet
 import settingdust.modsets.ModSets
+import settingdust.modsets.config
 import settingdust.modsets.rules
 import kotlin.io.path.name
 
 class Entrypoint : ModInitializer {
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onInitialize(container: ModContainer) {
         val modSets = ModSets.rules.modSets
         val modDir = QuiltLoaderImpl.INSTANCE.modsDir
@@ -29,10 +32,11 @@ class Entrypoint : ModInitializer {
                     // I can't find the real case of muleiple quilt source paths. So, just use the first
                     val paths = mod.sourcePaths.singleOrNull() ?: continue
                     // Quilt will be writing the path like [path in system, path in jar] etc.
-                    val pathInSystem = paths.first()
-                    if (pathInSystem.startsWith(modDir)) {
+                    val pathInSystem = paths.singleOrNull() ?: continue
+                    if (pathInSystem.startsWith(modDir) && modDir != pathInSystem.parent) {
                         val subDir = pathInSystem.parent.name
-                        if (subDir in modSets) ModSets.logger.warn("Duplicate mod set with directory name:  $subDir")
+                        ModSets.logger.debug("Add {} to {}", pathInSystem, subDir)
+                        if (subDir in modSets) ModSets.logger.warn("Duplicate mod set with directory name: $subDir")
                         modSets.getOrPut(subDir) {
                             ModSet(
                                 Component.literal(subDir),
@@ -44,6 +48,23 @@ class Entrypoint : ModInitializer {
                     if (metadata.id() in modSets) ModSets.logger.warn("Duplicate mod set with mod id: ${metadata.id()}")
                     modSets.putIfAbsent(metadata.id(), ModSet(metadata))
                 }
+
+                ModSets.config.disabledMods.forEach {
+                    modSets.putIfAbsent(it, ModSet(
+                        if (try {
+                                I18n.exists("modmenu.nameTranslation.$it")
+                            } catch (e: Exception) {
+                                false
+                            }
+                        ) {
+                            Component.translatable("modmenu.nameTranslation.$it")
+                        } else {
+                            Component.literal(it)
+                        },
+                        Component.literal("$it@disabled"),
+                        mutableSetOf(it),
+                    ))
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -45,3 +45,4 @@ bin/`
`45`	`45`	`*/run`
`46`	`46`
`47`	`47`	`.env`
	`48`	`+*.log`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package settingdust.modsets`
`2`	`2`
`3`		`-import com.mojang.logging.LogUtils`
	`3`	`+import org.slf4j.LoggerFactory`
`4`	`4`
`5`	`5`	`object ModSets {`
`6`		`- val logger by lazy { LogUtils.getLogger()!! }`
	`6`	`+ val logger by lazy { LoggerFactory.getLogger(javaClass)!! }`
`7`	`7`	`}`
`8`	`8`