Refactor entity targeting to use ray tracing API

Replaces custom vector math and bounding box intersection logic for targeting entities with Bukkit's built-in rayTraceEntities API across multiple commands and utility classes. This simplifies code, improves maintainability, and leverages native engine support for line-of-sight entity detection.

Author: eccentricdevotion

src/main/java/me/eccentric_nz/TARDIS/commands/dev/MountCommand.java

@@ -5,13 +5,12 @@
 import me.eccentric_nz.TARDIS.enumeration.TardisModule;
 import me.eccentric_nz.TARDIS.flight.vehicle.InterpolatedAnimation;
 import me.eccentric_nz.TARDIS.flight.vehicle.VehicleUtility;
-import me.eccentric_nz.TARDIS.sonic.actions.TARDISSonicFreeze;
-import me.eccentric_nz.TARDIS.utility.TARDISVector3D;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.*;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.util.RayTraceResult;
 
 public class MountCommand {
 
@@ -25,34 +24,22 @@ public boolean test(Player player, boolean mount) {
         if (mount) {
             // get the armour stand the player is looking at
             Location observerPos = player.getEyeLocation();
-            TARDISVector3D observerDir = new TARDISVector3D(observerPos.getDirection());
-            TARDISVector3D observerStart = new TARDISVector3D(observerPos);
-            TARDISVector3D observerEnd = observerStart.add(observerDir.multiply(16));
-            ArmorStand as = null;
-            // Get nearby entities
-            for (Entity target : player.getNearbyEntities(8.0d, 8.0d, 8.0d)) {
-                // Bounding box of the given player
-                TARDISVector3D targetPos = new TARDISVector3D(target.getLocation());
-                TARDISVector3D minimum = targetPos.add(-0.5, 0, -0.5);
-                TARDISVector3D maximum = targetPos.add(0.5, 1.67, 0.5);
-                if (target.getType().equals(EntityType.ARMOR_STAND) && TARDISSonicFreeze.hasIntersection(observerStart, observerEnd, minimum, maximum)) {
-                    if (as == null || as.getLocation().distanceSquared(observerPos) > target.getLocation().distanceSquared(observerPos)) {
-                        as = (ArmorStand) target;
-                    }
-                }
-            }
-            if (as == null) {
+            RayTraceResult result = observerPos.getWorld().rayTraceEntities(observerPos, observerPos.getDirection(), 16.0d, (s) -> s.getType() == EntityType.ARMOR_STAND);
+            if (result == null) {
                 plugin.getMessenger().send(player, TardisModule.TARDIS, "WA_STAND");
                 return true;
             }
-            ItemStack box = ItemStack.of(Material.BLUE_DYE, 1);
-            ItemMeta im = box.getItemMeta();
-            im.setItemModel(ChameleonVariant.BLUE_CLOSED.getKey());
-            box.setItemMeta(im);
-            ItemDisplay display = VehicleUtility.getItemDisplay(player, box, 1.75f);
-            int period = 40;
-            plugin.getTrackerKeeper().setAnimateTask(plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new InterpolatedAnimation(display, period), 5, period));
-            as.addPassenger(player);
+            ArmorStand as = (ArmorStand) result.getHitEntity();
+            if (as != null) {
+                ItemStack box = ItemStack.of(Material.BLUE_DYE, 1);
+                ItemMeta im = box.getItemMeta();
+                im.setItemModel(ChameleonVariant.BLUE_CLOSED.getKey());
+                box.setItemMeta(im);
+                ItemDisplay display = VehicleUtility.getItemDisplay(player, box, 1.75f);
+                int period = 40;
+                plugin.getTrackerKeeper().setAnimateTask(plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new InterpolatedAnimation(display, period), 5, period));
+                as.addPassenger(player);
+            }
         } else {
             // unmount
             for (Entity e : player.getPassengers()) {

src/main/java/me/eccentric_nz/TARDIS/commands/dev/RomanCommand.java

@@ -1,44 +1,33 @@
 package me.eccentric_nz.TARDIS.commands.dev;
 
 import me.eccentric_nz.TARDIS.TARDIS;
-import me.eccentric_nz.TARDIS.sonic.actions.TARDISSonicFreeze;
+import me.eccentric_nz.TARDIS.enumeration.TardisModule;
 import me.eccentric_nz.TARDIS.utility.TARDISStringUtils;
-import me.eccentric_nz.TARDIS.utility.TARDISVector3D;
 import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngels;
 import me.eccentric_nz.tardisweepingangels.equip.ArmourStandEquipment;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.ArmorStand;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataType;
+import org.bukkit.util.RayTraceResult;
 
 public class RomanCommand {
 
     public void equip(Player player, String which) {
         // get the armour stand player is looking at
         Location observerPos = player.getEyeLocation();
-        TARDISVector3D observerDir = new TARDISVector3D(observerPos.getDirection());
-        TARDISVector3D observerStart = new TARDISVector3D(observerPos);
-        TARDISVector3D observerEnd = observerStart.add(observerDir.multiply(16));
-        ArmorStand as = null;
-        // get nearby entities
-        for (Entity target : player.getNearbyEntities(8.0d, 8.0d, 8.0d)) {
-            // Bounding box of the given player
-            TARDISVector3D targetPos = new TARDISVector3D(target.getLocation());
-            TARDISVector3D minimum = targetPos.add(-0.5, 0, -0.5);
-            TARDISVector3D maximum = targetPos.add(0.5, 1.67, 0.5);
-            if (target.getType().equals(EntityType.ARMOR_STAND) && TARDISSonicFreeze.hasIntersection(observerStart, observerEnd, minimum, maximum)) {
-                if (as == null || as.getLocation().distanceSquared(observerPos) > target.getLocation().distanceSquared(observerPos)) {
-                    as = (ArmorStand) target;
-                }
-            }
+        RayTraceResult result = observerPos.getWorld().rayTraceEntities(observerPos, observerPos.getDirection(), 16.0d, (s) -> s.getType() == EntityType.ARMOR_STAND);
+        if (result == null) {
+            TARDIS.plugin.getMessenger().send(player, TardisModule.TARDIS, "WA_STAND");
+            return;
         }
+        ArmorStand as = (ArmorStand) result.getHitEntity();
         if (as != null) {
             as.setArms(false);
             as.getPersistentDataContainer().set(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.INTEGER, 1);