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.

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

Backend: Migrate some events to be GenericSkyHanniEvent #2753

Merged
merged 14 commits into from
Dec 5, 2024

Conversation

CalMWolfs
Copy link
Collaborator

@CalMWolfs CalMWolfs commented Oct 18, 2024

What

Convert events to GenericSkyHanniEvent
This does some of the more complicated parts of changing to all skyhanni events as this requires additional lines to be changed that aren't an import or an annotation. This will make reviewing the diff of the closed pr even easier because half of the non filtered changes were these

Changelog Technical Details

  • Converted some events to GenericSkyHanniEvent. - CalMWolfs

@CalMWolfs CalMWolfs added the Soon This Pull Request will be merged within the next couple of betas label Oct 18, 2024
@CalMWolfs CalMWolfs added this to the Version 0.28 milestone Oct 18, 2024
@github-actions github-actions bot added the Backend A backend pull request that will be merged soon label Oct 18, 2024
@hannibal002 hannibal002 added test and removed test labels Oct 18, 2024
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 18, 2024
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Oct 19, 2024
Copy link

Conflicts have been resolved! 🎉

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 20, 2024
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
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 20, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 1, 2024
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.

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftHorsezookaHider.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 1, 2024
Copy link

github-actions bot commented Nov 1, 2024

Conflicts have been resolved! 🎉

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.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 1, 2024
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
#	src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
#	src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 1, 2024
Copy link

github-actions bot commented Nov 1, 2024

Conflicts have been resolved! 🎉

Copy link

github-actions bot commented Nov 2, 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 Nov 2, 2024
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHider.kt
Copy link

github-actions bot commented Nov 2, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 2, 2024
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 Nov 20, 2024
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 21, 2024
Copy link

Conflicts have been resolved! 🎉

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

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

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt
#	src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt
#	src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt
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 Nov 22, 2024
@hannibal002 hannibal002 merged commit 55c4e40 into hannibal002:beta Dec 5, 2024
6 checks passed
@github-actions github-actions bot removed Soon This Pull Request will be merged within the next couple of betas Backend A backend pull request that will be merged soon labels Dec 5, 2024
@CalMWolfs CalMWolfs deleted the generic-event branch December 5, 2024 07:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants