Merge pull request #27 from majorsopa/main

add fly
evaan · Jun 11, 2021 · f2af08c · f2af08c
2 parents f618638 + 754003f
commit f2af08c
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 13 deletions.
diff --git a/src/main/java/com/evaan/frostburn/module/ModuleManager.java b/src/main/java/com/evaan/frostburn/module/ModuleManager.java
@@ -2,10 +2,7 @@
 
 import com.evaan.frostburn.module.modules.combat.*;
 import com.evaan.frostburn.module.modules.misc.*;
-import com.evaan.frostburn.module.modules.movement.Jesus;
-import com.evaan.frostburn.module.modules.movement.NoFall;
-import com.evaan.frostburn.module.modules.movement.SafeWalk;
-import com.evaan.frostburn.module.modules.movement.Sprint;
+import com.evaan.frostburn.module.modules.movement.*;
 import com.evaan.frostburn.module.modules.render.*;
 
 import java.util.ArrayList;
@@ -50,6 +47,7 @@ public static void init() {
         modules.add(new CleanChat());
         modules.add(new MiddleClick());
         modules.add(new ImGuiMod());
+        modules.add(new Fly());
 
         modules.sort(Comparator.comparing(object -> object.name)); //sort the modules alphabetically
     }

diff --git a/src/main/java/com/evaan/frostburn/module/modules/misc/Nuker.java b/src/main/java/com/evaan/frostburn/module/modules/misc/Nuker.java
@@ -79,16 +79,19 @@ public void onUpdate() {
             }
         }
 
-        if (faceBlock.getValue()) {
-            mc.player.lookAt(EntityAnchorArgumentType.EntityAnchor.EYES, Vec3d.of(blocks.get(0)));
-        }
 
-        Iterator<BlockPos> blocksIter = blocks.iterator();
-        for (int j = 0; j < blocks.size(); j++) {
-            if (j < blocksToMine.getValue() && blocksIter.hasNext()) {
-                breakBlock(blocksIter.next());
-            } else {
-                break;
+        if (blocks.size() > 0) {
+            if (faceBlock.getValue()) {
+                mc.player.lookAt(EntityAnchorArgumentType.EntityAnchor.EYES, Vec3d.of(blocks.get(0)));
+            }
+
+            Iterator<BlockPos> blocksIter = blocks.iterator();
+            for (int j = 0; j < blocks.size(); j++) {
+                if (j < blocksToMine.getValue() && blocksIter.hasNext()) {
+                    breakBlock(blocksIter.next());
+                } else {
+                    break;
+                }
             }
         }
 

diff --git a/src/main/java/com/evaan/frostburn/module/modules/movement/Fly.java b/src/main/java/com/evaan/frostburn/module/modules/movement/Fly.java
@@ -0,0 +1,42 @@
+package com.evaan.frostburn.module.modules.movement;
+
+import com.evaan.frostburn.module.Module;
+import com.evaan.frostburn.util.Setting;
+import net.minecraft.entity.player.PlayerAbilities;
+
+public class Fly extends Module {
+    public Fly() {super("Fly", Module.Category.MOVEMENT);}
+
+    Setting<Float> speed = register(
+            new Setting(
+                    "Speed",
+                    this,
+                    100f,
+                    1f,
+                    500f
+            )
+    );
+
+    @Override
+    public void onUpdate() {
+        assert mc.player != null;
+
+        PlayerAbilities abilities = mc.player.getAbilities();
+        abilities.flying = true;
+
+        abilities.setFlySpeed(speed.getValue() / 5000);
+
+        mc.player.sendAbilitiesUpdate();
+    }
+
+    @Override
+    public void onDisable() {
+        assert mc.player != null;
+
+        PlayerAbilities abilities = mc.player.getAbilities();
+        abilities.flying = false;
+
+        mc.player.sendAbilitiesUpdate();
+
+    }
+}