Merge branch '1.21.8' into 1.21.4

Author: Alexander01998

.github/workflows/publish.yml

@@ -82,26 +82,29 @@ jobs:
         GITHUB_TOKEN: ${{ github.token }}
       run: ./gradlew closeMilestone --stacktrace --no-configuration-cache
 
+    - name: Build website update inputs
+      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"
+
     - name: Upload backups
       if: ${{ inputs.upload_backups }}
-      env:
-        WI_BACKUPS_API_KEY: ${{ secrets.WI_BACKUPS_API_KEY }}
-      run: ./gradlew uploadBackups --stacktrace --no-configuration-cache
+      uses: Wurst-Imperium/upload-backups@v1
+      with:
+        api_key: ${{ secrets.WI_BACKUPS_API_KEY }}
+        project: Wurst
+        version: ${{ steps.website_inputs.outputs.wurst_version }}
+        path: build/libs/*.jar
 
     - name: Publish to GitHub
       if: ${{ inputs.publish_github }}
       env:
         GITHUB_TOKEN: ${{ secrets.OLD_MCX_PUBLISH_TOKEN }}
       run: ./gradlew github --stacktrace --no-configuration-cache
 
-    - name: Build website update inputs
-      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"
-
     - name: Trigger website update
       if: ${{ inputs.update_website }}
       uses: Wurst-Imperium/dispatch-and-wait@v1

build.gradle

@@ -6,7 +6,7 @@ buildscript {
 
 plugins {
 	id "fabric-loom" version "${loom_version}"
-	id "com.diffplug.spotless" version "8.0.0"
+	id "com.diffplug.spotless" version "8.1.0"
 }
 
 def ENV = System.getenv()
@@ -68,6 +68,10 @@ loom {
 	accessWidenerPath = file("src/main/resources/wurst.accesswidener")
 
 	runs {
+		clientWithMods {
+			inherit client
+		}
+
 		clientGameTestWithMods {
 			inherit client
 			source = sourceSets.gametest
@@ -89,6 +93,20 @@ dependencies {
 	testMods "maven.modrinth:sodium:${project.sodium_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")
 }
@@ -247,60 +265,3 @@ task closeMilestone {
 		}
 	}
 }
-
-task uploadBackups {
-	dependsOn build
-	
-	onlyIf {
-		ENV.WI_BACKUPS_API_KEY
-	}
-	
-	doLast {
-		def shortVersion = getGhVersion().substring(1)
-		def backupUrl = "https://api.wurstclient.net/artifact-backups/Wurst/${shortVersion}"
-		
-		def maxRetries = 3
-		def retryCount = 0
-		def success = false
-		
-		while (!success && retryCount < maxRetries) {
-			try {
-				def connection = new URL(backupUrl).openConnection() as HttpURLConnection
-				def boundary = UUID.randomUUID().toString()
-				connection.setRequestMethod("POST")
-				connection.setRequestProperty("X-API-Key", ENV.WI_BACKUPS_API_KEY)
-				connection.setRequestProperty("Accept", "application/json")
-				connection.setRequestProperty("Content-Type", "multipart/form-data; boundary=$boundary")
-				connection.doOutput = true
-				
-				def output = connection.outputStream
-				[remapJar, remapSourcesJar].each { jarTask ->
-					def file = jarTask.archiveFile.get().asFile
-					output << "--${boundary}\r\n"
-					output << "Content-Disposition: form-data; name=\"files\"; filename=\"${file.name}\"\r\n"
-					output << "Content-Type: application/java-archive\r\n\r\n"
-					file.withInputStream { input -> 
-						output << input
-					}
-					output << "\r\n"
-				}
-				output << "--${boundary}--\r\n"
-				output.flush()
-				
-				if(connection.responseCode != 200) {
-					throw new IOException("HTTP ${connection.responseCode}: ${connection.responseMessage}")
-				}
-				
-				success = true
-				
-			} catch (Exception e) {
-				retryCount++
-				if (retryCount >= maxRetries) {
-					throw new GradleException("Failed to upload backups after ${maxRetries} attempts: ${e.message}")
-				}
-				println "Upload attempt ${retryCount} failed: ${e.message}. Retrying in 5 seconds..."
-				Thread.sleep(5000)
-			}
-		}
-	}
-}

gradle.properties

@@ -8,14 +8,14 @@ org.gradle.configuration-cache=true
 # https://modrinth.com/mod/fabric-api/versions
 minecraft_version=1.21.4
 yarn_mappings=1.21.4+build.8
-loader_version=0.17.3
+loader_version=0.18.1
 loom_version=1.13-SNAPSHOT
 
 # Fabric API
 fabric_version=0.119.4+1.21.4
 
 # Mod Properties
-mod_version=v7.51.1-MC1.21.4
+mod_version=v7.51.2-MC1.21.4
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric

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

@@ -38,8 +38,7 @@ public static void testXRayHack(ClientGameTestContext context,
 		input.pressKey(GLFW.GLFW_KEY_X);
 		waitForChunkReloading(context, world);
 		assertScreenshotEquals(context, "xray_default",
-			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/02KZHLm.png"
-				: "https://i.imgur.com/Dftamqv.png");
+			"https://i.imgur.com/Dftamqv.png");
 
 		// Exposed only
 		runWurstCommand(context, "setcheckbox X-Ray only_show_exposed on");
@@ -48,8 +47,7 @@ public static void testXRayHack(ClientGameTestContext context,
 		input.pressKey(GLFW.GLFW_KEY_X);
 		waitForChunkReloading(context, world);
 		assertScreenshotEquals(context, "xray_exposed_only",
-			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/xplrJwM.png"
-				: "https://i.imgur.com/QlEpQTu.png");
+			"https://i.imgur.com/QlEpQTu.png");
 
 		// Opacity mode
 		runWurstCommand(context, "setcheckbox X-Ray only_show_exposed off");
@@ -58,8 +56,7 @@ public static void testXRayHack(ClientGameTestContext context,
 		input.pressKey(GLFW.GLFW_KEY_X);
 		waitForChunkReloading(context, world);
 		assertScreenshotEquals(context, "xray_opacity",
-			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/MFc821z.png"
-				: "https://i.imgur.com/0nLulJn.png");
+			"https://i.imgur.com/0nLulJn.png");
 
 		// Exposed only + opacity
 		runWurstCommand(context, "setcheckbox X-Ray only_show_exposed on");
@@ -68,8 +65,7 @@ public static void testXRayHack(ClientGameTestContext context,
 		input.pressKey(GLFW.GLFW_KEY_X);
 		waitForChunkReloading(context, world);
 		assertScreenshotEquals(context, "xray_exposed_only_opacity",
-			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/GRHgW6P.png"
-				: "https://i.imgur.com/noPWDUl.png");
+			"https://i.imgur.com/noPWDUl.png");
 
 		// Clean up
 		runCommand(server, "fill ~-5 ~-2 ~5 ~5 ~5 ~7 air");

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.1";
+	public static final String VERSION = "7.51.2";
 	public static final String MC_VERSION = "1.21.4";
 
 	private PlausibleAnalytics plausible;

src/main/java/net/wurstclient/WurstTranslator.java

@@ -15,15 +15,18 @@
 import java.util.IllegalFormatException;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.BiConsumer;
 
 import com.google.common.collect.Lists;
+import com.google.gson.JsonParseException;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.language.ClientLanguage;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.locale.Language;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.packs.repository.KnownPack;
 import net.minecraft.server.packs.resources.Resource;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
@@ -187,17 +190,50 @@ private void loadTranslations(ResourceManager manager,
 			ResourceLocation langId =
 				ResourceLocation.fromNamespaceAndPath("wurst", langFilePath);
 
+			// IMPORTANT: Exceptions thrown by Language.loadFromJson() must
+			// be caught to prevent mod detection vulnerabilities using
+			// intentionally corrupted resource packs.
 			for(Resource resource : manager.getResourceStack(langId))
+			{
 				try(InputStream stream = resource.open())
 				{
-					Language.loadFromJson(stream, entryConsumer);
+					if(isBuiltInWurstResourcePack(resource))
+						Language.loadFromJson(stream, entryConsumer);
+					
+				}catch(IOException | JsonParseException e)
+				{
+					System.out.println(
+						"Failed to load Wurst translations for " + langCode);
+					e.printStackTrace();
 
-				}catch(IOException e)
+				}catch(Exception e)
 				{
-					System.out.println("Failed to load translations for "
-						+ langCode + " from pack " + resource.sourcePackId());
+					System.out.println(
+						"Unexpected exception while loading Wurst translations for "
+							+ langCode);
 					e.printStackTrace();
 				}
+			}
 		}
 	}
+	
+	/**
+	 * Ensures that the given resource is from Wurst's built-in resource pack,
+	 * or at least from another client-side mod pretending to be Wurst, as it
+	 * should be impossible for server-provided resource packs to obtain a
+	 * KnownPack of <code>fabric:wurst</code>.
+	 *
+	 * <p>
+	 * ASSUME THEY CAN BYPASS THIS. CATCH EXCEPTIONS ANYWAY.
+	 */
+	private boolean isBuiltInWurstResourcePack(Resource resource)
+	{
+		KnownPack knownPack = Optional.ofNullable(resource)
+			.flatMap(Resource::knownPackInfo).orElse(null);
+		if(knownPack == null)
+			return false;
+		
+		return "fabric".equals(knownPack.namespace())
+			&& "wurst".equals(knownPack.id());
+	}
 }

