From 9b01b216f14b14f34af406a8ac2647efc7e0a6a6 Mon Sep 17 00:00:00 2001
From: Colton <coltonk9043@yahoo.ca>
Date: Tue, 2 Apr 2024 18:26:44 -0400
Subject: [PATCH] Fixed horizontal fly speed.

---
 .../aoba/mixin/ClientPlayerEntityMixin.java   | 26 +++++++++----------
 .../net/aoba/mixin/LivingEntityMixin.java     |  4 +++
 .../net/aoba/mixin/PlayerEntityMixin.java     |  5 ++++
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/main/java/net/aoba/mixin/ClientPlayerEntityMixin.java b/src/main/java/net/aoba/mixin/ClientPlayerEntityMixin.java
index e3e76c61..3e55391c 100644
--- a/src/main/java/net/aoba/mixin/ClientPlayerEntityMixin.java
+++ b/src/main/java/net/aoba/mixin/ClientPlayerEntityMixin.java
@@ -28,6 +28,7 @@
 import net.aoba.event.events.PlayerHealthEvent;
 import net.aoba.gui.GuiManager;
 import net.aoba.misc.FakePlayerEntity;
+import net.aoba.module.modules.movement.Fly;
 import net.aoba.module.modules.movement.Freecam;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.network.ClientPlayerEntity;
@@ -86,18 +87,15 @@ public void onSetHealth(float health, CallbackInfo ci) {
 	}
 
 
-//	@Override
-//	protected float getOffGroundSpeed() {
-//		float speed = super.getOffGroundSpeed();
-//		if(Aoba.getInstance().moduleManager.fly.getState()) {
-//			Fly fly = (Fly)Aoba.getInstance().moduleManager.fly;
-//			return (float)fly.getSpeed();
-//		}
-//
-//		if(Aoba.getInstance().moduleManager.freecam.getState()) {
-//			Freecam freecam = (Freecam)Aoba.getInstance().moduleManager.freecam;
-//			return (float)freecam.getSpeed();
-//		}
-//		return speed;
-//	}
+	@Override
+	protected void onGetOffGroundSpeed(CallbackInfoReturnable<Float> cir) {
+		if(Aoba.getInstance().moduleManager.fly.getState()) {
+			Fly fly = (Fly)Aoba.getInstance().moduleManager.fly;
+			System.out.println("FLY IS ON!");
+			cir.setReturnValue((float)fly.getSpeed());
+		}else if(Aoba.getInstance().moduleManager.freecam.getState()) {
+			Freecam freecam = (Freecam)Aoba.getInstance().moduleManager.freecam;
+			cir.setReturnValue((float)freecam.getSpeed());
+		}
+	}
 }
diff --git a/src/main/java/net/aoba/mixin/LivingEntityMixin.java b/src/main/java/net/aoba/mixin/LivingEntityMixin.java
index 256ca93c..65e0ce71 100644
--- a/src/main/java/net/aoba/mixin/LivingEntityMixin.java
+++ b/src/main/java/net/aoba/mixin/LivingEntityMixin.java
@@ -4,6 +4,8 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
 import net.minecraft.entity.LivingEntity;
 
 @Mixin(LivingEntity.class)
@@ -13,4 +15,6 @@ public abstract class LivingEntityMixin extends EntityMixin {
 	public void onSetHealth(float health, CallbackInfo ci) {
 		return;
 	}
+	
+	
 }
diff --git a/src/main/java/net/aoba/mixin/PlayerEntityMixin.java b/src/main/java/net/aoba/mixin/PlayerEntityMixin.java
index 853e2271..69264877 100644
--- a/src/main/java/net/aoba/mixin/PlayerEntityMixin.java
+++ b/src/main/java/net/aoba/mixin/PlayerEntityMixin.java
@@ -59,4 +59,9 @@ public void onGetBlockBreakingSpeed(BlockState blockState, CallbackInfoReturnabl
 			ci.setReturnValue(speed);
 		}
 	}
+	
+	@Inject(at = {@At("HEAD")}, method="getOffGroundSpeed()F", cancellable = true)
+	protected void onGetOffGroundSpeed(CallbackInfoReturnable<Float> cir) {
+		return;
+	}
 }