Merge branch 'multiversion/dev' into feature/splitscreen

# Conflicts:
#	buildSrc/build.gradle.kts
#	buildSrc/src/main/kotlin/dev/isxander/controlify/project.gradle.kts
#	settings.gradle.kts
#	src/main/java/dev/isxander/controlify/Controlify.java
#	src/main/resources/controlify-compat.iris.mixins.json
#	src/main/resources/controlify-compat.reeses-sodium-options.mixins.json
#	src/main/resources/controlify-compat.simple-voice-chat.mixins.json
#	src/main/resources/controlify-compat.sodium.mixins.json
#	src/main/resources/controlify-compat.yacl.mixins.json
#	src/main/resources/controlify-platform.fabric.mixins.json
#	src/main/resources/controlify-platform.neoforge.mixins.json
#	src/main/resources/controlify.mixins.json
#	stonecutter.gradle.kts

Author: isXander

.github/FUNDING.yml

@@ -1 +1 @@
-ko_fi: isxander
+patreon: isxander

.github/workflows/build.yml

@@ -47,14 +47,14 @@ jobs:
         with:
           java-version: 21
           distribution: temurin
-      - name: Setup gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          cache-read-only: false
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
       - name: Overwrite current version
         run: printf "%s" "${{ matrix.target }}" | cut -d':' -f1 | tr -d '\n' > ./versions/current
       - name: Build ${{ matrix.target }}
-        run: ./gradlew "Refresh active project" buildAndCollectActive --stacktrace
+        run: |
+          ./gradlew "Refresh active project"
+          ./gradlew buildAndCollectActive --stacktrace
         env:
           CI_SINGLE_BUILD: ${{ matrix.target }}
 

.github/workflows/update-gamecontrollerdb.yml

@@ -0,0 +1,37 @@
+name: Update gamecontrollerdb.txt
+
+on:
+  workflow_dispatch:
+
+  # Runs on a schedule (every Sunday at 3:00 AM UTC)
+  schedule:
+    - cron: '0 3 * * 0'
+
+jobs:
+  update-gamecontrollerdb:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write # Required to commit changes to the repository
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+
+      - name: Update gamecontrollerdb.txt
+        run: ./gradlew :downloadHidDb
+
+      - name: Commit and push changes
+        uses: stefanzweifel/git-auto-commit-action@v6
+        with:
+          file_pattern: '**/gamecontrollerdb-*.txt'
+          commit_message: "chore: update gamecontrollerdb.txt"

.run/Build (Active).run.xml

@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="chiseledBuildAndCollect" />
+          <option value="build" />
         </list>
       </option>
       <option name="vmOptions" />

.run/Build (All).run.xml

@@ -83,10 +83,8 @@ dependencies {
     }
 
     modstitchModApi("dev.isxander:yet-another-config-lib:${property("deps.yacl")}") {
-        // was including old fapi version that broke things at runtime
-        exclude(group = "net.fabricmc.fabric-api", module = "fabric-api")
         exclude(group = "thedarkcolour")
-    }.productionMod()
+    }.productionMod().jij()
 
     // bindings for SDL3
     modstitchApi("dev.isxander:libsdl4j:${property("deps.sdl3Target")}-${property("deps.sdl34jBuild")}")
