Skip to content

Commit 0c5107a

Browse files
committed
Crash fix
1 parent d905991 commit 0c5107a

6 files changed

Lines changed: 2 additions & 143 deletions

File tree

build.gradle

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

5858
// Meteor Client
5959
modImplementation files("libs\\baritone-unoptimized-fabric-1.10.2.jar")
60-
modImplementation files("libs\\meteor-client-0.5.9.jar")
60+
modImplementation files("libs\\meteor-client-1.21.4-26.jar")
6161

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

src/main/java/nekiplay/meteorplus/features/modules/movement/fly/FlyMode.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package nekiplay.meteorplus.features.modules.movement.fly;
22

3-
import meteordevelopment.meteorclient.events.entity.DamageEvent;
43
import meteordevelopment.meteorclient.events.entity.player.CanWalkOnFluidEvent;
54
import meteordevelopment.meteorclient.events.entity.player.PlayerMoveEvent;
65
import meteordevelopment.meteorclient.events.entity.player.SendMovementPacketsEvent;
@@ -29,7 +28,6 @@ public void onPlayerMoveSendPre(SendMovementPacketsEvent.Pre event) {}
2928

3029
public void onCanWalkOnFluid(CanWalkOnFluidEvent event) {}
3130
public void onCollisionShape(CollisionShapeEvent event) {}
32-
public void onDamage(DamageEvent event) {}
3331

3432
public void onTickEventPre(TickEvent.Pre event) {}
3533
public void onTickEventPost(TickEvent.Post event) {}

src/main/java/nekiplay/meteorplus/features/modules/movement/fly/FlyModes.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ public enum FlyModes {
44
Vulcan_Clip,
55
Matrix_Exploit_2,
66
Matrix_Exploit,
7-
Damage,
8-
Damage_OldFag
9-
;
7+
Damage_OldFag;
108

119
@Override
1210
public String toString() {

src/main/java/nekiplay/meteorplus/features/modules/movement/fly/FlyPlus.java

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package nekiplay.meteorplus.features.modules.movement.fly;
22

3-
import meteordevelopment.meteorclient.events.entity.DamageEvent;
43
import meteordevelopment.meteorclient.events.entity.player.CanWalkOnFluidEvent;
54
import meteordevelopment.meteorclient.events.entity.player.PlayerMoveEvent;
65
import meteordevelopment.meteorclient.events.entity.player.SendMovementPacketsEvent;
@@ -53,58 +52,6 @@ public FlyPlus() {
5352
.build()
5453
);
5554

56-
public final Setting<Double> speedDamage = sgGeneral.add(new DoubleSetting.Builder()
57-
.name("damage-fly-speed")
58-
.description("Fly speed.")
59-
.defaultValue(1.25)
60-
.max(2500)
61-
.sliderRange(0, 2500)
62-
.onChanged((e) -> {
63-
Damage.speed = e;
64-
})
65-
.visible(() -> flyMode.get() == FlyModes.Damage)
66-
.build()
67-
);
68-
69-
public final Setting<Double> speedDamageY = sgGeneral.add(new DoubleSetting.Builder()
70-
.name("speed-y")
71-
.description("Fly speed Y.")
72-
.defaultValue(1.25)
73-
.max(2500)
74-
.sliderRange(0, 2500)
75-
.onChanged((e) -> {
76-
Damage.speedUp = e;
77-
})
78-
.visible(() -> flyMode.get() == FlyModes.Damage)
79-
.build()
80-
);
81-
82-
public final Setting<Integer> speedDamageTicks = sgGeneral.add(new IntSetting.Builder()
83-
.name("max-ticks")
84-
.description("Max fly ticks.")
85-
.defaultValue(15)
86-
.max(2500)
87-
.sliderRange(0, 2500)
88-
.onChanged((e) -> {
89-
Damage.workingTicks = e;
90-
})
91-
.visible(() -> flyMode.get() == FlyModes.Damage)
92-
.build()
93-
);
94-
public final Setting<Integer> speedUpDamageTicks = sgGeneral.add(new IntSetting.Builder()
95-
.name("max-up-ticks")
96-
.description("Max fly ticks.")
97-
.defaultValue(5)
98-
.max(2500)
99-
.sliderRange(0, 2500)
100-
.onChanged((e) -> {
101-
Damage.workingUpTicks = e;
102-
})
103-
.visible(() -> flyMode.get() == FlyModes.Damage)
104-
.build()
105-
);
106-
107-
10855
public final Setting<Boolean> canClip = sgGeneral.add(new BoolSetting.Builder()
10956
.name("can-clip")
11057
.description("Max fly ticks.")
@@ -181,12 +128,6 @@ private void onPlayerMoveSendPre(SendMovementPacketsEvent.Pre event) {
181128
currentMode.onPlayerMoveSendPre(event);
182129
}
183130

184-
185-
@EventHandler
186-
private void onDamage(DamageEvent event) {
187-
currentMode.onDamage(event);
188-
}
189-
190131
private void onFlyModeChanged(FlyModes mode) {
191132
switch (mode) {
192133
case Matrix_Exploit_2 -> currentMode = new MatrixExploit2();
@@ -197,14 +138,6 @@ private void onFlyModeChanged(FlyModes mode) {
197138
}
198139
currentMode = new VulcanClip();
199140
}
200-
case Damage -> currentMode = new Damage();
201-
case Damage_OldFag -> {
202-
currentMode = new Damage();
203-
Damage.workingUpTicks = 0;
204-
Damage.workingTicks = 15;
205-
Damage.speed = 0.396;
206-
Damage.speedUp = 0;
207-
}
208141
}
209142
}
210143

src/main/java/nekiplay/meteorplus/features/modules/movement/fly/modes/Damage.java

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)