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

Feature: Mute High Heat sound in the Magma Fields #2573

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

Conversation

martimavocado
Copy link
Contributor

What

adds a toggle to mute the high heat sound in the magma fields when at or above 90 heat

suggestion

Changelog New Features

  • Added a toggle to mute the high heat sound in the Magma Fields. - martimavocado

Copy link
Contributor

@Thunderblade73 Thunderblade73 left a comment

Choose a reason for hiding this comment

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

Please check the heat level. Since we don't want to silence something unintentional all the time.

@hannibal002 hannibal002 added this to the Version 0.28 milestone Sep 23, 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 Sep 28, 2024
…ting

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
Copy link

github-actions bot commented Oct 3, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Oct 3, 2024
Copy link

github-actions bot commented Oct 6, 2024

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 6, 2024
…ting

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboardUtils.kt
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.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
@CalMWolfs CalMWolfs added the Soon This Pull Request will be merged within the next couple of betas label Oct 17, 2024
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

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Oct 18, 2024
Copy link

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

@hannibal002 hannibal002 added test and removed test labels Oct 18, 2024
Copy link
Contributor

@ItsEmpa ItsEmpa left a comment

Choose a reason for hiding this comment

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

just this one nitpick

@SubscribeEvent
fun onSound(event: PlaySoundEvent) {
if (!isEnabled()) return
if (!(LocationUtils.playerLocation().y <= 65.0 && MiningAPI.heat >= 90)) return
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if (!(LocationUtils.playerLocation().y <= 65.0 && MiningAPI.heat >= 90)) return
if (LocationUtils.playerLocation().y > 65.0 || MiningAPI.heat < 90) return

@hannibal002 hannibal002 removed the Soon This Pull Request will be merged within the next couple of betas label Oct 30, 2024
@hannibal002 hannibal002 modified the milestones: Version 0.28, Version 0.29 Nov 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Merge Conflicts There are open merge conflicts with the beta branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants