Merge remote-tracking branch 'upstream/master'

Author: cev-api

.github/workflows/auto_snapshot_update.yml

@@ -8,8 +8,8 @@ on:
         description: "Minecraft version to update to"
         required: true
       yarn_mappings:
-        description: "Yarn mappings version"
-        required: true
+        description: "Yarn mappings version (no longer used)"
+        required: false
       fabric_loader:
         description: "Fabric Loader version"
         required: true
@@ -41,41 +41,13 @@ jobs:
       with:
         python-version: "3.12"
 
-    - name: Set up Java 21
-      uses: actions/setup-java@v5
-      with:
-        java-version: "21"
-        distribution: "microsoft"
-
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v5
-      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: Migrate mappings
-      run: |
-        ./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.fabric_loader }}" \
           "${{ inputs.fapi_version }}"
 
-    # To fix any style issues that the migration scripts might cause
-    - name: Run spotlessApply task
-      run: ./gradlew spotlessApply
-
     - name: Commit and push changes
       run: |
         git config --global user.name "Wurst-Bot"

.github/workflows/multi_publish.yml

@@ -6,25 +6,22 @@ on:
     inputs:
       wurst_version:
         description: "Wurst version (without v or -MC)"
-        required: true
         type: string
+        required: true
       branches:
         description: "Space-separated list of branches to publish from"
-        required: true
         type: string
+        required: true
       announce_update:
         description: "Announce as an update on WurstForum"
-        required: true
         type: boolean
         default: false
       announce_ports:
         description: "Announce as ports on WurstForum"
-        required: true
         type: boolean
         default: false
       dry_run:
         description: "Dry-run mode (don't actually publish anything)"
-        required: false
         type: boolean
         default: false
 
@@ -47,6 +44,15 @@ jobs:
         JSON_ARRAY="[${quoted_branches%,}]"
         echo "branches=$JSON_ARRAY" >> "$GITHUB_OUTPUT"
         echo "Branches: $JSON_ARRAY" >> "$GITHUB_STEP_SUMMARY"
+    - name: Verify mod_version is as expected
+      run: |
+        expected_prefix="v${{ inputs.wurst_version }}-MC"
+        for branch in ${{ inputs.branches }}; do
+          url="https://raw.githubusercontent.com/${{ github.repository }}/${branch}/gradle.properties"
+          actual=$(curl -sf "$url" | grep "^mod_version=" | cut -d'=' -f2)
+          echo "$branch: $actual"
+          [[ "$actual" == "$expected_prefix"* ]] || { echo "::error::Expected $expected_prefix*, got $actual"; exit 1; }
+        done
 
   publish_each:
     runs-on: ubuntu-latest
@@ -62,14 +68,13 @@ jobs:
       fail-fast: true
       matrix:
         branch: ${{ fromJson(needs.prepare.outputs.branches) }}
-    # TODO: Maybe also verify that the wurst_version in each branch is as expected before publishing?
     steps:
     - name: Trigger publish workflow
       uses: Wurst-Imperium/dispatch-and-wait@v1
       with:
         token: ${{ github.token }}
-        owner: Wurst-Imperium
-        repo: Wurst7
+        owner: ${{ github.repository_owner }}
+        repo: ${{ github.event.repository.name }}
         ref: ${{ matrix.branch }}
         workflow: publish.yml
         workflow_inputs: |

.github/workflows/publish.yml

@@ -6,25 +6,22 @@ on:
     inputs:
       close_milestone:
         description: "Close milestone"
-        required: true
         type: boolean
         default: true
       upload_backups:
         description: "Upload to backups server"
-        required: true
         type: boolean
         default: true
       publish_github:
         description: "Publish to GitHub"
-        required: true
         type: boolean
         default: true
       update_website:
         description: "Update WurstClient.net post (only works if there already is one)"
-        required: true
         type: boolean
         default: false
       distinct_id:
