Skip to content
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.

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

Calculate item hash only if needed #4687

Draft
wants to merge 1 commit into
base: 1.19.4
Choose a base branch
from
Draft
Changes from all commits
Commits
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
11 changes: 2 additions & 9 deletions src/launch/java/baritone/launch/mixins/MixinItemStack.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,6 @@ private void recalculateHash() {
baritoneHash = item == null ? -1 : item.hashCode() + getDamageValue();
}

@Inject(
method = "<init>*",
at = @At("RETURN")
)
private void onInit(CallbackInfo ci) {
recalculateHash();
}

@Inject(
method = "setDamageValue",
at = @At("TAIL")
Expand All @@ -63,7 +55,8 @@ private void onItemDamageSet(CallbackInfo ci) {

@Override
public int getBaritoneHash() {
// TODO: figure out why <init> mixin not working, was 0 for some reason
// cannot do this in an init mixin because silentlib likes creating new
// items in getDamageValue, which we call in recalculateHash
if (baritoneHash == 0) recalculateHash();
return baritoneHash;
}
Expand Down