Merge branch 'master' into 1.21.10

Alexander01998 · Alexander01998 · commit a4eb030cbf2f · 2025-12-02T14:28:38.000+01:00
diff --git a/src/main/java/net/wurstclient/WurstTranslator.java b/src/main/java/net/wurstclient/WurstTranslator.java
@@ -232,8 +232,11 @@ private boolean isBuiltInWurstResourcePack(Resource resource)
 			.flatMap(Resource::knownPackInfo).orElse(null);
 		if(knownPack == null)
 			return false;
-		
-		return "fabric".equals(knownPack.namespace())
+			
+		// Note: Namespace can be "fabric" or "vanilla" depending on
+		// Fabric API version (changed in 0.139.3+1.21.11).
+		return ("fabric".equals(knownPack.namespace())
+			|| "vanilla".equals(knownPack.namespace()))
 			&& "wurst".equals(knownPack.id());
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -232,8 +232,11 @@ private boolean isBuiltInWurstResourcePack(Resource resource)`
`232`	`232`	`.flatMap(Resource::knownPackInfo).orElse(null);`
`233`	`233`	`if(knownPack == null)`
`234`	`234`	`return false;`
`235`		`-`
`236`		`- return "fabric".equals(knownPack.namespace())`
	`235`	`+`
	`236`	`+ // Note: Namespace can be "fabric" or "vanilla" depending on`
	`237`	`+ // Fabric API version (changed in 0.139.3+1.21.11).`
	`238`	`+ return ("fabric".equals(knownPack.namespace())`
	`239`	`+ \|\| "vanilla".equals(knownPack.namespace()))`
`237`	`240`	`&& "wurst".equals(knownPack.id());`
`238`	`241`	`}`
`239`	`242`	`}`