Merge v7.50.2 into 1.21.9

Alexander01998 · Alexander01998 · commit b4eb9abbeda7 · 2025-09-29T21:19:38.000+02:00
diff --git a/.github/workflows/auto_snapshot_update.yml b/.github/workflows/auto_snapshot_update.yml
@@ -56,6 +56,8 @@ jobs:
         build-scan-publish: true
         build-scan-terms-of-use-url: "https://gradle.com/help/legal-terms-of-use"
         build-scan-terms-of-use-agree: "yes"
+        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+        cache-read-only: ${{ github.ref != 'refs/heads/master' && !startsWith(github.ref, 'refs/heads/1.') }}
 
     - name: Migrate mappings for main source set
       run: |
diff --git a/.github/workflows/dependency_graph.yml b/.github/workflows/dependency_graph.yml
@@ -39,3 +39,4 @@ jobs:
         build-scan-publish: true
         build-scan-terms-of-use-url: "https://gradle.com/help/legal-terms-of-use"
         build-scan-terms-of-use-agree: "yes"
+        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -29,9 +29,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    env:
-      VIRUSTOTAL_API_KEY: ${{ secrets.VIRUSTOTAL_API_KEY }}
-      IMGUR_CLIENT_ID: ${{ secrets.IMGUR_CLIENT_ID }}
     steps:
 
     - name: Echo distinct ID ${{ inputs.distinct_id }}
@@ -55,30 +52,16 @@ jobs:
         build-scan-publish: true
         build-scan-terms-of-use-url: "https://gradle.com/help/legal-terms-of-use"
         build-scan-terms-of-use-agree: "yes"
-
-    - name: Compile Java code
-      run: ./gradlew remapJar --stacktrace --warning-mode=fail
-
-    - name: Validate JSON files
-      run: ./gradlew spotlessJsonCheck || (echo "::error::JSON validation failed! Run './gradlew spotlessApply' to fix style issues, or check the full error message for syntax errors." && exit 1)
-
-    - name: Validate Java code style
-      run: ./gradlew spotlessJavaCheck || (echo "::error::Java code style validation failed! To fix, run 'Clean Up' and then 'Format' in Eclipse, or './gradlew spotlessApply' in the terminal." && exit 1)
-
-    - name: Validate license headers
-      run: ./gradlew spotlessLicenseHeaderCheck || (echo "::error::License headers are missing or malformed in some files! Run './gradlew spotlessApply' to fix this, or check the full error message for details." && exit 1)
-
-    - name: Run unit tests
-      run: ./gradlew test --stacktrace --warning-mode=fail
-
-    - name: Validate access widener
-      run: ./gradlew validateAccessWidener --stacktrace --warning-mode=fail
+        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+        cache-read-only: ${{ github.ref != 'refs/heads/master' && !startsWith(github.ref, 'refs/heads/1.') }}
 
     - name: Build
       run: ./gradlew build --stacktrace --warning-mode=fail
 
     - name: Upload to VirusTotal for analysis
       id: virustotal
+      env:
+        VIRUSTOTAL_API_KEY: ${{ secrets.VIRUSTOTAL_API_KEY }}
       if: ${{ env.VIRUSTOTAL_API_KEY }}
       uses: crazy-max/ghaction-virustotal@v4
       with:
@@ -90,7 +73,7 @@ jobs:
       continue-on-error: true
 
     - name: Add VirusTotal links to build summary
-      if: ${{ env.VIRUSTOTAL_API_KEY && steps.virustotal.outputs.analysis }}
+      if: ${{ steps.virustotal.outputs.analysis }}
       run: |
         echo "<details open>" >> $GITHUB_STEP_SUMMARY
         echo "<summary>🛡️ VirusTotal Scans</summary>" >> $GITHUB_STEP_SUMMARY
@@ -105,20 +88,27 @@ jobs:
         echo "</details>" >> $GITHUB_STEP_SUMMARY
 
     - name: Run the mod and take screenshots
-      uses: GabrielBB/xvfb-action@v1.7
-      with:
-        run: ./gradlew runEndToEndTest --stacktrace --warning-mode=fail
+      # 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
 
-    # Needed because the screenshot gallery won't be created on pull requests.
-    # Also useful if Imgur uploads fail.
-    - name: Upload Test Screenshots.zip artifact
+    - name: Upload screenshots.zip artifact
       uses: actions/upload-artifact@v4
-      if: always()
+      if: ${{ success() || failure() }}
       with:
-        name: Test Screenshots
+        name: screenshots
         path: run/screenshots
+        compression-level: 0
+
+    - name: Upload crash-reports.zip artifact
+      uses: actions/upload-artifact@v4
+      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.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -36,9 +36,6 @@ permissions:
 jobs:
   publish:
     runs-on: ubuntu-latest
