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

Improvement + Backend: Dungeon Features Cleanup #2108

Merged
merged 65 commits into from
Nov 1, 2024
Merged

Improvement + Backend: Dungeon Features Cleanup #2108

merged 65 commits into from
Nov 1, 2024

Conversation

ItsEmpa
Copy link
Contributor

@ItsEmpa ItsEmpa commented Jun 16, 2024 •
edited by hannibal002
Loading

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 Armor Stand-related functions inside EntityUtils in favor of using Mob Detection. - Empa
  • Cleaned up BlockUtils. - Empa
  • Added exactBoundingBox function. - Empa

ItsEmpa added 16 commits June 15, 2024 09:09
@ItsEmpa
startt
c313a7b 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
livid
5328917 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
fix livid
54382ce 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
formatting
5ea697d 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
some cleanup and a couple more features
c4eb149 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
shorter
2c8a091 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
Merge branch 'refs/heads/beta' into mob-detection-migration/dungeon-f…
d4d47c8 
…eatures
@ItsEmpa
fix compile error
a2e9a23 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
i hate this so much
270072e 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
deprecate nametag functions
cbd3037 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
surely its gonna work now!
95d6362 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
this should fix it
cfbfdfa 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
Merge branch 'refs/heads/beta' into mob-detection-migration/dungeon-f…
6a07883 
…eatures
@ItsEmpa
clean up exact bounding box code
7256669 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
livid entity out of function
b6ee211 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
private
83f5531 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@hannibal002 hannibal002 added this to the Version 0.27 milestone Jun 16, 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 Jun 22, 2024
ItsEmpa added 3 commits June 25, 2024 21:31
@ItsEmpa
make RecalculatingValue a ReadOnlyProperty
716992a 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
grammar
9961a41 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
Merge branch 'refs/heads/beta' into mob-detection-migration/dungeon-f…
2388092 
…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
@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 22, 2024
@CalMWolfs
Merge branch 'refs/heads/beta' into fork/ItsEmpa/mob-detection-migrat…
3f0da93 
…ion/dungeon-features

# 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 22, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 22, 2024 •
edited by CalMWolfs
Loading

One or more Detekt Failures were detected:

CalMWolfs
CalMWolfs reviewed Oct 22, 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.

Code lgtm

@CalMWolfs CalMWolfs changed the title Improvement: Dungeon Features Cleanup Improvement + Backend: Dungeon Features Cleanup Oct 24, 2024
@github-actions github-actions bot added the Backend A backend pull request that will be merged soon label Oct 24, 2024
hannibal002
hannibal002 requested changes Oct 26, 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.

worked for me in game

src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt Outdated Show resolved Hide resolved
@ItsEmpa ItsEmpa requested a review from hannibal002 October 26, 2024 11:12
hannibal002
hannibal002 requested changes Oct 27, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Replied to the comments above

@ItsEmpa ItsEmpa requested a review from hannibal002 October 28, 2024 13:36
@github-actions GitHub Actions
Copy link

One or more Detekt Failures were detected:

@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
Merge branch 'refs/heads/beta' into fork/ItsEmpa/mob-detection-migrat…
74288bb 
…ion/dungeon-features

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
@github-actions github-actions bot removed 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

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 merged commit e508455 into hannibal002:beta Nov 1, 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 Nov 1, 2024
@ItsEmpa ItsEmpa deleted the mob-detection-migration/dungeon-features branch November 1, 2024 14:39
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 hannibal002 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.0.0 (old Version 0.28)
Development

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