kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

修复SeekTool相关问题

Browse source
This commit is contained in:
Light_Quanta 2025-04-08 14:32:13 +08:00
parent f6eb2c18ac
commit 40943b2f5a
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
1 changed files with 71 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
src/main/java/com/atsuishio/superbwarfare/tools/SeekTool.java
View file

@ -1,10 +1,20 @@
package com.atsuishio.superbwarfare.tools; package com.atsuishio.superbwarfare.tools;
import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.ClaymoreEntity;
import com.atsuishio.superbwarfare.entity.projectile.C4Entity;
import com.atsuishio.superbwarfare.entity.vehicle.base.MobileVehicleEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.entity.AreaEffectCloud;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.ExperienceOrb;
import net.minecraft.world.entity.decoration.ArmorStand;
import net.minecraft.world.entity.decoration.HangingEntity;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.projectile.Projectile;
import net.minecraft.world.level.ClipContext; import net.minecraft.world.level.ClipContext;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.HitResult;
@ -18,9 +28,7 @@ public class SeekTool {
public static List<Entity> getVehicleWithinRange(Player player, Level level, double range) { public static List<Entity> getVehicleWithinRange(Player player, Level level, double range) {
return StreamSupport.stream(EntityFindUtil.getEntities(level).getAll().spliterator(), false) return StreamSupport.stream(EntityFindUtil.getEntities(level).getAll().spliterator(), false)
.filter(e -> e.position().distanceTo(player.getEyePosition()) <= range .filter(e -> e.position().distanceTo(player.getEyePosition()) <= range && e instanceof MobileVehicleEntity)
// && e instanceof MobileVehicleEntity
)
.toList(); .toList();
} }
@ -33,43 +41,64 @@ public class SeekTool {
public static Entity seekEntity(Entity entity, Level level, double seekRange, double seekAngle) { public static Entity seekEntity(Entity entity, Level level, double seekRange, double seekAngle) {
return StreamSupport.stream(EntityFindUtil.getEntities(level).getAll().spliterator(), false) return StreamSupport.stream(EntityFindUtil.getEntities(level).getAll().spliterator(), false)
.filter(e -> { .filter(e -> {
if (e.distanceTo(entity) <= seekRange && calculateAngle(e, entity) < seekAngle if (e.distanceTo(entity) <= seekRange
&& calculateAngle(e, entity) < seekAngle
&& e != entity && e != entity
&& baseFilter(e) && baseFilter(e)
&& e.getVehicle() == null && e.getVehicle() == null
) { ) {
return level.clip(new ClipContext(entity.getEyePosition(), e.getEyePosition(), return level.clip(new ClipContext(
ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, entity)).getType() != HitResult.Type.BLOCK; entity.getEyePosition(),
e.getEyePosition(),
ClipContext.Block.COLLIDER,
ClipContext.Fluid.NONE, entity)
).getType() != HitResult.Type.BLOCK;
} }
return false; return false;
}).min(Comparator.comparingDouble(e -> calculateAngle(e, entity))).orElse(null); })
.min(Comparator.comparingDouble(e -> calculateAngle(e, entity)))
.orElse(null);
} }
public static Entity seekLivingEntity(Entity entity, Level level, double seekRange, double seekAngle) { public static Entity seekLivingEntity(Entity entity, Level level, double seekRange, double seekAngle) {
return StreamSupport.stream(EntityFindUtil.getEntities(level).getAll().spliterator(), false) return StreamSupport.stream(EntityFindUtil.getEntities(level).getAll().spliterator(), false)
.filter(e -> { .filter(e -> {
if (e.distanceTo(entity) <= seekRange && calculateAngle(e, entity) < seekAngle if (e.distanceTo(entity) <= seekRange
&& calculateAngle(e, entity) < seekAngle
&& e != entity && e != entity
&& baseFilter(e) && baseFilter(e)
&& e.getVehicle() == null && e.getVehicle() == null
&& (!e.isAlliedTo(entity) || e.getTeam() == null || e.getTeam().getName().equals("TDM"))) { && (!e.isAlliedTo(entity) || e.getTeam() == null || e.getTeam().getName().equals("TDM"))
return level.clip(new ClipContext(entity.getEyePosition(), e.getEyePosition(), ) {
ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, entity)).getType() != HitResult.Type.BLOCK; return level.clip(new ClipContext(
entity.getEyePosition(),
e.getEyePosition(),
ClipContext.Block.COLLIDER,
ClipContext.Fluid.NONE, entity)
).getType() != HitResult.Type.BLOCK;
} }
return false; return false;
}).min(Comparator.comparingDouble(e -> calculateAngle(e, entity))).orElse(null); })
.min(Comparator.comparingDouble(e -> calculateAngle(e, entity)))
.orElse(null);
} }
public static List<Entity> seekLivingEntities(Entity entity, Level level, double seekRange, double seekAngle) { public static List<Entity> seekLivingEntities(Entity entity, Level level, double seekRange, double seekAngle) {
return StreamSupport.stream(EntityFindUtil.getEntities(level).getAll().spliterator(), false) return StreamSupport.stream(EntityFindUtil.getEntities(level).getAll().spliterator(), false)
.filter(e -> { .filter(e -> {
if (e.distanceTo(entity) <= seekRange && calculateAngle(e, entity) < seekAngle if (e.distanceTo(entity) <= seekRange
&& calculateAngle(e, entity) < seekAngle
&& e != entity && e != entity
&& baseFilter(e) && baseFilter(e)
&& e.getVehicle() == null && e.getVehicle() == null
&& (!e.isAlliedTo(entity) || e.getTeam() == null || e.getTeam().getName().equals("TDM"))) { && (!e.isAlliedTo(entity) || e.getTeam() == null || e.getTeam().getName().equals("TDM"))
return level.clip(new ClipContext(entity.getEyePosition(), e.getEyePosition(), ) {
ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, entity)).getType() != HitResult.Type.BLOCK; return level.clip(new ClipContext(
entity.getEyePosition(),
e.getEyePosition(),
ClipContext.Block.COLLIDER,
ClipContext.Fluid.NONE, entity)
).getType() != HitResult.Type.BLOCK;
} }
return false; return false;
}).toList(); }).toList();
@ -78,31 +107,39 @@ public class SeekTool {
public static Entity vehicleSeekEntity(VehicleEntity vehicle, Level level, double seekRange, double seekAngle) { public static Entity vehicleSeekEntity(VehicleEntity vehicle, Level level, double seekRange, double seekAngle) {
return StreamSupport.stream(EntityFindUtil.getEntities(level).getAll().spliterator(), false) return StreamSupport.stream(EntityFindUtil.getEntities(level).getAll().spliterator(), false)
.filter(e -> { .filter(e -> {
if (e.distanceTo(vehicle) <= seekRange && calculateAngleVehicle(e, vehicle) < seekAngle if (e.distanceTo(vehicle) <= seekRange
&& calculateAngleVehicle(e, vehicle) < seekAngle
&& e != vehicle && e != vehicle
&& baseFilter(e) && baseFilter(e)
&& e.getVehicle() == null && e.getVehicle() == null
&& (!e.isAlliedTo(vehicle) || e.getTeam() == null || e.getTeam().getName().equals("TDM"))) { && (!e.isAlliedTo(vehicle) || e.getTeam() == null || e.getTeam().getName().equals("TDM"))) {
return level.clip(new ClipContext(vehicle.getNewEyePos(1), vehicle.getNewEyePos(1), return level.clip(new ClipContext(
ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, vehicle)).getType() != HitResult.Type.BLOCK; vehicle.getNewEyePos(1),
vehicle.getNewEyePos(1),
ClipContext.Block.COLLIDER,
ClipContext.Fluid.NONE, vehicle)
).getType() != HitResult.Type.BLOCK;
} }
return false; return false;
}).min(Comparator.comparingDouble(e -> calculateAngleVehicle(e, vehicle))).orElse(null); })
.min(Comparator.comparingDouble(e -> calculateAngleVehicle(e, vehicle)))
.orElse(null);
} }
public static List<Entity> seekLivingEntitiesThroughWall(Entity entity, Level level, double seekRange, double seekAngle) { public static List<Entity> seekLivingEntitiesThroughWall(Entity entity, Level level, double seekRange, double seekAngle) {
return StreamSupport.stream(EntityFindUtil.getEntities(level).getAll().spliterator(), false) return StreamSupport.stream(EntityFindUtil.getEntities(level).getAll().spliterator(), false)
.filter(e -> e.distanceTo(entity) <= seekRange && calculateAngle(e, entity) < seekAngle .filter(e -> e.distanceTo(entity) <= seekRange
&& calculateAngle(e, entity) < seekAngle
&& e != entity && e != entity
&& baseFilter(e) && baseFilter(e)
&& e.getVehicle() == null && e.getVehicle() == null
&& (!e.isAlliedTo(entity) || e.getTeam() == null || e.getTeam().getName().equals("TDM"))).toList(); && (!e.isAlliedTo(entity) || e.getTeam() == null || e.getTeam().getName().equals("TDM"))
).toList();
} }
public static List<Entity> getEntitiesWithinRange(BlockPos pos, Level level, double range) { public static List<Entity> getEntitiesWithinRange(BlockPos pos, Level level, double range) {
return StreamSupport.stream(EntityFindUtil.getEntities(level).getAll().spliterator(), false) return StreamSupport.stream(EntityFindUtil.getEntities(level).getAll().spliterator(), false)
.filter(e -> e.distanceToSqr(pos.getX(), pos.getY(), pos.getZ()) <= range * range .filter(e -> e.distanceToSqr(pos.getX(), pos.getY(), pos.getZ()) <= range * range && baseFilter(e))
&& baseFilter(e))
.toList(); .toList();
} }
@ -121,15 +158,20 @@ public class SeekTool {
public static boolean baseFilter(Entity entity) { public static boolean baseFilter(Entity entity) {
return entity.isAlive() return entity.isAlive()
// && !(entity instanceof ItemEntity || entity instanceof ExperienceOrb || entity instanceof HangingEntity || entity instanceof Projectile || entity instanceof ArmorStand || entity instanceof ClaymoreEntity || entity instanceof C4Entity || entity instanceof AreaEffectCloud) && !(entity instanceof ItemEntity
// && !(entity instanceof Player player && player.isSpectator()) || entity instanceof ExperienceOrb
|| entity instanceof HangingEntity
|| entity instanceof Projectile
|| entity instanceof ArmorStand
|| entity instanceof ClaymoreEntity
|| entity instanceof C4Entity
|| entity instanceof AreaEffectCloud)
&& !(entity instanceof Player player && player.isSpectator())
|| includedByConfig(entity); || includedByConfig(entity);
} }
public static boolean includedByConfig(Entity entity) { public static boolean includedByConfig(Entity entity) {
var type = BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()); var type = BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType());
// return VehicleConfig.COLLISION_ENTITY_WHITELIST.get().contains(type.toString()); return VehicleConfig.COLLISION_ENTITY_WHITELIST.get().contains(type.toString());
return false;
} }
} }