@@ -132,30 +130,33 @@ j52j {
 
 /*
 START
-Set up the configuration to put natives in the jar
+Include native libraries for SDL3 in the jar.
  */
-class NativeTarget(
+data class NativeTarget(
     val classifier: String,
     val fileExtension: String,
     val jnaPrefix: String,
     val fileName: String,
-    configuration: String,
-) {
-    val configuration = configurations.create("offlineNative$configuration")
-}
+    val configurationName: String,
+)
+
 val nativeTargets = listOf(
-    NativeTarget(classifier = "linux-aarch64", fileExtension = "so", jnaPrefix = "linux-aarch64/", fileName = "libSDL3", configuration = "LinuxAarch64"),
-    NativeTarget(classifier = "linux-x86_64", fileExtension = "so", jnaPrefix = "linux-x86-64/", fileName = "libSDL3", configuration = "LinuxX86_64"),
-    NativeTarget(classifier = "macos-aarch64", fileExtension = "dylib", jnaPrefix = "darwin-aarch64/", fileName = "libSDL3", configuration = "MacArm"),
-    NativeTarget(classifier = "macos-x86_64", fileExtension = "dylib", jnaPrefix = "darwin-x86-64/", fileName = "libSDL3", configuration = "MacIntel"),
-    NativeTarget(classifier = "windows-x86_64", fileExtension = "dll", jnaPrefix = "win32-x86-64/", fileName = "SDL3", configuration = "WinX86_64"),
+    NativeTarget(classifier = "linux-aarch64", fileExtension = "so", jnaPrefix = "linux-aarch64/", fileName = "libSDL3", configurationName = "offlineNativeLinuxAarch64"),
+    NativeTarget(classifier = "linux-x86_64", fileExtension = "so", jnaPrefix = "linux-x86-64/", fileName = "libSDL3", configurationName = "offlineNativeLinuxX86_64"),
+    NativeTarget(classifier = "macos-aarch64", fileExtension = "dylib", jnaPrefix = "darwin-aarch64/", fileName = "libSDL3", configurationName = "offlineNativeMacArm"),
+    NativeTarget(classifier = "macos-x86_64", fileExtension = "dylib", jnaPrefix = "darwin-x86-64/", fileName = "libSDL3", configurationName = "offlineNativeMacIntel"),
+    NativeTarget(classifier = "windows-x86_64", fileExtension = "dll", jnaPrefix = "win32-x86-64/", fileName = "SDL3", configurationName = "offlineNativeWinX86_64"),
 )
 
+// Create configurations
+val nativeConfigurations = nativeTargets.associate { target ->
+    target.configurationName to configurations.create(target.configurationName)
+}
 val nativeHashConfiguration = configurations.create("nativeHashes")
 
 nativeTargets.forEach { target ->
     dependencies {
-        target.configuration("dev.isxander:libsdl4j-natives:${property("deps.sdl3Target")}:${target.classifier}@${target.fileExtension}")
+        nativeConfigurations[target.configurationName]!!("dev.isxander:libsdl4j-natives:${property("deps.sdl3Target")}:${target.classifier}@${target.fileExtension}")
         nativeHashConfiguration("dev.isxander:libsdl4j-natives:${property("deps.sdl3Target")}:${target.classifier}@${target.fileExtension}.md5")
     }
 }
@@ -166,12 +167,12 @@ val prepareNatives = tasks.register<Sync>("prepareNativeResources") {
     into(layout.buildDirectory.dir("generated-resources/sdl-natives"))
 
     nativeTargets.forEach { target ->
-        from(target.configuration) {
+        from(configurations.named(target.configurationName)) {
             into(target.jnaPrefix)
             rename { "${target.fileName}.${target.fileExtension}" }
         }
     }
-    from(nativeHashConfiguration) {
+    from(configurations.named("nativeHashes")) {
         into("sdl3-hashes/")
     }
 }
@@ -187,7 +188,7 @@ tasks.processResources {
 }
 /*
 END
-Set up the configuration to put native hashes in the jar
+Include native libraries for SDL3 in the jar.
  */
 
 
@@ -202,6 +203,12 @@ val releaseModVersion by tasks.registering {
 }
 createActiveTask(releaseModVersion)
 
+if (project.isPublishingEnabled) {
+    rootProject.tasks.named("releaseModVersions") {
+        dependsOn(releaseModVersion)
+    }
+}
+
 val finalJarTasks = listOf(
     modstitch.finalJarTask,
 )
@@ -237,7 +244,7 @@ publishMods {
     val stableMCVersions = versionList("pub.stableMC")
 
     val modrinthId: String by project
-    if (modrinthId.isNotBlank() && hasProperty("modrinth.token") && !isExperimentalBuild) {
+    if (modrinthId.isNotBlank() && hasProperty("modrinth.token")) {
         modrinth {
             projectId.set(modrinthId)
             accessToken.set(findProperty("modrinth.token")?.toString())
@@ -256,7 +263,7 @@ publishMods {
     }
 
     val curseforgeId: String by project
-    if (curseforgeId.isNotBlank() && hasProperty("curseforge.token") && !isExperimentalBuild) {
+    if (curseforgeId.isNotBlank() && hasProperty("curseforge.token")) {
         curseforge {
             projectId = curseforgeId
             projectSlug = findProperty("curseforgeSlug")!!.toString()

.run/Run Dev Client (Active).run.xml

@@ -4,26 +4,34 @@ plugins {
 }
 
 repositories {
-    mavenCentral()
-    gradlePluginPortal()
-    maven("https://maven.fabricmc.net")
-    maven("https://maven.neoforged.net/releases")
-    exclusiveContent {
-        forRepositories(
-            maven("https://maven.kikugie.dev/releases"),
-            maven("https://maven.kikugie.dev/snapshots")
-        )
-        filter {
-            includeGroupAndSubgroups("dev.kikugie")
+    fun strictMaven(url: String, action: Action<in InclusiveRepositoryContentDescriptor>) =
+        exclusiveContent {
+            forRepository { maven(url) }
+            filter(action)
         }
+
+    gradlePluginPortal()
+    mavenCentral()
+    strictMaven("https://maven.fabricmc.net") {
+        includeGroupAndSubgroups("net.fabricmc")
+        includeGroup("fabric-loom")
+    }
+    strictMaven("https://maven.neoforged.net/releases/") {
+        includeGroupAndSubgroups("net.neoforged")
+    }
+    strictMaven("https://maven.kikugie.dev/releases") {
+        includeGroupAndSubgroups("dev.kikugie")
+    }
+    strictMaven("https://quiltmc.org/repository/release") {
+        includeGroupAndSubgroups("org.quiltmc")
     }
 }
 
 dependencies {
     fun plugin(id: String, version: String) = "$id:$id.gradle.plugin:$version"
 
-    implementation(plugin("dev.isxander.modstitch.base", "0.6.2-unstable"))
-    implementation(plugin("dev.kikugie.stonecutter", "0.7.1"))
-    implementation(plugin("fabric-loom", "1.10.5"))
-    implementation(plugin("net.neoforged.moddev", "2.0.80"))
+    implementation(plugin("dev.isxander.modstitch.base", "0.7.0-unstable"))
+    implementation(plugin("dev.kikugie.stonecutter", "0.7.6"))
+    implementation(plugin("fabric-loom", "1.11.4"))
+    implementation(plugin("net.neoforged.moddev", "2.0.103"))
 }

.run/Run Prod Client (Active).run.xml

@@ -2,7 +2,10 @@ package dev.isxander.controlify
 
 import dev.isxander.modstitch.base.extensions.ModstitchExtension
 import dev.kikugie.stonecutter.build.StonecutterBuildExtension
+import org.gradle.api.Action
 import org.gradle.api.Project
+import org.gradle.api.artifacts.dsl.RepositoryHandler
+import org.gradle.api.artifacts.repositories.InclusiveRepositoryContentDescriptor
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.kotlin.dsl.*
 
@@ -19,8 +22,8 @@ val Project.modVersion: String
     get() = prop("modVersion")!!
 val Project.mcVersion: String
     get() = prop("mcVersion")!!
-val Project.isExperimentalBuild: Boolean
-    get() = "exp" in stonecutter.current.project
+val Project.isPublishingEnabled: Boolean
+    get() = prop("pub.enabled") { "true" }!!.toBooleanStrict()
 
 fun <T> Project.propMap(property: String, required: Boolean = false, ifNull: () -> String? = { null }, block: (String) -> T?): T? {
     return ((System.getenv(property) ?: branchProj.findProperty(property)?.toString())
@@ -64,4 +67,10 @@ fun Project.createActiveTask(
     return activeTaskName
 }
 
+fun RepositoryHandler.strictMaven(url: String, action: Action<in InclusiveRepositoryContentDescriptor>) =
+    exclusiveContent {
+        forRepository { maven(url) }
+        filter(action)
+    }
+