Feature: AutoElytraSwap (#305)

Author: beanbag44

src/main/java/com/lambda/mixin/MinecraftClientMixin.java

@@ -17,7 +17,7 @@
 
 package com.lambda.mixin;
 
-import com.lambda.core.TimerHandler;
+import com.lambda.interaction.handlers.TimerHandler;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.*;
 import com.lambda.gui.DearImGui;

src/main/java/com/lambda/mixin/entity/ClientPlayInteractionManagerMixin.java

@@ -20,7 +20,7 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.InventoryEvent;
 import com.lambda.event.events.PlayerEvent;
-import com.lambda.interaction.BaritoneHandler;
+import com.lambda.interaction.handlers.BaritoneHandler;
 import com.lambda.interaction.managers.inventory.InventoryManager;
 import com.lambda.interaction.managers.rotating.RotationManager;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
@@ -123,7 +123,7 @@ public void clickSlotHead(int syncId, int slotId, int button, SlotActionType act
      * }
      * }</pre>
      */
-    @Inject(method = "syncSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayNetworkHandler;sendPacket(Lnet/minecraft/network/packet/Packet;)V", shift = At.Shift.BEFORE))
+    @Inject(method = "syncSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayNetworkHandler;sendPacket(Lnet/minecraft/network/packet/Packet;)V"))
     public void overrideSelectedSlotSync(CallbackInfo ci) {
         EventFlow.post(new InventoryEvent.HotbarSlot.Update(lastSelectedSlot));
     }

src/main/java/com/lambda/mixin/entity/ClientPlayerEntityMixin.java

@@ -19,7 +19,7 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.*;
-import com.lambda.interaction.BaritoneHandler;
+import com.lambda.interaction.handlers.BaritoneHandler;
 import com.lambda.interaction.managers.rotating.RotationManager;
 import com.lambda.module.modules.movement.NoJumpCooldown;
 import com.lambda.module.modules.movement.elytrafly.ElytraFly;

src/main/java/com/lambda/mixin/entity/EntityMixin.java

@@ -20,7 +20,7 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.EntityEvent;
 import com.lambda.event.events.PlayerEvent;
-import com.lambda.interaction.BaritoneHandler;
+import com.lambda.interaction.handlers.BaritoneHandler;
 import com.lambda.interaction.managers.rotating.RotationManager;
 import com.lambda.module.modules.movement.elytrafly.ElytraFly;
 import com.lambda.module.modules.render.NoRender;

src/main/java/com/lambda/mixin/entity/LivingEntityMixin.java

@@ -20,7 +20,8 @@
 import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MovementEvent;
-import com.lambda.interaction.BaritoneHandler;
+import com.lambda.interaction.handlers.BaritoneHandler;
+import com.lambda.interaction.handlers.GlideHandler;
 import com.lambda.interaction.managers.rotating.RotationManager;
 import com.lambda.module.modules.movement.Velocity;
 import com.lambda.module.modules.movement.elytrafly.ElytraFly;
