Merge placing and interacting into one (175)

Author: beanbag44

src/main/java/com/lambda/mixin/baritone/MixinBaritonePlayerContext.java

@@ -21,7 +21,7 @@
 import baritone.api.utils.Rotation;
 import baritone.utils.player.BaritonePlayerContext;
 import com.lambda.interaction.BaritoneManager;
-import com.lambda.interaction.request.rotating.RotationManager;
+import com.lambda.interaction.managers.rotating.RotationManager;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

src/main/java/com/lambda/mixin/baritone/MixinLookBehavior.java

@@ -22,7 +22,7 @@
 import baritone.api.utils.Rotation;
 import baritone.behavior.LookBehavior;
 import com.lambda.interaction.BaritoneManager;
-import com.lambda.interaction.request.rotating.RotationManager;
+import com.lambda.interaction.managers.rotating.RotationManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

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

@@ -20,12 +20,18 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.InventoryEvent;
 import com.lambda.event.events.PlayerEvent;
+import com.lambda.interaction.managers.inventory.InventoryManager;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
+import net.minecraft.client.recipebook.ClientRecipeBook;
+import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.screen.slot.SlotActionType;
+import net.minecraft.stat.StatHandler;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
@@ -42,7 +48,6 @@
 
 @Mixin(ClientPlayerInteractionManager.class)
 public class ClientPlayInteractionManagerMixin {
-
     @Shadow
     public float currentBreakingProgress;
 
@@ -115,4 +120,11 @@ private void updateBlockBreakingProgressPre(BlockPos pos, Direction side, Callba
     private void cancelBlockBreakingPre(CallbackInfo ci) {
         if (EventFlow.post(new PlayerEvent.Breaking.Cancel(currentBreakingProgress)).isCanceled()) ci.cancel();
     }
+
+    @WrapMethod(method = "createPlayer(Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/stat/StatHandler;Lnet/minecraft/client/recipebook/ClientRecipeBook;ZZ)Lnet/minecraft/client/network/ClientPlayerEntity;")
+    private ClientPlayerEntity injectCreatePlayer(ClientWorld world, StatHandler statHandler, ClientRecipeBook recipeBook, boolean lastSneaking, boolean lastSprinting, Operation<ClientPlayerEntity> original) {
+        var player = original.call(world, statHandler, recipeBook, lastSneaking, lastSprinting);
+        InventoryManager.INSTANCE.setScreenHandler(player.playerScreenHandler);
+        return player;
+    }
 }

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

@@ -22,8 +22,8 @@
 import com.lambda.event.events.MovementEvent;
 import com.lambda.event.events.PlayerEvent;
 import com.lambda.event.events.TickEvent;
-import com.lambda.interaction.PlayerPacketManager;
-import com.lambda.interaction.request.rotating.RotationManager;
+import com.lambda.interaction.PlayerPacketHandler;
+import com.lambda.interaction.managers.rotating.RotationManager;
 import com.lambda.module.modules.player.PortalGui;
 import com.lambda.module.modules.render.ViewModel;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
@@ -80,13 +80,13 @@ void processMovement(Input input) {
     @Inject(method = "sendMovementPackets", at = @At(value = "HEAD"), cancellable = true)
     void sendLambdaMovement(CallbackInfo ci) {
         ci.cancel();
-        PlayerPacketManager.sendPlayerPackets();
+        PlayerPacketHandler.sendPlayerPackets();
         autoJumpEnabled = Lambda.getMc().options.getAutoJump().getValue();
     }
 
     @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;sendSneakingPacket()V"))
     void sendSneakingPacket(ClientPlayerEntity entity) {
-        PlayerPacketManager.sendSneakPackets();
+        PlayerPacketHandler.sendSneakPackets();
     }
 
     @Redirect(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isSprinting()Z"))

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

@@ -21,8 +21,8 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.EntityEvent;
 import com.lambda.event.events.PlayerEvent;
-import com.lambda.interaction.request.rotating.RotationManager;
-import com.lambda.interaction.request.rotating.RotationMode;
+import com.lambda.interaction.managers.rotating.RotationManager;
+import com.lambda.interaction.managers.rotating.RotationMode;
 import com.lambda.module.modules.player.RotationLock;
 import com.lambda.module.modules.render.NoRender;
 import com.lambda.util.math.Vec2d;

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

@@ -17,7 +17,7 @@
 
 package com.lambda.mixin.entity;
 
-import com.lambda.interaction.request.inventory.InventoryManager;
+import com.lambda.interaction.managers.inventory.InventoryManager;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.HandledScreens;
 import net.minecraft.screen.ScreenHandler;

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

@@ -20,7 +20,7 @@
 import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MovementEvent;
-import com.lambda.interaction.request.rotating.RotationManager;
+import com.lambda.interaction.managers.rotating.RotationManager;
 import com.lambda.module.modules.movement.Velocity;
 import com.lambda.module.modules.render.ViewModel;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;

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

@@ -20,7 +20,7 @@
 import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MovementEvent;
-import com.lambda.interaction.request.rotating.RotationManager;
+import com.lambda.interaction.managers.rotating.RotationManager;
 import net.minecraft.entity.player.PlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

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

@@ -18,7 +18,7 @@
 package com.lambda.mixin.entity;
 
 import com.lambda.Lambda;
-import com.lambda.interaction.request.hotbar.HotbarManager;
+import com.lambda.interaction.managers.hotbar.HotbarManager;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import net.minecraft.entity.player.PlayerInventory;
 import org.objectweb.asm.Opcodes;

src/main/java/com/lambda/mixin/network/ClientPlayNetworkHandlerMixin.java

@@ -20,7 +20,7 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.InventoryEvent;
 import com.lambda.event.events.WorldEvent;
-import com.lambda.interaction.request.inventory.InventoryManager;
+import com.lambda.interaction.managers.inventory.InventoryManager;
 import com.lambda.module.modules.movement.Velocity;
 import com.lambda.module.modules.render.NoRender;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;