+        type: string
         required: false
 
 permissions:
@@ -69,6 +66,7 @@ jobs:
       run: ./gradlew build --stacktrace --warning-mode=fail
 
     - name: Create and push tag
+      if: ${{ github.ref_type != 'tag' }}
       run: |
         MOD_VERSION=$(grep "^mod_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r')
         git config --global user.name "Wurst-Bot"

build.gradle

@@ -90,15 +90,20 @@ loom {
 	accessWidenerPath = file("src/main/resources/wurst.accesswidener")
 
 	runs {
+		clientGameTest {
+			vmArgs.add("-Dfabric.client.gametest.disableNetworkSynchronizer=true")
+		}
+		
 		clientWithMods {
 			inherit client
 		}
-
+		
 		clientGameTestWithMods {
 			inherit client
 			source = sourceSets.gametest
 			runDir = "build/run/clientGameTestWithMods"
 			vmArgs.add("-Dfabric.client.gametest")
+			vmArgs.add("-Dfabric.client.gametest.disableNetworkSynchronizer=true")
 			vmArgs.add("-Dwurst.test.withMods=true")
 			programArgs.add("--username=Wurst-Bot")
 		}

gradle.properties

@@ -6,25 +6,24 @@ 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.18.1
+minecraft_version=1.21.11
+yarn_mappings=1.21.11+build.2
+loader_version=0.18.2
 loom_version=1.14-SNAPSHOT
 
 # Fabric API
-fabric_version=0.138.3+1.21.10
+fabric_version=0.139.4+1.21.11
 
 # Mod Properties
-mod_version=v7.51.2-CevAPI-MC1.21.10
+mod_version=v7.51.3-CevAPI-MC1.21.11
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric
 
 # GitHub
 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.10
-sodium_version=mc1.21.10-0.7.3-fabric
+# check at https://modrinth.com/mod/sodium/versions?l=fabric&g=1.21.11
+sodium_version=mc1.21.11-0.8.0-fabric
 do_mod_compat_test=true

scripts/update_version_constants.py

@@ -56,7 +56,7 @@ def update_mc_version_constant(mc_version):
 			break
 
 	# Save modified WurstClient.java
-	with open("src/main/java/net/wurstclient/WurstClient.java", "w") as f:
+	with open("src/main/java/net/wurstclient/WurstClient.java", "w", newline='\r\n') as f:
 		f.writelines(lines)
 
 	if found:

src/gametest/java/net/wurstclient/gametest/WurstTest.java

@@ -23,10 +23,11 @@
 import net.fabricmc.fabric.api.client.gametest.v1.context.TestServerContext;
 import net.fabricmc.fabric.api.client.gametest.v1.context.TestSingleplayerContext;
 import net.fabricmc.fabric.api.client.gametest.v1.world.TestWorldBuilder;
+import net.fabricmc.fabric.impl.client.gametest.TestSystemProperties;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState;
-import net.minecraft.world.level.GameRules;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.gamerules.GameRules;
 import net.minecraft.world.level.levelgen.FlatLevelSource;
 import net.minecraft.world.level.levelgen.flat.FlatLayerInfo;
 import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
@@ -42,13 +43,16 @@ public class WurstTest implements FabricClientGameTest
 	@Override
 	public void runTest(ClientGameTestContext context)
 	{
+		if(!TestSystemProperties.DISABLE_NETWORK_SYNCHRONIZER)
+			throw new RuntimeException("Network synchronizer is not disabled");
+		
 		LOGGER.info("Starting Wurst Client GameTest");
 		hideSplashTexts(context);
 		waitForTitleScreenFade(context);
 
 		LOGGER.info("Reached title screen");
 		assertScreenshotEquals(context, "title_screen",
-			"https://i.imgur.com/4fSJRpd.png");
+			"https://i.imgur.com/xSAHDXr.png");
 
 		AltManagerTest.testAltManagerButton(context);
 
@@ -58,8 +62,8 @@ public void runTest(ClientGameTestContext context)
 			String mcVersion = SharedConstants.getCurrentVersion().name();
 			creator.setName("E2E Test " + mcVersion);
 			creator.setGameMode(WorldCreationUiState.SelectedGameMode.CREATIVE);
-			creator.getGameRules().getRule(GameRules.RULE_SENDCOMMANDFEEDBACK)
-				.set(false, null);
+			creator.getGameRules().set(GameRules.SEND_COMMAND_FEEDBACK, false,
+				null);
 			applyFlatPresetWithSmoothStone(creator);
 		});
 
@@ -79,6 +83,9 @@ private void testInWorld(ClientGameTestContext context,
 		TestClientWorldContext world = spContext.getClientWorld();
 		TestServerContext server = spContext.getServer();
 
+		// Disable chunk fade
+		context.runOnClient(mc -> mc.options.chunkSectionFadeInTime().set(0.0));
+		
 		runCommand(server, "time set noon");
 		runCommand(server, "tp 0 -57 0");
 		runCommand(server, "fill ~ ~-3 ~ ~ ~-1 ~ smooth_stone");

src/gametest/java/net/wurstclient/gametest/tests/XRayHackTest.java

@@ -56,7 +56,8 @@ public static void testXRayHack(ClientGameTestContext context,
 		input.pressKey(GLFW.GLFW_KEY_X);
 		waitForChunkReloading(context, world);
 		assertScreenshotEquals(context, "xray_opacity",
-			"https://i.imgur.com/0nLulJn.png");
+			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/hXdzoDB.png"
+				: "https://i.imgur.com/ERrL7ko.png");
 
 		// Exposed only + opacity
 		runWurstCommand(context, "setcheckbox X-Ray only_show_exposed on");
@@ -65,10 +66,11 @@ public static void testXRayHack(ClientGameTestContext context,
 		input.pressKey(GLFW.GLFW_KEY_X);
 		waitForChunkReloading(context, world);
 		assertScreenshotEquals(context, "xray_exposed_only_opacity",
-			"https://i.imgur.com/noPWDUl.png");
+			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/ZwIARSr.png"
+				: "https://i.imgur.com/mCnP6LG.png");
 
 		// Clean up
-		runCommand(server, "fill ~-5 ~-2 ~5 ~5 ~5 ~7 air");
+		runCommand(server, "fill ~-5 ~-2 ~4 ~5 ~5 ~7 air");
 		waitForBlock(context, 5, 5, 7, Blocks.AIR);
 		runWurstCommand(context, "setcheckbox X-Ray only_show_exposed off");
 		runWurstCommand(context, "setslider X-Ray opacity 0");
@@ -103,6 +105,10 @@ private static void buildTestRig(ClientGameTestContext context,
 		runCommand(server, "setblock ~1 ~0 ~6 minecraft:water");
 		runCommand(server, "setblock ~-1 ~0 ~6 minecraft:lava");
 
+		// Snow
+		runCommand(server, "fill ~-5 ~-1 ~4 ~5 ~-1 ~4 minecraft:stone");
+		runCommand(server, "fill ~-5 ~0 ~4 ~5 ~0 ~4 minecraft:snow");
+		
 		// Wait for blocks to appear
 		waitForBlock(context, -1, 0, 6, Blocks.LAVA);
 		waitForChunkReloading(context, world);

src/main/java/net/wurstclient/WurstClient.java

@@ -52,8 +52,8 @@ public enum WurstClient
 	public static Minecraft MC;
 	public static IMinecraftClient IMC;
 
-	public static final String VERSION = "7.51.2";
-	public static final String MC_VERSION = "1.21.10";
+	public static final String VERSION = "7.51.3";
+	public static final String MC_VERSION = "1.21.11";
 
 	private PlausibleAnalytics plausible;
 	private EventManager eventManager;