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

1.21.3 #4536

Merged
merged 3 commits into from
Nov 6, 2024
Merged

1.21.3 #4536

merged 3 commits into from
Nov 6, 2024

Conversation

rfresh2
Copy link
Contributor

@rfresh2 rfresh2 commented Oct 26, 2024

No description provided.

@rfresh2
Copy link
Contributor Author

rfresh2 commented Oct 26, 2024

should be rebased on #4534 after that's merged

}
Tool toolComponent = itemStack.get(DataComponents.TOOL);
if (toolComponent == null) return -1;
return toolComponent.damagePerBlock(); // todo: i have no idea what "material cost" means anymore
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's supposed to be a rough estimate how valuable the tool is. Just so if you happen to have two equally fast tools, Baritone will pick the cheaper one.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gotcha, that makes more sense.

i think there's an enchantment cost data component for something like the prev behavior then. i'll update and also add clarifying comment about what this "cost" means

* <p>
* If below 1000L (1sec), it's better to disable this
*/
public final Setting<Long> toastTimer = new Setting<>(5000L);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed/possible anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably possible but the timer is encoded as a final field in SystemToastId

so we'd have to revert back to implementing a custom Toast subclass or do some other hack

reusing system toasts is much simpler and i don't think its worth the maintenance burden doing the alternatives

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, fine.

@andrew121410
Copy link

andrew121410 commented Nov 1, 2024

#4534 has been merged

Edit: I'm blind

@ZacSharp
Copy link
Collaborator

ZacSharp commented Nov 1, 2024

And rfresh already did the rebase.

@leijurv
Copy link
Member

leijurv commented Nov 5, 2024

Should this have a new base branch 1.21.3 or should I actually merge into 1.21.1?

@rfresh2
Copy link
Contributor Author

rfresh2 commented Nov 6, 2024

new base branch

@leijurv leijurv changed the base branch from 1.21.1 to 1.21.3 November 6, 2024 05:37
@leijurv leijurv merged commit b14c758 into cabaletta:1.21.3 Nov 6, 2024
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants