From b6df5621a3e020f24d5897ee58b0e93edd0c62f7 Mon Sep 17 00:00:00 2001 From: Brady Date: Fri, 19 Apr 2024 17:00:08 -0230 Subject: Backend: Display in-world the locations of sounds for TrackSoundsCommand (#1489) --- .../skyhanni/test/command/TrackSoundsCommand.kt | 36 +++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt index be279eaa8..b925950ed 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt @@ -2,14 +2,18 @@ package at.hannibal2.skyhanni.test.command import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.GuiRenderEvent +import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.events.PlaySoundEvent import at.hannibal2.skyhanni.utils.ChatUtils +import at.hannibal2.skyhanni.utils.LorenzVec import at.hannibal2.skyhanni.utils.OSUtils +import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables import at.hannibal2.skyhanni.utils.SimpleTimeMark import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.fromNow import at.hannibal2.skyhanni.utils.renderables.Renderable +import com.mojang.realmsclient.gui.ChatFormatting import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.concurrent.ConcurrentLinkedDeque import kotlin.time.Duration @@ -27,6 +31,7 @@ object TrackSoundsCommand { private val position get() = SkyHanniMod.feature.dev.debug.trackSoundPosition private var display: List = emptyList() + private var worldSounds: Map> = emptyMap() fun command(args: Array) { if (args.firstOrNull() == "end") { @@ -60,10 +65,13 @@ object TrackSoundsCommand { fun onTick(event: LorenzTickEvent) { if (!isRecording) return - display = sounds.takeWhile { startTime.passedSince() - it.first < 3.0.seconds } + val soundsToDisplay = sounds.takeWhile { startTime.passedSince() - it.first < 3.0.seconds } + + display = soundsToDisplay .take(10).reversed().map { Renderable.string("§3" + it.second.soundName + " §8p:" + it.second.pitch + " §7v:" + it.second.volume) } + worldSounds = soundsToDisplay.map { it.second }.groupBy { it.location } // The function must run after cutOfTime has passed to ensure thread safety if (cutOfTime.passedSince() <= 0.1.seconds) return @@ -89,4 +97,30 @@ object TrackSoundsCommand { if (cutOfTime.isInPast()) return position.renderRenderables(display, posLabel = "Track sound log") } + + @SubscribeEvent + fun onWorldRender(event: LorenzRenderWorldEvent) { + if (cutOfTime.isInPast()) return + worldSounds.forEach { (key, value) -> + if (value.size != 1) { + event.drawDynamicText(key, "§e${value.size} sounds", 0.8) + + var offset = -0.2 + value.groupBy { it.soundName }.forEach { (soundName, sounds) -> + event.drawDynamicText(key.up(offset), "§7§l$soundName §7(§e${sounds.size}§7)", 0.8) + offset -= 0.2 + } + } else { + val sound = value.first() + val volumeColor = when(sound.volume) { + in 0.0..0.25 -> ChatFormatting.RED.toString() + in 0.25..0.5 -> ChatFormatting.GOLD.toString() + else -> ChatFormatting.GREEN.toString() + } + + event.drawDynamicText(key, "§7§l${sound.soundName}", 0.8) + event.drawDynamicText(key.up(-0.2), "§7P: §e%.2f §7V: $volumeColor%.2f".format(sound.pitch, sound.volume), 0.8) + } + } + } } -- cgit