Skip to content

Commit f32f287

Browse files
Merge v7.50.1 into 1.21.4
2 parents 83126dc + 6f7fbe6 commit f32f287

File tree

12 files changed

+56
-27
lines changed

12 files changed

+56
-27
lines changed

.github/workflows/auto_snapshot_update.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ jobs:
6060
uses: actions/checkout@v5
6161

6262
- name: Set up Python 3.12
63-
uses: actions/setup-python@v5
63+
uses: actions/setup-python@v6
6464
with:
6565
python-version: "3.12"
6666

6767
- name: Set up Java 21
68-
uses: actions/setup-java@v4
68+
uses: actions/setup-java@v5
6969
with:
7070
java-version: "21"
7171
distribution: "microsoft"

.github/workflows/check_translations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v5
2525

2626
- name: Set up Python 3.12
27-
uses: actions/setup-python@v5
27+
uses: actions/setup-python@v6
2828
with:
2929
python-version: "3.12"
3030

.github/workflows/dependency_graph.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/checkout@v5
2626

2727
- name: Set up Java 21
28-
uses: actions/setup-java@v4
28+
uses: actions/setup-java@v5
2929
with:
3030
java-version: "21"
3131
distribution: "microsoft"

.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
uses: actions/checkout@v5
4343

4444
- name: Set up Java 21
45-
uses: actions/setup-java@v4
45+
uses: actions/setup-java@v5
4646
with:
4747
java-version: "21"
4848
distribution: "microsoft"

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
fetch-tags: true
5353

5454
- name: Set up Java 21
55-
uses: actions/setup-java@v4
55+
uses: actions/setup-java@v5
5656
with:
5757
java-version: "21"
5858
distribution: "microsoft"

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616

1717
- name: Run stale action
18-
uses: actions/stale@v9
18+
uses: actions/stale@v10
1919
with:
2020
stale-issue-message: |
2121
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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
dependencies {
3-
classpath "org.kohsuke:github-api:1.329"
3+
classpath "org.kohsuke:github-api:1.330"
44
}
55
}
66

@@ -33,10 +33,16 @@ configurations.all {
3333
force "net.minidev:json-smart:2.5.2"
3434
// v2.13.4, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2025-52999
3535
force "com.fasterxml.jackson.core:jackson-core:2.15.0"
36-
// v1.115.Final, used by Minecraft 1.21.4 - 1.21.5, is vulnerable to CVE-2025-25193
36+
// v3.17.0, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2025-48924
37+
force "org.apache.commons:commons-lang3:3.18.0"
38+
// v9.40, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2025-53864
39+
force "com.nimbusds:nimbus-jose-jwt:10.0.2"
40+
// v1.115.Final, used by Minecraft 1.21.4, is vulnerable to CVE-2025-25193
3741
force "io.netty:netty-common:4.1.118.Final"
38-
// v1.115.Final, used by Minecraft 1.21.4 - 1.21.5, is vulnerable to CVE-2025-24970
42+
// v1.115.Final, used by Minecraft 1.21.4, is vulnerable to CVE-2025-24970
3943
force "io.netty:netty-handler:4.1.118.Final"
44+
// v1.115.Final, used by Minecraft 1.21.4, is vulnerable to CVE-2025-58057
45+
force "io.netty:netty-codec:4.1.125.Final"
4046
}
4147
}
4248

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ loom_version=1.11-SNAPSHOT
1414
fabric_version=0.119.4+1.21.4
1515

1616
# Mod Properties
17-
mod_version=v7.50-MC1.21.4
17+
mod_version=v7.50.1-MC1.21.4
1818
maven_group=net.wurstclient
1919
archives_base_name=Wurst-Client
2020
mod_loader=Fabric

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public enum WurstClient
5050
public static MinecraftClient MC;
5151
public static IMinecraftClient IMC;
5252

53-
public static final String VERSION = "7.50";
53+
public static final String VERSION = "7.50.1";
5454
public static final String MC_VERSION = "1.21.4";
5555

5656
private PlausibleAnalytics plausible;

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

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.google.gson.JsonPrimitive;
2222

2323
import net.minecraft.block.Block;
24-
import net.minecraft.registry.Registries;
2524
import net.minecraft.util.Identifier;
2625
import net.wurstclient.WurstClient;
2726
import net.wurstclient.clickgui.Component;
@@ -41,8 +40,7 @@ public BlockListSetting(String name, WText description, String... blocks)
4140
{
4241
super(name, description);
4342

44-
Arrays.stream(blocks).parallel()
45-
.map(s -> Registries.BLOCK.get(Identifier.of(s)))
43+
Arrays.stream(blocks).parallel().map(BlockUtils::getBlockFromNameOrID)
4644
.filter(Objects::nonNull).map(BlockUtils::getName).distinct()
4745
.sorted().forEachOrdered(s -> blockNames.add(s));
4846
defaultNames = blockNames.toArray(new String[0]);
@@ -135,10 +133,27 @@ public void fromJson(JsonElement json)
135133
}
136134

137135
// otherwise, load the blocks in the JSON array
138-
JsonUtils.getAsArray(json).getAllStrings().parallelStream()
139-
.map(s -> Registries.BLOCK.get(Identifier.of(s)))
140-
.filter(Objects::nonNull).map(BlockUtils::getName).distinct()
141-
.sorted().forEachOrdered(s -> blockNames.add(s));
136+
for(String rawName : JsonUtils.getAsArray(json).getAllStrings())
137+
{
138+
Identifier id = Identifier.tryParse(rawName);
139+
if(id == null)
140+
{
141+
System.out.println("Discarding BlockList entry \"" + rawName
142+
+ "\" as it is not a valid identifier");
143+
continue;
144+
}
145+
146+
String name = id.toString();
147+
if(blockNames.contains(name))
148+
{
149+
System.out.println("Discarding BlockList entry \"" + rawName
150+
+ "\" as \"" + name + "\" is already in the list");
151+
continue;
152+
}
153+
154+
blockNames.add(name);
155+
}
156+
blockNames.sort(null);
142157

143158
}catch(JsonException e)
144159
{

0 commit comments

Comments
 (0)