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:
Atsuishio 2025-06-17 00:47:00 +08:00 • committed by Light_Quanta
parent d6619f3295
commit 5ac84a8938
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/atsuishio/superbwarfare/entity/projectile/ProjectileEntity.java
View file

@ -65,7 +65,9 @@ import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Predicate;
@SuppressWarnings({"unused", "UnusedReturnValue"})
import static com.atsuishio.superbwarfare.tools.ParticleTool.sendParticle;
@SuppressWarnings({"unused", "UnusedReturnValue", "SuspiciousNameCombination"})
public class ProjectileEntity extends Projectile implements IEntityWithComplexSpawn, GeoEntity, CustomSyncMotionEntity {
public static final EntityDataAccessor<Float> COLOR_R = SynchedEntityData.defineId(ProjectileEntity.class, EntityDataSerializers.FLOAT);
@ -187,6 +189,10 @@ public class ProjectileEntity extends Projectile implements IEntityWithComplexSp
var obbVec = obb.clip(startVec.toVector3f(), endVec.toVector3f()).orElse(null);
if (obbVec != null) {
hitPos = new Vec3(obbVec);
if (this.level() instanceof ServerLevel serverLevel) {
sendParticle(serverLevel, ModParticleTypes.FIRE_STAR.get(), hitPos.x, hitPos.y, hitPos.z, 2, 0, 0, 0, 0.2, false);
sendParticle(serverLevel, ParticleTypes.SMOKE, hitPos.x, hitPos.y, hitPos.z, 3, 0, 0, 0, 0.01, false);
}
}
}
} else {

2
src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
View file

@ -229,7 +229,7 @@ public class GunEventHandler {
if (reload.singleReloadStarter.start()) {
NeoForge.EVENT_BUS.post(new ReloadEvent.Pre(player, data));
if (data.defaultPrepareLoadTime() != 0 && data.ammo.get() == 0) {
if (data.defaultPrepareLoadTime() != 0 && (data.ammo.get() == 0 || stack.is(ModItems.SECONDARY_CATACLYSM.get()))) {
// 此处判断空仓换弹的时候，是否在准备阶段就需要装填一发，如M870
playGunPrepareLoadReloadSounds(player);
int prepareLoadTime = data.defaultPrepareLoadTime();

1
src/main/resources/data/superbwarfare/guns/secondary_cataclysm.json
View file

@ -13,6 +13,7 @@
"ReloadTypes": [
"Iterative"
],
"PrepareTime": 31,
"PrepareLoadTime": 31,
"PrepareAmmoLoadTime": 3,
"IterativeTime": 20,