3 files changed, 128 insertions, 0 deletions
diff --git a/src/main/kotlin/features/debug/SoundVisualizer.kt b/src/main/kotlin/features/debug/SoundVisualizer.kt
new file mode 100644
index 0000000..cc14122
--- /dev/null
+++ b/src/main/kotlin/features/debug/SoundVisualizer.kt
@@ -0,0 +1,65 @@
+package moe.nea.firmament.features.debug
+
+import net.minecraft.text.Text
+import moe.nea.firmament.annotations.Subscribe
+import moe.nea.firmament.commands.thenExecute
+import moe.nea.firmament.commands.thenLiteral
+import moe.nea.firmament.events.CommandEvent
+import moe.nea.firmament.events.SoundReceiveEvent
+import moe.nea.firmament.events.WorldReadyEvent
+import moe.nea.firmament.events.WorldRenderLastEvent
+import moe.nea.firmament.util.red
+import moe.nea.firmament.util.render.RenderInWorldContext
+
+object SoundVisualizer {
+
+	var showSounds = false
+
+	var sounds = mutableListOf<SoundReceiveEvent>()
+
+
+	@Subscribe
+	fun onSubCommand(event: CommandEvent.SubCommand) {
+		event.subcommand("dev") {
+			thenLiteral("sounds") {
+				thenExecute {
+					showSounds = !showSounds
+					if (!showSounds) {
+						sounds.clear()
+					}
+				}
+			}
+		}
+	}
+
+	@Subscribe
+	fun onWorldSwap(event: WorldReadyEvent) {
+		sounds.clear()
+	}
+
+	@Subscribe
+	fun onRender(event: WorldRenderLastEvent) {
+		RenderInWorldContext.renderInWorld(event) {
+			sounds.forEach { event ->
+				withFacingThePlayer(event.position) {
+					text(
+						Text.literal(event.sound.value().id.toString()).also {
+							if (event.cancelled)
+								it.red()
+						},
+						verticalAlign = RenderInWorldContext.VerticalAlign.CENTER,
+					)
+				}
+			}
+		}
+	}
+
+	@Subscribe
+	fun onSoundReceive(event: SoundReceiveEvent) {
+		if (!showSounds) return
+		if (sounds.size > 1000) {
+			sounds.subList(0, 200).clear()
+		}
+		sounds.add(event)
+	}
+}
diff --git a/src/main/kotlin/features/garden/HideComposterNoises.kt b/src/main/kotlin/features/garden/HideComposterNoises.kt
new file mode 100644
index 0000000..69207a9
--- /dev/null
+++ b/src/main/kotlin/features/garden/HideComposterNoises.kt
@@ -0,0 +1,32 @@
+package moe.nea.firmament.features.garden
+
+import net.minecraft.entity.passive.WolfSoundVariants
+import net.minecraft.sound.SoundEvent
+import net.minecraft.sound.SoundEvents
+import moe.nea.firmament.annotations.Subscribe
+import moe.nea.firmament.events.SoundReceiveEvent
+import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.SBData
+import moe.nea.firmament.util.SkyBlockIsland
+
+object HideComposterNoises {
+	object TConfig : ManagedConfig("composter", Category.GARDEN) {
+		val hideComposterNoises by toggle("no-more-noises") { false }
+	}
+
+	val composterSoundEvents: List<SoundEvent> = listOf(
+		SoundEvents.BLOCK_PISTON_EXTEND,
+		SoundEvents.BLOCK_WATER_AMBIENT,
+		SoundEvents.ENTITY_CHICKEN_EGG,
+		SoundEvents.WOLF_SOUNDS[WolfSoundVariants.Type.CLASSIC]!!.growlSound().value(),
+	)
+
+	@Subscribe
+	fun onNoise(event: SoundReceiveEvent) {
+		if (!TConfig.hideComposterNoises) return
+		if (SBData.skyblockLocation == SkyBlockIsland.GARDEN) {
+			if (event.sound.value() in composterSoundEvents)
+				event.cancel()
+		}
+	}
+}
diff --git a/src/main/kotlin/features/inventory/PriceData.kt b/src/main/kotlin/features/inventory/PriceData.kt
index 804d741..e247080 100644
--- a/src/main/kotlin/features/inventory/PriceData.kt
+++ b/src/main/kotlin/features/inventory/PriceData.kt
@@ -2,6 +2,7 @@ package moe.nea.firmament.features.inventory
 
 import org.lwjgl.glfw.GLFW
 import net.minecraft.text.Text
+import net.minecraft.util.StringIdentifiable
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ItemTooltipEvent
 import moe.nea.firmament.features.FirmamentFeature
@@ -23,6 +24,22 @@ object PriceData : FirmamentFeature {
 		val tooltipEnabled by toggle("enable-always") { true }
 		val enableKeybinding by keyBindingWithDefaultUnbound("enable-keybind")
 		val stackSizeKey by keyBinding("stack-size-keybind") { GLFW.GLFW_KEY_LEFT_SHIFT }
+		val avgLowestBin by choice(
+			"avg-lowest-bin-days",
+		) {
+			AvgLowestBin.THREEDAYAVGLOWESTBIN
+		}
+	}
+
+	enum class AvgLowestBin : StringIdentifiable {
+		OFF,
+		ONEDAYAVGLOWESTBIN,
+		THREEDAYAVGLOWESTBIN,
+		SEVENDAYAVGLOWESTBIN;
+
+		override fun asString(): String {
+			return name
+		}
 	}
 
 	override val config get() = TConfig
@@ -60,6 +77,12 @@ object PriceData : FirmamentFeature {
 				).darkGrey()
 		val bazaarData = HypixelStaticData.bazaarData[sbId]
 		val lowestBin = HypixelStaticData.lowestBin[sbId]
+		val avgBinValue: Double? = when (TConfig.avgLowestBin) {
+			AvgLowestBin.ONEDAYAVGLOWESTBIN -> HypixelStaticData.avg1dlowestBin[sbId]
+			AvgLowestBin.THREEDAYAVGLOWESTBIN -> HypixelStaticData.avg3dlowestBin[sbId]
+			AvgLowestBin.SEVENDAYAVGLOWESTBIN -> HypixelStaticData.avg7dlowestBin[sbId]
+			AvgLowestBin.OFF -> null
+		}
 		if (bazaarData != null) {
 			it.lines.add(Text.literal(""))
 			it.lines.add(multiplierText)
@@ -84,6 +107,14 @@ object PriceData : FirmamentFeature {
 					lowestBin * multiplier
 				)
 			)
+			if (avgBinValue != null) {
+				it.lines.add(
+					formatPrice(
+						tr("firmament.tooltip.ah.avg-lowestbin", "AVG Lowest BIN"),
+						avgBinValue * multiplier
+					)
+				)
+			}
 		}
 	}
 }