From 07f77101032ebd11a0603898c680a0fb591e1749 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Sun, 15 Jun 2025 19:38:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ProjectileUtil=E5=AF=B9?=
 =?UTF-8?q?=E4=BA=8Eobb=20entity=E7=9A=84=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mixins/ProjectileUtilMixin.java           | 45 +++++++++++++++++++
 .../atsuishio/superbwarfare/tools/OBB.java    | 21 ++++++---
 src/main/resources/mixins.superbwarfare.json  |  1 +
 3 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/com/atsuishio/superbwarfare/mixins/ProjectileUtilMixin.java

diff --git a/src/main/java/com/atsuishio/superbwarfare/mixins/ProjectileUtilMixin.java b/src/main/java/com/atsuishio/superbwarfare/mixins/ProjectileUtilMixin.java
new file mode 100644
index 000000000..6f38c28c2
--- /dev/null
+++ b/src/main/java/com/atsuishio/superbwarfare/mixins/ProjectileUtilMixin.java
@@ -0,0 +1,45 @@
+package com.atsuishio.superbwarfare.mixins;
+
+import com.atsuishio.superbwarfare.entity.OBBEntity;
+import com.atsuishio.superbwarfare.tools.OBB;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.projectile.ProjectileUtil;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.EntityHitResult;
+import net.minecraft.world.phys.Vec3;
+import org.joml.Vector3f;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Optional;
+import java.util.function.Predicate;
+
+@Mixin(ProjectileUtil.class)
+public class ProjectileUtilMixin {
+
+    @Inject(method = "getEntityHitResult(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/AABB;Ljava/util/function/Predicate;F)Lnet/minecraft/world/phys/EntityHitResult;",
+            at = @At("RETURN"), cancellable = true)
+    private static void getEntityHitResult(Level pLevel, Entity pProjectile, Vec3 pStartVec, Vec3 pEndVec, AABB pBoundingBox, Predicate<Entity> pFilter, float pInflationAmount, CallbackInfoReturnable<EntityHitResult> cir) {
+        Entity res = null;
+
+        for (var entity : pLevel.getEntities(pProjectile, pBoundingBox, pFilter)) {
+            if (entity instanceof OBBEntity obbEntity) {
+                OBB obb = obbEntity.getOBB().inflate(pInflationAmount * 2);
+
+                Optional<Vector3f> optional = obb.clip(pStartVec.toVector3f(), pEndVec.toVector3f());
+                if (optional.isPresent()) {
+                    double d1 = pStartVec.distanceToSqr(new Vec3(optional.get()));
+                    if (d1 < Double.MAX_VALUE) {
+                        res = entity;
+                    }
+                    if (res != null) {
+                        cir.setReturnValue(new EntityHitResult(res, new Vec3(optional.get())));
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/OBB.java b/src/main/java/com/atsuishio/superbwarfare/tools/OBB.java
index 06dc4bb54..5f75f683a 100644
--- a/src/main/java/com/atsuishio/superbwarfare/tools/OBB.java
+++ b/src/main/java/com/atsuishio/superbwarfare/tools/OBB.java
@@ -185,14 +185,11 @@ public record OBB(Vector3f center, Vector3f extents, Quaternionf rotation) {
         }
 
         // 检查是否有有效交点
-        if (tEnter >= 0 && tEnter <= 1) {
-            // 计算局部坐标系中的交点
-            Vector3f localHit = new Vector3f(dir).mul((float) tEnter).add(localFrom);
-            // 转换回世界坐标系
-            return Optional.of(localToWorld(localHit, axes));
-        }
+        // 计算局部坐标系中的交点
+        Vector3f localHit = new Vector3f(dir).mul((float) tEnter).add(localFrom);
+        // 转换回世界坐标系
+        return Optional.of(localToWorld(localHit, axes));
 
-        return Optional.empty();
     }
 
     // 世界坐标转局部坐标
@@ -213,4 +210,14 @@ public record OBB(Vector3f center, Vector3f extents, Quaternionf rotation) {
         result.add(axes[2].mul(localPoint.z, new Vector3f()));
         return result;
     }
+
+    public OBB inflate(float amount) {
+        Vector3f newExtents = new Vector3f(extents).add(amount, amount, amount);
+        return new OBB(center, newExtents, rotation);
+    }
+
+    public OBB inflate(float x, float y, float z) {
+        Vector3f newExtents = new Vector3f(extents).add(x, y, z);
+        return new OBB(center, newExtents, rotation);
+    }
 }
diff --git a/src/main/resources/mixins.superbwarfare.json b/src/main/resources/mixins.superbwarfare.json
index d04d9c658..1c8e5175c 100644
--- a/src/main/resources/mixins.superbwarfare.json
+++ b/src/main/resources/mixins.superbwarfare.json
@@ -11,6 +11,7 @@
     "LevelMixin",
     "LivingEntityMixin",
     "PlayerMixin",
+    "ProjectileUtilMixin",
     "VillagerMixin"
   ],
   "client": [