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: Dungeon Features Cleanup #2108

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

Improvement: Dungeon Features Cleanup #2108

wants to merge 56 commits into from
+148 −160

Commits on Jun 15, 2024

  1. startt 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    c313a7b View commit details
    Browse the repository at this point in the history

  2. livid 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    5328917 View commit details
    Browse the repository at this point in the history

  3. fix livid 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    54382ce View commit details
    Browse the repository at this point in the history

  4. formatting 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    5ea697d View commit details
    Browse the repository at this point in the history

  5. some cleanup and a couple more features 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    c4eb149 View commit details
    Browse the repository at this point in the history

  6. shorter 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    2c8a091 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'refs/heads/beta' into mob-detection-migration/dungeon-f… 

    …eatures
    @ItsEmpa
    ItsEmpa committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    d4d47c8 View commit details
    Browse the repository at this point in the history

  8. fix compile error 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    a2e9a23 View commit details
    Browse the repository at this point in the history

  9. i hate this so much 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    270072e View commit details
    Browse the repository at this point in the history

  10. deprecate nametag functions 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    cbd3037 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

  1. surely its gonna work now! 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    95d6362 View commit details
    Browse the repository at this point in the history

  2. this should fix it 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    cfbfdfa View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/beta' into mob-detection-migration/dungeon-f… 

    …eatures
    @ItsEmpa
    ItsEmpa committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    6a07883 View commit details
    Browse the repository at this point in the history

  4. clean up exact bounding box code 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    7256669 View commit details
    Browse the repository at this point in the history

  5. livid entity out of function 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    b6ee211 View commit details
    Browse the repository at this point in the history

  6. private 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    83f5531 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. make RecalculatingValue a ReadOnlyProperty 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    716992a View commit details
    Browse the repository at this point in the history

  2. grammar 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    9961a41 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Merge branch 'refs/heads/beta' into mob-detection-migration/dungeon-f… 

    …eatures

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
    @ItsEmpa
    ItsEmpa committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    2388092 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. updated clicked block highlight

    @Vahvl
    Vahvl authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    0d8dd98 View commit details
    Browse the repository at this point in the history

  2. Delete HighlightClickedBlocksConfig.java

    @Vahvl
    Vahvl authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    c1c068f View commit details
    Browse the repository at this point in the history

  3. Delete DungeonHighlightClickedBlocks.kt

    @Vahvl
    Vahvl authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    c3d52c2 View commit details
    Browse the repository at this point in the history

  4. Delete DungeonConfig.java

    @Vahvl
    Vahvl authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    867694f View commit details
    Browse the repository at this point in the history

  5. Add files via upload

    @Vahvl
    Vahvl authored Jun 27, 2024
    1 Configuration menu
    Copy the full SHA
    484d67a View commit details
    Browse the repository at this point in the history

  6. added config to clicked blocks

    @Vahvl
    Vahvl authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    1208dcf View commit details
    Browse the repository at this point in the history

  7. Update HighlightClickedBlocksConfig.java 

    made all option names uppercase
    @Vahvl
    Vahvl authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    a270962 View commit details
    Browse the repository at this point in the history

  8. Update DungeonHighlightClickedBlocks.kt 

    added missing space
    @Vahvl
    Vahvl authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    439130b View commit details
    Browse the repository at this point in the history

  9. Update ConfigUpdaterMigrator.kt 

    changed CONFIG_VERSION to 52 bc uhhhh idk ask j10a1n15
    @Vahvl
    Vahvl authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    931edf9 View commit details
    Browse the repository at this point in the history

  10. Update src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHi… 

    …ghlightClickedBlocks.kt

Co-authored-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @Vahvl @ItsEmpa
    Vahvl and ItsEmpa authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    88450f1 View commit details
    Browse the repository at this point in the history

  11. fixes 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    0a22d31 View commit details
    Browse the repository at this point in the history

  12. Update src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHi… 

    …ghlightClickedBlocks.kt

Co-authored-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @Vahvl @ItsEmpa
    Vahvl and ItsEmpa authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    d4406af View commit details
    Browse the repository at this point in the history

  13. Update src/main/java/at/hannibal2/skyhanni/config/features/dungeon/Hi… 

    …ghlightClickedBlocksConfig.java


