check for keepsprint on 1.9 servers (#2070)

* check for keepsprint on 1.9 servers

* update held item in AttackCooldownHandler every time the slot is changed

* fix #2389

* change AttackCooldownHandler package

Author: ManInMyVan

common/src/main/java/ac/grim/grimac/events/packets/PacketPlayerAttack.java

@@ -16,6 +16,7 @@
 import com.github.retrooper.packetevents.protocol.item.enchantment.type.EnchantmentTypes;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.protocol.player.GameMode;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
 
 public class PacketPlayerAttack extends PacketListenerAbstract {
@@ -65,7 +66,7 @@ public void onPacketReceive(PacketReceiveEvent event) {
 
                     final boolean isLegacyPlayer = player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8);
                     // assume cooldown is full on 1.8 servers
-                    final boolean noCooldown = isLegacyPlayer || PacketEvents.getAPI().getServerManager().getVersion().isOlderThan(ServerVersion.V_1_9);
+                    final boolean sufficientCooldownProgress = isLegacyPlayer || player.attackCooldown.getMinimumProgress() > 0.9F;
 
                     if (!isLegacyPlayer) {
                         knockbackLevel = Math.max(knockbackLevel, 0);
@@ -75,7 +76,7 @@ public void onPacketReceive(PacketReceiveEvent event) {
                     // 1.9+ players who are packet sprinting might not, based on attack cooldown
                     // Players with knockback enchantments always get slowed
 
-                    if ((player.lastSprinting && !hasNegativeKB && noCooldown) || knockbackLevel > 0) {
+                    if (player.lastSprinting && !hasNegativeKB && sufficientCooldownProgress || knockbackLevel > 0) {
                         player.minAttackSlow++;
                         player.maxAttackSlow++;
 
@@ -95,6 +96,10 @@ public void onPacketReceive(PacketReceiveEvent event) {
                         player.maxAttackSlow++;
                     }
                 }
+
+                if (player.gamemode != GameMode.SPECTATOR) {
+                    player.attackCooldown.reset();
+                }
             } else if (interact.getAction() == WrapperPlayClientInteractEntity.InteractAction.INTERACT) {
                 // Interacting with a horse in versions 1.13- will cause the client to
                 // set the player's rotation to the horse's rotation

common/src/main/java/ac/grim/grimac/manager/ActionManager.java

@@ -0,0 +1,71 @@
+package ac.grim.grimac.manager;
+
+import ac.grim.grimac.checks.Check;
+import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.player.GrimPlayer;
+import ac.grim.grimac.utils.math.GrimMath;
+import com.github.retrooper.packetevents.event.PacketReceiveEvent;
+import com.github.retrooper.packetevents.protocol.attribute.Attributes;
+import com.github.retrooper.packetevents.protocol.item.ItemStack;
+import com.github.retrooper.packetevents.protocol.packettype.PacketType;
+import com.github.retrooper.packetevents.protocol.player.DiggingAction;
+import com.github.retrooper.packetevents.protocol.world.BlockFace;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerDigging;
+
+public class AttackCooldownHandler extends Check implements PacketCheck {
+    private int ticksSinceLastSwing;
+    private ItemStack stack = ItemStack.EMPTY;
+    // Since we don't know when the client ticks, we call updateHeldItem() when the held item changes,
+    // but that means ticksSinceLastSwing is incremented after it gets reset. This is wrong, so we
+    // compensate for that by not incrementing ticksSinceLastSwing if updateHeldItem() was called
+    // (and the held item changed) before the tick packet.
+    private boolean stackChanged;
+
+    public AttackCooldownHandler(GrimPlayer player) {
+        super(player);
+    }
+
+    @Override
+    public void onPacketReceive(final PacketReceiveEvent event) {
+        if (event.getPacketType() == PacketType.Play.Client.ANIMATION) {
+            // FIXME: should only run when the click misses
+            reset();
+        }
+
+        if (event.getPacketType() == PacketType.Play.Client.PLAYER_DIGGING) {
+            WrapperPlayClientPlayerDigging packet = new WrapperPlayClientPlayerDigging(event);
+            if (packet.getAction() == DiggingAction.CANCELLED_DIGGING && packet.getBlockFace() == BlockFace.DOWN) {
+                // FIXME: this could also be triggered by switching targets while looking at the bottom face of a block
+                reset();
+            }
+        }
+
+        if (isTickPacket(event.getPacketType())) {
+            if (!stackChanged) {
+                ++ticksSinceLastSwing;
+            }
+            updateHeldItem();
+            stackChanged = false;
+        }
+    }
+
+    public void reset() {
+        ticksSinceLastSwing = 0;
+    }
+
+    // called on client tick and whenever the slot gets updated
+    public void updateHeldItem() {
+        ItemStack held = player.inventory.getHeldItem().copy();
+
+        if (!(stack.isEmpty() && held.isEmpty() || stack.getType() == held.getType() && (stack.isDamageableItem() || stack.getLegacyData() == held.getLegacyData()))) {
+            reset();
+            stackChanged = true;
+        }
+
+        stack = held;
+    }
+
+    public float getMinimumProgress() {
+        return GrimMath.clamp(((float) ticksSinceLastSwing + 0.5F) / (float) (1d / player.compensatedEntities.self.getAttributeValue(Attributes.ATTACK_SPEED) * 20.0D), 0, 1);
+    }
+}

common/src/main/java/ac/grim/grimac/manager/AttackCooldownHandler.java

@@ -99,7 +99,7 @@ public CheckManager(GrimPlayer player) {
                 .put(CompensatedInventory.class, player.inventory)
                 .put(PacketPlayerAbilities.class, new PacketPlayerAbilities(player))
                 .put(PacketWorldBorder.class, new PacketWorldBorder(player))
-                .put(ActionManager.class, player.actionManager)
+                .put(AttackCooldownHandler.class, player.attackCooldown)
                 .put(TeamHandler.class, new TeamHandler(player))
                 .put(ClientBrand.class, new ClientBrand(player))
                 .put(NoFall.class, new NoFall(player))

common/src/main/java/ac/grim/grimac/manager/CheckManager.java

@@ -20,6 +20,7 @@
 import ac.grim.grimac.predictionengine.MovementCheckRunner;
 import ac.grim.grimac.predictionengine.PointThreeEstimator;
 import ac.grim.grimac.predictionengine.UncertaintyHandler;
+import ac.grim.grimac.manager.AttackCooldownHandler;
 import ac.grim.grimac.utils.anticheat.LogUtil;
 import ac.grim.grimac.utils.anticheat.MessageUtil;
 import ac.grim.grimac.utils.anticheat.update.BlockBreak;
@@ -113,7 +114,7 @@ public class GrimPlayer implements GrimUser {
     // End transaction handling stuff
     // Manager like classes
     public final CheckManager checkManager;
-    public final ActionManager actionManager;
+    public final AttackCooldownHandler attackCooldown;
     public final PunishmentManager punishmentManager;
     public final MovementCheckRunner movementCheckRunner;
     public final SyncedTags tagManager;
@@ -242,7 +243,6 @@ public class GrimPlayer implements GrimUser {
     public final Object2DoubleMap<FluidTag> fluidHeight = new Object2DoubleArrayMap<>(2);
     // possibleEyeHeights[0] = Standing eye heights, [1] = Sneaking. [2] = Elytra, Swimming, and Riptide Trident which only exists in 1.9+
     public final double[][] possibleEyeHeights = new double[3][];
-    public int totalFlyingPacketsSent;
     public final Queue<BlockPlaceSnapshot> placeUseItemPackets = new LinkedBlockingQueue<>();
     public final Queue<BlockBreak> queuedBreaks = new LinkedBlockingQueue<>();
     public final PlayerBlockHistory blockHistory = new PlayerBlockHistory();
@@ -291,7 +291,7 @@ public GrimPlayer(@NotNull User user) {
         cameraEntity = new CompensatedCameraEntity(this);
 
         lastInstanceManager = new LastInstanceManager(this);
-        actionManager = new ActionManager(this);
+        attackCooldown = new AttackCooldownHandler(this);
         checkManager = new CheckManager(this);
         punishmentManager = new PunishmentManager(this);
         this.tagManager = new SyncedTags(this); // must be after this.user = user

common/src/main/java/ac/grim/grimac/player/GrimPlayer.java

@@ -70,7 +70,8 @@ protected void initAttributes(GrimPlayer player) {
         trackAttribute(movementSpeed);
         trackAttribute(ValuedAttribute.ranged(Attributes.ATTACK_DAMAGE, 2, 0, 2048)); // NOTE: Not synced to client currently.
         trackAttribute(ValuedAttribute.ranged(Attributes.ATTACK_SPEED, 4, 0, 1024)
-                .requiredVersion(player, ClientVersion.V_1_9));
+                .requiredVersion(player, ClientVersion.V_1_9)
+                .withGetRewriter(value -> PacketEvents.getAPI().getServerManager().getVersion().isOlderThan(ServerVersion.V_1_9) ? 20 : value));
         trackAttribute(ValuedAttribute.ranged(Attributes.JUMP_STRENGTH, 0.42f, 0, 32)
                 .requiredVersion(player, ClientVersion.V_1_20_5));
         trackAttribute(ValuedAttribute.ranged(Attributes.BLOCK_BREAK_SPEED, 1.0, 0, 1024)

common/src/main/java/ac/grim/grimac/utils/data/packetentity/PacketEntitySelf.java

@@ -21,7 +21,8 @@ public class Inventory extends AbstractContainerMenu {
     public static final int SLOT_LEGGINGS = 6;
     public static final int SLOT_BOOTS = 7;
     private static final int TOTAL_SIZE = 46;
-    public int selected = 0;
+    @Getter
+    private int selected;
     @Getter
     private final CorrectingPlayerInventoryStorage inventoryStorage;
 
@@ -68,7 +69,7 @@ public ItemStack getOffhand() {
     }
 
     public boolean hasItemType(ItemType item) {
-        for (int i = 0; i < inventoryStorage.items.length; ++i) {
+        for (int i = 0; i < inventoryStorage.getSize(); ++i) {
             if (inventoryStorage.getItem(i).getType() == item) {
                 return true;
             }
@@ -93,7 +94,7 @@ public boolean add(ItemStack p_36055_) {
     }
 
     public int getFreeSlot() {
-        for (int i = 0; i < inventoryStorage.items.length; ++i) {
+        for (int i = 0; i < inventoryStorage.getSize(); ++i) {
             if (inventoryStorage.getItem(i).isEmpty()) {
                 return i;
             }
@@ -252,4 +253,9 @@ public ItemStack quickMoveStack(int slotID) {
     public boolean canTakeItemForPickAll(ItemStack p_38908_, Slot p_38909_) {
         return p_38909_.inventoryStorageSlot != 0; // Result slot
     }
+
+    public void setSelected(int selected) {
+        this.selected = selected;
+        this.player.attackCooldown.updateHeldItem();
+    }
 }

common/src/main/java/ac/grim/grimac/utils/inventory/Inventory.java

@@ -4,7 +4,7 @@
 import lombok.Getter;
 
 public class InventoryStorage {
-    protected final ItemStack[] items;
+    private final ItemStack[] items;
     @Getter
     private final int size;
 
@@ -26,7 +26,7 @@ public ItemStack getItem(int index) {
     }
 
     public ItemStack removeItem(int slot, int amount) {
-        return slot >= 0 && slot < items.length && !items[slot].isEmpty() && amount > 0 ? items[slot].split(amount) : ItemStack.EMPTY;
+        return slot >= 0 && slot < size && !items[slot].isEmpty() && amount > 0 ? items[slot].split(amount) : ItemStack.EMPTY;
     }
 
     public int getMaxStackSize() {

common/src/main/java/ac/grim/grimac/utils/inventory/InventoryStorage.java

@@ -231,7 +231,7 @@ public void onPacketReceive(final PacketReceiveEvent event) {
                     return;
 
                 // 1.19.4+ clients support swapping with non-empty items
-                int swapItemSlot = item.getHand() == InteractionHand.MAIN_HAND ? inventory.selected + Inventory.HOTBAR_OFFSET : Inventory.SLOT_OFFHAND;
+                int swapItemSlot = item.getHand() == InteractionHand.MAIN_HAND ? inventory.getSelected() + Inventory.HOTBAR_OFFSET : Inventory.SLOT_OFFHAND;
 
                 // Mojang implemented this stupidly, I rewrote their item swap code to make it somewhat cleaner.
                 // Slot in hotbar
@@ -270,7 +270,7 @@ public void onPacketReceive(final PacketReceiveEvent event) {
             // Stop people from spamming the server with an out-of-bounds exception
             if (slot > 8 || slot < 0) return;
 
-            inventory.selected = slot;
+            inventory.setSelected(slot);
         } else if (event.getPacketType() == PacketType.Play.Client.CREATIVE_INVENTORY_ACTION) {
             WrapperPlayClientCreativeInventoryAction action = new WrapperPlayClientCreativeInventoryAction(event);
             if (player.gamemode != GameMode.CREATIVE) return;

common/src/main/java/ac/grim/grimac/utils/latency/CompensatedInventory.java

@@ -89,6 +89,10 @@ public void setItem(int item, ItemStack stack) {
         }
 
         super.setItem(item, stack);
+
+        if (item == player.inventory.inventory.getSelected() + Inventory.HOTBAR_OFFSET) {
+            player.attackCooldown.updateHeldItem();
+        }
     }
 
     /**