diff --git a/common/src/main/java/com/starfish_studios/naturalist/client/model/SnailModel.java b/common/src/main/java/com/starfish_studios/naturalist/client/model/SnailModel.java index 947399f9..be3efdfe 100644 --- a/common/src/main/java/com/starfish_studios/naturalist/client/model/SnailModel.java +++ b/common/src/main/java/com/starfish_studios/naturalist/client/model/SnailModel.java @@ -63,7 +63,7 @@ public void setCustomAnimations(Snail animatable, long instanceId, @Nullable Ani eyes.setScaleZ(1.0F); } - if (!animatable.isClimbing() || !animatable.canHide()) { + if (!animatable.isNaturalistClimbing() || !animatable.canHide()) { leftEye.setRotX(extraDataOfType.headPitch() * Mth.DEG_TO_RAD); leftEye.setRotY(extraDataOfType.netHeadYaw() * Mth.DEG_TO_RAD); rightEye.setRotX(extraDataOfType.headPitch() * Mth.DEG_TO_RAD); diff --git a/common/src/main/java/com/starfish_studios/naturalist/common/entity/Snail.java b/common/src/main/java/com/starfish_studios/naturalist/common/entity/Snail.java index b9e7f9e9..3fde3efa 100644 --- a/common/src/main/java/com/starfish_studios/naturalist/common/entity/Snail.java +++ b/common/src/main/java/com/starfish_studios/naturalist/common/entity/Snail.java @@ -403,7 +403,7 @@ public AnimatableInstanceCache getAnimatableInstanceCache() { private PlayState predicate(final @NotNull AnimationState event) { if (this.getDeltaMovement().horizontalDistanceSqr() > 1.0E-6) { event.getController().setAnimation(CRAWL); - } else if (this.isClimbing()){ + } else if (this.isNaturalistClimbing()){ event.getController().setAnimation(CLIMB); } else { event.getController().setAnimation(IDLE); diff --git a/common/src/main/java/com/starfish_studios/naturalist/common/entity/Snake.java b/common/src/main/java/com/starfish_studios/naturalist/common/entity/Snake.java index f9c4c95f..eb15f890 100644 --- a/common/src/main/java/com/starfish_studios/naturalist/common/entity/Snake.java +++ b/common/src/main/java/com/starfish_studios/naturalist/common/entity/Snake.java @@ -419,7 +419,7 @@ public AnimatableInstanceCache getAnimatableInstanceCache() { if (this.isSleeping()) { event.getController().setAnimation(SLEEP); return PlayState.CONTINUE; - } else if (this.isClimbing()) { + } else if (this.isNaturalistClimbing()) { event.getController().setAnimation(CLIMB); return PlayState.CONTINUE; } else if (!(event.getLimbSwingAmount() > -0.04F && event.getLimbSwingAmount() < 0.04F)) { diff --git a/common/src/main/java/com/starfish_studios/naturalist/common/entity/core/ClimbingAnimal.java b/common/src/main/java/com/starfish_studios/naturalist/common/entity/core/ClimbingAnimal.java index 64d6af52..89bf3815 100644 --- a/common/src/main/java/com/starfish_studios/naturalist/common/entity/core/ClimbingAnimal.java +++ b/common/src/main/java/com/starfish_studios/naturalist/common/entity/core/ClimbingAnimal.java @@ -32,7 +32,7 @@ protected void defineSynchedData() { public void tick() { super.tick(); if (!this.level().isClientSide) { - this.setClimbing(this.horizontalCollision); + this.setNaturalistClimbing(this.horizontalCollision); } if (this.horizontalCollision && this.onClimbable()) { this.setDeltaMovement(this.getDeltaMovement().x, this.getDeltaMovement().y * this.getClimbSpeedMultiplier(), this.getDeltaMovement().z); @@ -41,16 +41,16 @@ public void tick() { @Override public boolean onClimbable() { - return this.isClimbing(); + return this.isNaturalistClimbing(); } - public boolean isClimbing() { + public boolean isNaturalistClimbing() { return (this.entityData.get(CLIMB_FLAG) & 1) != 0; } - public void setClimbing(boolean pClimbing) { + public void setNaturalistClimbing(boolean climbing) { byte flag = this.entityData.get(CLIMB_FLAG); - if (pClimbing) { + if (climbing) { flag = (byte)(flag | 1); } else { flag = (byte)(flag & -2);