Fix compile issues from rebasing upstream

Author: Axionize

common/src/main/java/ac/grim/grimac/checks/impl/combat/Reach.java

@@ -273,7 +273,7 @@ private CheckResult checkReach(PacketEntity reachEntity, Vector3d from, boolean
                 minDistance = Double.MIN_VALUE;
                 foundHitData = hitData;
                 // until I fix block modeling exempt any blocks changed this tick
-            } else if (hitData instanceof BlockHitData && !blocksChangedThisTick.contains(((BlockHitData) hitData).getPosition())) {
+            } else if (hitData instanceof BlockHitData && !blocksChangedThisTick.contains(((BlockHitData) hitData).position())) {
                 minDistance = Double.MIN_VALUE;
                 foundHitData = hitData;
             }
@@ -284,7 +284,7 @@ private CheckResult checkReach(PacketEntity reachEntity, Vector3d from, boolean
             if (minDistance == Double.MIN_VALUE && foundHitData != null) {
                 cancelBuffer = 1;
                 if (foundHitData instanceof BlockHitData) {
-                    return new CheckResult(ResultType.WALL_HIT, "Hit block=" + ((BlockHitData) foundHitData).getState().getType().getName() + " ");
+                    return new CheckResult(ResultType.WALL_HIT, "Hit block=" + ((BlockHitData) foundHitData).state().getType().getName() + " ");
                 } else { // entity hit data
                     return new CheckResult(ResultType.ENTITY_PIERCE, "Hit entity=" + ((EntityHitData) foundHitData).getEntity().type.getName() + " ");
                 }

common/src/main/java/ac/grim/grimac/command/commands/GrimDebug.java

@@ -40,7 +40,7 @@ public void register(CommandManager<Sender> commandManager) {
         Command.Builder<Sender> hitboxDebugCommand = grimCommand
                 .literal("hitboxdebug", Description.of("Toggle hitbox debug visualization"))
                 .permission("grim.hitboxdebug")
-                .optional("target", GrimAPI.INSTANCE.getParserDescriptors().getSinglePlayer(), Description.of("Player to debug (defaults to self if sender is player)"))
+                .optional("target", GrimAPI.INSTANCE.getCommandAdapter().singlePlayerSelectorParser(), Description.of("Player to debug (defaults to self if sender is player)"))
                 .handler(this::handleHitboxDebug);
 
         // Register command

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

@@ -1,14 +1,13 @@
 package ac.grim.grimac.events.packets;
 
 import ac.grim.grimac.GrimAPI;
-import ac.grim.grimac.checks.impl.inventory.InventoryB;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.BlockBreak;
 import ac.grim.grimac.utils.anticheat.update.BlockPlace;
 import ac.grim.grimac.utils.blockplace.BlockPlaceResult;
 import ac.grim.grimac.utils.blockplace.ConsumesBlockPlace;
+import ac.grim.grimac.utils.data.BlockHitData;
 import ac.grim.grimac.utils.data.BlockPlaceSnapshot;
-import ac.grim.grimac.utils.data.HitData;
 import ac.grim.grimac.utils.inventory.Inventory;
 import ac.grim.grimac.utils.latency.CompensatedWorld;
 import ac.grim.grimac.utils.nmsutil.BoundingBoxSize;

common/src/main/java/ac/grim/grimac/manager/init/load/PacketEventsInit.java

@@ -1,6 +1,5 @@
 package ac.grim.grimac.manager.init.load;
 
-import ac.grim.grimac.GrimAPI;
 import ac.grim.grimac.utils.anticheat.LogUtil;
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.PacketEventsAPI;

common/src/main/java/ac/grim/grimac/utils/anticheat/update/BlockPlace.java

@@ -52,14 +52,14 @@ public class BlockPlace {
     private final GrimPlayer player;
     public final ItemStack itemStack;
     public final StateType material;
-    public final @Nullable HitData hitData;
+    public final @Nullable BlockHitData hitData;
     @Getter private int faceId;
     @Getter private BlockFace face;
     public boolean isInside;
     public Vector3f cursor;
     public final int sequence;
 
-    public BlockPlace(GrimPlayer player, InteractionHand hand, Vector3i position, int faceId, BlockFace face, ItemStack itemStack, @Nullable HitData hitData, int sequence) {
+    public BlockPlace(GrimPlayer player, InteractionHand hand, Vector3i position, int faceId, BlockFace face, ItemStack itemStack, @Nullable BlockHitData hitData, int sequence) {
         this.player = player;
         this.hand = hand;
         this.position = position;

common/src/main/java/ac/grim/grimac/utils/data/BlockHitData.java

@@ -7,8 +7,10 @@
 import com.github.retrooper.packetevents.util.Vector3i;
 import lombok.Getter;
 import lombok.ToString;
+import lombok.experimental.Accessors;
 
 @Getter
+@Accessors(fluent = true)
 @ToString
 public class BlockHitData extends HitData {
     Vector3i position;

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

@@ -237,10 +237,6 @@ public CollisionBox getMinimumPossibleCollisionBoxes() {
         return ReachInterpolationData.getOverlapHitbox(oldPacketLocation.getOverlapHitboxCombined(), newPacketLocation.getOverlapHitboxCombined());
     }
 
-    public PacketEntity getRiding() {
-        return riding;
-    }
-
     public OptionalInt getPotionEffectLevel(PotionType effect) {
         final int amplifier = potionsMap == null ? -1 : potionsMap.getInt(effect);
         return amplifier == -1 ? OptionalInt.empty() : OptionalInt.of(amplifier);