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

修复迫击炮的角度不同步BUG

Browse source
This commit is contained in:
Atsuihsio 2024-11-10 02:14:18 +08:00
parent 89a384820f
commit f96ec9cd69
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/net/mcreator/superbwarfare/entity/MortarEntity.java
View file

@ -44,6 +44,7 @@ import static net.mcreator.superbwarfare.tools.ParticleTool.sendParticle;
public class MortarEntity extends Entity implements GeoEntity, AnimatedEntity { public class MortarEntity extends Entity implements GeoEntity, AnimatedEntity {
public static final EntityDataAccessor<Integer> FIRE_TIME = SynchedEntityData.defineId(MortarEntity.class, EntityDataSerializers.INT); public static final EntityDataAccessor<Integer> FIRE_TIME = SynchedEntityData.defineId(MortarEntity.class, EntityDataSerializers.INT);
public static final EntityDataAccessor<Float> PITCH = SynchedEntityData.defineId(MortarEntity.class, EntityDataSerializers.FLOAT); public static final EntityDataAccessor<Float> PITCH = SynchedEntityData.defineId(MortarEntity.class, EntityDataSerializers.FLOAT);
public static final EntityDataAccessor<Float> Y_ROT = SynchedEntityData.defineId(MortarEntity.class, EntityDataSerializers.FLOAT);
public static final EntityDataAccessor<Float> HEALTH = SynchedEntityData.defineId(MortarEntity.class, EntityDataSerializers.FLOAT); public static final EntityDataAccessor<Float> HEALTH = SynchedEntityData.defineId(MortarEntity.class, EntityDataSerializers.FLOAT);
private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
@ -64,6 +65,7 @@ public class MortarEntity extends Entity implements GeoEntity, AnimatedEntity {
protected void defineSynchedData() { protected void defineSynchedData() {
this.entityData.define(FIRE_TIME, 0); this.entityData.define(FIRE_TIME, 0);
this.entityData.define(PITCH, 70f); this.entityData.define(PITCH, 70f);
this.entityData.define(Y_ROT, 0f);
this.entityData.define(HEALTH, 100f); this.entityData.define(HEALTH, 100f);
} }
@ -116,6 +118,7 @@ public class MortarEntity extends Entity implements GeoEntity, AnimatedEntity {
public void addAdditionalSaveData(CompoundTag compound) { public void addAdditionalSaveData(CompoundTag compound) {
compound.putInt("FireTime", this.entityData.get(FIRE_TIME)); compound.putInt("FireTime", this.entityData.get(FIRE_TIME));
compound.putFloat("Pitch", this.entityData.get(PITCH)); compound.putFloat("Pitch", this.entityData.get(PITCH));
compound.putFloat("YRot", this.entityData.get(Y_ROT));
compound.putFloat("Health", this.entityData.get(HEALTH)); compound.putFloat("Health", this.entityData.get(HEALTH));
} }
@ -127,6 +130,9 @@ public class MortarEntity extends Entity implements GeoEntity, AnimatedEntity {
if (compound.contains("Pitch")) { if (compound.contains("Pitch")) {
this.entityData.set(PITCH, compound.getFloat("Pitch")); this.entityData.set(PITCH, compound.getFloat("Pitch"));
} }
if (compound.contains("YRot")) {
this.entityData.set(Y_ROT, compound.getFloat("YRot"));
}
if (compound.contains("Health")) { if (compound.contains("Health")) {
this.entityData.set(HEALTH, compound.getFloat("Health")); this.entityData.set(HEALTH, compound.getFloat("Health"));
} }
@ -140,11 +146,7 @@ public class MortarEntity extends Entity implements GeoEntity, AnimatedEntity {
this.discard(); this.discard();
ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.MORTAR_DEPLOYER.get())); ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.MORTAR_DEPLOYER.get()));
} }
this.setYRot(player.getYRot()); this.entityData.set(Y_ROT, player.getYRot());
this.setYBodyRot(this.getYRot());
this.setYHeadRot(this.getYRot());
this.yRotO = this.getYRot();
this.setRot(this.getYRot(), this.getXRot());
} }
if (mainHandItem.getItem() == ModItems.MORTAR_SHELLS.get() && !player.isShiftKeyDown() && this.entityData.get(FIRE_TIME) == 0) { if (mainHandItem.getItem() == ModItems.MORTAR_SHELLS.get() && !player.isShiftKeyDown() && this.entityData.get(FIRE_TIME) == 0) {
this.entityData.set(FIRE_TIME, 25); this.entityData.set(FIRE_TIME, 25);
@ -189,6 +191,11 @@ public class MortarEntity extends Entity implements GeoEntity, AnimatedEntity {
} }
this.setXRot(-Mth.clamp(entityData.get(PITCH), 20, 89)); this.setXRot(-Mth.clamp(entityData.get(PITCH), 20, 89));
this.xRotO = this.getXRot(); this.xRotO = this.getXRot();
this.setYRot(entityData.get(Y_ROT));
this.setYBodyRot(this.getYRot());
this.setYHeadRot(this.getYRot());
this.yRotO = this.getYRot();
this.setRot(this.getYRot(), this.getXRot());
this.setDeltaMovement(this.getDeltaMovement().add(0.0, -0.04, 0.0)); this.setDeltaMovement(this.getDeltaMovement().add(0.0, -0.04, 0.0));