Merge remote-tracking branch 'upstream/master'

Author: cev-api

.github/workflows/gradle.yml

@@ -98,22 +98,22 @@ jobs:
       run: ./gradlew runClientGameTestWithMods --stacktrace --warning-mode=fail
 
     - name: Upload screenshots
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       if: ${{ success() || failure() }}
       with:
         name: screenshots
         path: build/run/*/screenshots
         compression-level: 0
 
     - name: Upload logs
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       if: ${{ success() || failure() }}
       with:
         name: logs
         path: build/run/*/logs/latest.log
 
     - name: Upload crash reports
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       if: ${{ failure() }}
       with:
         name: crash-reports

README.md

@@ -1,4 +1,4 @@
-# Wurst Client v7.51.3 (MC1.21.11) - Modified by CevAPI 
+# Wurst Client v7.51.4 (MC1.21.11) - Modified by CevAPI 
 
 ![CevAPI Logo](https://i.imgur.com/kBIn9Ab.png)
 
@@ -545,6 +545,10 @@ Examples:
 
 ![UHHHUHOHUHUHHUHOHOHOHHOHH](https://i.imgur.com/TA65cm8.png)
 
+### AutoSign Improved
+- Can input sign text directly into ClickUI/Nagivator
+- Can now save and manage a list of presets
+
 ### Keybind Manager Improved
 - Can now clear the entire keybinds instead of just resetting.
 

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.11
-yarn_mappings=1.21.11+build.2
-loader_version=0.18.2
+yarn_mappings=1.21.11+build.3
+loader_version=0.18.3
 loom_version=1.14-SNAPSHOT
 
 # Fabric API
-fabric_version=0.139.4+1.21.11
+fabric_version=0.140.0+1.21.11
 
 # Mod Properties
-mod_version=v7.51.3-CevAPI-MC1.21.11
+mod_version=v7.51.4-CevAPI-MC1.21.11
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric
@@ -25,5 +25,5 @@ gh_repo_id=cev-api/Wurst7-CevAPI
 
 # Dependencies
 # check at https://modrinth.com/mod/sodium/versions?l=fabric&g=1.21.11
-sodium_version=mc1.21.11-0.8.0-fabric
+sodium_version=mc1.21.11-0.8.1-fabric
 do_mod_compat_test=true

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

@@ -57,7 +57,7 @@ public static void testXRayHack(ClientGameTestContext context,
 		waitForChunkReloading(context, world);
 		assertScreenshotEquals(context, "xray_opacity",
 			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/hXdzoDB.png"
-				: "https://i.imgur.com/ERrL7ko.png");
+				: "https://i.imgur.com/oZqevTx.png");
 
 		// Exposed only + opacity
 		runWurstCommand(context, "setcheckbox X-Ray only_show_exposed on");
@@ -67,7 +67,7 @@ public static void testXRayHack(ClientGameTestContext context,
 		waitForChunkReloading(context, world);
 		assertScreenshotEquals(context, "xray_exposed_only_opacity",
 			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/ZwIARSr.png"
-				: "https://i.imgur.com/mCnP6LG.png");
+				: "https://i.imgur.com/3DLxNuS.png");
 
 		// Clean up
 		runCommand(server, "fill ~-5 ~-2 ~4 ~5 ~5 ~7 air");

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.3";
+	public static final String VERSION = "7.51.4";
 	public static final String MC_VERSION = "1.21.11";
 
 	private PlausibleAnalytics plausible;

src/main/java/net/wurstclient/mixin/indigo/AbstractTerrainRenderContextMixin.java

@@ -7,43 +7,45 @@
  */
 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.fabricmc.fabric.impl.client.indigo.renderer.mesh.MutableQuadViewImpl;
+import net.fabricmc.fabric.impl.client.indigo.renderer.render.BlockRenderInfo;
+import net.wurstclient.WurstClient;
+import net.wurstclient.hacks.XRayHack;
 
 @Pseudo
 @Mixin(
 	targets = "net.fabricmc.fabric.impl.client.indigo.renderer.render.AbstractTerrainRenderContext",
 	remap = false)
 public abstract class AbstractTerrainRenderContextMixin
 {
-	// @Shadow
-	// @Final
-	// private BlockRenderInfo blockInfo;
+	@Shadow
+	@Final
+	private BlockRenderInfo blockInfo;
 
-	// /**
-	// * Applies X-Ray's opacity mask to the block color after all the normal
-	// * coloring and shading is done, if Indigo is running.
-	// */
-	// @Inject(at = @At("RETURN"),
-	// method =
-	// "shadeQuad(Lnet/fabricmc/fabric/impl/client/indigo/renderer/mesh/MutableQuadViewImpl;ZZZ)V",
-	// require = 0)
-	// private void onShadeQuad(MutableQuadViewImpl quad, boolean ao,
-	// boolean emissive, boolean vanillaShade, CallbackInfo ci)
-	// {
-	// XRayHack xray = WurstClient.INSTANCE.getHax().xRayHack;
-	// if(!xray.isOpacityMode() || xray
-	// .isVisible(blockInfo.blockState.getBlock(), blockInfo.blockPos))
-	// return;
-	
-	// for(int i = 0; i < 4; i++)
-	// quad.color(i, quad.color(i) & xray.getOpacityColorMask());
-	// }
+	/**
+	 * Applies X-Ray's opacity mask to the block color after all the normal
+	 * coloring and shading is done, if Indigo is running.
+	 */
+	@Inject(at = @At("RETURN"),
+		method = "shadeQuad(Lnet/fabricmc/fabric/impl/client/indigo/renderer/mesh/MutableQuadViewImpl;ZZZ)V",
+		require = 0)
+	private void onShadeQuad(MutableQuadViewImpl quad, boolean ao,
+		boolean emissive, boolean vanillaShade, CallbackInfo ci)
+	{
+		XRayHack xray = WurstClient.INSTANCE.getHax().xRayHack;
+		if(!xray.isOpacityMode() || xray
+			.isVisible(blockInfo.blockState.getBlock(), blockInfo.blockPos))
+			return;
+		
+		for(int i = 0; i < 4; i++)
+			quad.color(i, quad.color(i) & xray.getOpacityColorMask());
+	}
 }

src/main/java/net/wurstclient/seedmapper/VendorSeedMapperLoader.java

@@ -36,12 +36,17 @@ private static void ensureChecked()
 		FabricLoader loader = FabricLoader.getInstance();
 		if(loader.isModLoaded(MOD_ID))
 		{
+			// Do not load vendor classes during early initialization. Loading
+			// can trigger static initializers in the vendor mod which may fail
+			// when Wurst initializes very early and cause hard crashes.
+			// Detect presence and report fallback data instead. A later
+			// call to forceReload() can be used to attempt a full load.
 			available = true;
 			version =
 				loader.getModContainer(MOD_ID).map(ModContainer::getMetadata)
 					.map(meta -> meta.getVersion().getFriendlyString())
 					.orElse("unknown");
-			data = SeedMapperData.tryLoadFromVendor();
+			data = SeedMapperData.createFallback();
 		}else
 		{
 			available = false;

src/main/resources/fabric.mod.json

@@ -27,7 +27,7 @@
   "accessWidener": "wurst.accesswidener",
   "depends": {
     "fabricloader": ">=0.17.3",
-    "fabric-api": ">=0.139.1",
+    "fabric-api": ">=0.140.0",
     "minecraft": "~1.21.11-beta.1",
     "java": ">=21"
   },