diff --git a/src/main/kotlin/com/lambda/event/events/ModuleEvent.kt b/src/main/kotlin/com/lambda/event/events/ModuleEvent.kt new file mode 100644 index 000000000..516b195af --- /dev/null +++ b/src/main/kotlin/com/lambda/event/events/ModuleEvent.kt @@ -0,0 +1,55 @@ +/* + * Copyright 2026 Lambda + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.lambda.event.events + +import com.lambda.event.Event +import com.lambda.event.callback.Cancellable +import com.lambda.event.callback.ICancellable +import com.lambda.module.Module + +/** + * Represents events related to toggling, enabling, and disabling of [Module]s. + * + * @see Toggle + * @see Enabled + * @see Disabled + */ +sealed class ModuleEvent { + /** + * Event that fires before a [Module] is toggled, allowing listeners to cancel the toggle. + * @property module The module that is being toggled. + * @property newValue The value that the module is being toggled to (true for enabling, false for disabling). + * @see Enabled + * @see Disabled + */ + data class Toggle(val module: Module, val newValue: Boolean) : Event, ICancellable by Cancellable() + + /** + * Event that fires before a [Module] is enabled, allowing listeners to cancel the enable. + * @property module The module that is being enabled. + * @see Toggle + */ + data class Enabled(val module: Module) : Event, ICancellable by Cancellable() + + /** + * Event that fires before a [Module] is disabled, allowing listeners to cancel the disable. + * @property module The module that is being disabled. + * @see Toggle + */ + data class Disabled(val module: Module) : Event, ICancellable by Cancellable() +} \ No newline at end of file diff --git a/src/main/kotlin/com/lambda/module/Module.kt b/src/main/kotlin/com/lambda/module/Module.kt index 3599ef30c..91510ef9e 100644 --- a/src/main/kotlin/com/lambda/module/Module.kt +++ b/src/main/kotlin/com/lambda/module/Module.kt @@ -28,11 +28,13 @@ import com.lambda.config.settings.complex.Bind import com.lambda.config.settings.complex.KeybindSetting.Companion.onPress import com.lambda.config.settings.complex.KeybindSetting.Companion.onRelease import com.lambda.context.SafeContext +import com.lambda.event.EventFlow.post import com.lambda.event.EventFlow.updateListenerSorting import com.lambda.event.Muteable import com.lambda.event.OwnerPriority import com.lambda.event.events.ClientEvent import com.lambda.event.events.ConnectionEvent +import com.lambda.event.events.ModuleEvent import com.lambda.event.listener.Listener import com.lambda.event.listener.SafeListener import com.lambda.event.listener.SafeListener.Companion.listen @@ -150,8 +152,12 @@ abstract class Module( get() = !isEnabled && !alwaysListening init { - onEnable { LambdaSound.ModuleOn.play() } - onDisable { LambdaSound.ModuleOff.play() } + onEnable { + LambdaSound.ModuleOn.play() + } + onDisable { + LambdaSound.ModuleOff.play() + } onEnableUnsafe { LambdaSound.ModuleOn.play() } onDisableUnsafe { LambdaSound.ModuleOff.play() } @@ -162,15 +168,24 @@ abstract class Module( } fun enable() { + if (!isEnabled && ModuleEvent.Enabled(this@Module).post().isCanceled()) { + return + } isEnabled = true } fun disable() { + if (isEnabled && ModuleEvent.Disabled(this@Module).post().isCanceled()) { + return + } isEnabled = false } fun toggle() { - isEnabled = !isEnabled + if (ModuleEvent.Toggle(this@Module, !isEnabled).post().isCanceled()) { + return + } + if (isEnabled) disable() else enable() } fun onEnable(block: SafeContext.() -> Unit) { diff --git a/src/main/kotlin/com/lambda/module/modules/client/ModuleNotifier.kt b/src/main/kotlin/com/lambda/module/modules/client/ModuleNotifier.kt new file mode 100644 index 000000000..c441dbad6 --- /dev/null +++ b/src/main/kotlin/com/lambda/module/modules/client/ModuleNotifier.kt @@ -0,0 +1,73 @@ +/* + * Copyright 2026 Lambda + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.lambda.module.modules.client + +import com.lambda.event.events.ModuleEvent +import com.lambda.event.listener.SafeListener.Companion.listen +import com.lambda.module.Module +import com.lambda.module.tag.ModuleTag +import com.lambda.threading.runSafe +import com.lambda.util.Communication.log +import com.lambda.util.Describable +import com.lambda.util.NamedEnum +import com.lambda.util.text.buildText +import com.lambda.util.text.color +import com.lambda.util.text.literal +import net.minecraft.text.Text +import net.minecraft.util.Colors +import java.awt.Color + +object ModuleNotifier : Module( + name = "ModuleNotifier", + description = "Notifies you when a module is enabled or disabled", + tag = ModuleTag.CLIENT +) { + var notifyTarget by setting("Notify Target", setOf(NotifyTarget.ActionBar), NotifyTarget.entries.toSet(), description = "Where to send notifications when modules are toggled") + + enum class NotifyTarget(override val displayName: String, override val description: String) : Describable, NamedEnum { + Chat("Chat", "Sends a message to chat when a module is toggled"), + ActionBar("Action Bar", "Sends a message to the action bar when a module is toggled"), ; + } + + init { + listen { event -> + logToTargets(event.module, buildText { + color(Color(Colors.GREEN)) { + literal("on") + } + }) + } + + listen { event -> + logToTargets(event.module, buildText { + color(Color(Colors.RED)) { + literal("off") + } + }) + } + } + + private fun logToTargets(module: Module, message: Text) { + if (NotifyTarget.Chat in notifyTarget) { + module.log(message) + } + if (NotifyTarget.ActionBar in notifyTarget) { + module.log(message, inGameOverlay = true) + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/lambda/util/Communication.kt b/src/main/kotlin/com/lambda/util/Communication.kt index 914db8d66..f793fb94c 100644 --- a/src/main/kotlin/com/lambda/util/Communication.kt +++ b/src/main/kotlin/com/lambda/util/Communication.kt @@ -101,13 +101,14 @@ object Communication { logLevel: LogLevel = LogLevel.Info, source: String = "", textSource: Text = Text.empty(), + inGameOverlay: Boolean = false ) { buildText { text(this@log.source(logLevel, source, textSource)) text(message) }.let { log -> runSafeGameScheduled { - player.sendMessage(log, false) + player.sendMessage(log, inGameOverlay) } } }