From e17fb0463decbf0a5245710208592675e3c0d118 Mon Sep 17 00:00:00 2001 From: RobotHanzo <36107150+RobotHanzo@users.noreply.github.com> Date: Tue, 9 Jul 2024 02:17:23 +0800 Subject: [PATCH] feat: Toggleable macro enable/disable discord webhook notification --- .../com/jelly/farmhelperv2/config/FarmHelperConfig.java | 5 +++++ .../java/com/jelly/farmhelperv2/handler/MacroHandler.java | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/jelly/farmhelperv2/config/FarmHelperConfig.java b/src/main/java/com/jelly/farmhelperv2/config/FarmHelperConfig.java index 7a1e65a0..a49265f0 100644 --- a/src/main/java/com/jelly/farmhelperv2/config/FarmHelperConfig.java +++ b/src/main/java/com/jelly/farmhelperv2/config/FarmHelperConfig.java @@ -1340,6 +1340,11 @@ public static void triggerManuallyPestsDestroyer() { description = "Pings everyone on Visitors Macro Logs" ) public static boolean pingEveryoneOnVisitorsMacroLogs = false; + @Switch( + name = "Send Macro Enable/Disable Logs", category = DISCORD_INTEGRATION, subcategory = "Discord Webhook", + description = "Sends messages when the macro has been enabled or disabled" + ) + public static boolean sendMacroEnableDisableLogs = true; @Text( name = "WebHook URL", category = DISCORD_INTEGRATION, subcategory = "Discord Webhook", description = "The URL to use for the webhook", diff --git a/src/main/java/com/jelly/farmhelperv2/handler/MacroHandler.java b/src/main/java/com/jelly/farmhelperv2/handler/MacroHandler.java index ccdc7f9b..6129b3ba 100644 --- a/src/main/java/com/jelly/farmhelperv2/handler/MacroHandler.java +++ b/src/main/java/com/jelly/farmhelperv2/handler/MacroHandler.java @@ -180,7 +180,9 @@ public void enableMacro() { LogUtils.sendDebug("Selected macro: " + LogUtils.capitalize(currentMacro.get().getClass().getSimpleName())); PlayerUtils.closeScreen(); LogUtils.sendSuccess("Macro enabled!"); - LogUtils.webhookLog("Macro enabled!"); + if (FarmHelperConfig.sendMacroEnableDisableLogs) { + LogUtils.webhookLog("Macro enabled!"); + } analyticsTimer.reset(); Multithreading.schedule(() -> { @@ -206,7 +208,9 @@ public void enableMacro() { public void disableMacro() { setMacroToggled(false); LogUtils.sendSuccess("Macro disabled!"); - LogUtils.webhookLog("Macro disabled!"); + if (FarmHelperConfig.sendMacroEnableDisableLogs) { + LogUtils.webhookLog("Macro disabled!"); + } currentMacro.ifPresent(m -> { m.setSavedState(Optional.empty()); m.getRotation().reset();