Global toggle sounds

Author: bladekt

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

@@ -174,12 +174,11 @@ class ModuleButton(
     }
 
     override fun performClickAction(e: GuiEvent.MouseClick) {
-        val sound = when (e.button) {
+        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
@@ -189,13 +188,10 @@ class ModuleButton(
                 if (isOpen) settingsLayer.onEvent(GuiEvent.Show())
                 updateHeight()
 
-                if (isOpen) LambdaSound.SETTINGS_OPEN else LambdaSound.SETTINGS_CLOSE
+                val sound = if (isOpen) LambdaSound.SETTINGS_OPEN else LambdaSound.SETTINGS_CLOSE
+                playSoundRandomly(sound.event)
             }
-
-            else -> return
         }
-
-        playSoundRandomly(sound.event)
     }
 
     override fun equals(other: Any?) =

common/src/main/kotlin/com/lambda/module/Module.kt

@@ -18,6 +18,8 @@ import com.lambda.gui.impl.clickgui.LambdaClickGui
 import com.lambda.gui.impl.clickgui.buttons.ModuleButton
 import com.lambda.module.modules.client.ClickGui
 import com.lambda.module.tag.ModuleTag
+import com.lambda.sound.LambdaSound
+import com.lambda.sound.SoundManager.playSoundRandomly
 import com.lambda.util.KeyCode
 import com.lambda.util.Nameable
 
@@ -119,6 +121,14 @@ abstract class Module(
                         || screen is LambdaClickGui)
             ) toggle()
         }
+
+        onEnable {
+            playSoundRandomly(LambdaSound.MODULE_ON.event)
+        }
+
+        onDisable {
+            playSoundRandomly(LambdaSound.MODULE_OFF.event)
+        }
     }
 
     fun enable() {