i forgor to change this lol

Co-authored-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @Vahvl @ItsEmpa
    Vahvl and ItsEmpa authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    7232aba View commit details
    Browse the repository at this point in the history

  14. Merge branch 'refs/heads/fork/Vahvl/beta' into improvement/highlight-… 

    …blocks

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
    @ItsEmpa
    ItsEmpa committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    c962944 View commit details
    Browse the repository at this point in the history

  15. fix merge 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    f5467cf View commit details
    Browse the repository at this point in the history

  16. oops 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    3ee3523 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #1 from ItsEmpa/improvement/highlight-blocks 

    fixes and some formatting
    @Vahvl
    Vahvl authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    1314885 View commit details
    Browse the repository at this point in the history

  18. Update DungeonHighlightClickedBlocks.kt 

    pattern group thingies
    @Vahvl
    Vahvl authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    d81475a View commit details
    Browse the repository at this point in the history

  19. unexpected space before (

    @Vahvl
    Vahvl authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    3943272 View commit details
    Browse the repository at this point in the history

  20. did an oopsie and changed color to colour

    @Vahvl
    Vahvl authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    1358bde View commit details
    Browse the repository at this point in the history

  21. Merge remote-tracking branch 'refs/remotes/Vahvl/beta' into mob-detec… 

    …tion-migration/dungeon-features

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
    @ItsEmpa
    ItsEmpa committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    cec92d8 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'refs/heads/backend/recalculating-value' into mob-detect… 

    …ion-migration/dungeon-features
    @ItsEmpa
    ItsEmpa committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    ab1461f View commit details
    Browse the repository at this point in the history

  23. cleanup 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    bf60f7a View commit details
    Browse the repository at this point in the history

  24. some more changes 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    7ac889a View commit details
    Browse the repository at this point in the history

  25. slightly better 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    b9e3cd5 View commit details
    Browse the repository at this point in the history

  26. make currentvalue not be initialized 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    d99ef9b View commit details
    Browse the repository at this point in the history

  27. Merge branch 'refs/heads/backend/recalculating-value' into mob-detect… 

    …ion-migration/dungeon-features
    @ItsEmpa
    ItsEmpa committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    4831525 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2024

  1. Merge branch 'refs/heads/beta' into mob-detection-migration/dungeon-f… 

    …eatures

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt
#	src/main/java/at/hannibal2/skyhanni/utils/RecalculatingValue.kt
    @ItsEmpa
    ItsEmpa committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    2f79348 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. Update ConfigUpdaterMigrator.kt 

    updated config version
    @Vahvl
    Vahvl authored Aug 14, 2024
    Configuration menu
    Copy the full SHA
    6767ad0 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/Vahvl/beta' into mob-detec… 

    …tion-migration/dungeon-features

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
    @ItsEmpa
    ItsEmpa committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    fc7d94d View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Merge branch 'refs/heads/beta' into mob-detection-migration/dungeon-f… 

    …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
    @ItsEmpa
    ItsEmpa committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    a086c67 View commit details
    Browse the repository at this point in the history

  2. fix merge 

    Signed-off-by: ItsEmpa <itsempa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    06f240a View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Merge branch 'refs/heads/beta' into mob-detection-migration/dungeon-f… 

    …eatures

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
#	src/main/java/at/hannibal2/skyhanni/utils/BlockUtils.kt
    @ItsEmpa
    ItsEmpa committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    37eaf91 View commit details
    Browse the repository at this point in the history

  2. fix merge 

    Signed-off-by: ItsEmpa <itsempa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    f3a125c View commit details
    Browse the repository at this point in the history

  3. fix merge again 

    Signed-off-by: ItsEmpa <itsempa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    4a6f010 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2024

  1. Merge branch 'beta' into mob-detection-migration/dungeon-features 

    # 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
    @ItsEmpa
    ItsEmpa committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    fad58be View commit details
    Browse the repository at this point in the history

  2. fix merge

    @ItsEmpa
    ItsEmpa committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    89aadeb View commit details
    Browse the repository at this point in the history