src/main/java/net/wurstclient/mixin/FluidRendererMixin.java

@@ -37,6 +37,7 @@ private boolean modifyShouldSkipRendering(Direction side, float height,
 		BlockAndTintGetter world, BlockPos pos, VertexConsumer vertexConsumer,
 		BlockState blockState, FluidState fluidState)
 	{
+		// Note: the null BlockPos is here to skip the "exposed only" check
 		ShouldDrawSideEvent event = new ShouldDrawSideEvent(blockState, null);
 		EventManager.fire(event);
 

src/main/java/net/wurstclient/mixin/sodium/DefaultFluidRendererMixin.java

@@ -87,7 +87,8 @@ private void onIsFluidOccluded(BlockAndTintGetter world, int x, int y,
 	}
 
 	/**
-	 * Hides and shows fluids when using X-Ray with Sodium installed.
+	 * Hides and shows the top side of fluids when using X-Ray with Sodium
+	 * installed.
 	 *
 	 * <p>
 	 * Works with Sodium >=0.6.13. Last updated for Sodium 0.6.13+mc1.21.4.
@@ -101,13 +102,43 @@ private void onIsFullBlockFluidOccluded(BlockAndTintGetter world,
 		BlockPos pos, Direction dir, BlockState state, FluidState fluid,
 		CallbackInfoReturnable<Boolean> cir)
 	{
-		ShouldDrawSideEvent event = new ShouldDrawSideEvent(state, pos);
+		// Note: the null BlockPos is here to skip the "exposed only" check
+		ShouldDrawSideEvent event = new ShouldDrawSideEvent(state, null);
 		EventManager.fire(event);
 
 		if(event.isRendered() != null)
 			cir.setReturnValue(!event.isRendered());
 	}
 
+	/**
+	 * Hides and shows all other sides of fluids when using X-Ray with Sodium
+	 * installed.
+	 */
+	@Inject(at = @At("HEAD"),
+		method = "isSideExposed(Lnet/minecraft/class_1920;IIILnet/minecraft/class_2350;F)Z",
+		cancellable = true,
+		remap = false,
+		require = 0)
+	private void onIsSideExposed(BlockAndTintGetter world, int x, int y, int z,
+		Direction dir, float height, CallbackInfoReturnable<Boolean> cir)
+	{
+		BlockPos pos = new BlockPos(x, y, z);
+		BlockState state = world.getBlockState(pos);
+		
+		// Note: the null BlockPos is here to skip the "exposed only" check
+		ShouldDrawSideEvent event = new ShouldDrawSideEvent(state, null);
+		EventManager.fire(event);
+		
+		if(event.isRendered() == null)
+			return;
+		
+		BlockPos nPos = pos.offset(dir.getUnitVec3i());
+		BlockState neighborState = world.getBlockState(nPos);
+		
+		cir.setReturnValue(!neighborState.getFluidState().getType()
+			.isSame(state.getFluidState().getType()) && event.isRendered());
+	}
+	
 	/**
 	 * Modifies opacity of fluids when using X-Ray with Sodium installed.
 	 *
@@ -117,8 +148,8 @@ private void onIsFullBlockFluidOccluded(BlockAndTintGetter world,
 	@ModifyExpressionValue(at = @At(value = "INVOKE",
 		target = "Lnet/caffeinemc/mods/sodium/api/util/ColorARGB;toABGR(I)I"),
 		method = "updateQuad",
-		require = 0,
-		remap = false)
+		remap = false,
+		require = 0)
 	private int onUpdateQuad(int original, @Local(argsOnly = true) BlockPos pos,
 		@Local(argsOnly = true) FluidState state)
 	{