Merge remote-tracking branch 'upstream'

cev-api · cev-api · commit 5c70ef3a38bb · 2025-11-24T23:16:46.000+10:00
diff --git a/.github/workflows/auto_snapshot_update.yml b/.github/workflows/auto_snapshot_update.yml
@@ -34,7 +34,7 @@ jobs:
       run: echo ${{ inputs.distinct_id }}
 
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Set up Python 3.12
       uses: actions/setup-python@v6
diff --git a/.github/workflows/check_translations.yml b/.github/workflows/check_translations.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
 
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Check translations
       uses: Wurst-Imperium/check-translations@v1
diff --git a/.github/workflows/dependency_graph.yml b/.github/workflows/dependency_graph.yml
@@ -22,7 +22,7 @@ jobs:
     steps:
 
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Set up Java 21
       uses: actions/setup-java@v5
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -35,7 +35,7 @@ jobs:
       run: echo ${{ inputs.distinct_id }}
 
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Set up Java 21
       uses: actions/setup-java@v5
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -42,7 +42,7 @@ jobs:
       run: echo ${{ inputs.distinct_id }}
 
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         # Include all tags in case the new tag already exists.
         fetch-tags: true
diff --git a/build.gradle b/build.gradle
@@ -88,6 +88,10 @@ loom {
 	accessWidenerPath = file("src/main/resources/wurst.accesswidener")
 	
 	runs {
+		clientWithMods {
+			inherit client
+		}
+
 		clientGameTestWithMods {
 			inherit client
 			source = sourceSets.gametest
@@ -109,6 +113,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")
 }
diff --git a/gradle.properties b/gradle.properties
@@ -7,15 +7,15 @@ org.gradle.configuration-cache=true
 # check these at https://fabricmc.net/develop/ and
 # https://modrinth.com/mod/fabric-api/versions
 minecraft_version=1.21.10
-official_mappings=1.21.10
-loader_version=0.17.3
+yarn_mappings=1.21.10+build.2
+loader_version=0.18.1
 loom_version=1.13-SNAPSHOT
 
 # Fabric API
 fabric_version=0.138.3+1.21.10
 
 # Mod Properties
-mod_version=v7.51.1-CevAPI-MC1.21.10
+mod_version=v7.51.2-CevAPI-MC1.21.10
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric
@@ -26,5 +26,5 @@ 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.2-fabric
+sodium_version=mc1.21.10-0.7.3-fabric
 do_mod_compat_test=true
diff --git a/src/gametest/java/net/wurstclient/gametest/WurstTest.java b/src/gametest/java/net/wurstclient/gametest/WurstTest.java
@@ -89,8 +89,7 @@ private void testInWorld(ClientGameTestContext context,
 		world.waitForChunksRender();
 		
 		assertScreenshotEquals(context, "in_game",
-			IS_MOD_COMPAT_TEST ? "https://i.imgur.com/VxbGFrb.png"
-				: "https://i.imgur.com/EfzN9Cd.png");
+			"https://i.imgur.com/EfzN9Cd.png");
 		
 		LOGGER.info("Recording debug menu");
 		input.pressKey(GLFW.GLFW_KEY_F3);
diff --git a/src/gametest/java/net/wurstclient/gametest/tests/FreecamHackTest.java b/src/gametest/java/net/wurstclient/gametest/tests/FreecamHackTest.java
@@ -41,16 +41,14 @@ public static void testFreecamHack(ClientGameTestContext context,
 		input.holdKeyFor(GLFW.GLFW_KEY_S, 2);
 		input.holdKeyFor(GLFW.GLFW_KEY_SPACE, 1);
 		assertScreenshotEquals(context, "freecam_moved",
-			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/oZUpI8c.png"
-				: "https://i.imgur.com/pZDlYfH.png");
+			"https://i.imgur.com/pZDlYfH.png");
 		clearChat(context);
 		
 		// Enable tracer
 		runWurstCommand(context, "setcheckbox Freecam tracer on");
 		context.waitTick();
 		assertScreenshotEquals(context, "freecam_tracer",
-			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/teKaxAK.png"
-				: "https://i.imgur.com/jYqDFzE.png");
+			"https://i.imgur.com/jYqDFzE.png");
 		clearChat(context);
 		
 		// Clean up
diff --git a/src/gametest/java/net/wurstclient/gametest/tests/XRayHackTest.java b/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");
diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java
@@ -52,7 +52,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.10";
 	
 	private PlausibleAnalytics plausible;
diff --git a/src/main/java/net/wurstclient/WurstTranslator.java b/src/main/java/net/wurstclient/WurstTranslator.java
@@ -15,12 +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;
@@ -185,17 +191,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 e)
+				}catch(IOException | JsonParseException e)
 				{
-					System.out.println("Failed to load translations for "
-						+ langCode + " from pack " + resource.sourcePackId());
+					System.out.println(
+						"Failed to load Wurst translations for " + langCode);
+					e.printStackTrace();
+					
+				}catch(Exception e)
+				{
+					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());
+	}
 }
diff --git a/src/main/java/net/wurstclient/mixin/FluidRendererMixin.java b/src/main/java/net/wurstclient/mixin/FluidRendererMixin.java
@@ -47,7 +47,8 @@ private boolean modifyShouldSkipRendering(Direction side, float height,
 		BlockAndTintGetter world, BlockPos pos, VertexConsumer vertexConsumer,
 		BlockState blockState, FluidState fluidState)
 	{
-		ShouldDrawSideEvent event = new ShouldDrawSideEvent(blockState, pos);
+		// Note: the null BlockPos is here to skip the "exposed only" check
+		ShouldDrawSideEvent event = new ShouldDrawSideEvent(blockState, null);
 		EventManager.fire(event);
 		
 		XRayHack xray = WurstClient.INSTANCE.getHax().xRayHack;
diff --git a/src/main/java/net/wurstclient/mixin/sodium/DefaultFluidRendererMixin.java b/src/main/java/net/wurstclient/mixin/sodium/DefaultFluidRendererMixin.java
@@ -38,7 +38,8 @@
 public class DefaultFluidRendererMixin
 {
 	/**
-	 * 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.
 	 */
 	@Inject(at = @At("HEAD"),
 		method = "isFullBlockFluidOccluded(Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)Z",
@@ -49,21 +50,51 @@ 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.
 	 */
 	@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 fluid)
 	{
diff --git a/src/main/resources/assets/wurst/translations/pl_pl.json b/src/main/resources/assets/wurst/translations/pl_pl.json
