Merge branch 'v7.51.1-1.21.10' into 1.21.8

Author: Alexander01998

gradle.properties

@@ -15,7 +15,7 @@ loom_version=1.13-SNAPSHOT
 fabric_version=0.136.0+1.21.8
 
 # Mod Properties
-mod_version=v7.51-MC1.21.8
+mod_version=v7.51.1-MC1.21.8
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric

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

@@ -42,6 +42,7 @@ public static void testAutoMineHack(ClientGameTestContext context,
 		runCommand(server, "gamemode creative");
 		runCommand(server, "kill @e[type=item]");
 		clearInventory(context);
+		context.waitTick();
 		clearParticles(context);
 		clearChat(context);
 		context.waitTick();

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

@@ -31,63 +31,53 @@ public static void testXRayHack(ClientGameTestContext context,
 		TestClientWorldContext world = spContext.getClientWorld();
 		TestServerContext server = spContext.getServer();
 		buildTestRig(context, spContext);
-		clearChat(context);
 
 		// Enable X-Ray with default settings
 		runWurstCommand(context, "setcheckbox X-Ray only_show_exposed off");
 		runWurstCommand(context, "setslider X-Ray opacity 0");
 		input.pressKey(GLFW.GLFW_KEY_X);
-		context.waitTick();
-		world.waitForChunksRender();
+		waitForChunkReloading(context, world);
 		assertScreenshotEquals(context, "xray_default",
 			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/02KZHLm.png"
 				: "https://i.imgur.com/Dftamqv.png");
-		input.pressKey(GLFW.GLFW_KEY_X);
-		clearChat(context);
 
 		// Exposed only
 		runWurstCommand(context, "setcheckbox X-Ray only_show_exposed on");
 		runWurstCommand(context, "setslider X-Ray opacity 0");
 		input.pressKey(GLFW.GLFW_KEY_X);
-		context.waitTick();
-		world.waitForChunksRender();
+		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");
-		input.pressKey(GLFW.GLFW_KEY_X);
-		clearChat(context);
 
 		// Opacity mode
 		runWurstCommand(context, "setcheckbox X-Ray only_show_exposed off");
 		runWurstCommand(context, "setslider X-Ray opacity 0.5");
 		input.pressKey(GLFW.GLFW_KEY_X);
-		context.waitTick();
-		world.waitForChunksRender();
+		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");
-		input.pressKey(GLFW.GLFW_KEY_X);
-		clearChat(context);
 
 		// Exposed only + opacity
 		runWurstCommand(context, "setcheckbox X-Ray only_show_exposed on");
 		runWurstCommand(context, "setslider X-Ray opacity 0.5");
 		input.pressKey(GLFW.GLFW_KEY_X);
-		context.waitTick();
-		world.waitForChunksRender();
+		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");
-		input.pressKey(GLFW.GLFW_KEY_X);
-		clearChat(context);
 
 		// Clean up
 		runCommand(server, "fill ~-5 ~-2 ~5 ~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");
-		context.waitTick();
-		world.waitForChunksRender();
+		input.pressKey(GLFW.GLFW_KEY_X);
+		waitForChunkReloading(context, world);
 		clearChat(context);
 	}
 
@@ -119,7 +109,16 @@ private static void buildTestRig(ClientGameTestContext context,
 
 		// Wait for blocks to appear
 		waitForBlock(context, -1, 0, 6, Blocks.LAVA);
-		context.waitTick();
+		waitForChunkReloading(context, world);
+		clearChat(context);
+	}
+	
+	private static void waitForChunkReloading(ClientGameTestContext context,
+		TestClientWorldContext world)
+	{
+		// Wait longer if testing with Sodium, since we can't rely on
+		// waitForChunksRender() to track when Sodium finishes loading chunks
+		context.waitTicks(WurstTest.IS_MOD_COMPAT_TEST ? 5 : 1);
 		world.waitForChunksRender();
 	}
 }

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

@@ -50,7 +50,7 @@ public enum WurstClient
 	public static MinecraftClient MC;
 	public static IMinecraftClient IMC;
 
