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 2024-09-26 11:23:17 +08:00
parent 5b24ae40a3
commit 5a8e1744a1
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/net/mcreator/superbwarfare/entity/projectile/ProjectileEntity.java
View file

@ -57,10 +57,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.ArrayDeque; import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Queue;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Predicate; import java.util.function.Predicate;
@ -247,7 +244,7 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa
Vec3 vec = this.getDeltaMovement(); Vec3 vec = this.getDeltaMovement();
if (!this.level().isClientSide()) { if (!this.level().isClientSide() && this.shooter != null) {
Vec3 startVec = this.position(); Vec3 startVec = this.position();
Vec3 endVec = startVec.add(this.getDeltaMovement()); Vec3 endVec = startVec.add(this.getDeltaMovement());
HitResult result = rayTraceBlocks(this.level(), new ClipContext(startVec, endVec, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this), IGNORE_LEAVES); HitResult result = rayTraceBlocks(this.level(), new ClipContext(startVec, endVec, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this), IGNORE_LEAVES);
@ -256,16 +253,18 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa
} }
List<EntityResult> entityResults = new ArrayList<>(); List<EntityResult> entityResults = new ArrayList<>();
var temp = findEntitiesOnPath(startVec, endVec);
if (temp != null) entityResults.addAll(temp);
entityResults.sort(Comparator.comparingDouble(e -> e.getHitPos().distanceTo(this.shooter.position())));
if (this.beast) { for (EntityResult entityResult : entityResults) {
var temp = findEntitiesOnPath(startVec, endVec); if (!this.beast) {
if (temp != null) entityResults.addAll(temp); this.bypassArmorRate -= 0.2F;
} else { if (this.bypassArmorRate < 0) {
var temp = this.findEntityOnPath(startVec, endVec); break;
if (temp != null) entityResults.add(temp); }
} }
for (var entityResult : entityResults) {
result = new ExtendedEntityRayTraceResult(entityResult); result = new ExtendedEntityRayTraceResult(entityResult);
if (((EntityHitResult) result).getEntity() instanceof Player player) { if (((EntityHitResult) result).getEntity() instanceof Player player) {
if (this.shooter instanceof Player && !((Player) this.shooter).canHarmPlayer(player)) { if (this.shooter instanceof Player && !((Player) this.shooter).canHarmPlayer(player)) {
@ -423,7 +422,6 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa
} }
} }
// TODO 实现穿甲比例大于1时的穿透生物效果
protected void onHitEntity(Entity entity, boolean headshot, boolean legShot) { protected void onHitEntity(Entity entity, boolean headshot, boolean legShot) {
if (this.shooter == null) return; if (this.shooter == null) return;

2
src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java
View file

@ -39,8 +39,8 @@ public class TooltipTool {
addLevelTips(tooltip, stack); addLevelTips(tooltip, stack);
addBypassTips(tooltip, stack); addBypassTips(tooltip, stack);
addPerkTips(tooltip, stack);
addRpmTips(tooltip, stack); addRpmTips(tooltip, stack);
addPerkTips(tooltip, stack);
} }
public static void addShotgunTips(List<Component> tooltip, ItemStack stack, int count) { public static void addShotgunTips(List<Component> tooltip, ItemStack stack, int count) {