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

Improvement: Dungeon Features Cleanup #2108

Open
wants to merge 56 commits into
base: beta
Choose a base branch
from

Conversation

ItsEmpa
Copy link
Contributor

@ItsEmpa ItsEmpa commented Jun 16, 2024

Dependencies

What

General cleanup of basically all dungeon features. moved some patterns to be repopatterns, used mob detection when it can be used, etc.

Theres also some cleanup in block utils, deprecating armor stand related functions in entity utils (in favor of using mob detection), and added an exactBoundingBox method for entities.

Changelog Improvements

  • Improved various Dungeon related features. - Empa

Changelog Technical Details

  • Deprecated Armorstand related functions inside EntityUtils in favor of using Mob Detection. - Empa
  • Cleaned up BlockUtils. - Empa
  • Added exactBoundingBox function. - Empa

Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@hannibal002 hannibal002 added this to the Version 0.27 milestone Jun 16, 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 Jun 22, 2024
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
…eatures

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 26, 2024
Copy link

Conflicts have been resolved! 🎉

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 Jul 31, 2024
Copy link

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

Vahvl and others added 2 commits August 14, 2024 17:39
updated config version
…tion-migration/dungeon-features

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Aug 14, 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 Aug 26, 2024
…eatures

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
#	src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
#	src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
#	src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
Signed-off-by: ItsEmpa <itsempa@users.noreply.github.com>
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Sep 11, 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 Sep 20, 2024
Copy link

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

…eatures

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
#	src/main/java/at/hannibal2/skyhanni/utils/BlockUtils.kt
Signed-off-by: ItsEmpa <itsempa@users.noreply.github.com>
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 Sep 25, 2024
Signed-off-by: ItsEmpa <itsempa@users.noreply.github.com>
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Sep 29, 2024
Copy link

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

@CalMWolfs CalMWolfs self-requested a review October 8, 2024 11:05
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
#	src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
#	src/main/java/at/hannibal2/skyhanni/features/dungeon/HighlightDungeonDeathmite.kt
#	src/main/java/at/hannibal2/skyhanni/features/dungeon/TerracottaPhase.kt
#	src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.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 13, 2024
@jani270 jani270 added the Soon This Pull Request will be merged within the next couple of betas label Oct 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Soon This Pull Request will be merged within the next couple of betas
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants