Revert "Feature: PacketMine (#20)"

This reverts commit ec587e0.

Author: Avanatiker

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

@@ -11,8 +11,6 @@
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -28,9 +26,6 @@ public class ClientPlayInteractionManagerMixin {
     @Shadow
     private MinecraftClient client;
 
-    @Shadow
-    public float currentBreakingProgress;
-
     @Inject(method = "interactBlock", at = @At("HEAD"))
     public void interactBlockHead(final ClientPlayerEntity player, final Hand hand, final BlockHitResult hitResult, final CallbackInfoReturnable<ActionResult> cir) {
         if (client.world == null) return;
@@ -46,27 +41,4 @@ void onAttackPre(PlayerEntity player, Entity target, CallbackInfo ci) {
     void onAttackPost(PlayerEntity player, Entity target, CallbackInfo ci) {
         EventFlow.post(new AttackEvent.Post(target));
     }
-
-    @Inject(method = "attackBlock", at = @At("HEAD"), cancellable = true)
-    public void onAttackBlock(BlockPos pos, Direction side, CallbackInfoReturnable<Boolean> cir) {
-        if (EventFlow.post(new InteractionEvent.BlockAttack.Pre(pos, side)).isCanceled()) cir.cancel();
-    }
-
-    @Inject(method = "attackBlock", at = @At("TAIL"))
-    public void onAttackBlockPost(BlockPos pos, Direction side, CallbackInfoReturnable<Boolean> cir) {
-        EventFlow.post(new InteractionEvent.BlockAttack.Post(pos, side));
-    }
-
-    @Inject(method = "updateBlockBreakingProgress", at = @At("HEAD"), cancellable = true)
-    private void updateBlockBreakingProgressPre(BlockPos pos, Direction side, CallbackInfoReturnable<Boolean> cir) {
-        var event = EventFlow.post(new InteractionEvent.BreakingProgress.Pre(pos, side, currentBreakingProgress));
-        if (event.isCanceled()) cir.cancel();
-
-        currentBreakingProgress = event.getProgress();
-    }
-
-    @Inject(method = "updateBlockBreakingProgress", at = @At("TAIL"))
-    private void updateBlockBreakingProgressPost(BlockPos pos, Direction side, CallbackInfoReturnable<Boolean> cir) {
-        EventFlow.post(new InteractionEvent.BreakingProgress.Post(pos, side, currentBreakingProgress));
-    }
 }

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

@@ -2,15 +2,13 @@
 
 import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
-import com.lambda.event.events.EntityEvent;
 import com.lambda.event.events.MovementEvent;
 import com.lambda.event.events.TickEvent;
 import com.lambda.interaction.PlayerPacketManager;
 import com.lambda.interaction.RotationManager;
 import net.minecraft.client.input.Input;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.MovementType;
-import net.minecraft.util.Hand;
 import net.minecraft.util.math.Vec3d;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -93,9 +91,4 @@ float fixHeldItemYaw(ClientPlayerEntity instance) {
     float fixHeldItemPitch(ClientPlayerEntity instance) {
         return Objects.requireNonNullElse(RotationManager.getHandPitch(), instance.getPitch());
     }
-
-    @Inject(method = "swingHand", at = @At("HEAD"), cancellable = true)
-    void onSwingHandPre(Hand hand, CallbackInfo ci) {
-        if (EventFlow.post(new EntityEvent.SwingHand(hand)).isCanceled()) ci.cancel();
-    }
 }

common/src/main/kotlin/com/lambda/config/groups/RotationSettings.kt

@@ -16,7 +16,7 @@ class RotationSettings(
         vis
     )
 
-    override val keepTicks by c.setting("Keep Rotation", 3, 0..10, 1, "Ticks to keep rotation", " ticks", vis)
+    override val keepTicks by c.setting("Keep Rotation", 3, 1..10, 1, "Ticks to keep rotation", " ticks", vis)
     override val resetTicks by c.setting("Reset Rotation", 3, 1..10, 1, "Ticks before rotation is reset", " ticks", vis)
 
     /**

common/src/main/kotlin/com/lambda/event/events/EntityEvent.kt

@@ -3,15 +3,10 @@ package com.lambda.event.events
 import com.lambda.event.Event
 import com.lambda.event.callback.Cancellable
 import com.lambda.event.callback.ICancellable
-import net.minecraft.util.Hand
 
 abstract class EntityEvent : Event {
     class ChangeLookDirection(
         val deltaYaw: Double,
         val deltaPitch: Double,
     ) : EntityEvent(), ICancellable by Cancellable()
-
-    class SwingHand(
-        val hand: Hand
-    ) : EntityEvent(), ICancellable by Cancellable()
 }

common/src/main/kotlin/com/lambda/event/events/InteractionEvent.kt

@@ -1,42 +1,12 @@
 package com.lambda.event.events
 
 import com.lambda.event.Event
-import com.lambda.event.callback.Cancellable
-import com.lambda.event.callback.ICancellable
 import net.minecraft.client.world.ClientWorld
 import net.minecraft.util.hit.BlockHitResult
-import net.minecraft.util.math.BlockPos
-import net.minecraft.util.math.Direction
 
 sealed class InteractionEvent : Event {
     class Block(
         val world: ClientWorld,
         val blockHitResult: BlockHitResult
     ) : InteractionEvent()
-
-    sealed class BlockAttack : InteractionEvent() {
-        class Pre(
-            val pos: BlockPos,
-            val side: Direction
-        ) : BlockAttack(), ICancellable by Cancellable()
-
-        class Post(
-            val pos: BlockPos,
-            val side: Direction
-        ) : BlockAttack()
-    }
-
-    sealed class BreakingProgress : InteractionEvent() {
-        class Pre(
-            val pos: BlockPos,
-            val side: Direction,
-            var progress: Float,
-        ) : BreakingProgress(), ICancellable by Cancellable()
-
-        class Post(
-            val pos: BlockPos,
-            val side: Direction,
-            val progress: Float,
-        ) : BreakingProgress()
-    }
-}
+}

common/src/main/kotlin/com/lambda/interaction/RotationManager.kt

@@ -30,7 +30,7 @@ object RotationManager : Loadable {
     var currentRotation = Rotation.ZERO
     var prevRotation = Rotation.ZERO
 
-    var currentContext: RotationContext? = null
+    private var currentContext: RotationContext? = null
 
     private var keepTicks = 0
     private var pauseTicks = 0

common/src/main/kotlin/com/lambda/module/modules/player/FastBreak.kt

@@ -8,6 +8,8 @@ object Interact : Module(
     description = "Modify players interaction with the world",
     defaultTags = setOf(ModuleTag.PLAYER)
 ) {
+    // ToDo: Is this fast place / fast use? Should it be relocated with more options?
     @JvmStatic val placeDelay by setting("Item Use / Place Delay", 4, 0..20, 1, "Sets the delay between placing blocks or using items")
+//    @JvmStatic val breakDelay by setting("Attack / Break Delay", 10, 0..20, 1)
     @JvmStatic val multiAction by setting("Multi Action", false, "Allows to use many items while breaking blocks")
 }