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

可能是优化实体获取方法

Browse source
This commit is contained in:
17146 2025-06-16 19:16:31 +08:00 • committed by Light_Quanta
parent 82c30075f4
commit 5ad00132aa
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
1 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/com/atsuishio/superbwarfare/mixins/LevelMixin.java
View file

@ -1,7 +1,6 @@
package com.atsuishio.superbwarfare.mixins; package com.atsuishio.superbwarfare.mixins;
import com.atsuishio.superbwarfare.entity.OBBEntity; import com.atsuishio.superbwarfare.entity.OBBEntity;
import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity;
import com.atsuishio.superbwarfare.tools.OBB; import com.atsuishio.superbwarfare.tools.OBB;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
@ -15,6 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.List; import java.util.List;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.StreamSupport;
@Mixin(Level.class) @Mixin(Level.class)
public abstract class LevelMixin { public abstract class LevelMixin {
@ -25,30 +25,14 @@ public abstract class LevelMixin {
@Inject(method = "getEntities(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/AABB;Ljava/util/function/Predicate;)Ljava/util/List;", @Inject(method = "getEntities(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/AABB;Ljava/util/function/Predicate;)Ljava/util/List;",
at = @At("RETURN")) at = @At("RETURN"))
public void getEntities(Entity pEntity, AABB pBoundingBox, Predicate<? super Entity> pPredicate, CallbackInfoReturnable<List<Entity>> cir) { public void getEntities(Entity pEntity, AABB pBoundingBox, Predicate<? super Entity> pPredicate, CallbackInfoReturnable<List<Entity>> cir) {
if (pEntity instanceof ProjectileEntity) { StreamSupport.stream(this.getEntities().getAll().spliterator(), false).filter(e -> e instanceof OBBEntity && pPredicate.test(e))
this.getEntities().get(pBoundingBox.inflate(3), entity -> { .forEach(entity -> {
if (entity instanceof OBBEntity obbEntity && pPredicate.test(entity)) { for (OBB obb : ((OBBEntity) entity).getOBBs()) {
for (OBB obb : obbEntity.getOBBs()) { if (OBB.isColliding(obb, pBoundingBox) && !cir.getReturnValue().contains(entity)) {
if (OBB.isColliding(obb, pBoundingBox)) { cir.getReturnValue().add(entity);
if (!cir.getReturnValue().contains(entity)) { }
cir.getReturnValue().add(entity);
} }
} }
} );
}
});
} else {
this.getEntities().get(pBoundingBox, entity -> {
if (entity instanceof OBBEntity obbEntity && pPredicate.test(entity)) {
for (OBB obb : obbEntity.getOBBs()) {
if (OBB.isColliding(obb, pBoundingBox)) {
if (!cir.getReturnValue().contains(entity)) {
cir.getReturnValue().add(entity);
}
}
}
}
});
}
} }
} }