Merge branch '1.21.11'

Author: Alexander01998

.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"

gradle.properties

@@ -1,30 +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.18.1
-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
-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.3-fabric
-do_mod_compat_test=true
+# 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.11
+yarn_mappings=25w46a+build.2
+loader_version=0.18.1
+loom_version=1.14-SNAPSHOT
+
+# Fabric API
+fabric_version=0.139.4+1.21.11
+
+# Mod Properties
+mod_version=v7.51.2-MC1.21.11
+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.11
+sodium_version=mc1.21.10-0.7.3-fabric
+do_mod_compat_test=false

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

@@ -25,8 +25,8 @@
 import net.fabricmc.fabric.api.client.gametest.v1.world.TestWorldBuilder;
 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;
@@ -48,7 +48,7 @@ public void runTest(ClientGameTestContext 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 +58,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 +79,12 @@ private void testInWorld(ClientGameTestContext context,
 		TestClientWorldContext world = spContext.getClientWorld();
 		TestServerContext server = spContext.getServer();
 
+		// Disable anisotropic filtering
+		context.runOnClient(mc -> mc.options.maxAnisotropyBit().set(0));
+		
+		// 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,7 @@ 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");
+			"https://i.imgur.com/Ee9ZANB.png");
 
 		// Exposed only + opacity
 		runWurstCommand(context, "setcheckbox X-Ray only_show_exposed on");
@@ -65,7 +65,7 @@ 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");
+			"https://i.imgur.com/hQOQRVG.png");
 
 		// Clean up
 		runCommand(server, "fill ~-5 ~-2 ~5 ~5 ~5 ~7 air");

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

@@ -51,7 +51,7 @@ public enum WurstClient
 	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 MC_VERSION = "1.21.11";
 
 	private PlausibleAnalytics plausible;
 	private EventManager eventManager;

src/main/java/net/wurstclient/WurstRenderLayers.java

@@ -7,96 +7,63 @@
  */
 package net.wurstclient;
 