-    env:
-      WI_BACKUPS_API_KEY: ${{ secrets.WI_BACKUPS_API_KEY }}
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
 
     - name: Echo distinct ID ${{ inputs.distinct_id }}
@@ -61,6 +58,12 @@ jobs:
 
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v4
+      with:
+        build-scan-publish: true
+        build-scan-terms-of-use-url: "https://gradle.com/help/legal-terms-of-use"
+        build-scan-terms-of-use-agree: "yes"
+        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+        cache-read-only: ${{ github.ref != 'refs/heads/master' && !startsWith(github.ref, 'refs/heads/1.') }}
 
     - name: Build
       run: ./gradlew build --stacktrace --warning-mode=fail
@@ -75,10 +78,14 @@ jobs:
 
     - name: Close milestone
       if: ${{ inputs.close_milestone }}
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
       run: ./gradlew closeMilestone --stacktrace
 
     - name: Upload backups
       if: ${{ inputs.upload_backups }}
+      env:
+        WI_BACKUPS_API_KEY: ${{ secrets.WI_BACKUPS_API_KEY }}
       run: ./gradlew uploadBackups --stacktrace
 
     - name: Publish to GitHub
@@ -91,9 +98,9 @@ jobs:
       id: website_inputs
       if: ${{ inputs.update_website }}
       run: |
-        echo "wurst_version=$(grep "^mod_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r' | sed 's/^v//' | sed 's/-MC.*$//')" >> "$GITHUB_OUTPUT"
-        echo "mc_version=$(grep "^minecraft_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r')" >> "$GITHUB_OUTPUT"
-        echo "fapi_version=$(grep "^fabric_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r')" >> "$GITHUB_OUTPUT"
+        echo "wurst_version=$(grep '^mod_version=' gradle.properties | cut -d'=' -f2 | tr -d ' \r' | sed 's/^v//' | sed 's/-MC.*$//')" >> "$GITHUB_OUTPUT"
+        echo "mc_version=$(grep '^minecraft_version=' gradle.properties | cut -d'=' -f2 | tr -d ' \r')" >> "$GITHUB_OUTPUT"
+        echo "fapi_version=$(grep '^fabric_version=' gradle.properties | cut -d'=' -f2 | tr -d ' \r')" >> "$GITHUB_OUTPUT"
 
     - name: Trigger website update
       if: ${{ inputs.update_website }}
diff --git a/README.md b/README.md
@@ -82,9 +82,14 @@ I don't use or recommend IntelliJ, but the commands to run would be:
 ```pwsh
 git clone https://github.com/Wurst-Imperium/Wurst7.git
 cd Wurst7
-./gradlew genSources idea
+./gradlew genSources idea --no-configuration-cache
 ```
 
