Merge master into 1.21.10

Author: Alexander01998

.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

@@ -68,15 +68,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

@@ -8,14 +8,14 @@ org.gradle.configuration-cache=true
 # https://modrinth.com/mod/fabric-api/versions
 minecraft_version=1.21.10
 yarn_mappings=1.21.10+build.2
-loader_version=0.18.1
+loader_version=0.18.2
 loom_version=1.14-SNAPSHOT
 
 # Fabric API
 fabric_version=0.138.3+1.21.10
 
 # Mod Properties
-mod_version=v7.51.2-MC1.21.10
+mod_version=v7.51.3-MC1.21.10
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric

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

@@ -23,6 +23,7 @@
 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;
@@ -42,6 +43,9 @@ 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);

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

@@ -50,7 +50,7 @@ public enum WurstClient
 	public static Minecraft MC;
 	public static IMinecraftClient IMC;
 
-	public static final String VERSION = "7.51.2";
+	public static final String VERSION = "7.51.3";
 	public static final String MC_VERSION = "1.21.10";
 
 	private PlausibleAnalytics plausible;