Skip to content

Commit 06cec1a

Browse files
NekiplayNekiplay
committed
1.21.9
1 parent 4c16d03 commit 06cec1a

29 files changed

Lines changed: 130 additions & 172 deletions

File tree

‎.github/workflows/dev_build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
uses: marvinpinto/action-automatic-releases@latest
2727
with:
2828
repo_token: '${{ secrets.GITHUB_TOKEN }}'
29-
automatic_release_tag: "1.21.8_1.0.9.5"
29+
automatic_release_tag: "1.21.9_1.0.9.5"
3030
prerelease: true
31-
title: "1.21.8 | 1.0.9.5"
31+
title: "1.21.9 | 1.0.9.5"
3232
files: |
3333
./build/libs/*.jar

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ dependencies {
6060

6161
// Meteor Client
6262
modImplementation files("libs\\baritone-unoptimized-fabric-1.14.0-1.jar")
63-
modImplementation files("libs\\meteor-client-1.21.8-14.jar")
63+
modImplementation files("libs\\meteor-client-1.21.9-local.jar")
6464

6565
// Xaero's Mods
6666
modCompileOnly "maven.modrinth:xaeros-world-map:${project.xwm_fabric_version}" // Xaero's World Map

‎gradle.properties‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
org.gradle.jvmargs=-Xmx2G
1+
org.gradle.jvmargs=-Xmx4G
22

33
# Fabric (https://fabricmc.net/versions.html)
4-
minecraft_version=1.21.8
5-
yarn_mappings=1.21.8+build.1
6-
loader_version=0.16.14
4+
minecraft_version=1.21.9
5+
yarn_mappings=1.21.9+build.1
6+
loader_version=0.17.2
77

88
# Fabric API
9-
fabric_version=0.130.0+1.21.8
9+
fabric_version=0.133.14+1.21.9
1010

1111
# Mod Properties
12-
mod_version=1.21.8_1.0.9.5
12+
mod_version=1.21.9_1.0.9.5
1313
maven_group=nekiplay.meteorplus
1414
archives_base_name=meteor-plus
1515

1616
# Dependency Versions
1717

1818
# Xaero's Mods
1919
# Xaero's World Map (https://modrinth.com/mod/xaeros-world-map/versions)
20-
xwm_fabric_version=1.39.13_Fabric_1.21.8
20+
xwm_fabric_version=1.39.16_Fabric_1.21.9
2121
# Xaero's Minimap (https://modrinth.com/mod/xaeros-minimap/versions)
22-
xmm_fabric_version=25.2.12_Fabric_1.21.8
22+
xmm_fabric_version=25.2.14_Fabric_1.21.9
2323

2424
# Where Is It (https://modrinth.com/mod/where-is-it/versions)
2525
where_is_it_version=2.6.4+1.21.2

libs/meteor-client-1.21.8-14.jar renamed to libs/meteor-client-1.21.9-local.jar

4.45 MB
Binary file not shown.

‎src/main/java/nekiplay/main/events/hud/DebugDrawTextEvent.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,9 @@ public class DebugDrawTextEvent extends Cancellable {
1616
public boolean isLeft() { return isLeft; }
1717

1818

19-
private HitResult blockHit;
20-
private HitResult fluidHit;
21-
public HitResult blockHit() { return blockHit; }
22-
public HitResult fluidHit() { return fluidHit; }
23-
24-
public static DebugDrawTextEvent get(List<String> lines, boolean isLeft, HitResult blockHit, HitResult fluidHit) {
19+
public static DebugDrawTextEvent get(List<String> lines, boolean isLeft) {
2520
INSTANCE.lines = lines;
2621
INSTANCE.isLeft = isLeft;
27-
INSTANCE.blockHit = blockHit;
28-
INSTANCE.fluidHit = fluidHit;
2922
return INSTANCE;
3023
}
3124
}

‎src/main/java/nekiplay/meteorplus/features/commands/EclipCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private boolean work() {
7676
}
7777
}
7878
private Block getBlock(BlockPos pos) {
79-
return mc.player.getWorld().getBlockState(pos).getBlock();
79+
return mc.world.getBlockState(pos).getBlock();
8080
}
8181

8282
private double findBlock(boolean up, int maximum) {

‎src/main/java/nekiplay/meteorplus/features/modules/combat/Hunt.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public Hunt() {
5656
);
5757

5858
private boolean entityCheck(Entity entity) {
59-
if (entity.equals(mc.player) || entity.equals(mc.cameraEntity)) return false;
59+
if (entity.equals(mc.player) || entity.equals(mc.getCameraEntity())) return false;
6060
if ((entity instanceof LivingEntity && ((LivingEntity) entity).isDead()) || !entity.isAlive()) return false;
6161
if (!entities.get().contains(entity.getType())) return false;
6262
if (entity instanceof Tameable tameable
@@ -76,9 +76,9 @@ private boolean entityCheck(Entity entity) {
7676
}
7777
if (onGround.get()) {
7878
if (customCheck.get()) {
79-
World world = entity.getWorld();
79+
World world = entity.getEntityWorld();
8080

81-
Vec3d entityPos = entity.getPos();
81+
Vec3d entityPos = entity.getEntityPos();
8282
BlockPos posBelow = new BlockPos((int) entityPos.x, (int) (entityPos.y - 1), (int) entityPos.z);
8383

8484
Block blockBelow = world.getBlockState(posBelow).getBlock();

‎src/main/java/nekiplay/meteorplus/features/modules/combat/TriggerBot.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void onDeactivate() {
105105
private int hitDelayTimer;
106106

107107
private boolean entityCheck(Entity entity) {
108-
if (entity.equals(mc.player) || entity.equals(mc.cameraEntity)) return false;
108+
if (entity.equals(mc.player) || entity.equals(mc.getCameraEntity())) return false;
109109
if ((entity instanceof LivingEntity && ((LivingEntity) entity).isDead()) || !entity.isAlive()) return false;
110110
if (!entities.get().contains(entity.getType())) return false;
111111
if (entity instanceof Tameable tameable

‎src/main/java/nekiplay/meteorplus/features/modules/combat/killaura/modes/Matrix.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private void attack(Entity target) {
9898
}
9999

100100
private boolean entityCheck(Entity entity) {
101-
if (entity.equals(mc.player) || entity.equals(mc.cameraEntity)) return false;
101+
if (entity.equals(mc.player) || entity.equals(mc.getCameraEntity())) return false;
102102
if ((entity instanceof LivingEntity livingEntity && livingEntity.isDead()) || !entity.isAlive()) return false;
103103

104104
Box hitbox = entity.getBoundingBox();
@@ -146,7 +146,7 @@ public enum Type {
146146

147147

148148
private void updateRotation(boolean attack, float rotationYawSpeed, float rotationPitchSpeed) {
149-
Vec3d vec = target.getPos().add(0, clamp(mc.player.getEyeHeight(mc.player.getPose()) - target.getY(),
149+
Vec3d vec = target.getEntityPos().add(0, clamp(mc.player.getEyeHeight(mc.player.getPose()) - target.getY(),
150150
0, target.getHeight() * (mc.player.distanceTo(target) / settings.range.get())), 0)
151151
.subtract(mc.player.getEyePos());
152152

‎src/main/java/nekiplay/meteorplus/features/modules/misc/CordinateProtector.java‎

Lines changed: 52 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package nekiplay.meteorplus.features.modules.misc;
22

3+
import meteordevelopment.meteorclient.systems.modules.Modules;
4+
import meteordevelopment.meteorclient.systems.modules.player.Reach;
35
import meteordevelopment.orbit.EventHandler;
46
import nekiplay.main.events.hud.DebugDrawTextEvent;
57
import nekiplay.meteorplus.mixinclasses.SpoofMode;
@@ -22,81 +24,66 @@ private void onDebugF3RenderText(DebugDrawTextEvent event) {
2224
List<String> lines = event.getLines();
2325

2426
if (ConfigModifier.get().positionProtection.get()) {
25-
if (event.isLeft()) {
26-
int index = 0;
27-
for (Object obj : lines.toArray()) {
28-
String str = obj.toString();
27+
int index = 0;
28+
for (Object obj : lines.toArray()) {
29+
String str = obj.toString();
2930

30-
if (str.startsWith("XYZ:")) {
31-
String xyz = String.format(Locale.ROOT, "XYZ: %.3f / %.5f / %.3f", mc.getCameraEntity().getX() + ConfigModifier.get().x_spoof.get(), mc.getCameraEntity().getY(), mc.getCameraEntity().getZ() + ConfigModifier.get().z_spoof.get());
32-
if (ConfigModifier.get().spoofMode.get() == SpoofMode.Fake) {
33-
lines.set(index, xyz);
34-
}
35-
else if (ConfigModifier.get().spoofMode.get() == SpoofMode.Sensor) {
36-
lines.set(index, "XYZ: *** / *** / ***");
37-
}
38-
} else if (str.startsWith("Block: ")) {
39-
BlockPos blockPos = mc.getCameraEntity().getBlockPos();
40-
blockPos = blockPos.add(ConfigModifier.get().x_spoof.get(), 0, ConfigModifier.get().z_spoof.get());
41-
42-
String block = String.format(Locale.ROOT, "Block: %d %d %d [%d %d %d]", blockPos.getX(), blockPos.getY(), blockPos.getZ(), blockPos.getX() & 15, blockPos.getY() & 15, blockPos.getZ() & 15);
43-
if (ConfigModifier.get().spoofMode.get() == SpoofMode.Fake) {
44-
lines.set(index, block);
45-
}
46-
else if (ConfigModifier.get().spoofMode.get() == SpoofMode.Sensor) {
47-
lines.set(index, "Block: *** *** *** [*** *** ***]");
48-
}
49-
} else if (str.startsWith("Chunk:")) {
50-
BlockPos blockPos = mc.getCameraEntity().getBlockPos();
51-
blockPos = blockPos.add(ConfigModifier.get().x_spoof.get(), 0, ConfigModifier.get().z_spoof.get());
52-
ChunkPos chunkPos = new ChunkPos(blockPos);
31+
if (str.startsWith("XYZ:")) {
32+
String xyz = String.format(Locale.ROOT, "XYZ: %.3f / %.5f / %.3f", mc.getCameraEntity().getX() + ConfigModifier.get().x_spoof.get(), mc.getCameraEntity().getY(), mc.getCameraEntity().getZ() + ConfigModifier.get().z_spoof.get());
33+
if (ConfigModifier.get().spoofMode.get() == SpoofMode.Fake) {
34+
lines.set(index, xyz);
35+
} else if (ConfigModifier.get().spoofMode.get() == SpoofMode.Sensor) {
36+
lines.set(index, "XYZ: *** / *** / ***");
37+
}
38+
} else if (str.startsWith("Block: ")) {
39+
BlockPos blockPos = mc.getCameraEntity().getBlockPos();
40+
blockPos = blockPos.add(ConfigModifier.get().x_spoof.get(), 0, ConfigModifier.get().z_spoof.get());
5341

54-
if (ConfigModifier.get().spoofMode.get() == SpoofMode.Fake) {
55-
String chunk = String.format(Locale.ROOT, "Chunk: %d %d %d [%d %d in r.%d.%d.mca]", chunkPos.x, ChunkSectionPos.getSectionCoord(blockPos.getY()), chunkPos.z, chunkPos.getRegionRelativeX(), chunkPos.getRegionRelativeZ(), chunkPos.getRegionX(), chunkPos.getRegionZ());
56-
lines.set(index, chunk);
57-
}
58-
else if (ConfigModifier.get().spoofMode.get() == SpoofMode.Sensor) {
59-
lines.set(index, "Chunk: *** *** *** [*** *** in ***.***.mca]");
60-
}
42+
String block = String.format(Locale.ROOT, "Block: %d %d %d", blockPos.getX(), blockPos.getY(), blockPos.getZ());
43+
if (ConfigModifier.get().spoofMode.get() == SpoofMode.Fake) {
44+
lines.set(index, block);
45+
} else if (ConfigModifier.get().spoofMode.get() == SpoofMode.Sensor) {
46+
lines.set(index, "Block: *** *** ***");
6147
}
62-
index++;
63-
}
64-
} else {
65-
int index = 0;
66-
for (Object obj : lines.toArray()) {
67-
String str = obj.toString();
48+
} else if (str.startsWith("Chunk:")) {
49+
BlockPos blockPos = mc.getCameraEntity().getBlockPos();
50+
blockPos = blockPos.add(ConfigModifier.get().x_spoof.get(), 0, ConfigModifier.get().z_spoof.get());
51+
ChunkPos chunkPos = new ChunkPos(blockPos);
6852

69-
if (str.contains("Targeted Block:")) {
70-
HitResult blockHitResult = event.blockHit();
71-
if (blockHitResult != null && blockHitResult.getType() == HitResult.Type.BLOCK) {
72-
Formatting var10001 = Formatting.UNDERLINE;
53+
if (ConfigModifier.get().spoofMode.get() == SpoofMode.Fake) {
54+
String chunk = String.format(Locale.ROOT, "Chunk: %d %d %d [%d %d in r.%d.%d.mca]", chunkPos.x, ChunkSectionPos.getSectionCoord(blockPos.getY()), chunkPos.z, chunkPos.getRegionRelativeX(), chunkPos.getRegionRelativeZ(), chunkPos.getRegionX(), chunkPos.getRegionZ());
55+
lines.set(index, chunk);
56+
} else if (ConfigModifier.get().spoofMode.get() == SpoofMode.Sensor) {
57+
lines.set(index, "Chunk: *** *** *** [*** *** in ***.***.mca]");
58+
}
59+
} else if (str.contains("Targeted Block:")) {
60+
HitResult blockHitResult = mc.player.raycast(Modules.get().get(Reach.class).blockReach(), 1f, false);
61+
if (blockHitResult != null && blockHitResult.getType() == HitResult.Type.BLOCK) {
62+
Formatting var10001 = Formatting.UNDERLINE;
7363

74-
BlockPos blockPos = ((BlockHitResult) blockHitResult).getBlockPos();
75-
blockPos = blockPos.add(ConfigModifier.get().x_spoof.get(), 0, ConfigModifier.get().z_spoof.get());
76-
if (ConfigModifier.get().spoofMode.get() == SpoofMode.Fake) {
77-
lines.set(index, "" + var10001 + "Targeted Block: " + blockPos.getX() + ", " + blockPos.getY() + ", " + blockPos.getZ());
78-
}
79-
else if (ConfigModifier.get().spoofMode.get() == SpoofMode.Sensor) {
80-
lines.set(index, var10001 + "Targeted Block: *** *** ***");
81-
}
64+
BlockPos blockPos = ((BlockHitResult) blockHitResult).getBlockPos();
65+
blockPos = blockPos.add(ConfigModifier.get().x_spoof.get(), 0, ConfigModifier.get().z_spoof.get());
66+
if (ConfigModifier.get().spoofMode.get() == SpoofMode.Fake) {
67+
lines.set(index, "" + var10001 + "Targeted Block: " + blockPos.getX() + ", " + blockPos.getY() + ", " + blockPos.getZ());
68+
} else if (ConfigModifier.get().spoofMode.get() == SpoofMode.Sensor) {
69+
lines.set(index, var10001 + "Targeted Block: *** *** ***");
8270
}
83-
} else if (str.contains("Targeted Fluid:")) {
84-
HitResult blockHitResult = event.fluidHit();
85-
if (blockHitResult != null && blockHitResult.getType() == HitResult.Type.BLOCK) {
86-
Formatting var10001 = Formatting.UNDERLINE;
71+
}
72+
} else if (str.contains("Targeted Fluid:")) {
73+
HitResult blockHitResult = mc.player.raycast(Modules.get().get(Reach.class).blockReach(), 1f, true);
74+
if (blockHitResult != null && blockHitResult.getType() == HitResult.Type.BLOCK) {
75+
Formatting var10001 = Formatting.UNDERLINE;
8776

88-
BlockPos blockPos = ((BlockHitResult) blockHitResult).getBlockPos();
89-
blockPos = blockPos.add(ConfigModifier.get().x_spoof.get(), 0, ConfigModifier.get().z_spoof.get());
90-
if (ConfigModifier.get().spoofMode.get() == SpoofMode.Fake) {
91-
lines.set(index, "" + var10001 + "Targeted Fluid: " + blockPos.getX() + ", " + blockPos.getY() + ", " + blockPos.getZ());
92-
}
93-
else if (ConfigModifier.get().spoofMode.get() == SpoofMode.Sensor) {
94-
lines.set(index, var10001 + "Targeted Fluid: *** *** ***");
95-
}
77+
BlockPos blockPos = ((BlockHitResult) blockHitResult).getBlockPos();
78+
blockPos = blockPos.add(ConfigModifier.get().x_spoof.get(), 0, ConfigModifier.get().z_spoof.get());
79+
if (ConfigModifier.get().spoofMode.get() == SpoofMode.Fake) {
80+
lines.set(index, "" + var10001 + "Targeted Fluid: " + blockPos.getX() + ", " + blockPos.getY() + ", " + blockPos.getZ());
81+
} else if (ConfigModifier.get().spoofMode.get() == SpoofMode.Sensor) {
82+
lines.set(index, var10001 + "Targeted Fluid: *** *** ***");
9683
}
9784
}
98-
index++;
9985
}
86+
index++;
10087
}
10188
}
10289
}

0 commit comments

Comments
 (0)