Merge remote-tracking branch 'upstream/1.21.1' into 1.21.8

Author: cev-api

.github/workflows/gradle.yml

@@ -87,34 +87,57 @@ jobs:
         done
         echo "</details>" >> $GITHUB_STEP_SUMMARY
 
-    - 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: 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: Upload screenshots
+    - name: Upload screenshots.zip artifact
       uses: actions/upload-artifact@v5
       if: ${{ success() || failure() }}
       with:
         name: screenshots
-        path: build/run/*/screenshots
+        path: run/screenshots
         compression-level: 0
 
-    - name: Upload logs
-      uses: actions/upload-artifact@v5
-      if: ${{ success() || failure() }}
-      with:
-        name: logs
-        path: build/run/*/logs/latest.log
-
-    - name: Upload crash reports
+    - name: Upload crash-reports.zip artifact
       uses: actions/upload-artifact@v5
       if: ${{ failure() }}
       with:
         name: crash-reports
-        path: build/run/*/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

build.gradle

@@ -48,17 +48,6 @@ 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.
-	exclusiveContent {
-		forRepository {
-			maven {
-				name = "Modrinth"
-				url = "https://api.modrinth.com/maven"
-			}
-		}
-		filter {
-			includeGroup "maven.modrinth"
-		}
-	}
 }
 
 dependencies {
@@ -80,71 +69,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 {
-		clientWithMods {
-			inherit client
-		}
-
-		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 {
-	testMods {
-		transitive = false
+	productionRuntime {
+		extendsFrom configurations.minecraftLibraries
+		extendsFrom configurations.loaderLibraries
+		extendsFrom configurations.minecraftRuntimeLibraries
 	}
 }
 
 dependencies {
-	testMods "maven.modrinth:sodium:${project.sodium_version}"
+	productionRuntime "net.fabricmc:fabric-loader:${project.loader_version}"
+	productionRuntime "net.fabricmc:intermediary:${project.minecraft_version}"
 }
 
-def cleanClientWithMods = tasks.register("cleanClientWithMods", Delete) {
-	delete "run/mods"
-}
-
-def prepareClientWithMods = tasks.register("prepareClientWithMods", Sync) {
-	from configurations.testMods
-	into "run/mods"
-}
-
-tasks.named("runClientWithMods") {
-	dependsOn prepareClientWithMods
-	finalizedBy cleanClientWithMods
-}
-
-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")
-}
+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")
+		}
 
-def doModCompatTest = providers.gradleProperty("do_mod_compat_test").map { it.toBoolean() }.orElse(false)
-tasks.named("runClientGameTestWithMods") {
-	onlyIf { doModCompatTest.get() }
-	dependsOn prepareClientGameTestWithMods
+		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"
+		)
+	}
 }
 
 processResources {

gradle.properties

@@ -9,16 +9,16 @@ org.gradle.user.home=D:\\GradleCacheLocal
 # Fabric Properties
 # check these at https://fabricmc.net/develop/ and
 # https://modrinth.com/mod/fabric-api/versions
-minecraft_version=1.21.8
-yarn_mappings=1.21.8+build.1
+minecraft_version=1.21.1
+yarn_mappings=1.21.1+build.3
 loader_version=0.18.1
 loom_version=1.13-SNAPSHOT
 
 # Fabric API
-fabric_version=0.136.1+1.21.8
+fabric_version=0.116.7+1.21.1
 
 # Mod Properties
-mod_version=v7.51.2-CevAPI-MC1.21.8
+mod_version=v7.51.2-CevaPI-MC1.21.1
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric
@@ -28,6 +28,3 @@ gh_repo_id=cev-api/Wurst7-CevAPI
 mcx_repo_id=Wurst-Imperium/Wurst-MCX2
 
 # Dependencies
-# check at https://modrinth.com/mod/sodium/versions?l=fabric&g=1.21.8
-sodium_version=mc1.21.8-0.7.3-fabric
-do_mod_compat_test=true