-import java.util.OptionalDouble;
-
-import net.minecraft.client.renderer.RenderStateShard;
-import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.rendertype.LayeringTransform;
+import net.minecraft.client.renderer.rendertype.OutputTarget;
+import net.minecraft.client.renderer.rendertype.RenderSetup;
+import net.minecraft.client.renderer.rendertype.RenderType;
 
 public enum WurstRenderLayers
 {
 	;
 
 	/**
-	 * Similar to {@link RenderType#lines()}, but with line width 2.
+	 * Similar to {@link RenderType#getLines()}, but with line width 2.
 	 */
-	public static final RenderType.CompositeRenderType LINES = RenderType
-		.create("wurst:lines", 1536, WurstShaderPipelines.DEPTH_TEST_LINES,
-			RenderType.CompositeState.builder()
-				.setLineState(
-					new RenderStateShard.LineStateShard(OptionalDouble.of(2)))
-				.setLayeringState(RenderType.VIEW_OFFSET_Z_LAYERING)
-				.setOutputState(RenderType.ITEM_ENTITY_TARGET)
-				.createCompositeState(false));
+	public static final RenderType LINES = RenderType.create("wurst:lines",
+		RenderSetup.builder(WurstShaderPipelines.DEPTH_TEST_LINES)
+			.setLayeringTransform(LayeringTransform.VIEW_OFFSET_Z_LAYERING)
+			.setOutputTarget(OutputTarget.ITEM_ENTITY_TARGET)
+			.createRenderSetup());
 
 	/**
-	 * Similar to {@link RenderType#lines()}, but with line width 2 and no
+	 * Similar to {@link RenderType#getLines()}, but with line width 2 and no
 	 * depth test.
 	 */
-	public static final RenderType.CompositeRenderType ESP_LINES = RenderType
-		.create("wurst:esp_lines", 1536, WurstShaderPipelines.ESP_LINES,
-			RenderType.CompositeState.builder()
-				.setLineState(
-					new RenderStateShard.LineStateShard(OptionalDouble.of(2)))
-				.setLayeringState(RenderType.VIEW_OFFSET_Z_LAYERING)
-				.setOutputState(RenderType.ITEM_ENTITY_TARGET)
-				.createCompositeState(false));
-	
-	/**
-	 * Similar to {@link RenderType#lineStrip()}, but with line width 2.
-	 */
-	public static final RenderType.CompositeRenderType LINE_STRIP =
-		RenderType.create("wurst:line_strip", 1536, false, true,
-			WurstShaderPipelines.DEPTH_TEST_LINE_STRIP,
-			RenderType.CompositeState.builder()
-				.setLineState(
-					new RenderStateShard.LineStateShard(OptionalDouble.of(2)))
-				.setLayeringState(RenderType.VIEW_OFFSET_Z_LAYERING)
-				.setOutputState(RenderType.ITEM_ENTITY_TARGET)
-				.createCompositeState(false));
-	
-	/**
-	 * Similar to {@link RenderType#lineStrip()}, but with line width 2 and
-	 * no depth test.
-	 */
-	public static final RenderType.CompositeRenderType ESP_LINE_STRIP =
-		RenderType.create("wurst:esp_line_strip", 1536, false, true,
-			WurstShaderPipelines.ESP_LINE_STRIP,
-			RenderType.CompositeState.builder()
-				.setLineState(
-					new RenderStateShard.LineStateShard(OptionalDouble.of(2)))
-				.setLayeringState(RenderType.VIEW_OFFSET_Z_LAYERING)
-				.setOutputState(RenderType.ITEM_ENTITY_TARGET)
-				.createCompositeState(false));
+	public static final RenderType ESP_LINES =
+		RenderType.create("wurst:esp_lines",
+			RenderSetup.builder(WurstShaderPipelines.ESP_LINES)
+				.setLayeringTransform(LayeringTransform.VIEW_OFFSET_Z_LAYERING)
+				.setOutputTarget(OutputTarget.ITEM_ENTITY_TARGET)
+				.createRenderSetup());
 
 	/**
-	 * Similar to {@link RenderType#debugQuads()}, but with culling enabled.
+	 * Similar to {@link RenderType#getDebugQuads()}, but with culling enabled.
 	 */
-	public static final RenderType.CompositeRenderType QUADS = RenderType
-		.create("wurst:quads", 1536, false, true, WurstShaderPipelines.QUADS,
-			RenderType.CompositeState.builder().createCompositeState(false));
+	public static final RenderType QUADS = RenderType.create("wurst:quads",
+		RenderSetup.builder(WurstShaderPipelines.QUADS).sortOnUpload()
+			.createRenderSetup());
 
 	/**
-	 * Similar to {@link RenderType#debugQuads()}, but with culling enabled
+	 * Similar to {@link RenderType#getDebugQuads()}, but with culling enabled
 	 * and no depth test.
 	 */
-	public static final RenderType.CompositeRenderType ESP_QUADS =
-		RenderType.create("wurst:esp_quads", 1536, false, true,
-			WurstShaderPipelines.ESP_QUADS,
-			RenderType.CompositeState.builder().createCompositeState(false));
+	public static final RenderType ESP_QUADS = RenderType.create(
+		"wurst:esp_quads", RenderSetup.builder(WurstShaderPipelines.ESP_QUADS)
+			.sortOnUpload().createRenderSetup());
 
 	/**
-	 * Similar to {@link RenderType#debugQuads()}, but with no depth test.
+	 * Similar to {@link RenderType#getDebugQuads()}, but with no depth test.
 	 */
-	public static final RenderType.CompositeRenderType ESP_QUADS_NO_CULLING =
-		RenderType.create("wurst:esp_quads_no_culling", 1536, false, true,
-			WurstShaderPipelines.ESP_QUADS_NO_CULLING,
-			RenderType.CompositeState.builder().createCompositeState(false));
+	public static final RenderType ESP_QUADS_NO_CULLING =
+		RenderType.create("wurst:esp_quads_no_culling",
+			RenderSetup.builder(WurstShaderPipelines.ESP_QUADS_NO_CULLING)
+				.sortOnUpload().useLightmap().createRenderSetup());
 
 	/**
 	 * Returns either {@link #QUADS} or {@link #ESP_QUADS} depending on the
 	 * value of {@code depthTest}.
 	 */
-	public static RenderType.CompositeRenderType getQuads(boolean depthTest)
+	public static RenderType getQuads(boolean depthTest)
 	{
 		return depthTest ? QUADS : ESP_QUADS;
 	}
@@ -105,17 +72,8 @@ public static RenderType.CompositeRenderType getQuads(boolean depthTest)
 	 * Returns either {@link #LINES} or {@link #ESP_LINES} depending on the
 	 * value of {@code depthTest}.
 	 */
-	public static RenderType.CompositeRenderType getLines(boolean depthTest)
+	public static RenderType getLines(boolean depthTest)
 	{
 		return depthTest ? LINES : ESP_LINES;
 	}
-	
-	/**
-	 * Returns either {@link #LINE_STRIP} or {@link #ESP_LINE_STRIP} depending
-	 * on the value of {@code depthTest}.
-	 */
-	public static RenderType.CompositeRenderType getLineStrip(boolean depthTest)
-	{
-		return depthTest ? LINE_STRIP : ESP_LINE_STRIP;
-	}
 }