Skip to content

Conflict Resolver #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xGabou wants to merge 2 commits into
base: 1.20.1-Arch
Choose a base branch
from
Open

Conflict Resolver #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
714fdbe
Rename climbing methods to avoid mapping conflicts
xGabou Aug 13, 2025
9b6b6ad
Merge pull request #1 from xGabou/codex/fix-method-name-conflict-for-…
xGabou Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/src/main/java/com/starfish_studios/naturalist/client/model/SnailModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/com/starfish_studios/naturalist/common/entity/Snail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ public AnimatableInstanceCache getAnimatableInstanceCache() {
private <E extends Snail> PlayState predicate(final @NotNull AnimationState<E> 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);
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/com/starfish_studios/naturalist/common/entity/Snake.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
10 changes: 5 additions & 5 deletions common/src/main/java/com/starfish_studios/naturalist/common/entity/core/ClimbingAnimal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down