diff options
author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2022-09-17 09:50:34 +0200 |
---|---|---|
committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2022-09-17 09:50:34 +0200 |
commit | 12c9a696ff24c9d92cc16cca2b3467ab780bef90 (patch) | |
tree | 0eca52d080568cbbd72de83fbb07de490ae21880 | |
parent | 96de0a0c8925cb9a75e2108c8997625bcac2f7ff (diff) | |
download | skyhanni-12c9a696ff24c9d92cc16cca2b3467ab780bef90.tar.gz skyhanni-12c9a696ff24c9d92cc16cca2b3467ab780bef90.tar.bz2 skyhanni-12c9a696ff24c9d92cc16cca2b3467ab780bef90.zip |
added sound to clean end
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | FEATURES.md | 4 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java | 3 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt | 11 |
4 files changed, 15 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cb52a0f36..d00d21cf9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,11 @@ - Added option to hide all damage splashes, from anywhere in Skyblock. - Added highlight Thunder Sparks after killing a Thunder - Added Thunder to damage indicator -- Added support for links in player chat - Added option to enable that clicking on a player name in chat opens the profile viewer of NotEnoughUpdates (to fix SkyHanni breaking the default NEU feature). - Added support for new SBA chat icon feature (show profile type and faction in chat) - Added hide the damage, ability damage and defence orbs that spawn when the healer is killing mobs - Added hide the golden fairy that follows the healer in dungeon. +- Added hidden music for the clean end of the dungeon ### Fixed - Links in player chat are clickable again diff --git a/FEATURES.md b/FEATURES.md index 67c1d439b..41a75d926 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -19,8 +19,8 @@ ## Dungeon - Clicked Blocks (Showing the block behind walls AFTER clicked on a chest, wither essence or a lever) - Current milestone display. -- Death Counter (Changing color depending on amount) -- Clean End (Hiding all entities and particles from displaying after the last dungeon boss dies, showing dungeon chests, still) +- Death Counter (Changing color depending on amount, hidden at 0 deaths) +- Clean Ending (After the last dungeon boss has died, all entities and particles are no longer displayed and the music stops playing, but the dungeon chests are still displayed) - Option to exclude guardians in F3 and M3 from the clean end feature (only when sneaking) - Hiding damage splashes while inside the boss room (replacing a broken feature from Skytils) - Highlight deathmites in red color. diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java index 6cc58f211..40f58df81 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java @@ -48,7 +48,8 @@ public class Dungeon { public boolean cleanEnd = false; @Expose - @ConfigOption(name = "Clean End", desc = "Hide entities and particles after the boss in Floor 1 - 6 has died.") + @ConfigOption(name = "Clean Ending", desc = "After the last dungeon boss has died, all entities and " + + "particles are no longer displayed and the music stops playing, but the loot chests are still displayed.") @ConfigEditorBoolean @ConfigAccordionId(id = 2) public boolean cleanEndToggle = false; diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt index a78f4a64c..85a233619 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt @@ -105,9 +105,18 @@ class DungeonCleanEnd { } @SubscribeEvent - fun onReceivePacket(event: PlayParticleEvent) { + fun onPlayParticle(event: PlayParticleEvent) { if (shouldBlock()) { event.isCanceled = true } } + + @SubscribeEvent + fun onPlaySound(event: PlaySoundEvent) { + if (shouldBlock() && !chestsSpawned) { + if (event.soundName.startsWith("note.")) { + event.isCanceled = true + } + } + } }
\ No newline at end of file |