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

Backend: Replace lorenevent with skyhanni event #2750

Closed
wants to merge 46 commits into from
Closed

Backend: Replace lorenevent with skyhanni event #2750

wants to merge 46 commits into from

Conversation

NopoTheGamer
Copy link
Contributor

@NopoTheGamer NopoTheGamer commented Oct 17, 2024 •
edited by CalMWolfs
Loading

Dependencies

What

Gets rid of lorenzevent and uses skyhannievent on everything.
This is an important step of modern version support

Images

image

Changelog Technical Details

  • Replace LorenzEvent with SkyhanniEvent. - nopo & CalMWolfs
    • A few files got changed.

@NopoTheGamer NopoTheGamer changed the title Changes by Cal Backend: Replace lorenevent with skyhanni event Oct 17, 2024
@github-actions github-actions bot added the Backend A backend pull request that will be merged soon label Oct 17, 2024
@github-actions GitHub Actions
Copy link

I have detected some issues with your pull request:

Body issues:
Change should start with a capital letter in text: few files got changed.

Title issues:
PR title does not match the expected format of 'Category: Title'

Please fix these issues. For the correct format, refer to the pull request template.

@github-actions github-actions bot added the Wrong Title/Changelog There is an error in the title or changelog label Oct 17, 2024
@github-actions GitHub Actions
Copy link

I have detected some issues with your pull request:

Body issues:
Change should start with a capital letter in text: few files got changed.

Please fix these issues. For the correct format, refer to the pull request template.

@github-actions github-actions bot removed the Wrong Title/Changelog There is an error in the title or changelog label Oct 17, 2024
@CalMWolfs CalMWolfs added this to the Version 0.28 milestone Oct 17, 2024
CalMWolfs
CalMWolfs approved these changes Oct 17, 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.

Works for me.

Additionally, when this is merged I will go fix up all prs that this causes to not build or that get merge conflicts because of this

@hannibal002
Copy link
Owner

Too big of an pr. Please don't create that many lines changes at once in the future

@github-actions github-actions bot removed the Backend A backend pull request that will be merged soon label Oct 17, 2024
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Oct 23, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@github-actions GitHub Actions
Copy link

One or more Detekt Failures were detected:

  • ParkourHelper.kt#L45: The function render appears to be too complex based on Cyclomatic Complexity (complexity: 33). Defined complexity threshold for methods is set to '25'

@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 Oct 26, 2024
@NopoTheGamer
Merge remote-tracking branch 'refs/remotes/hannibald/beta' into events
a223ea2 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
#	src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerChatManager.kt
#	src/main/java/at/hannibal2/skyhanni/utils/ConfigUtils.kt
#	src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.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 Oct 26, 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 Oct 26, 2024
@NopoTheGamer
Merge remote-tracking branch 'refs/remotes/hannibald/beta' into events
dc601c0 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt
#	src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
#	src/main/java/at/hannibal2/skyhanni/events/PurseChangeEvent.kt
#	src/main/java/at/hannibal2/skyhanni/events/ScoreboardUpdateEvent.kt
#	src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt
#	src/main/java/at/hannibal2/skyhanni/features/event/spook/TheGreatSpook.kt
@NopoTheGamer
fix merge
6fb8be9
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Oct 27, 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 Oct 27, 2024
@NopoTheGamer
Merge remote-tracking branch 'refs/remotes/hannibald/beta' into events
3ac3944 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
#	src/main/java/at/hannibal2/skyhanni/events/ScoreboardUpdateEvent.kt
#	src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
#	src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
#	src/main/java/at/hannibal2/skyhanni/features/inventory/FocusMode.kt
#	src/main/java/at/hannibal2/skyhanni/features/inventory/MinisterInCalendar.kt
#	src/main/java/at/hannibal2/skyhanni/features/misc/SkyBlockKickDuration.kt
#	src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt
@NopoTheGamer
fix merge
5e53a40
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Oct 27, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@github-actions GitHub Actions
Copy link

One or more Detekt Failures were detected:

  • DianaProfitTracker.kt#L3: Imports must be ordered in lexicographic order without any empty lines in-between with "java", "javax", "kotlin" and aliases in the end. This should then be followed by pre-processed imports.

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

github-actions bot commented Nov 1, 2024

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

@CalMWolfs
Copy link
Collaborator

#3025

@CalMWolfs CalMWolfs closed this Dec 6, 2024
@github-actions github-actions bot removed Merge Conflicts There are open merge conflicts with the beta branch. Backend A backend pull request that will be merged soon labels Dec 6, 2024
@NopoTheGamer
Copy link
Contributor Author

#3025

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

@CalMWolfs CalMWolfs removed this from the Version 0.29 milestone Dec 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ItsEmpa ItsEmpa ItsEmpa left review comments

@CalMWolfs CalMWolfs CalMWolfs approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@NopoTheGamer @hannibal002 @CalMWolfs @ItsEmpa @jani270