-	public static final String VERSION = "7.51";
+	public static final String VERSION = "7.51.1";
 	public static final String MC_VERSION = "1.21.8";
 
 	private PlausibleAnalytics plausible;

…n/AbstractTerrainRenderContextMixin.java …o/AbstractTerrainRenderContextMixin.javasrc/main/java/net/wurstclient/mixin/AbstractTerrainRenderContextMixin.java renamed to src/main/java/net/wurstclient/mixin/indigo/AbstractTerrainRenderContextMixin.java src/main/java/net/wurstclient/mixin/AbstractTerrainRenderContextMixin.java renamed to src/main/java/net/wurstclient/mixin/indigo/AbstractTerrainRenderContextMixin.java

@@ -5,22 +5,25 @@
  * License, version 3. If a copy of the GPL was not distributed with this
  * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
  */
-package net.wurstclient.mixin;
+package net.wurstclient.mixin.indigo;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.fabricmc.fabric.impl.client.indigo.renderer.mesh.MutableQuadViewImpl;
-import net.fabricmc.fabric.impl.client.indigo.renderer.render.AbstractTerrainRenderContext;
 import net.fabricmc.fabric.impl.client.indigo.renderer.render.BlockRenderInfo;
 import net.wurstclient.WurstClient;
 import net.wurstclient.hacks.XRayHack;
 
