refactor: clear unnecessary hitbox code

Author: toxicity188

api/src/main/java/kr/toxicity/model/api/bone/RenderedBone.java

@@ -203,7 +203,7 @@ public boolean createHitBox(@NotNull BaseEntity entity, @NotNull Predicate<Rende
             synchronized (this) {
                 if (previous != hitBox) return false;
                 var h = group.getHitBox();
-                if (h == null) h = ModelBoundingBox.MIN.named(name());
+                if (h == null) h = ModelBoundingBox.MIN;
                 var l = eventDispatcher.onCreateHitBox(this, (listener != null ? listener : HitBoxListener.EMPTY).toBuilder()).build();
                 if (hitBox != null) hitBox.removeHitBox();
                 hitBox = BetterModel.nms().createHitBox(entity, this, h, group.getMountController(), l);

api/src/main/java/kr/toxicity/model/api/data/blueprint/BlueprintElement.java

@@ -221,7 +221,7 @@ public float scale() {
          * @return the named bounding box, or null if no cubes are present
          * @since 1.15.2
          */
-        public @Nullable NamedBoundingBox hitBox() {
+        public @Nullable ModelBoundingBox hitBox() {
             return filterIsInstance(children, Cube.class).map(element -> {
                     var from = element.from()
                         .minus(origin)
@@ -238,7 +238,6 @@ public float scale() {
                         to.z()
                     ).invert();
                 }).max(Comparator.comparingDouble(ModelBoundingBox::length))
-                .map(max -> new NamedBoundingBox(name, max))
                 .orElse(null);
         }
     }

api/src/main/java/kr/toxicity/model/api/data/blueprint/ModelBoundingBox.java

@@ -6,10 +6,10 @@
  */
 package kr.toxicity.model.api.data.blueprint;
 
-import kr.toxicity.model.api.bone.BoneName;
 import org.jetbrains.annotations.NotNull;
 import org.joml.Quaterniond;
 import org.joml.Vector3d;
+import org.joml.Vector3f;
 
 /**
  * Represents an axis-aligned bounding box (AABB) for a model part.
@@ -111,17 +111,6 @@ public record ModelBoundingBox(
         );
     }
 
-    /**
-     * Associates this bounding box with a bone name.
-     *
-     * @param name the bone name
-     * @return a {@link NamedBoundingBox} wrapping this box
-     * @since 1.15.2
-     */
-    public @NotNull NamedBoundingBox named(@NotNull BoneName name) {
-        return new NamedBoundingBox(name, this);
-    }
-
     /**
      * Returns the width of the bounding box (X-axis extent).
      *
@@ -168,12 +157,12 @@ public double z() {
      * @return the center vector
      * @since 1.15.2
      */
-    public @NotNull Vector3d centerPoint() {
-        return new Vector3d(
-            minX + maxX,
-            minY + maxY,
-            minZ + maxZ
-        ).div(2D);
+    public @NotNull Vector3f centerPoint() {
+        return new Vector3f(
+            (float) (minX + maxX),
+            (float) (minY + maxY),
+            (float) (minZ + maxZ)
+        ).div(2F);
     }
 
     /**

api/src/main/java/kr/toxicity/model/api/data/blueprint/NamedBoundingBox.java

@@ -9,7 +9,7 @@
 import kr.toxicity.model.api.BetterModel;
 import kr.toxicity.model.api.bone.*;
 import kr.toxicity.model.api.data.blueprint.BlueprintElement;
-import kr.toxicity.model.api.data.blueprint.NamedBoundingBox;
+import kr.toxicity.model.api.data.blueprint.ModelBoundingBox;
 import kr.toxicity.model.api.mount.MountController;
 import kr.toxicity.model.api.mount.MountControllers;
 import kr.toxicity.model.api.util.MathUtil;
@@ -46,7 +46,7 @@ public final class RendererGroup {
     @Unmodifiable
     private final Map<BoneName, RendererGroup> children;
     @Getter
-    private final @Nullable NamedBoundingBox hitBox;
+    private final @Nullable ModelBoundingBox hitBox;
 
     @Getter
     private final @NotNull BoneItemMapper itemMapper;
@@ -67,7 +67,7 @@ public RendererGroup(
         @Nullable ItemStack itemStack,
         @NotNull BlueprintElement.Bone group,
         @NotNull Map<BoneName, RendererGroup> children,
-        @Nullable NamedBoundingBox box
+        @Nullable ModelBoundingBox box
     ) {
         this.parent = group;
         this.children = children;

api/src/main/java/kr/toxicity/model/api/data/renderer/RendererGroup.java

@@ -77,7 +77,9 @@ public interface HitBox extends Identifiable {
      * @return the group name
      * @since 1.15.2
      */
-    @NotNull BoneName groupName();
+    default @NotNull BoneName groupName() {
+        return positionSource().name();
+    }
 
     /**
      * Returns the mount controller for this hitbox.

api/src/main/java/kr/toxicity/model/api/nms/HitBox.java

@@ -8,7 +8,7 @@
 
 import kr.toxicity.model.api.BetterModel;
 import kr.toxicity.model.api.bone.RenderedBone;
-import kr.toxicity.model.api.data.blueprint.NamedBoundingBox;
+import kr.toxicity.model.api.data.blueprint.ModelBoundingBox;
 import kr.toxicity.model.api.entity.BaseBukkitEntity;
 import kr.toxicity.model.api.entity.BaseBukkitPlayer;
 import kr.toxicity.model.api.entity.BaseEntity;
@@ -184,13 +184,13 @@ default void hide(@NotNull PlayerChannelHandler channel, @NotNull EntityTrackerR
      *
      * @param entity the target entity
      * @param bone the bone associated with the hitbox
-     * @param namedBoundingBox the bounding box definition
+     * @param boundingBox the bounding box definition
      * @param controller the mount controller
      * @param listener the hitbox listener
      * @return the created hitbox, or null if creation failed
      * @since 1.15.2
      */
-    @Nullable HitBox createHitBox(@NotNull BaseEntity entity, @NotNull RenderedBone bone, @NotNull NamedBoundingBox namedBoundingBox, @NotNull MountController controller, @NotNull HitBoxListener listener);
+    @Nullable HitBox createHitBox(@NotNull BaseEntity entity, @NotNull RenderedBone bone, @NotNull ModelBoundingBox boundingBox, @NotNull MountController controller, @NotNull HitBoxListener listener);
 
     /**
      * Returns the NMS version of the server.

api/src/main/java/kr/toxicity/model/api/nms/NMS.java

@@ -96,7 +96,7 @@ public EntityTracker(@NotNull EntityTrackerRegistry registry, @NotNull RenderPip
                 var shadow = BetterModel.nms().create(entity.location(), d -> {
                     if (entity instanceof BasePlayer) d.moveDuration(1);
                 });
-                var baseScale = (float) (box.box().x() + box.box().z()) / 4F;
+                var baseScale = (float) (box.x() + box.z()) / 4F;
                 tick(((t, s) -> {
                     var wPos = bone.hitBoxPosition();
                     shadow.shadowRadius(scale.getAsFloat() * baseScale);

api/src/main/java/kr/toxicity/model/api/tracker/EntityTracker.java

@@ -8,7 +8,6 @@ package kr.toxicity.model.nms.v1_20_R4
 
 import io.papermc.paper.event.entity.EntityKnockbackEvent
 import kr.toxicity.model.api.BetterModel
-import kr.toxicity.model.api.bone.BoneName
 import kr.toxicity.model.api.bone.RenderedBone
 import kr.toxicity.model.api.config.DebugConfig
 import kr.toxicity.model.api.data.blueprint.ModelBoundingBox
@@ -19,7 +18,6 @@ import kr.toxicity.model.api.mount.MountController
 import kr.toxicity.model.api.nms.HitBox
 import kr.toxicity.model.api.nms.HitBoxListener
 import kr.toxicity.model.api.nms.ModelInteractionHand
-import kr.toxicity.model.api.util.FunctionUtil
 import net.minecraft.core.BlockPos
 import net.minecraft.network.protocol.game.ServerboundInteractPacket
 import net.minecraft.server.level.ServerPlayer
@@ -47,13 +45,10 @@ import org.bukkit.craftbukkit.entity.CraftPlayer
 import org.bukkit.event.entity.CreatureSpawnEvent
 import org.bukkit.event.entity.EntityPotionEffectEvent
 import org.bukkit.util.Vector
-import org.joml.Quaterniond
 import org.joml.Vector3f
 import java.util.*
-import java.util.function.Supplier
 
 internal class HitBoxImpl(
-    private val name: BoneName,
     private val source: ModelBoundingBox,
     private val bone: RenderedBone,
     private val listener: HitBoxListener,
@@ -71,11 +66,7 @@ internal class HitBoxImpl(
     val craftEntity: HitBox by lazy {
         object : CraftArmorStand(Bukkit.getServer() as CraftServer, this), HitBox by this {}
     }
-    private val _rotatedSource = FunctionUtil.throttleTick(Supplier {
-        source.rotate(Quaterniond(bone.hitBoxViewRotation()))
-    })
-    private val rotatedSource get() = _rotatedSource.get()
-    val dimensions: EntityDimensions get() = rotatedSource.run {
+    val dimensions: EntityDimensions get() = source.run {
         EntityDimensions(
             (x() + z()).toFloat() / 2,
             y().toFloat(),
@@ -110,7 +101,6 @@ internal class HitBoxImpl(
         }
     }
 
-    override fun groupName(): BoneName = name
     override fun id(): Int = id
     override fun uuid(): UUID = uuid
     override fun source(): org.bukkit.entity.Entity = delegate.bukkitEntity
@@ -290,7 +280,7 @@ internal class HitBoxImpl(
         yHeadRot = yRot
         yBodyRot = yRot
         val pos = relativePosition()
-        val minusHeight = rotatedSource.minY * bone.hitBoxScale()
+        val minusHeight = source.minY * bone.hitBoxScale()
         setPos(
             pos.x.toDouble(),
             pos.y.toDouble() + minusHeight,
@@ -420,7 +410,6 @@ internal class HitBoxImpl(
         } else {
             val vec3 = position()
             val scale = bone.hitBoxScale()
-            val source = rotatedSource
             AABB(
                 vec3.x + source.minX * scale,
                 vec3.y,

nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/HitBoxImpl.kt

@@ -14,7 +14,7 @@ import io.netty.channel.ChannelPromise
 import io.papermc.paper.chunk.system.entity.EntityLookup
 import kr.toxicity.model.api.BetterModel
 import kr.toxicity.model.api.bone.RenderedBone
-import kr.toxicity.model.api.data.blueprint.NamedBoundingBox
+import kr.toxicity.model.api.data.blueprint.ModelBoundingBox
 import kr.toxicity.model.api.entity.BaseBukkitEntity
 import kr.toxicity.model.api.entity.BaseBukkitPlayer
 import kr.toxicity.model.api.entity.BaseEntity
@@ -334,12 +334,10 @@ class NMSImpl : NMS {
         }
     }
 
-    override fun createHitBox(entity: BaseEntity, bone: RenderedBone, namedBoundingBox: NamedBoundingBox, mountController: MountController, listener: HitBoxListener): HitBox? {
+    override fun createHitBox(entity: BaseEntity, bone: RenderedBone, boundingBox: ModelBoundingBox, mountController: MountController, listener: HitBoxListener): HitBox? {
         val handle = entity.handle() as? Entity ?: return null
-        val newBox = namedBoundingBox.center()
         return HitBoxImpl(
-            namedBoundingBox.name,
-            newBox,
+            boundingBox.center(),
             bone,
             listener,
             handle,