Fixed horizontal fly speed.

coltonk9043 · Apr 2, 2024 · 9b01b21 · 9b01b21
1 parent 7fd04b1
commit 9b01b21
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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;
+	}
 }