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

Feature: Reforge helper #1437

Merged
merged 53 commits into from
Jun 23, 2024
Merged

Feature: Reforge helper #1437

merged 53 commits into from
Jun 23, 2024

Conversation

Thunderblade73
Copy link
Contributor

@Thunderblade73 Thunderblade73 commented Apr 13, 2024 •
edited by hannibal002
Loading

Dependencies

What

A helper for random Reforges similar to the one sba has but better.
Blocks the Reforge Button when the desired reforge is on the item.
Shows all possible Reforges, with there stats and the difference it would make by chancing to them
and has support for reforge stones in Hex

Continues #816

Preview

image

Changelog New Features

  • Add Reforge Helper. - Thunderblade73
    • Add reforge locking similar to SkyblockAddons.
    • Work with Hex.
    • Show a list of all possible reforges for the item, with stats.
    • The reforge list can be sorted by a specific stat.
    • Optionally show the different stat values compared to the current reforge.

Changelog Technical Details

  • Add SkyblockStats. - Thunderblade73
  • Add ReforgeAPI. - Thunderblade73

@Thunderblade73 Thunderblade73 mentioned this pull request Apr 13, 2024
Closed
@hannibal002 hannibal002 added this to the Version 0.25 milestone Apr 13, 2024
@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 13, 2024
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 13, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

CalMWolfs
CalMWolfs requested changes Apr 15, 2024
View reviewed changes
Copy link
Collaborator

@CalMWolfs CalMWolfs left a comment

Choose a reason for hiding this comment

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

this pr looks very cool, just a bit of initial code cleanup

src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 17, 2024
Thunderblade73 and others added 5 commits April 17, 2024 20:50
@Thunderblade73
ReforgeHelper
b5eec4d
@Thunderblade73 @CalMWolfs
. fix
f5c2b9a 
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
@Thunderblade73
fix ConfigManager
576aad9
@Thunderblade73
fix repoPattern
96e5b7f
@Thunderblade73
added config links
7ccc984
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 17, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 24, 2024
@Thunderblade73
Merge branch 'beta' into reforgeHelper-cleanup
7ad9082 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 24, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented May 7, 2024

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label May 7, 2024
@Thunderblade73
Merge branch 'beta' into reforgeHelper-cleanup
cf021fe 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label May 7, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 14, 2024
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 14, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@Thunderblade73
Copy link
Contributor Author

i like the idea of the quick "comparison" between current reforge and another reforge.
but the current format is a bit confusing imo:
move the comparison data disabled behind a toggle, that is default disabled.
or additonally show the stats of the currently hovered reforge that are 0 so that the comparison correctly shows all the differences.

I implemented both things.

hannibal002
hannibal002 requested changes Jun 16, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

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

Works perfect. Just small code cleanups remaining

src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt Outdated Show resolved Hide resolved
@Thunderblade73 @hannibal002
Update src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
225ad02 
Co-authored-by: hannibal2 <24389977+hannibal002@users.noreply.github.com>
@hannibal002
Copy link
Owner

Looks weird when using a drill. Is this intended?
grafik
grafik

@hannibal002 hannibal002 merged commit 6eb085f into hannibal002:beta Jun 23, 2024
4 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Jun 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CalMWolfs CalMWolfs CalMWolfs approved these changes

@hannibal002 hannibal002 Awaiting requested review from hannibal002

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Version 0.26
Development

Successfully merging this pull request may close these issues.
3 participants
@Thunderblade73 @hannibal002 @CalMWolfs