item interact based fake fly when the elytra is in hotbar to avoid reaching inventory packet limit

Author: beanbag44

src/main/kotlin/com/lambda/interaction/managers/inventory/InventoryManager.kt

@@ -22,10 +22,10 @@ import com.lambda.context.SafeContext
 import com.lambda.event.events.PacketEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
-import com.lambda.interaction.managers.Manager
 import com.lambda.interaction.handlers.packet.PacketLimitHandler.canSendPackets
 import com.lambda.interaction.handlers.packet.PacketLimitHandler.sentPackets
 import com.lambda.interaction.handlers.packet.PacketType
+import com.lambda.interaction.managers.Manager
 import com.lambda.interaction.managers.inventory.InventoryManager.actions
 import com.lambda.interaction.managers.inventory.InventoryManager.activeRequest
 import com.lambda.interaction.managers.inventory.InventoryManager.alteredSlots
@@ -163,15 +163,18 @@ object InventoryManager : Manager<InventoryRequest>(
 	 * incoming [InventoryS2CPacket] and [ScreenHandlerSlotUpdateS2CPacket] packets to decide whether to
 	 * block certain updates.
 	 */
-	private fun SafeContext.indexInventoryChanges() {
-		if (player.currentScreenHandler.syncId != screenHandler?.syncId) return
-		val changes = screenHandler?.slots
-			?.filter { !it.stack.equal(slots[it.id]) }
-			?.map { InventoryChange(it.id, slots[it.id], it.stack.copy()) }
-			?: emptyList()
-		if (player.currentScreenHandler.syncId == 0) alteredPlayerSlots.addAll(changes)
-		else alteredSlots.addAll(changes)
-		slots = getStacks(player.currentScreenHandler.slots)
+	context(safeContext: SafeContext)
+	fun indexInventoryChanges() {
+		with(safeContext) {
+			if (player.currentScreenHandler.syncId != screenHandler?.syncId) return
+			val changes = screenHandler?.slots
+				?.filter { !it.stack.equal(slots[it.id]) }
+				?.map { InventoryChange(it.id, slots[it.id], it.stack.copy()) }
+				?: emptyList()
+			if (player.currentScreenHandler.syncId == 0) alteredPlayerSlots.addAll(changes)
+			else alteredSlots.addAll(changes)
+			slots = getStacks(player.currentScreenHandler.slots)
+		}
 	}
 
 	private fun getStacks(slots: Collection<Slot>) = slots.map { it.stack.copy() }

src/main/kotlin/com/lambda/module/modules/movement/elytrafly/ElytraFly.kt

@@ -17,6 +17,7 @@
 
 package com.lambda.module.modules.movement.elytrafly
 
+import com.lambda.config.ConfigEditor.editSetting
 import com.lambda.config.ConfigEditor.forEachSetting
 import com.lambda.config.ConfigEditor.hideAllExcept
 import com.lambda.config.Tab
@@ -26,6 +27,7 @@ import com.lambda.config.withEdits
 import com.lambda.event.events.ClientEvent
 import com.lambda.event.events.MovementEvent
 import com.lambda.event.events.PacketEvent
+import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.module.Module
 import com.lambda.module.modules.movement.elytrafly.modes.BounceElytraFly
@@ -72,6 +74,7 @@ object ElytraFly : Module(
     init {
         setDefaultAutomationConfig()
             .withEdits {
+                hotbarConfig::tickStageMask.editSetting { defaultValue(TickEvent.ALL_STAGES.toMutableList()) }
 	            hideAllExcept(::inventoryConfig, ::rotationConfig)
             }
 

src/main/kotlin/com/lambda/module/modules/movement/elytrafly/ElytraFlyMode.kt

@@ -21,9 +21,12 @@ import com.lambda.config.ConfigBlock
 import com.lambda.context.Automated
 import com.lambda.context.SafeContext
 import com.lambda.event.Muteable
+import com.lambda.event.events.PacketEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.handlers.GlideHandler.ELYTRA_SELECTION
+import com.lambda.interaction.managers.hotbar.HotbarRequest
+import com.lambda.interaction.managers.inventory.InventoryManager
 import com.lambda.interaction.managers.inventory.InventoryRequest
 import com.lambda.interaction.managers.inventory.InventoryRequest.Companion.inventoryRequest
 import com.lambda.module.modules.movement.elytrafly.ElytraFly.FlyMode
@@ -36,7 +39,10 @@ import net.minecraft.entity.Entity
 import net.minecraft.entity.EquipmentSlot
 import net.minecraft.item.Items
 import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket
+import net.minecraft.network.packet.s2c.play.InventoryS2CPacket
+import net.minecraft.network.packet.s2c.play.ScreenHandlerSlotUpdateS2CPacket
 import net.minecraft.screen.slot.Slot
+import net.minecraft.util.Hand
 
 abstract class ElytraFlyMode(
 	val flyMode: FlyMode
@@ -54,6 +60,11 @@ abstract class ElytraFlyMode(
 		listen<TickEvent.Pre>({ 100 }) {
 			fakeGliding = fakeFly && fakeGliding && player.canGlide()
 		}
+
+		listen<PacketEvent.Receive.Pre>({ 100 }) { event ->
+			if (event.packet !is InventoryS2CPacket && event.packet !is ScreenHandlerSlotUpdateS2CPacket) return@listen
+			if (fakeGliding) event.cancel()
+		}
 	}
 
 	protected fun onEnable(callback: SafeContext.() -> Unit) { onEnableListeners.add(callback) }
@@ -82,21 +93,34 @@ abstract class ElytraFlyMode(
 		}
 		val elytraInHotbar = elytraSlot.index in 0..8
 
-		val chestSlot = player.armorSlots[1]
+		val chestSlot = player.armorSlots.getOrNull(1) ?: return false
 
+		if (elytraInHotbar) {
+			val hotbarRequest = HotbarRequest(
+				elytraSlot.index,
+				ElytraFly,
+				keepTicks = 0,
+				nowOrNothing = true
+			).submit()
+			if (!hotbarRequest.done) return false
+		}
 		fun InventoryRequest.InvRequestBuilder.swapChest() {
-			if (elytraInHotbar) swap(chestSlot.id, elytraSlot.index)
-			else {
+			if (elytraInHotbar) {
+				interaction.interactItem(player, Hand.MAIN_HAND)
+				InventoryManager.indexInventoryChanges()
+			} else {
 				moveSlot(elytraSlot.id, chestSlot.id)
 				if (!chestSlot.stack.isEmpty) pickup(elytraSlot.id)
 			}
 		}
 
-		return inventoryRequest {
+		val inventoryRequest = inventoryRequest {
 			swapChest()
 			action { startFly() }
 			swapChest()
-		}.submit(false).done
+		}.submit(false)
+
+		return inventoryRequest.done
 	}
 
 	fun SafeContext.findElytra(): Slot? =