规范animationprocedure命名

This commit is contained in:
Light_Quanta 2025-01-18 21:43:03 +08:00
parent c75246dbfc
commit 7f8307655f
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
2 changed files with 9 additions and 9 deletions

View file

@ -55,7 +55,7 @@ public class CannonShellEntity extends ThrowableItemProjectile implements GeoEnt
public static final EntityDataAccessor<String> ANIMATION = SynchedEntityData.defineId(CannonShellEntity.class, EntityDataSerializers.STRING); public static final EntityDataAccessor<String> ANIMATION = SynchedEntityData.defineId(CannonShellEntity.class, EntityDataSerializers.STRING);
private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
public String animationprocedure = "empty"; public String animationProcedure = "empty";
private float damage = 0; private float damage = 0;
private float radius = 0; private float radius = 0;
private float explosionDamage = 0; private float explosionDamage = 0;
@ -339,20 +339,20 @@ public class CannonShellEntity extends ThrowableItemProjectile implements GeoEnt
} }
private PlayState movementPredicate(AnimationState<CannonShellEntity> event) { private PlayState movementPredicate(AnimationState<CannonShellEntity> event) {
if (this.animationprocedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.cannon_shell.idle")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.cannon_shell.idle"));
} }
return PlayState.STOP; return PlayState.STOP;
} }
private PlayState procedurePredicate(AnimationState<CannonShellEntity> event) { private PlayState procedurePredicate(AnimationState<CannonShellEntity> event) {
if (!animationprocedure.equals("empty") && event.getController().getAnimationState() == AnimationController.State.STOPPED) { if (!animationProcedure.equals("empty") && event.getController().getAnimationState() == AnimationController.State.STOPPED) {
event.getController().setAnimation(RawAnimation.begin().thenPlay(this.animationprocedure)); event.getController().setAnimation(RawAnimation.begin().thenPlay(this.animationProcedure));
if (event.getController().getAnimationState() == AnimationController.State.STOPPED) { if (event.getController().getAnimationState() == AnimationController.State.STOPPED) {
this.animationprocedure = "empty"; this.animationProcedure = "empty";
event.getController().forceAnimationReset(); event.getController().forceAnimationReset();
} }
} else if (animationprocedure.equals("empty")) { } else if (animationProcedure.equals("empty")) {
return PlayState.STOP; return PlayState.STOP;
} }
return PlayState.CONTINUE; return PlayState.CONTINUE;
@ -373,7 +373,7 @@ public class CannonShellEntity extends ThrowableItemProjectile implements GeoEnt
@Override @Override
public void setAnimationProcedure(String procedure) { public void setAnimationProcedure(String procedure) {
this.animationprocedure = procedure; this.animationProcedure = procedure;
} }
@Override @Override

View file

@ -51,7 +51,7 @@ public class RpgRocketEntity extends ThrowableItemProjectile implements GeoEntit
public static final EntityDataAccessor<String> ANIMATION = SynchedEntityData.defineId(RpgRocketEntity.class, EntityDataSerializers.STRING); public static final EntityDataAccessor<String> ANIMATION = SynchedEntityData.defineId(RpgRocketEntity.class, EntityDataSerializers.STRING);
private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
public String animationprocedure = "empty"; public String animationProcedure = "empty";
private float monsterMultiplier = 0.0f; private float monsterMultiplier = 0.0f;
private float damage = 250f; private float damage = 250f;
@ -205,7 +205,7 @@ public class RpgRocketEntity extends ThrowableItemProjectile implements GeoEntit
@Override @Override
public void setAnimationProcedure(String procedure) { public void setAnimationProcedure(String procedure) {
this.animationprocedure = procedure; this.animationProcedure = procedure;
} }
@Override @Override