+**Note:** IntelliJ IDEA is [not yet compatible](https://github.com/FabricMC/fabric-loom/issues/1349) with Gradle's configuration cache. You will run into issues.
+
+Possible workarounds:
+- Turn off args files ([this setting](https://i.imgur.com/zHqIOYg.png)). Won't work for some users because of a command length limit.
+- Add `--no-configuration-cache` to all of your Gradle commands.
 
 ## Contributing
 
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
 plugins {
 	id "fabric-loom" version "${loom_version}"
-	id "com.diffplug.spotless" version "7.2.1"
+	id "com.diffplug.spotless" version "8.0.0"
 }
 
 def ENV = System.getenv()
@@ -59,8 +59,8 @@ dependencies {
 	// In other words, Wurst won't compile without this library,
 	// even though it's Minecraft that actually uses it.
 	modImplementation "com.google.code.findbugs:jsr305:3.0.2"
-}
-
+	}
+	
 loom {
 	accessWidenerPath = file("src/main/resources/wurst.accesswidener")
 }
@@ -111,10 +111,11 @@ tasks.register('runEndToEndTest', JavaExec) {
 }
 
 processResources {
-	inputs.property "version", project.version.substring(1)
+	def modVersion = project.version.substring(1)
+	inputs.property("version", modVersion)
 	
 	filesMatching("fabric.mod.json") {
-		expand "version": inputs.properties.version
+		expand(version: modVersion)
 	}
 }
 
@@ -134,10 +135,11 @@ java {
 }
 
 jar {
-	inputs.property "archivesName", project.base.archivesName
+	def archivesName = project.base.archivesName
+	inputs.property("archivesName", archivesName)
 	
 	from("LICENSE.txt") {
-		rename { "LICENSE-${inputs.properties.archivesName}.txt" }
+		rename { "LICENSE-${archivesName}.txt" }
 	}
 	
 	exclude("intentionally_untranslated.json")
diff --git a/gradle.properties b/gradle.properties
@@ -1,20 +1,21 @@
 # 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.9-rc1
-yarn_mappings=1.21.9-rc1+build.1
+yarn_mappings=1.21.9-rc1+build.2
 loader_version=0.17.2
 loom_version=1.11-SNAPSHOT
 
 # Fabric API
-fabric_version=0.133.11+1.21.9
+fabric_version=0.133.14+1.21.9
 
 # Mod Properties
-mod_version=v7.50.1-MC1.21.9-rc1
+mod_version=v7.50.2-MC1.21.9-rc1
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
diff --git a/gradlew.bat b/gradlew.bat
@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java
@@ -50,7 +50,7 @@ public enum WurstClient
 	public static MinecraftClient MC;
 	public static IMinecraftClient IMC;
 	
-	public static final String VERSION = "7.50.1";
+	public static final String VERSION = "7.50.2";
 	public static final String MC_VERSION = "1.21.9-rc1";
 	
 	private PlausibleAnalytics plausible;
diff --git a/src/main/java/net/wurstclient/altmanager/MicrosoftLoginManager.java b/src/main/java/net/wurstclient/altmanager/MicrosoftLoginManager.java
@@ -75,15 +75,15 @@ public enum MicrosoftLoginManager
 		createURL("https://api.minecraftservices.com/minecraft/profile");
 	
 	/**
-	 * Expected data: <code>sFTTag: '&lt;input type="hidden" name="PPFT"
-	 * id="12345" value="random stuff"/&gt;'</code>
+	 * Expected data: <code>"sFTTag": "&lt;input type=\"hidden\" name=\"PPFT\"
+	 * id=\"12345\" value=\"random stuff\"/&gt;"</code>
 	 *
 	 * <p>
 	 * This is all inside a long &lt;script&gt; tag on the {@link #LOGIN_URL}
 	 * webpage.
 	 */
 	private static final Pattern PPFT_REGEX =
-		Pattern.compile("sFTTag:[ ]?'.*value=\"(.*)\"/>");
+		Pattern.compile("\"sFTTag\":\".*value=\\\\\"([^\\\\]+)\\\\\"/>");
 	
 	/**
 	 * Expected data: <code>urlPost: 'https://login.live.com/...'</code>
@@ -92,10 +92,10 @@ public enum MicrosoftLoginManager
 	 * This appears earlier in the same &lt;script&gt; tag.
 	 */
 	private static final Pattern URLPOST_REGEX =
-		Pattern.compile("urlPost:[ ]?'(.+?(?='))");
+		Pattern.compile("\"urlPost\":\"([^\"]+)");
 	
 	private static final Pattern AUTHCODE_REGEX =
-		Pattern.compile("[?|&]code=([\\w.-]+)");
+		Pattern.compile("[?&]code=([\\w\\.-]+)");
 	
 	public static void login(String email, String password)
 		throws LoginException

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`
`7`	`7`	`plugins {`
`8`	`8`	`id "fabric-loom" version "${loom_version}"`
`9`		`- id "com.diffplug.spotless" version "7.2.1"`
	`9`	`+ id "com.diffplug.spotless" version "8.0.0"`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`def ENV = System.getenv()`
`@@ -59,8 +59,8 @@ dependencies {`
`59`	`59`	`// In other words, Wurst won't compile without this library,`
`60`	`60`	`// even though it's Minecraft that actually uses it.`
`61`	`61`	`modImplementation "com.google.code.findbugs:jsr305:3.0.2"`
`62`		`-}`
`63`		`-`
	`62`	`+ }`
	`63`	`+`
`64`	`64`	`loom {`
`65`	`65`	`accessWidenerPath = file("src/main/resources/wurst.accesswidener")`
`66`	`66`	`}`
`@@ -111,10 +111,11 @@ tasks.register('runEndToEndTest', JavaExec) {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`processResources {`
`114`		`- inputs.property "version", project.version.substring(1)`
	`114`	`+ def modVersion = project.version.substring(1)`
	`115`	`+ inputs.property("version", modVersion)`
`115`	`116`
`116`	`117`	`filesMatching("fabric.mod.json") {`
`117`		`- expand "version": inputs.properties.version`
	`118`	`+ expand(version: modVersion)`
`118`	`119`	`}`
`119`	`120`	`}`
`120`	`121`
`@@ -134,10 +135,11 @@ java {`
`134`	`135`	`}`
`135`	`136`
`136`	`137`	`jar {`
`137`		`- inputs.property "archivesName", project.base.archivesName`
	`138`	`+ def archivesName = project.base.archivesName`
	`139`	`+ inputs.property("archivesName", archivesName)`
`138`	`140`
`139`	`141`	`from("LICENSE.txt") {`
`140`		`- rename { "LICENSE-${inputs.properties.archivesName}.txt" }`
	`142`	`+ rename { "LICENSE-${archivesName}.txt" }`
`141`	`143`	`}`
`142`	`144`
`143`	`145`	`exclude("intentionally_untranslated.json")`