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

Bits Helper #939

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Bits Helper #939

wants to merge 20 commits into from
+428 −3

Conversation

Fluboxer
Copy link
Contributor

Shows you best coins per bit and highlights them
изображение
Supports showing quick selling items (green), as well as best of all (yellow)
изображение

Took me way longer than it should've taken tbh

@LifeIsAParadox LifeIsAParadox added the reviews needed This PR needs reviews label Aug 18, 2024
@AzureAaron AzureAaron added the new feature This issue or PR is a new feature label Aug 18, 2024
@AzureAaron AzureAaron added this to the 1.23.0 milestone Aug 19, 2024
AzureAaron
AzureAaron requested changes Aug 19, 2024
View reviewed changes
src/main/java/de/hysky/skyblocker/utils/container/ContainerSolverManager.java Outdated Show resolved Hide resolved
src/main/resources/assets/skyblocker/lang/en_us.json Outdated Show resolved Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BitsHelper.java Outdated Show resolved Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BitsHelper.java Outdated Show resolved Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BitsHelper.java Outdated Show resolved Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BitsHelper.java Outdated Show resolved Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BitsHelper.java Outdated Show resolved Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BitsHelper.java Outdated Show resolved Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BitsHelper.java Show resolved Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BitsHelper.java Outdated Show resolved Hide resolved
@LifeIsAParadox LifeIsAParadox added changes requested This PR need changes and removed reviews needed This PR needs reviews labels Aug 19, 2024
@LifeIsAParadox LifeIsAParadox added reviews needed This PR needs reviews and removed changes requested This PR need changes labels Aug 19, 2024
@LifeIsAParadox LifeIsAParadox added merge conflicts This PR has merge conflicts that need solving. and removed reviews needed This PR needs reviews labels Sep 2, 2024
kevinthegreat1
kevinthegreat1 requested changes Sep 7, 2024
View reviewed changes
Copy link
Collaborator

@kevinthegreat1 kevinthegreat1 left a comment

Choose a reason for hiding this comment

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

The method and field order are a bit confusing. For example addToTooltip -> calculateBestItems -> calculateBestInCategory -> processCategory jumps all over the place. Fields should also be placed first.

src/main/java/de/hysky/skyblocker/config/configs/HelperConfig.java Outdated Show resolved Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java Outdated Show resolved Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BitsHelper.java Outdated Show resolved Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BitsHelper.java Outdated Show resolved Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BitsHelper.java Outdated Show resolved Hide resolved
@Fluboxer
Merge remote-tracking branch 'origin/master' into bits
4ff3427 
# Conflicts:
#	src/main/java/de/hysky/skyblocker/config/configs/HelperConfig.java
#	src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java
@Fluboxer
rebased + few little changes
a303920
@LifeIsAParadox LifeIsAParadox removed the merge conflicts This PR has merge conflicts that need solving. label Sep 8, 2024
@LifeIsAParadox LifeIsAParadox added the reviews needed This PR needs reviews label Sep 8, 2024
kevinthegreat1
kevinthegreat1 requested changes Sep 8, 2024
View reviewed changes
Copy link
Collaborator

@kevinthegreat1 kevinthegreat1 left a comment

Choose a reason for hiding this comment

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

Looks good, but can you rebase this. If you don't I'll rebase it, but it'll say authored by you and committed by me.

src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/BitsHelper.java Outdated Show resolved Hide resolved
@LifeIsAParadox LifeIsAParadox added changes requested This PR need changes and removed reviews needed This PR needs reviews labels Sep 8, 2024
@kevinthegreat1 kevinthegreat1 mentioned this pull request Sep 8, 2024
Merged
@LifeIsAParadox LifeIsAParadox added merge conflicts This PR has merge conflicts that need solving. and removed changes requested This PR need changes labels Sep 8, 2024
@LifeIsAParadox LifeIsAParadox added reviews needed This PR needs reviews and removed merge conflicts This PR has merge conflicts that need solving. labels Sep 9, 2024
@Fluboxer
Merge remote-tracking branch 'origin/master' into bits
90e0686 
# Conflicts:
#	src/main/java/de/hysky/skyblocker/config/configs/HelperConfig.java
@Fluboxer
:clown:
aefff28
@kevinthegreat1
Copy link
Collaborator

kevinthegreat1 commented Sep 13, 2024 •
edited
Loading

This is good but it seems like the rebase didn't work. While you're on your bits branch, it should be:

git pull origin
git rebase master
git push --force-with-lease

Again, you can ask me to do it if you have any problems.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kevinthegreat1 kevinthegreat1 kevinthegreat1 requested changes

@AzureAaron AzureAaron Awaiting requested review from AzureAaron

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
new feature This issue or PR is a new feature reviews needed This PR needs reviews
Projects
None yet
Milestone
1.23.0
Development

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