Merge v7.50.1 into 1.21.4

Author: Alexander01998

.github/workflows/auto_snapshot_update.yml

@@ -60,12 +60,12 @@ jobs:
       uses: actions/checkout@v5
 
     - name: Set up Python 3.12
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: "3.12"
 
     - name: Set up Java 21
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: "21"
         distribution: "microsoft"

.github/workflows/check_translations.yml

@@ -24,7 +24,7 @@ jobs:
       uses: actions/checkout@v5
 
     - name: Set up Python 3.12
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: "3.12"
 

.github/workflows/dependency_graph.yml

@@ -25,7 +25,7 @@ jobs:
       uses: actions/checkout@v5
 
     - name: Set up Java 21
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: "21"
         distribution: "microsoft"

.github/workflows/gradle.yml

@@ -42,7 +42,7 @@ jobs:
       uses: actions/checkout@v5
 
     - name: Set up Java 21
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: "21"
         distribution: "microsoft"

.github/workflows/publish.yml

@@ -52,7 +52,7 @@ jobs:
         fetch-tags: true
 
     - name: Set up Java 21
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: "21"
         distribution: "microsoft"

.github/workflows/stale.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
 
     - name: Run stale action
-      uses: actions/stale@v9
+      uses: actions/stale@v10
       with:
         stale-issue-message: |
           This issue has been open for a while with no recent activity. If this issue is still important to you, please add a comment within the next 7 days to keep it open. Otherwise, the issue will be automatically closed to free up time for other tasks.

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath "org.kohsuke:github-api:1.329"
+		classpath "org.kohsuke:github-api:1.330"
 	}
 }
 
@@ -33,10 +33,16 @@ configurations.all {
 		force "net.minidev:json-smart:2.5.2"
 		// v2.13.4, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2025-52999
 		force "com.fasterxml.jackson.core:jackson-core:2.15.0"
-		// v1.115.Final, used by Minecraft 1.21.4 - 1.21.5, is vulnerable to CVE-2025-25193
+		// v3.17.0, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2025-48924
+		force "org.apache.commons:commons-lang3:3.18.0"
+		// v9.40, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2025-53864
+		force "com.nimbusds:nimbus-jose-jwt:10.0.2"
+		// v1.115.Final, used by Minecraft 1.21.4, is vulnerable to CVE-2025-25193
 		force "io.netty:netty-common:4.1.118.Final"
-		// v1.115.Final, used by Minecraft 1.21.4 - 1.21.5, is vulnerable to CVE-2025-24970
+		// v1.115.Final, used by Minecraft 1.21.4, is vulnerable to CVE-2025-24970
 		force "io.netty:netty-handler:4.1.118.Final"
+		// v1.115.Final, used by Minecraft 1.21.4, is vulnerable to CVE-2025-58057
+		force "io.netty:netty-codec:4.1.125.Final"
 	}
 }
 

gradle.properties

@@ -14,7 +14,7 @@ loom_version=1.11-SNAPSHOT
 fabric_version=0.119.4+1.21.4
 
 # Mod Properties
-mod_version=v7.50-MC1.21.4
+mod_version=v7.50.1-MC1.21.4
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric

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.50";
+	public static final String VERSION = "7.50.1";
 	public static final String MC_VERSION = "1.21.4";
 
 	private PlausibleAnalytics plausible;

src/main/java/net/wurstclient/settings/BlockListSetting.java

@@ -21,7 +21,6 @@
 import com.google.gson.JsonPrimitive;
 
 import net.minecraft.block.Block;
-import net.minecraft.registry.Registries;
 import net.minecraft.util.Identifier;
 import net.wurstclient.WurstClient;
 import net.wurstclient.clickgui.Component;
@@ -41,8 +40,7 @@ public BlockListSetting(String name, WText description, String... blocks)
 	{
 		super(name, description);
 
-		Arrays.stream(blocks).parallel()
-			.map(s -> Registries.BLOCK.get(Identifier.of(s)))
+		Arrays.stream(blocks).parallel().map(BlockUtils::getBlockFromNameOrID)
 			.filter(Objects::nonNull).map(BlockUtils::getName).distinct()
 			.sorted().forEachOrdered(s -> blockNames.add(s));
 		defaultNames = blockNames.toArray(new String[0]);
@@ -135,10 +133,27 @@ public void fromJson(JsonElement json)
 			}
 
 			// otherwise, load the blocks in the JSON array
-			JsonUtils.getAsArray(json).getAllStrings().parallelStream()
-				.map(s -> Registries.BLOCK.get(Identifier.of(s)))
-				.filter(Objects::nonNull).map(BlockUtils::getName).distinct()
-				.sorted().forEachOrdered(s -> blockNames.add(s));
+			for(String rawName : JsonUtils.getAsArray(json).getAllStrings())
+			{
+				Identifier id = Identifier.tryParse(rawName);
+				if(id == null)
+				{
+					System.out.println("Discarding BlockList entry \"" + rawName
+						+ "\" as it is not a valid identifier");
+					continue;
+				}
+				
+				String name = id.toString();
+				if(blockNames.contains(name))
+				{
+					System.out.println("Discarding BlockList entry \"" + rawName
+						+ "\" as \"" + name + "\" is already in the list");
+					continue;
+				}
+				
+				blockNames.add(name);
+			}
+			blockNames.sort(null);
 
 		}catch(JsonException e)
 		{