@@ -204,13 +205,8 @@ private void injectTravelGliding(Vec3d movementInput, CallbackInfo ci) {
     }
 
     @ModifyExpressionValue(method = "canGlide", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;canGlideWith(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/EquipmentSlot;)Z"))
-    private boolean injectCanGlide(boolean original) {
-        if (lambda$instance != Lambda.getMc().player) return original;
-        if (original) return true;
-        if (!ElytraFly.INSTANCE.getFakeFly()) return false;
-        return Boolean.TRUE.equals(runSafe(safeContext -> {
-            final var mode = ElytraFly.getMode().getElytraFly();
-            return mode.isEnabled() && mode.findElytra(safeContext) != null;
-        }));
+    private boolean modifyCanGlideWith(boolean original) {
+        if ((Object) this != Lambda.getMc().player) return original;
+        return runSafe(GlideHandler::canGlide);
     }
 }

src/main/java/com/lambda/mixin/entity/PlayerEntityMixin.java

@@ -20,24 +20,21 @@
 import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MovementEvent;
-import com.lambda.interaction.BaritoneHandler;
+import com.lambda.interaction.handlers.BaritoneHandler;
+import com.lambda.interaction.handlers.GlideHandler;
 import com.lambda.interaction.managers.rotating.RotationManager;
-import com.lambda.module.modules.movement.elytrafly.ElytraFly;
 import com.lambda.module.modules.player.Reach;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import kotlin.Unit;
 import net.minecraft.entity.player.PlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import static com.lambda.threading.ThreadingKt.runSafe;
-
 @Mixin(PlayerEntity.class)
-public class PlayerEntityMixin {
+public abstract class PlayerEntityMixin {
     @Inject(method = "clipAtLedge", at = @At(value = "HEAD"), cancellable = true)
     private void injectSafeWalk(CallbackInfoReturnable<Boolean> cir) {
         MovementEvent.ClipAtLedge event = new MovementEvent.ClipAtLedge(((PlayerEntity) (Object) this).isSneaking());
@@ -70,16 +67,9 @@ private double wrapGetEntityInteractionRange(Operation<Double> original) {
         return original.call();
     }
 
-    @WrapOperation(method = "checkGliding", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;startGliding()V"))
-    private void injectCheckGliding(PlayerEntity instance, Operation<Void> original) {
-        final var elytraFly = ElytraFly.getMode().getElytraFly();
-        if (!elytraFly.isEnabled() || !ElytraFly.INSTANCE.getFakeFly()) {
-            original.call(instance);
-            return;
-        }
-        runSafe(safeContext -> {
-            elytraFly.flyOrFakeFly(safeContext, null);
-            return Unit.INSTANCE;
-        });
+    @Inject(method = "checkGliding", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;startGliding()V"), cancellable = true)
+    private void injectCheckGliding(CallbackInfoReturnable<Boolean> cir) {
+        if ((Object) this != Lambda.getMc().player) return;
+        if (GlideHandler.getOverridingGlide()) cir.setReturnValue(false);
     }
 }

src/main/java/com/lambda/mixin/render/LivingEntityRendererMixin.java

@@ -18,7 +18,7 @@
 package com.lambda.mixin.render;
 
 import com.lambda.Lambda;
-import com.lambda.interaction.BaritoneHandler;
+import com.lambda.interaction.handlers.BaritoneHandler;
 import com.lambda.interaction.managers.rotating.RotationManager;
 import com.lambda.module.modules.render.Nametags;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;

src/main/java/com/lambda/mixin/render/PlayerListHudMixin.java

@@ -17,7 +17,7 @@
 
 package com.lambda.mixin.render;
 
-import com.lambda.friend.FriendHandler;
+import com.lambda.interaction.handlers.FriendHandler;
 import com.lambda.module.modules.render.ExtraTab;
 import com.lambda.util.text.TextBuilder;
 import com.lambda.util.text.TextDslKt;

src/main/java/com/lambda/mixin/world/DirectionMixin.java

@@ -17,7 +17,7 @@
 
 package com.lambda.mixin.world;
 
-import com.lambda.interaction.BaritoneHandler;
+import com.lambda.interaction.handlers.BaritoneHandler;
 import com.lambda.interaction.managers.rotating.RotationManager;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import net.minecraft.entity.Entity;

src/main/kotlin/com/lambda/command/commands/FriendCommand.kt

@@ -29,7 +29,7 @@ import com.lambda.brigadier.executeWithResult
 import com.lambda.brigadier.required
 import com.lambda.command.LambdaCommand
 import com.lambda.config.categories.FriendCategory
-import com.lambda.friend.FriendHandler
+import com.lambda.interaction.handlers.FriendHandler
 import com.lambda.network.mojang.getProfile
 import com.lambda.threading.runIO
 import com.lambda.util.CommunicationUtils.info