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.

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

Jump to bottom

Farming hud improvements #685

Merged
merged 7 commits into from
Jun 10, 2024
Merged

Farming hud improvements #685

merged 7 commits into from
Jun 10, 2024

Conversation

kevinthegreat1
Copy link
Collaborator

Add coins per hour.
Fix the mouse not unlocking when the option is turned off.
Refactor item price calculations.

Farming Hud

Screenshot 2024-05-05 at 00 24 19

@kevinthegreat1 kevinthegreat1 added bug Something isn't working new feature This issue or PR is a new feature reviews needed This PR needs reviews labels May 5, 2024
@LifeIsAParadox LifeIsAParadox added merge conflicts This PR has merge conflicts that need solving. and removed reviews needed This PR needs reviews labels May 9, 2024
@LifeIsAParadox LifeIsAParadox added reviews needed This PR needs reviews and removed merge conflicts This PR has merge conflicts that need solving. labels May 9, 2024
@kevinthegreat1
Copy link
Collaborator Author

Conflicts with #683. Will wait until after #683 is merged.

@kevinthegreat1 kevinthegreat1 added this to the 1.21 milestone May 16, 2024
@kevinthegreat1
Copy link
Collaborator Author

Add cultivating counter and use normal counter as fallback.
Screenshot 2024-05-17 at 17 14 40

@kevinthegreat1 kevinthegreat1 mentioned this pull request May 20, 2024
Merged
@LifeIsAParadox LifeIsAParadox added merge conflicts This PR has merge conflicts that need solving. and removed reviews needed This PR needs reviews labels May 20, 2024
@LifeIsAParadox LifeIsAParadox added reviews needed This PR needs reviews and removed merge conflicts This PR has merge conflicts that need solving. labels May 20, 2024
@kevinthegreat1
Copy link
Collaborator Author

Fix the merge conflict on #683’s side, so all good to review now.

@Emirlol

This comment was marked as resolved.

Sign in to view
@kevinthegreat1
Copy link
Collaborator Author

kevinthegreat1 commented May 24, 2024 •
edited
Loading

All fixed up, including the crash.

Screenshot 2024-05-24 at 17 55 00

@kevinthegreat1 kevinthegreat1 added the bleeding edge This PR has been accepted into bleeding edge label May 25, 2024
@Emirlol
Copy link
Collaborator

Emirlol commented May 25, 2024 •
edited
Loading

Not something added by this PR but perhaps you could fix it too:
Farming with low FPS causes the counters to be all messed up
image
This can probably be fixed by updating counters on another event such as ClientTickEvents.END_CLIENT_TICK and using HudRenderEvents.AFTER_MAIN_HUD to only render the widget from the updated values, but I haven't tested out anything and might be completely wrong.

@kevinthegreat1
Copy link
Collaborator Author

I tried switching over to ClientTickEvents.END_CLIENT_TICK but since it updates slower, block per second shows 21. I tried reproducing what you're experiencing but couldn't.

AzureAaron
AzureAaron requested changes May 30, 2024
View reviewed changes
Copy link
Collaborator

@AzureAaron AzureAaron left a comment

Choose a reason for hiding this comment

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

The farming hud icon using the main hand stack is a bit weird.

Although the HUD is broken in the main menus and stuff (when the player has no main hand stack)

@LifeIsAParadox LifeIsAParadox added changes requested This PR need changes and removed reviews needed This PR needs reviews labels May 30, 2024
@LifeIsAParadox LifeIsAParadox added reviews needed This PR needs reviews and removed changes requested This PR need changes labels May 30, 2024
@kevinthegreat1
Copy link
Collaborator Author

Untested.

@kevinthegreat1
Copy link
Collaborator Author

Tested btw.

Farming Hud

Screenshot 2024-05-31 at 21 17 48

@Emirlol
Copy link
Collaborator

Emirlol commented Jun 5, 2024 •
edited
Loading

Just found out that the cultivating counter disappears after 100m. That got me thinking, would it be possible to calculate crops/min using bps (or blocks per min if necessary) and multiplying that by average drops per crop * (1+(fortune/100)) and then save the amount ever farmed somewhere?

@Fluboxer
Copy link
Contributor

Fluboxer commented Jun 5, 2024 •
edited
Loading

Just found out that the cultivating counter disappears after 100m. That got me thinking, would it be possible to calculate crops/min using bps (or blocks per min if necessary) and multiplying that by average drops per crop * (1+(fortune/100)) and then save the amount ever farmed somewhere?

is there a need to? It is still here, just not displayed
изображение

@Emirlol
Copy link
Collaborator

Emirlol commented Jun 5, 2024

is there a need to? It is still here, just not displayed

I checked it out and indeed, the nbt is still there after reaching lvl X. But the current cultivating counter implementation depends on the lore, so it would necessitate a change regardless.

@kevinthegreat1
Copy link
Collaborator Author

All done.

@kevinthegreat1 kevinthegreat1 added merge me please Pull requests that are ready to merge and removed reviews needed This PR needs reviews labels Jun 10, 2024
@kevinthegreat1 kevinthegreat1 merged commit ec1c010 into SkyblockerMod:master Jun 10, 2024
1 check passed
@kevinthegreat1 kevinthegreat1 deleted the farming-hud-improvements branch June 10, 2024 03:48
@LifeIsAParadox LifeIsAParadox removed the merge me please Pull requests that are ready to merge label Jun 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Emirlol Emirlol Emirlol left review comments

@AzureAaron AzureAaron AzureAaron approved these changes

Assignees
No one assigned
Labels
bleeding edge This PR has been accepted into bleeding edge bug Something isn't working new feature This issue or PR is a new feature
Projects
None yet
Milestone
1.21
Development

Successfully merging this pull request may close these issues.
5 participants
@kevinthegreat1 @Emirlol @Fluboxer @AzureAaron @LifeIsAParadox