Merge upstream/master into master (2025-10-18)

Author: cev-api

gradle.properties

@@ -1,27 +1,27 @@
-# 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.9
-yarn_mappings=1.21.9+build.1
-loader_version=0.17.2
-loom_version=1.11-SNAPSHOT
-
-# Fabric API
-fabric_version=0.133.14+1.21.9
-
-# Mod Properties
-mod_version=v7.50.2-MC1.21.9
-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
+# 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.17.3
+loom_version=1.11-SNAPSHOT
+
+# Fabric API
+fabric_version=0.135.0+1.21.10
+
+# Mod Properties
+mod_version=v7.50.3-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

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

@@ -50,8 +50,8 @@ public enum WurstClient
 	public static MinecraftClient MC;
 	public static IMinecraftClient IMC;
 
-	public static final String VERSION = "7.50.2";
-	public static final String MC_VERSION = "1.21.9";
+	public static final String VERSION = "7.50.3";
+	public static final String MC_VERSION = "1.21.10";
 
 	private PlausibleAnalytics plausible;
 	private EventManager eventManager;

src/main/java/net/wurstclient/hacks/NoLevitationHack.java

@@ -20,5 +20,6 @@ public NoLevitationHack()
 		setCategory(Category.MOVEMENT);
 	}
 
-	// See ClientPlayerEntityMixin.hasStatusEffect()
+	// See ClientPlayerEntityMixin.hasStatusEffect() and
+	// ClientPlayerEntityMixin.getStatusEffect()
 }

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

@@ -28,6 +28,7 @@
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.MovementType;
 import net.minecraft.entity.effect.StatusEffect;
+import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.util.math.Vec3d;
@@ -285,6 +286,19 @@ public boolean hasStatusEffect(RegistryEntry<StatusEffect> effect)
 		return super.hasStatusEffect(effect);
 	}
 
+	@Override
+	public StatusEffectInstance getStatusEffect(
+		RegistryEntry<StatusEffect> effect)
+	{
+		HackList hax = WurstClient.INSTANCE.getHax();
+		
+		if(effect == StatusEffects.LEVITATION
+			&& hax.noLevitationHack.isEnabled())
+			return null;
+		
+		return super.getStatusEffect(effect);
+	}
+	
 	@Override
 	public float getStepHeight()
 	{

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

@@ -15,6 +15,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 
+<<<<<<< HEAD
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.sugar.Local;
 
@@ -23,11 +24,24 @@
 
 @Mixin(Downloader.class)
 public abstract class DownloaderMixin
+=======
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+
+import net.minecraft.client.session.Session;
+import net.minecraft.util.Downloader;
+import net.minecraft.util.Uuids;
+import net.wurstclient.WurstClient;
+
+@Mixin(Downloader.class)
+public abstract class DownloaderMixin implements AutoCloseable
+>>>>>>> upstream/master
 {
 	@Shadow
 	@Final
 	private Path directory;
 
+<<<<<<< HEAD
 	@ModifyExpressionValue(method = "method_55485",
 		at = @At(value = "INVOKE",
 			target = "Ljava/nio/file/Path;resolve(Ljava/lang/String;)Ljava/nio/file/Path;"))
@@ -36,5 +50,41 @@ public abstract class DownloaderMixin
 	{
 		return ResourcePackProtector.remapDownloadPath(directory, original,
 			packId);
+=======
+	/**
+	 * Patches a fingerprinting vulnerability by creating a separate cache
+	 * folder for each Minecraft account.
+	 *
+	 * <p>
+	 * This mixin targets the <code>entries.forEach()</code> lambda in
+	 * <code>download(Config, Map)</code>.
+	 *
+	 * @see https://github.com/Wurst-Imperium/Wurst7/issues/1226
+	 */
+	@WrapOperation(at = @At(value = "INVOKE",
+		target = "Ljava/nio/file/Path;resolve(Ljava/lang/String;)Ljava/nio/file/Path;",
+		ordinal = 0,
+		remap = false), method = "method_55485")
+	private Path wrapResolve(Path instance, String filename,
+		Operation<Path> original)
+	{
+		Path result = original.call(instance, filename);
+		
+		// If the path has already been modified by another mod (likely trying
+		// to patch the same exploit), don't modify it further.
+		if(result == null || !result.getParent().equals(directory))
+			return result;
+			
+		// "getUuidOrNull" seems to be an outdated Yarn name, as Minecraft
+		// 1.21.10 treats this like a non-null method. Just in case, we manually
+		// fallback to the offline UUID if it ever does return null.
+		Session session = WurstClient.MC.getSession();
+		UUID uuid = session.getUuidOrNull();
+		if(uuid == null)
+			uuid = Uuids.getOfflinePlayerUuid(session.getUsername());
+		
+		return result.getParent().resolve(uuid.toString())
+			.resolve(result.getFileName());
+>>>>>>> upstream/master
 	}
 }

src/main/resources/wurst.mixins.json

@@ -32,6 +32,7 @@
     "DirectConnectScreenMixin",
     "DownloaderMixin",
     "DisconnectedScreenMixin",
+    "DownloaderMixin",
     "EntityMixin",
     "EntityRendererMixin",
     "FluidRendererMixin",