-
-
Notifications
You must be signed in to change notification settings - Fork 163
Slayers Fixes and new Features #1932
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
base: master
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request overview
This PR addresses various slayer-related fixes and features, with the primary focus on fixing the Enderman slayer laser timer functionality. The changes refactor the timer logic to use a cooldown-based activation system rather than tracking the riding state.
Key Changes:
- Refactored Enderman laser timer with 10-second activation cooldown to prevent rapid re-triggering
- Simplified timer tick logic and removed dependency on vehicle state tracking
- Changed default behavior to mute enderman sounds in The End
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| LazerTimer.java | Refactored timer from riding-state-based to activation-cooldown-based system with simplified tick logic and updated rendering |
| EntityMixin.java | Simplified tick method logic and removed unused shadow methods (getVehicle()) and imports |
| OtherLocationsConfig.java | Changed default value for muteEndermanSounds from false to true in The End configuration |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
src/main/java/de/hysky/skyblocker/skyblock/slayers/boss/voidgloom/LazerTimer.java
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/config/configs/OtherLocationsConfig.java
Show resolved
Hide resolved
7c8753f to
1952562
Compare
# Conflicts: # src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java # src/main/java/de/hysky/skyblocker/config/configs/SlayersConfig.java # src/main/java/de/hysky/skyblocker/mixins/BossBarHudMixin.java # src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java # src/main/java/de/hysky/skyblocker/mixins/ClientPlayerInteractionManagerMixin.java # src/main/java/de/hysky/skyblocker/mixins/EntityMixin.java # src/main/java/de/hysky/skyblocker/mixins/EntityRenderDispatcherMixin.java # src/main/java/de/hysky/skyblocker/mixins/EntityRendererMixin.java # src/main/java/de/hysky/skyblocker/skyblock/end/MuteEndermen.java # src/main/java/de/hysky/skyblocker/skyblock/entity/MobBoundingBoxes.java # src/main/java/de/hysky/skyblocker/skyblock/entity/glow/adder/SlayerGlowAdder.java # src/main/java/de/hysky/skyblocker/skyblock/profileviewer/slayers/SlayerWidget.java # src/main/java/de/hysky/skyblocker/skyblock/slayers/SlayerBossBars.java # src/main/java/de/hysky/skyblocker/skyblock/slayers/SlayerHudWidget.java # src/main/java/de/hysky/skyblocker/skyblock/slayers/SlayerManager.java # src/main/java/de/hysky/skyblocker/skyblock/slayers/SlayerTier.java # src/main/java/de/hysky/skyblocker/skyblock/slayers/SlayerTimer.java # src/main/java/de/hysky/skyblocker/skyblock/slayers/SlayerType.java # src/main/java/de/hysky/skyblocker/skyblock/slayers/boss/demonlord/AttunementColors.java # src/main/java/de/hysky/skyblocker/skyblock/slayers/boss/demonlord/FirePillarAnnouncer.java # src/main/java/de/hysky/skyblocker/skyblock/slayers/boss/vampire/ManiaIndicator.java # src/main/java/de/hysky/skyblocker/skyblock/slayers/boss/vampire/TwinClawsIndicator.java # src/main/java/de/hysky/skyblocker/skyblock/slayers/boss/voidgloom/BeaconHighlighter.java # src/main/java/de/hysky/skyblocker/skyblock/slayers/boss/voidgloom/LazerTimer.java
viciscat
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
review of the simpler stuff first. will review the bigger files at a later time
src/main/java/de/hysky/skyblocker/skyblock/end/MuteEndermenSounds.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/slayers/boss/demonlord/AttunementColors.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/slayers/boss/demonlord/MuteBlazeSounds.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/slayers/boss/tarantula/MuteSpiderSounds.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/mixins/EntityRenderDispatcherMixin.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/end/MuteEndermenSounds.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/entity/glow/adder/SlayerGlowAdder.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/slayers/boss/sven/MuteWolfSounds.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/slayers/boss/tarantula/MuteSpiderSounds.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/slayers/boss/voidgloom/BeaconHighlighter.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/slayers/features/SlayerTimer.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/slayers/SlayerManager.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/mixins/MultiPlayerGameModeMixin.java
Outdated
Show resolved
Hide resolved
# Conflicts: # src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java # src/main/java/de/hysky/skyblocker/mixins/EntityRendererMixin.java # src/main/java/de/hysky/skyblocker/skyblock/slayers/SlayerManager.java
kevinthegreat1
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approving since all requested changes have been made. I can solve the conflicts if they are not solved.
Todo list:
Things to work on later:
time to spawnboss