From dd86d227dd25bd626d470c7e17b47d61cd5e9d85 Mon Sep 17 00:00:00 2001
From: Cloudburst <serek.lego@gmail.com>
Date: Fri, 4 Jun 2021 11:11:18 +0200
Subject: [PATCH] Dolphin -> Gravity

---
 .../rejects/MeteorRejectsAddon.java           |  2 +-
 .../cloudburst/rejects/modules/Dolphin.java   | 26 ----------
 .../cloudburst/rejects/modules/Gravity.java   | 52 +++++++++++++++++++
 3 files changed, 53 insertions(+), 27 deletions(-)
 delete mode 100644 src/main/java/cloudburst/rejects/modules/Dolphin.java
 create mode 100644 src/main/java/cloudburst/rejects/modules/Gravity.java

diff --git a/src/main/java/cloudburst/rejects/MeteorRejectsAddon.java b/src/main/java/cloudburst/rejects/MeteorRejectsAddon.java
index 10b0251..5e270d9 100644
--- a/src/main/java/cloudburst/rejects/MeteorRejectsAddon.java
+++ b/src/main/java/cloudburst/rejects/MeteorRejectsAddon.java
@@ -33,7 +33,7 @@ public class MeteorRejectsAddon extends MeteorAddon {
 		modules.add(new AutoWither());
 		modules.add(new ColorSigns());
 		modules.add(new Confuse());
-		modules.add(new Dolphin());
+		modules.add(new Gravity());
 		modules.add(new InteractionMenu());
 		modules.add(new Glide());
 		modules.add(new Lavacast());
diff --git a/src/main/java/cloudburst/rejects/modules/Dolphin.java b/src/main/java/cloudburst/rejects/modules/Dolphin.java
deleted file mode 100644
index 0517c16..0000000
--- a/src/main/java/cloudburst/rejects/modules/Dolphin.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudburst.rejects.modules;
-
-import meteordevelopment.orbit.EventHandler;
-import minegame159.meteorclient.events.world.TickEvent;
-import minegame159.meteorclient.mixininterface.IVec3d;
-import minegame159.meteorclient.systems.modules.Module;
-import net.minecraft.util.math.Vec3d;
-
-import cloudburst.rejects.MeteorRejectsAddon;
-
-public class Dolphin extends Module {
-
-    public Dolphin() {
-        super(MeteorRejectsAddon.CATEGORY, "dolphin", "Disables underwater gravity.");
-    }
-
-    @EventHandler
-    private void onTick(TickEvent.Post event) {
-        if (mc.options.keySneak.isPressed()) return;
-
-        if (mc.player.isTouchingWater()) {
-            Vec3d velocity = mc.player.getVelocity();
-            ((IVec3d) velocity).set(velocity.x, 0.002, velocity.z);
-        }
-    }
-}
diff --git a/src/main/java/cloudburst/rejects/modules/Gravity.java b/src/main/java/cloudburst/rejects/modules/Gravity.java
new file mode 100644
index 0000000..d9f511b
--- /dev/null
+++ b/src/main/java/cloudburst/rejects/modules/Gravity.java
@@ -0,0 +1,52 @@
+package cloudburst.rejects.modules;
+
+import meteordevelopment.orbit.EventHandler;
+import minegame159.meteorclient.events.world.TickEvent;
+import minegame159.meteorclient.mixininterface.IVec3d;
+import minegame159.meteorclient.settings.BoolSetting;
+import minegame159.meteorclient.settings.Setting;
+import minegame159.meteorclient.settings.SettingGroup;
+import minegame159.meteorclient.systems.modules.Module;
+import net.minecraft.util.math.Vec3d;
+
+import cloudburst.rejects.MeteorRejectsAddon;
+
+public class Gravity extends Module {
+
+    public Gravity() {
+        super(MeteorRejectsAddon.CATEGORY, "gravity", "Modifies gravity.");
+    }
+
+    private final SettingGroup sgGeneral = settings.getDefaultGroup();
+
+    private final Setting<Boolean> dolphin = sgGeneral.add(new BoolSetting.Builder()
+        .name("dolphin")
+        .description("Disable underwater gravity.")
+        .defaultValue(true)
+        .build()
+    );
+
+    private final Setting<Boolean> moon = sgGeneral.add(new BoolSetting.Builder()
+        .name("moon")
+        .description("Tired of being on earth?")
+        .defaultValue(true)
+        .build()
+    );
+
+    @EventHandler
+    private void onTick(TickEvent.Post event) {
+        if (mc.options.keySneak.isPressed()) return;
+
+        if (mc.player.isTouchingWater()) {
+            if (dolphin.get()) {
+                Vec3d velocity = mc.player.getVelocity();
+                ((IVec3d) velocity).set(velocity.x, 0.002, velocity.z);
+            }
+            
+        }
+        else if (moon.get()) {
+            Vec3d velocity = mc.player.getVelocity();
+            ((IVec3d) velocity).set(velocity.x, velocity.y + 0.0568000030517578, velocity.z); // Yes, this was precisely calculated.
+        }
+    }
+}