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: Sound Responses (Meow) #2222

Merged
merged 15 commits into from
Jan 11, 2025
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ public String toString() {
@FeatureToggle
public boolean petRarityDropMessage = true;


@Expose
@ConfigOption(name = "Sound Responses", desc = "")
@Accordion
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
package at.hannibal2.skyhanni.config.features.chat;

import at.hannibal2.skyhanni.config.FeatureToggle;
import at.hannibal2.skyhanni.features.chat.SoundResponseTypes;
import com.google.gson.annotations.Expose;
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;

import java.util.ArrayList;
import java.util.List;

public class SoundResponseConfig {

@Expose
@ConfigOption(name = "Meow", desc = "Play a meow any time a meow appears in chat.")
@ConfigOption(name = "Enabled", desc = "Enable sound responses which play animal sounds when they are said in chat.")
@FeatureToggle
@ConfigEditorBoolean
public boolean meow = false;
public boolean enabled = false;

@Expose
@ConfigOption(name = "Bark", desc = "Play a bark any time a woof, arf or bark appears in chat.")
@ConfigEditorBoolean
public boolean bark = false;
@ConfigOption(name = "Sound Responses", desc = "Add animal sounds to play when certain words are said in chat.")
@ConfigEditorDraggableList
public List<SoundResponseTypes> soundResponses = new ArrayList<>(SoundResponseTypes.getEntries());
}
45 changes: 31 additions & 14 deletions src/main/java/at/hannibal2/skyhanni/features/chat/SoundResponse.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
import at.hannibal2.skyhanni.utils.RegexUtils.matches
import at.hannibal2.skyhanni.utils.SoundUtils
import at.hannibal2.skyhanni.utils.SoundUtils.playSound
import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent

Expand All @@ -13,23 +14,39 @@ object SoundResponse {

private val config get() = SkyHanniMod.feature.chat.soundResponse

private val repoGroup = RepoPattern.group("chat.sound.response")

/** REGEX-TEST: meow
REGEX-TEST: meow
REGEX-TEST: meow
REGEX-TEST: MEow
REGEX-TEST: §ameow
REGEX-TEST: hello §ameow
*/
private val meow by repoGroup.pattern("meow", "(?:^|^.* )(?: |§.)*(?i)meow(?: |§.)*(?:\$| .*\$)")
private val bark by repoGroup.pattern("bark", "(?:^|^.* )(?: |§.)*(?i)(?:bark|arf|woof)(?: |§.)*(?:\$| .*\$)")
init {
SoundResponseTypes.entries.forEach { it.pattern }
}

@SubscribeEvent
fun onLorenzChat(event: LorenzChatEvent) {
when {
config.meow && meow.matches(event.message) -> SoundUtils.playMeowSound()
config.bark && bark.matches(event.message) -> SoundUtils.playBarkSound()
for (soundType in SoundResponseTypes.entries) {
if (!config.soundResponses.contains(soundType)) continue
if (soundType.pattern.matches(event.message)) {
soundType.sound.playSound()
return
}
}
}
}

private const val START_PATTERN = "(?:^|^.* )(?: |§.)*(?i)"
private const val END_PATTERN = "(?: |§.|!|\\?|\\.)*(?:\$| .*\$)"

enum class SoundResponseTypes(soundLocation: String, triggersOn: List<String>) {
CAT("mob.cat.meow", listOf("meow")),
DOG("mob.wolf.bark", listOf("bark", "arf", "woof")),
SHEEP("mob.sheep.say", listOf("baa", "baah", "baaa", "baaaa", "baaaaa")),
COW("mob.cow.say", listOf("moo", "mooo", "moooo")),
Thunderblade73 marked this conversation as resolved.
Show resolved Hide resolved
PIG("mob.pig.say", listOf("oink")),
CHICKEN("mob.chicken.say", listOf("cluck")),
;

val sound by lazy { SoundUtils.createSound(soundLocation, 1f) }

// creates a pattern that looks for if the message contains any of the triggerOn strings but as a full word
val pattern by RepoPattern.pattern(
"chat.sound.response" + name.lowercase(),
"$START_PATTERN(?:${triggersOn.joinToString("|")})$END_PATTERN",
)
}
10 changes: 0 additions & 10 deletions src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ object SoundUtils {
private val beepSound by lazy { createSound("random.orb", 1f) }
private val clickSound by lazy { createSound("gui.button.press", 1f) }
private val errorSound by lazy { createSound("mob.endermen.portal", 0f) }
private val meowSound by lazy { createSound("mob.cat.meow", 1f) }
private val barkSound by lazy { createSound("mob.wolf.bark", 1f) }
val plingSound by lazy { createSound("note.pling", 1f) }
val centuryActiveTimerAlert by lazy { createSound("skyhanni:centurytimer.active", 1f) }

Expand Down Expand Up @@ -71,14 +69,6 @@ object SoundUtils {
plingSound.playSound()
}

fun playMeowSound() {
meowSound.playSound()
}

fun playBarkSound() {
barkSound.playSound()
}

fun command(args: Array<String>) {
if (args.isEmpty()) {
ChatUtils.userError("Specify a sound effect to test")
Expand Down
Loading