-@Mixin(value = AbstractTerrainRenderContext.class, remap = false)
+@Pseudo
+@Mixin(
+	targets = "net.fabricmc.fabric.impl.client.indigo.renderer.render.AbstractTerrainRenderContext",
+	remap = false)
 public abstract class AbstractTerrainRenderContextMixin
 {
 	@Shadow

…stclient/mixin/BlockRenderInfoMixin.java …t/mixin/indigo/BlockRenderInfoMixin.javasrc/main/java/net/wurstclient/mixin/BlockRenderInfoMixin.java renamed to src/main/java/net/wurstclient/mixin/indigo/BlockRenderInfoMixin.java src/main/java/net/wurstclient/mixin/BlockRenderInfoMixin.java renamed to src/main/java/net/wurstclient/mixin/indigo/BlockRenderInfoMixin.java

@@ -5,22 +5,25 @@
  * License, version 3. If a copy of the GPL was not distributed with this
  * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
  */
-package net.wurstclient.mixin;
+package net.wurstclient.mixin.indigo;
 
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.fabricmc.fabric.impl.client.indigo.renderer.render.BlockRenderInfo;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.wurstclient.event.EventManager;
 import net.wurstclient.events.ShouldDrawSideListener.ShouldDrawSideEvent;
 
-@Mixin(value = BlockRenderInfo.class, remap = false)
+@Pseudo
+@Mixin(
+	targets = "net.fabricmc.fabric.impl.client.indigo.renderer.render.BlockRenderInfo",
+	remap = false)
 public abstract class BlockRenderInfoMixin
 {
 	@Shadow
@@ -32,7 +35,10 @@ public abstract class BlockRenderInfoMixin
 	 * This mixin hides and shows regular blocks when using X-Ray, if Indigo
 	 * is running and Sodium is not installed.
 	 */
-	@Inject(at = @At("HEAD"), method = "shouldDrawSide", cancellable = true)
+	@Inject(at = @At("HEAD"),
+		method = "shouldDrawSide",
+		require = 0,
+		cancellable = true)
 	private void onShouldDrawSide(Direction face,
 		CallbackInfoReturnable<Boolean> cir)
 	{

…diumAbstractBlockRenderContextMixin.java …ium/AbstractBlockRenderContextMixin.javasrc/main/java/net/wurstclient/mixin/SodiumAbstractBlockRenderContextMixin.java renamed to src/main/java/net/wurstclient/mixin/sodium/AbstractBlockRenderContextMixin.java src/main/java/net/wurstclient/mixin/SodiumAbstractBlockRenderContextMixin.java renamed to src/main/java/net/wurstclient/mixin/sodium/AbstractBlockRenderContextMixin.java

@@ -5,7 +5,7 @@
  * License, version 3. If a copy of the GPL was not distributed with this
  * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
  */
-package net.wurstclient.mixin;
+package net.wurstclient.mixin.sodium;
 
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
@@ -29,7 +29,7 @@
 @Pseudo
 @Mixin(targets = {
 	"net.caffeinemc.mods.sodium.client.render.frapi.render.AbstractBlockRenderContext"})
-public class SodiumAbstractBlockRenderContextMixin
+public class AbstractBlockRenderContextMixin
 {
 	@Shadow
 	protected BlockState state;

…ient/mixin/SodiumBlockRendererMixin.java …ent/mixin/sodium/BlockRendererMixin.javasrc/main/java/net/wurstclient/mixin/SodiumBlockRendererMixin.java renamed to src/main/java/net/wurstclient/mixin/sodium/BlockRendererMixin.java src/main/java/net/wurstclient/mixin/SodiumBlockRendererMixin.java renamed to src/main/java/net/wurstclient/mixin/sodium/BlockRendererMixin.java

@@ -5,7 +5,7 @@
  * License, version 3. If a copy of the GPL was not distributed with this
  * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
  */
-package net.wurstclient.mixin;
+package net.wurstclient.mixin.sodium;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;
@@ -25,8 +25,7 @@
 @Mixin(targets = {
 	"net.caffeinemc.mods.sodium.client.render.chunk.compile.pipeline.BlockRenderer"},
 	remap = false)
-public class SodiumBlockRendererMixin
-	extends SodiumAbstractBlockRenderContextMixin
+public class BlockRendererMixin extends AbstractBlockRenderContextMixin
 {
 	/**
 	 * Modifies opacity of blocks when using X-Ray with Sodium installed.

…xin/SodiumDefaultFluidRendererMixin.java …in/sodium/DefaultFluidRendererMixin.javasrc/main/java/net/wurstclient/mixin/SodiumDefaultFluidRendererMixin.java renamed to src/main/java/net/wurstclient/mixin/sodium/DefaultFluidRendererMixin.java src/main/java/net/wurstclient/mixin/SodiumDefaultFluidRendererMixin.java renamed to src/main/java/net/wurstclient/mixin/sodium/DefaultFluidRendererMixin.java

@@ -5,7 +5,7 @@
  * License, version 3. If a copy of the GPL was not distributed with this
  * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
  */
-package net.wurstclient.mixin;
+package net.wurstclient.mixin.sodium;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;
@@ -34,7 +34,7 @@
 @Pseudo
 @Mixin(targets = {
 	"net.caffeinemc.mods.sodium.client.render.chunk.compile.pipeline.DefaultFluidRenderer"})
-public class SodiumDefaultFluidRendererMixin
+public class DefaultFluidRendererMixin
 {
 	/**
 	 * Hides and shows fluids when using X-Ray with Sodium installed.

src/main/resources/wurst.mixins.json

@@ -6,13 +6,11 @@
   "client": [
     "AbstractBlockStateMixin",
     "AbstractSignEditScreenMixin",
-    "AbstractTerrainRenderContextMixin",
     "AllowedAddressResolverMixin",
     "AtmosphericFogModifierMixin",
     "BlockEntityRenderDispatcherMixin",
     "BlockMixin",
     "BlockModelRendererMixin",
-    "BlockRenderInfoMixin",
     "CactusBlockMixin",
     "CameraMixin",
     "ChatHudMixin",
@@ -41,6 +39,8 @@
     "GameRendererMixin",
     "GenericContainerScreenMixin",
     "HeldItemRendererMixin",
+    "indigo.AbstractTerrainRenderContextMixin",
+    "indigo.BlockRenderInfoMixin",
     "IngameHudMixin",
     "InGameOverlayRendererMixin",
     "KeyBindingMixin",
@@ -60,9 +60,9 @@
     "ScreenMixin",
     "ShulkerBoxScreenMixin",
     "SimpleOptionMixin",
-    "SodiumAbstractBlockRenderContextMixin",
-    "SodiumBlockRendererMixin",
-    "SodiumDefaultFluidRendererMixin",
+    "sodium.AbstractBlockRenderContextMixin",
+    "sodium.BlockRendererMixin",
+    "sodium.DefaultFluidRendererMixin",
     "StatsScreenMixin",
     "StatusEffectInstanceMixin",
     "TelemetryManagerMixin",