Skip to content

Commit 145bd57

Browse files
committed
Merge branch 'master' into 1.21.8
2 parents dd8eca7 + 9ec6cb0 commit 145bd57

File tree

133 files changed

+1401
-829
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+1401
-829
lines changed

README.md

94 Bytes

MobSearch

  • Search mobs by fuzzy name/ID or exact type (e.g., minecraft:zombie or zombie).
  • Added list mode with visual list of mobs.
  • Multi-term queries: comma-separated (e.g., skeleton, zombie).
  • Rendering: Boxes, Octahedrons, Lines, or Both. Rainbow or fixed color, filled or unfilled and configurable box size.

MobSearch

MobSearch MobSearch

BedESP

  • Finds all bed types.
  • Chunk-based scanning with configurable color and Box/Line style.
  • Rendering: Boxes, Lines, or Both in a fixed color.

build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,18 @@ repositories {
2929
// Override vulnerable dependencies until Minecraft updates to newer versions
3030
configurations.all {
3131
resolutionStrategy {
32-
// v2.5.1, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2024-57699
32+
// v2.5.1, used by Minecraft 1.21.4 - 1.21.10, is vulnerable to CVE-2024-57699
3333
force "net.minidev:json-smart:2.5.2"
34-
// v2.13.4, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2025-52999
34+
// v2.13.4, used by Minecraft 1.21.4 - 1.21.10, is vulnerable to CVE-2025-52999
3535
force "com.fasterxml.jackson.core:jackson-core:2.15.0"
36-
// v3.17.0, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2025-48924
36+
// v3.17.0, used by Minecraft 1.21.4 - 1.21.10, is vulnerable to CVE-2025-48924
3737
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
38+
// v9.40, used by Minecraft 1.21.4 - 1.21.10, is vulnerable to CVE-2025-53864
3939
force "com.nimbusds:nimbus-jose-jwt:10.0.2"
40-
// v4.1.118.Final, used by Minecraft 1.21.5 - 1.21.8, is vulnerable to CVE-2025-58057
40+
// v4.1.118.Final, used by Minecraft 1.21.5 - 1.21.10, is vulnerable to CVE-2025-58057
4141
force "io.netty:netty-codec:4.1.125.Final"
42+
// v4.1.118.Final, used by Minecraft 1.21.5 - 1.21.10, is vulnerable to CVE-2025-58056
43+
force "io.netty:netty-codec-http:4.1.125.Final"
4244
}
4345
}
4446

@@ -139,7 +141,7 @@ jar {
139141
inputs.property("archivesName", archivesName)
140142

141143
from("LICENSE.txt") {
142-
rename { "LICENSE-${archivesName}.txt" }
144+
rename { "LICENSE-${archivesName.get()}.txt" }
143145
}
144146

145147
exclude("intentionally_untranslated.json")

gradle.properties

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
# Done to increase the memory available to gradle.
2-
org.gradle.jvmargs=-Xmx1G
3-
org.gradle.parallel=true
4-
org.gradle.configuration-cache=true
5-
6-
# Fabric Properties
7-
# check these at https://fabricmc.net/develop/ and
8-
# https://modrinth.com/mod/fabric-api/versions
9-
minecraft_version=1.21.8
10-
yarn_mappings=1.21.8+build.1
11-
loader_version=0.17.2
12-
loom_version=1.11-SNAPSHOT
13-
14-
# Fabric API
15-
fabric_version=0.133.4+1.21.8
16-
17-
# Mod Properties
18-
mod_version=v7.50.2-MC1.21.8
19-
maven_group=net.wurstclient
20-
archives_base_name=Wurst-Client
21-
mod_loader=Fabric
22-
23-
# GitHub
24-
gh_repo_id=Wurst-Imperium/Wurst7
25-
mcx_repo_id=Wurst-Imperium/Wurst-MCX2
26-
27-
# Dependencies
1+
# Done to increase the memory available to gradle.
2+
org.gradle.jvmargs=-Xmx2G
3+
org.gradle.parallel=true
4+
org.gradle.configuration-cache=true
5+
6+
# Fabric Properties
7+
# check these at https://fabricmc.net/develop/ and
8+
# https://modrinth.com/mod/fabric-api/versions
9+
minecraft_version=1.21.9
10+
yarn_mappings=1.21.9+build.1
11+
loader_version=0.17.2
12+
loom_version=1.11-SNAPSHOT
13+
14+
# Fabric API
15+
fabric_version=0.133.14+1.21.9
16+
17+
# Mod Properties
18+
mod_version=v7.50.2-MC1.21.9
19+
maven_group=net.wurstclient
20+
archives_base_name=Wurst-Client
21+
mod_loader=Fabric
22+
23+
# GitHub
24+
gh_repo_id=Wurst-Imperium/Wurst7
25+
mcx_repo_id=Wurst-Imperium/Wurst-MCX2
26+
27+
# Dependencies

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

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

5353
public static final String VERSION = "7.50.2";
54-
public static final String MC_VERSION = "1.21.8";
54+
public static final String MC_VERSION = "1.21.9";
5555

5656
private PlausibleAnalytics plausible;
5757
private EventManager eventManager;

src/main/java/net/wurstclient/ai/FlyPathProcessor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public FlyPathProcessor(ArrayList<PathPos> path, boolean creativeFlying)
3030
public void process()
3131
{
3232
// get positions
33-
BlockPos pos = BlockPos.ofFloored(MC.player.getPos());
34-
Vec3d posVec = MC.player.getPos();
33+
BlockPos pos = BlockPos.ofFloored(MC.player.getEntityPos());
34+
Vec3d posVec = MC.player.getEntityPos();
3535
BlockPos nextPos = path.get(index);
3636
int posIndex = path.indexOf(pos);
3737
Box nextBox = new Box(nextPos.getX() + 0.3, nextPos.getY(),
@@ -113,7 +113,7 @@ public void process()
113113
// horizontal movement
114114
if(horizontal)
115115
{
116-
if(!creativeFlying && MC.player.getPos().distanceTo(
116+
if(!creativeFlying && MC.player.getEntityPos().distanceTo(
117117
vecInPos) <= WURST.getHax().flightHack.horizontalSpeed
118118
.getValue())
119119
{
@@ -132,7 +132,7 @@ else if(posVec.y < nextBox.minY)
132132
// vertical movement
133133
}else if(y)
134134
{
135-
if(!creativeFlying && MC.player.getPos().distanceTo(
135+
if(!creativeFlying && MC.player.getEntityPos().distanceTo(
136136
vecInPos) <= WURST.getHax().flightHack.verticalSpeed.getValue())
137137
{
138138
MC.player.setPosition(vecInPos.x, vecInPos.y, vecInPos.z);

src/main/java/net/wurstclient/ai/PathFinder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public PathFinder(BlockPos goal)
6161
start = new PathPos(BlockPos.ofFloored(MC.player.getX(),
6262
MC.player.getY() + 0.5, MC.player.getZ()));
6363
else
64-
start = new PathPos(BlockPos.ofFloored(MC.player.getPos()));
64+
start = new PathPos(BlockPos.ofFloored(MC.player.getEntityPos()));
6565
this.goal = goal;
6666

6767
costMap.put(start, 0F);

src/main/java/net/wurstclient/ai/WalkPathProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void process()
3636
WurstClient.MC.player.getY() + 0.5,
3737
WurstClient.MC.player.getZ());
3838
else
39-
pos = BlockPos.ofFloored(WurstClient.MC.player.getPos());
39+
pos = BlockPos.ofFloored(WurstClient.MC.player.getEntityPos());
4040
PathPos nextPos = path.get(index);
4141
int posIndex = path.indexOf(pos);
4242

src/main/java/net/wurstclient/altmanager/AltRenderer.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
import net.minecraft.client.gui.DrawContext;
2424
import net.minecraft.client.network.PlayerListEntry;
2525
import net.minecraft.client.util.DefaultSkinHelper;
26-
import net.minecraft.client.util.SkinTextures;
26+
import net.minecraft.entity.player.PlayerSkinType;
27+
import net.minecraft.entity.player.SkinTextures;
2728
import net.minecraft.util.Identifier;
2829
import net.minecraft.util.Uuids;
2930
import net.wurstclient.WurstClient;
@@ -60,7 +61,7 @@ private static Identifier loadOfflineSkin(String name)
6061
UUID uuid = Uuids.getOfflinePlayerUuid(name);
6162
GameProfile profile = new GameProfile(uuid, name);
6263
PlayerListEntry entry = new PlayerListEntry(profile, false);
63-
Identifier texture = entry.getSkinTextures().texture();
64+
Identifier texture = entry.getSkinTextures().body().texturePath();
6465
offlineSkins.put(name, texture);
6566
return texture;
6667
}
@@ -73,7 +74,7 @@ private static void queueOnlineSkinLoading(String name)
7374

7475
UUID uuid = SkinStealer.getUUIDOrNull(name);
7576
ProfileResult result =
76-
mc.getSessionService().fetchProfile(uuid, false);
77+
mc.getApiServices().sessionService().fetchProfile(uuid, false);
7778

7879
return result == null ? null : result.profile();
7980

@@ -90,7 +91,7 @@ private static void queueOnlineSkinLoading(String name)
9091
}, BACKGROUND_THREAD).thenAcceptAsync(skinTextures -> {
9192

9293
if(skinTextures != null)
93-
onlineSkins.put(name, skinTextures.texture());
94+
onlineSkins.put(name, skinTextures.body().texturePath());
9495

9596
}, BACKGROUND_THREAD);
9697
}
@@ -134,7 +135,7 @@ public static void drawAltBody(DrawContext context, String name, int x,
134135

135136
boolean slim = DefaultSkinHelper
136137
.getSkinTextures(Uuids.getOfflinePlayerUuid(name))
137-
.model() == SkinTextures.Model.SLIM;
138+
.model() == PlayerSkinType.SLIM;
138139

139140
// Face
140141
x = x + width / 4;
@@ -273,7 +274,7 @@ public static void drawAltBack(DrawContext context, String name, int x,
273274

274275
boolean slim = DefaultSkinHelper
275276
.getSkinTextures(Uuids.getOfflinePlayerUuid(name))
276-
.model() == SkinTextures.Model.SLIM;
277+
.model() == PlayerSkinType.SLIM;
277278

278279
// Face
279280
x = x + width / 4;

src/main/java/net/wurstclient/altmanager/LoginManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static void changeCrackedName(String newName)
2121
{
2222
Session session =
2323
new Session(newName, Uuids.getOfflinePlayerUuid(newName), "",
24-
Optional.empty(), Optional.empty(), Session.AccountType.MOJANG);
24+
Optional.empty(), Optional.empty());
2525

2626
WurstClient.IMC.setWurstSession(session);
2727
}

src/main/java/net/wurstclient/altmanager/MicrosoftLoginManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ public static void login(String email, String password)
103103
MinecraftProfile mcProfile = getAccount(email, password);
104104

105105
Session session = new Session(mcProfile.getName(), mcProfile.getUUID(),
106-
mcProfile.getAccessToken(), Optional.empty(), Optional.empty(),
107-
Session.AccountType.MSA);
106+
mcProfile.getAccessToken(), Optional.empty(), Optional.empty());
108107

109108
WurstClient.IMC.setWurstSession(session);
110109
}

0 commit comments

Comments
 (0)