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: Added option to show some features outside SB. #603

Merged
merged 39 commits into from
Mar 4, 2024
Merged

Feature: Added option to show some features outside SB. #603

merged 39 commits into from
Mar 4, 2024

Conversation

Obsidianninja11
Copy link
Contributor

@Obsidianninja11 Obsidianninja11 commented Oct 19, 2023 •
edited by hannibal002
Loading

Hopefully it works this time
Idk what happened when i tried to fix merge conflicts last time, but I couldn't figure out how to revert that

Changelog Improvements

  • Added option to show some features outside SkyBlock. - Obsidian

@Obsidianninja11 Obsidianninja11 mentioned this pull request Oct 19, 2023
Closed
CalMWolfs
CalMWolfs requested changes Oct 19, 2023
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.

You have changed multiple config options location and names which means the user's settings for these specific settings will be reset.
Please look at the code base to see examples of ConfigUpdaterMigrator.ConfigFixEvent to correct this.

@Obsidianninja11
Copy link
Contributor Author

I think i fixed everything.
Didn't test though (idrk how to)

@hannibal002 hannibal002 added this to the Version 0.21 milestone Oct 25, 2023
@hannibal002 hannibal002 modified the milestones: Version 0.21, very soon Oct 28, 2023
@hannibal002 hannibal002 self-requested a review October 28, 2023 17:49
@hannibal002
Merge branch 'beta' into show-outside-2
3760199 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@hannibal002
code cleanup
874d487
@hannibal002 hannibal002 modified the milestones: very soon, Version 0.21 Oct 28, 2023
@Obsidianninja11
Copy link
Contributor Author

FINALLY IT WORKED

@hannibal002 hannibal002 modified the milestones: very soon, Version 0.21 Nov 2, 2023
@hannibal002 hannibal002 modified the milestones: very soon, Version 0.21 Nov 3, 2023
CalMWolfs
CalMWolfs requested changes Feb 21, 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.

overall still many things to change plus hannibal's comment to address,
Also I oppose Party Member Outlines outside of skyblock as this can easily give unfair advantage over other teams and be seen as a cheat

src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/ModifyVisualWords.kt Show resolved Hide resolved
@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Feb 22, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Feb 28, 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.

@hannibal002
Merge branch 'beta' into fork/show-outside-2
02605de 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 1, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 1, 2024

Conflicts have been resolved! 🎉

@Obsidianninja11
Copy link
Contributor Author

Please make it so that it only updates once when outside garden. Moreover, you should handle world switches differently. No need to update the weight display on every world switch when the user wants to see the weight outside SkyBlock.

I haven't added this yet

@hannibal002
Copy link
Owner

I want to fix the last thing missing in this pr myself: showing "join skyblock" in the lore for the 1-2 features that dont load properly in hypixel lobby

@Obsidianninja11
Copy link
Contributor Author

I want to fix the last thing missing in this pr myself: showing "join skyblock" in the lore for the 1-2 features that dont load properly in hypixel lobby

Oh yeah I forgot about that.

Also, do you still want the weight display to only update once when outside of sb?

@hannibal002
Copy link
Owner

Also, do you still want the weight display to only update once when outside of sb?

yes, definetly.
there is no reason to keep fetching elite bot just to see how many spots you have falled since last skyblock join.

@Obsidianninja11
Copy link
Contributor Author

Also I oppose Party Member Outlines outside of skyblock as this can easily give unfair advantage over other teams and be seen as a cheat

Oh i forgot to remove this

@Obsidianninja11
Copy link
Contributor Author

Oh and I don't think there's a config migration for the shwords show outside sb boolean to the draggable list

@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 3, 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 Mar 3, 2024
@Obsidianninja11
Merge branch 'beta' into show-outside-2
7437f4a 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 4, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 4, 2024

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 changed the title Feature: Added option to show some features outside SB. (Attempt 2) Feature: Added option to show some features outside SB. Mar 4, 2024
@hannibal002 hannibal002 merged commit 16facf4 into hannibal002:beta Mar 4, 2024
3 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Mar 4, 2024
@CalMWolfs CalMWolfs mentioned this pull request Mar 17, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hannibal002 hannibal002 hannibal002 approved these changes

@CalMWolfs CalMWolfs Awaiting requested review from CalMWolfs

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

Successfully merging this pull request may close these issues.
4 participants
@Obsidianninja11 @hannibal002 @CalMWolfs @jani270