Gui sounds

Author: bladekt

common/src/main/kotlin/com/lambda/core/LambdaSound.kt

@@ -5,7 +5,16 @@ import net.minecraft.sound.SoundEvent
 import net.minecraft.util.Identifier
 
 enum class LambdaSound(val id: Identifier) {
-    MODULE_TOGGLE("module_toggle".toIdentifier());
+    BUTTON_CLICK("button_click".toIdentifier()),
+
+    BOOLEAN_SETTING_ON("bool_on".toIdentifier()),
+    BOOLEAN_SETTING_OFF("bool_off".toIdentifier()),
+
+    MODULE_ON("module_on".toIdentifier()),
+    MODULE_OFF("module_off".toIdentifier()),
+
+    SETTINGS_OPEN("settings_open".toIdentifier()),
+    SETTINGS_CLOSE("settings_close".toIdentifier());
 
     val event: SoundEvent = SoundEvent.of(id)
 }

common/src/main/kotlin/com/lambda/core/SoundManager.kt

@@ -2,6 +2,7 @@ package com.lambda.core
 
 import com.lambda.Lambda
 import com.lambda.Lambda.mc
+import com.lambda.util.math.random
 import net.minecraft.client.sound.PositionedSoundInstance
 import net.minecraft.registry.Registries
 import net.minecraft.registry.Registry
@@ -18,9 +19,17 @@ object SoundManager : Loadable {
         return "Loaded ${LambdaSound.entries.size} sounds"
     }
 
-    fun playSound(event: SoundEvent, pitch: Float = 1.0f) {
+    fun playSound(event: SoundEvent, pitch: Double = 1.0) {
         mc.soundManager.play(
-            PositionedSoundInstance.master(event, pitch)
+            PositionedSoundInstance.master(event, pitch.toFloat())
+        )
+    }
+
+    fun playSoundRandomly(event: SoundEvent, pitch: Double = 1.0, pitchRange: Double = 0.05) {
+        val actualPitch = (pitch - pitchRange..pitch + pitchRange).random()
+
+        mc.soundManager.play(
+            PositionedSoundInstance.master(event, actualPitch.toFloat())
         )
     }
 

common/src/main/kotlin/com/lambda/gui/api/component/button/ButtonComponent.kt

@@ -1,11 +1,14 @@
 package com.lambda.gui.api.component.button
 
+import com.lambda.core.LambdaSound
+import com.lambda.core.SoundManager.playSoundRandomly
 import com.lambda.graphics.animation.Animation.Companion.exp
 import com.lambda.gui.api.GuiEvent
 import com.lambda.gui.api.component.core.list.ChildComponent
 import com.lambda.gui.api.component.core.list.ChildLayer
 import com.lambda.module.modules.client.ClickGui
 import com.lambda.module.modules.client.GuiSettings
+import com.lambda.util.Mouse
 import com.lambda.util.math.ColorUtils.multAlpha
 import com.lambda.util.math.MathUtils.lerp
 import com.lambda.util.math.Rect
@@ -82,6 +85,11 @@ abstract class ButtonComponent(
         }
     }
 
+    override fun onPress(e: GuiEvent.MouseClick) {
+        val pitch = if (e.button == Mouse.Button.Left) 1.0 else 0.9
+        playSoundRandomly(LambdaSound.BUTTON_CLICK.event, pitch)
+    }
+
     override fun onRelease(e: GuiEvent.MouseClick) {
         if (hovered) performClickAction(e)
     }

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/ModuleButton.kt

@@ -2,6 +2,8 @@ package com.lambda.gui.impl.clickgui.buttons
 
 import com.lambda.config.settings.NumericSetting
 import com.lambda.config.settings.comparable.BooleanSetting
+import com.lambda.core.LambdaSound
+import com.lambda.core.SoundManager.playSoundRandomly
 import com.lambda.graphics.animation.Animation.Companion.exp
 import com.lambda.graphics.gl.Scissor.scissor
 import com.lambda.gui.api.GuiEvent
