Merge branch 'master' into 1.21.10

Author: Alexander01998

.github/workflows/auto_snapshot_update.yml

@@ -61,15 +61,14 @@ jobs:
 
     - name: Migrate mappings
       run: |
-        ./gradlew migrateMappings --mappings ${{ inputs.yarn_mappings }} --overrideInputsIHaveABackup
-        ./gradlew migrateTestMappings --mappings ${{ inputs.yarn_mappings }} --overrideInputsIHaveABackup
-        ./gradlew migrateClassTweakerMappings --mappings ${{ inputs.yarn_mappings }} --overrideInputsIHaveABackup
+        ./gradlew migrateMappings --mappings "net.minecraft:mappings:${{ inputs.mc_version }}" --overrideInputsIHaveABackup
+        ./gradlew migrateGametestMappings --mappings "net.minecraft:mappings:${{ inputs.mc_version }}" --overrideInputsIHaveABackup
+        ./gradlew migrateClassTweakerMappings --mappings "net.minecraft:mappings:${{ inputs.mc_version }}" --overrideInputsIHaveABackup
 
     - name: Update version constants
       run: |
         python scripts/update_version_constants.py \
           "${{ inputs.mc_version }}" \
-          "${{ inputs.yarn_mappings }}" \
           "${{ inputs.fabric_loader }}" \
           "${{ inputs.fapi_version }}"
 

.github/workflows/gradle.yml

@@ -87,57 +87,34 @@ jobs:
         done
         echo "</details>" >> $GITHUB_STEP_SUMMARY
 
-    - name: Run the mod and take screenshots
-      # TODO: Migrate to Fabric Client Gametest API so this can run with configuration cache enabled
-      run: xvfb-run --auto-servernum ./gradlew runEndToEndTest --stacktrace --warning-mode=fail --no-configuration-cache
+    - name: Run client gametests
+      env:
+        IMGUR_CLIENT_ID: ${{ secrets.IMGUR_CLIENT_ID }}
+      run: xvfb-run --auto-servernum ./gradlew runClientGameTest --stacktrace --warning-mode=fail
+
+    - name: Run client gametests with mods
+      env:
+        IMGUR_CLIENT_ID: ${{ secrets.IMGUR_CLIENT_ID }}
+      run: xvfb-run --auto-servernum ./gradlew runClientGameTestWithMods --stacktrace --warning-mode=fail
 
-    - name: Upload screenshots.zip artifact
+    - name: Upload screenshots
       uses: actions/upload-artifact@v5
       if: ${{ success() || failure() }}
       with:
         name: screenshots
-        path: run/screenshots
+        path: build/run/*/screenshots
         compression-level: 0
 
-    - name: Upload crash-reports.zip artifact
+    - name: Upload logs
+      uses: actions/upload-artifact@v5
+      if: ${{ success() || failure() }}
+      with:
+        name: logs
+        path: build/run/*/logs/latest.log
+
+    - name: Upload crash reports
       uses: actions/upload-artifact@v5
       if: ${{ failure() }}
       with:
         name: crash-reports
-        path: run/crash-reports
-
-    - name: Create test screenshot gallery
-      env:
-        IMGUR_CLIENT_ID: ${{ secrets.IMGUR_CLIENT_ID }}
-      if: ${{ env.IMGUR_CLIENT_ID && (success() || failure()) }}
-      # Imgur uploads randomly fail sometimes, probably because of the low rate limit.
-      # TODO: Find a better place to upload the screenshots.
-      continue-on-error: true
-      run: |
-        echo "<details open>" >> $GITHUB_STEP_SUMMARY
-        echo "<summary>📸 Test Screenshots</summary>" >> $GITHUB_STEP_SUMMARY
-        echo "" >> $GITHUB_STEP_SUMMARY
-        for img in run/screenshots/*.png; do
-          if [ -f "$img" ]; then
-            filename=$(basename "$img")
-            name_without_ext="${filename%.*}"
-            # Upload to Imgur
-            response=$(curl -s -X POST \
-              -H "Authorization: Client-ID $IMGUR_CLIENT_ID" \
-              -F "image=@$img" \
-              https://api.imgur.com/3/image)
-            # Extract the URL from the response
-            url=$(echo $response | grep -o '"link":"[^"]*"' | cut -d'"' -f4)
-            if [ ! -z "$url" ]; then
-              # Convert underscores to spaces and capitalize first letter of each word
-              title=$(echo "$name_without_ext" | tr '_' ' ' | awk '{for(i=1;i<=NF;i++)sub(/./,toupper(substr($i,1,1)),$i)}1')
-              echo "### $title" >> $GITHUB_STEP_SUMMARY
-              echo "![${name_without_ext}]($url)" >> $GITHUB_STEP_SUMMARY
-              echo "" >> $GITHUB_STEP_SUMMARY
-            else
-              echo "Failed to upload $filename" >> $GITHUB_STEP_SUMMARY
-              echo "Imgur upload response for $filename: $response"
-            fi
-          fi
-        done
-        echo "</details>" >> $GITHUB_STEP_SUMMARY
+        path: build/run/*/crash-reports

