Skip to content

Commit 7f73e20

Browse files
authored
add height option
1 parent 32b445f commit 7f73e20

1 file changed

Lines changed: 14 additions & 4 deletions

File tree

src/main/java/tilley/rocket/AutoFireworkModule.java

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,33 @@
1212
import org.rusherhack.client.api.utils.InventoryUtils;
1313
import org.rusherhack.client.api.utils.WorldUtils;
1414
import org.rusherhack.core.event.subscribe.Subscribe;
15+
import org.rusherhack.core.setting.BooleanSetting;
1516
import org.rusherhack.core.setting.NumberSetting;
1617

1718
public class AutoFireworkModule extends ToggleableModule {
18-
private final NumberSetting<Float> minSpeed = new NumberSetting<>("MinSpeed", "Fires a rocket when the player’s speed drops below this value", 20f, 1f, 34f).incremental(1f);
19+
private final BooleanSetting underSpeed = new BooleanSetting("UnderSpeed", "Deploy rockets when player speed drops below a value", true);
20+
private final NumberSetting<Float> minSpeed = new NumberSetting<>("MinSpeed", "Value to deploy rocket at", 20f, 1f, 34f).incremental(1f);
21+
private final BooleanSetting underHeight = new BooleanSetting("UnderHeight", "Deploy rockets when player height (y coord) drops below a value", false);
22+
private final NumberSetting<Float> minHeight = new NumberSetting<>("MinSpeed", "Y coordinate to deploy rocket when player drops below", 120f, 1f, 340f).incremental(1f);
23+
1924
private boolean waitingForFirework = false;
2025

2126
public AutoFireworkModule() {
22-
super("AutoFirework", "Automatically redeploy fireworks when player drops below a certain speed", ModuleCategory.MOVEMENT);
23-
this.registerSettings(minSpeed);
27+
super("AutoFirework", "Automatically redeploy fireworks when player drops below a certain speed or height", ModuleCategory.MOVEMENT);
28+
this.registerSettings(underSpeed, underHeight);
29+
underSpeed.addSubSettings(minSpeed);
30+
underHeight.addSubSettings(minHeight);
2431
}
2532

2633
@Subscribe
2734
private void onUpdate(EventUpdate event) {
2835
if (mc.player == null || mc.gameMode == null) return;
2936
double speed = mc.player.getDeltaMovement().length() * RusherHackAPI.getServerState().getTPS();
3037

31-
if (mc.player.isFallFlying() && speed < minSpeed.getValue()) {
38+
if (mc.player.isFallFlying() &&
39+
((speed < minSpeed.getValue()) && underSpeed.getValue() ||
40+
mc.player.getY() < minHeight.getValue() && underHeight.getValue())) {
41+
3242
if (waitingForFirework) {
3343
if (hasActiveFirework()) waitingForFirework = false;
3444
return;

0 commit comments

Comments
 (0)