@@ -147,8 +149,11 @@ class ModuleButton(val module: Module, owner: ChildLayer.Drawable<*>) : ListButt
     }
 
     override fun performClickAction(e: GuiEvent.MouseClick) {
-        when (e.button) {
-            Mouse.Button.Left -> module.toggle()
+        val sound = when (e.button) {
+            Mouse.Button.Left -> {
+                module.toggle()
+                if (module.isEnabled) LambdaSound.MODULE_ON else LambdaSound.MODULE_OFF
+            }
             Mouse.Button.Right -> {
                 // Don't let user spam
                 val targetHeight = if (isOpen) settingsHeight else 0.0
@@ -157,8 +162,13 @@ class ModuleButton(val module: Module, owner: ChildLayer.Drawable<*>) : ListButt
                 isOpen = !isOpen
                 if (isOpen) settingsLayer.onEvent(GuiEvent.Show())
                 updateHeight()
+
+                if (isOpen) LambdaSound.SETTINGS_OPEN else LambdaSound.SETTINGS_CLOSE
             }
+            else -> return
         }
+
+        playSoundRandomly(sound.event)
     }
 
     override fun equals(other: Any?) =

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/BooleanButton.kt

@@ -2,8 +2,7 @@ package com.lambda.gui.impl.clickgui.buttons.setting
 
 import com.lambda.config.settings.comparable.BooleanSetting
 import com.lambda.core.LambdaSound
-import com.lambda.core.SoundManager
-import com.lambda.core.SoundManager.playSound
+import com.lambda.core.SoundManager.playSoundRandomly
 import com.lambda.graphics.animation.Animation.Companion.exp
 import com.lambda.gui.api.GuiEvent
 import com.lambda.gui.api.component.core.list.ChildLayer
@@ -49,7 +48,11 @@ class BooleanButton(
     }
 
     override fun performClickAction(e: GuiEvent.MouseClick) {
-        if (e.button == Mouse.Button.Left) value = !value
-        playSound(LambdaSound.MODULE_TOGGLE.event)
+        if (e.button != Mouse.Button.Left) return
+        value = !value
+
+        val sound = if (value) LambdaSound.BOOLEAN_SETTING_ON else LambdaSound.BOOLEAN_SETTING_OFF
+        val pitch = if (value) 1.0 else 0.9
+        playSoundRandomly(sound.event, pitch)
     }
 }

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/SliderSetting.kt

@@ -1,19 +1,26 @@
 package com.lambda.gui.impl.clickgui.buttons.setting
 
 import com.lambda.config.AbstractSetting
+import com.lambda.core.LambdaSound
+import com.lambda.core.SoundManager.playSound
+import com.lambda.core.SoundManager.playSoundRandomly
 import com.lambda.gui.api.GuiEvent
 import com.lambda.gui.api.component.core.list.ChildLayer
 import com.lambda.gui.impl.clickgui.buttons.SettingButton
 import com.lambda.module.modules.client.GuiSettings
 import com.lambda.util.math.ColorUtils.multAlpha
+import com.lambda.util.math.MathUtils.lerp
 import com.lambda.util.math.Vec2d
 import com.lambda.util.math.transform
+import kotlin.math.abs
 
 abstract class SliderSetting <V : Any, T : AbstractSetting<V>>(
     setting: T, owner: ChildLayer.Drawable<*>
 ) : SettingButton<V, T>(setting, owner) {
     protected abstract val renderProgress: Double
     protected abstract fun setValueByProgress(progress: Double)
+    private var lastPlayedValue = value
+    private var lastPlayedTiming = 0L
 
     init {
         renderer.filled {
@@ -26,9 +33,20 @@ abstract class SliderSetting <V : Any, T : AbstractSetting<V>>(
     override fun onEvent(e: GuiEvent) {
         super.onEvent(e)
 
-        if (e is GuiEvent.MouseMove && pressed) {
-            val p = transform(e.mouse.x, rect.left, rect.right, 0.0, 1.0)
-            setValueByProgress(p.coerceIn(0.0, 1.0))
+        when (e) {
+            is GuiEvent.MouseMove -> {
+                if (!pressed) return
+                val p = transform(e.mouse.x, rect.left, rect.right, 0.0, 1.0).coerceIn(0.0, 1.0)
+                setValueByProgress(p)
+
+                val time = System.currentTimeMillis()
+                if (lastPlayedValue == value || time - lastPlayedTiming < 50) return
+
+                lastPlayedValue = value
+                lastPlayedTiming = time
+
+                playSound(LambdaSound.BUTTON_CLICK.event, lerp(0.9, 1.2, p))
+            }
         }
     }
 }

common/src/main/resources/assets/lambda/sounds.json

@@ -1,7 +1,37 @@
 {
-  "module_toggle": {
+  "button_click": {
     "sounds": [
-      "lambda:ui/module_toggle"
+      "lambda:ui/button_click"
+    ]
+  },
+  "bool_on": {
+    "sounds": [
+      "lambda:ui/bool_on"
+    ]
+  },
+  "bool_off": {
+    "sounds": [
+      "lambda:ui/bool_off"
+    ]
+  },
+  "module_on": {
+    "sounds": [
+      "lambda:ui/module_on"
+    ]
+  },
+  "module_off": {
+    "sounds": [
+      "lambda:ui/module_off"
+    ]
+  },
+  "settings_open": {
+    "sounds": [
+      "lambda:ui/settings_open"
+    ]
+  },
+  "settings_close": {
+    "sounds": [
+      "lambda:ui/settings_close"
     ]
   }
 }