build.gradle

@@ -2,13 +2,6 @@ buildscript {
 	dependencies {
 		classpath "org.kohsuke:github-api:1.330"
 	}
-	
-	configurations.classpath {
-		resolutionStrategy {
-			// v28.0-jre, used by fabric-loom 1.13.3, is vulnerable to CVE-2020-8908 and CVE-2023-2976
-			force "com.google.guava:guava:32.0.1-jre"
-		}
-	}
 }
 
 plugins {
@@ -31,30 +24,23 @@ repositories {
 	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
 	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
 	// for more information about repositories.
-}
-
-// Override vulnerable dependencies until Minecraft updates to newer versions
-configurations.all {
-	resolutionStrategy {
-		// v2.5.1, used by Minecraft 1.21.4 - 1.21.10, is vulnerable to CVE-2024-57699
-		force "net.minidev:json-smart:2.5.2"
-		// v2.13.4, used by Minecraft 1.21.4 - 1.21.10, is vulnerable to CVE-2025-52999
-		force "com.fasterxml.jackson.core:jackson-core:2.15.0"
-		// v3.17.0, used by Minecraft 1.21.4 - 1.21.10, is vulnerable to CVE-2025-48924
-		force "org.apache.commons:commons-lang3:3.18.0"
-		// v9.40, used by Minecraft 1.21.4 - 1.21.10, is vulnerable to CVE-2025-53864
-		force "com.nimbusds:nimbus-jose-jwt:10.0.2"
-		// v4.1.118.Final, used by Minecraft 1.21.5 - 1.21.10, is vulnerable to CVE-2025-58057
-		force "io.netty:netty-codec:4.1.125.Final"
-		// v4.1.118.Final, used by Minecraft 1.21.5 - 1.21.10, is vulnerable to CVE-2025-58056
-		force "io.netty:netty-codec-http:4.1.125.Final"
+	exclusiveContent {
+		forRepository {
+			maven {
+				name = "Modrinth"
+				url = "https://api.modrinth.com/maven"
+			}
+		}
+		filter {
+			includeGroup "maven.modrinth"
+		}
 	}
 }
 
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	mappings loom.officialMojangMappings()
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 	testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
 
@@ -70,53 +56,53 @@ dependencies {
 	modImplementation "com.google.code.findbugs:jsr305:3.0.2"
 }
 
+fabricApi.configureTests {
+	createSourceSet = true
+	enableGameTests = false
+	enableClientGameTests = true
+	modId = "wurst_testmod"
+	username = "Wurst-Bot"
+}
+
 loom {
 	accessWidenerPath = file("src/main/resources/wurst.accesswidener")
+	
+	runs {
+		clientGameTestWithMods {
+			inherit client
+			source = sourceSets.gametest
+			runDir = "build/run/clientGameTestWithMods"
+			vmArgs.add("-Dfabric.client.gametest")
+			vmArgs.add("-Dwurst.test.withMods=true")
+			programArgs.add("--username=Wurst-Bot")
+		}
+	}
 }
 
 configurations {
-	productionRuntime {
-		extendsFrom configurations.minecraftLibraries
-		extendsFrom configurations.loaderLibraries
-		extendsFrom configurations.minecraftRuntimeLibraries
+	testMods {
+		transitive = false
 	}
 }
 
 dependencies {
-	productionRuntime "net.fabricmc:fabric-loader:${project.loader_version}"
-	productionRuntime "net.fabricmc:intermediary:${project.minecraft_version}"
+	testMods "maven.modrinth:sodium:${project.sodium_version}"
 }
 
-import net.fabricmc.loom.util.Platform
-tasks.register('runEndToEndTest', JavaExec) {
-	dependsOn remapJar, downloadAssets
-	classpath.from configurations.productionRuntime
-	mainClass = "net.fabricmc.loader.impl.launch.knot.KnotClient"
-	workingDir = file("run")
-	
-	doFirst {
-		classpath.from loom.minecraftProvider.minecraftClientJar
-		workingDir.mkdirs()
-		
-		args(
-			"--assetIndex", loom.minecraftProvider.versionInfo.assetIndex().fabricId(loom.minecraftProvider.minecraftVersion()),
-			"--assetsDir", new File(loom.files.userCache, "assets").absolutePath,
-			"--gameDir", workingDir.absolutePath
-		)
-		
-		if (Platform.CURRENT.operatingSystem.isMacOS()) {
-			jvmArgs("-XstartOnFirstThread")
-		}
-		
-		jvmArgs(
-			"-Dfabric.addMods=${configurations.modImplementation.find { it.name.contains('fabric-api') }.absolutePath}${File.pathSeparator}${remapJar.archiveFile.get().asFile.absolutePath}",
-			"-Dwurst.e2eTest",
-			"-Dfabric-tag-conventions-v2.missingTagTranslationWarning=fail",
-			"-Dfabric-tag-conventions-v1.legacyTagWarning=fail",
-			"-Dmixin.debug.verify=true",
-			"-Dmixin.debug.countInjections=true"
-		)
-	}
+def cleanClientGameTestWithMods = tasks.register("cleanClientGameTestWithMods", Delete) {
+	delete layout.buildDirectory.dir("run/clientGameTestWithMods")
+}
+
+def prepareClientGameTestWithMods = tasks.register("prepareClientGameTestWithMods", Sync) {
+	dependsOn cleanClientGameTestWithMods
+	from configurations.testMods
+	into layout.buildDirectory.dir("run/clientGameTestWithMods/mods")
+}
+
+def doModCompatTest = providers.gradleProperty("do_mod_compat_test").map { it.toBoolean() }.orElse(false)
+tasks.named("runClientGameTestWithMods") {
+	onlyIf { doModCompatTest.get() }
+	dependsOn prepareClientGameTestWithMods
 }
 
 processResources {
@@ -164,13 +150,13 @@ spotless {
 		eclipse().configFile(file("codestyle/formatter.xml"))
 	}
 	format("licenseHeader") {
-		target("src/*/java/**/*.java", "src/test/java/**/*.java")
+		target("src/*/java/**/*.java")
 		def header_file = file("codestyle/license_header.txt")
 		def delimiter = LicenseHeaderStep.DEFAULT_JAVA_HEADER_DELIMITER
 		licenseHeaderFile(header_file, delimiter).updateYearWithLatest(true)
 	}
 	json {
-		target "src/**/*.json"
+		target("src/**/*.json", "src/**/*.mcmeta")
 		gson().indentWithSpaces(2).version("2.11.0")
 	}
 }

gradle.properties

@@ -1,27 +1,30 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx2G
-org.gradle.parallel=true
-org.gradle.configuration-cache=true
-
-# Fabric Properties
-# check these at https://fabricmc.net/develop/ and
-# https://modrinth.com/mod/fabric-api/versions
-minecraft_version=1.21.10
-yarn_mappings=1.21.10+build.2
-loader_version=0.17.3
-loom_version=1.13-SNAPSHOT
-
-# Fabric API
-fabric_version=0.138.0+1.21.10
-
-# Mod Properties
-mod_version=v7.51-MC1.21.10
-maven_group=net.wurstclient
-archives_base_name=Wurst-Client
-mod_loader=Fabric
-
-# GitHub
-gh_repo_id=Wurst-Imperium/Wurst7
-mcx_repo_id=Wurst-Imperium/Wurst-MCX2
-
-# Dependencies
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx2G
+org.gradle.parallel=true
+org.gradle.configuration-cache=true
+
+# Fabric Properties
+# check these at https://fabricmc.net/develop/ and
+# https://modrinth.com/mod/fabric-api/versions
+minecraft_version=1.21.10
+yarn_mappings=1.21.10+build.2
+loader_version=0.17.3
+loom_version=1.13-SNAPSHOT
+
+# Fabric API
+fabric_version=0.138.3+1.21.10
+
+# Mod Properties
+mod_version=v7.51.1-MC1.21.10
+maven_group=net.wurstclient
+archives_base_name=Wurst-Client
+mod_loader=Fabric
+
+# GitHub
+gh_repo_id=Wurst-Imperium/Wurst7
+mcx_repo_id=Wurst-Imperium/Wurst-MCX2
+
+# Dependencies
+# check at https://modrinth.com/mod/sodium/versions?l=fabric&g=1.21.10
+sodium_version=mc1.21.10-0.7.2-fabric
+do_mod_compat_test=true

scripts/update_version_constants.py

@@ -2,7 +2,7 @@
 import re
 
 
-def update_gradle_properties(mc_version, yarn_mappings, fabric_loader, fapi_version):
+def update_gradle_properties(mc_version, fabric_loader, fapi_version):
 	print("Updating gradle.properties...")
 
 	# Read gradle.properties
@@ -12,7 +12,6 @@ def update_gradle_properties(mc_version, yarn_mappings, fabric_loader, fapi_vers
 	# Define replacements
 	replacements = {
 		"minecraft_version": lambda v: mc_version,
-		"yarn_mappings": lambda v: yarn_mappings,
 		"loader_version": lambda v: fabric_loader,
 		"fabric_version": lambda v: fapi_version,
 		"mod_version": lambda v: v[: v.index("MC") + 2] + mc_version,
@@ -70,14 +69,12 @@ def update_mc_version_constant(mc_version):
 if __name__ == "__main__":
 	parser = argparse.ArgumentParser()
 	parser.add_argument("mc_version", help="Minecraft version")
-	parser.add_argument("yarn_mappings", help="Yarn mappings version")
 	parser.add_argument("fabric_loader", help="Fabric Loader version")
 	parser.add_argument("fapi_version", help="Fabric API version")
 	args = parser.parse_args()
 
 	update_gradle_properties(
 		args.mc_version,
-		args.yarn_mappings,
 		args.fabric_loader,
 		args.fapi_version,
 	)