From b0c60ae7ffdd3c0de2f7daa84236223a65240e6b Mon Sep 17 00:00:00 2001 From: RobotHanzo <36107150+RobotHanzo@users.noreply.github.com> Date: Sun, 14 Jul 2024 23:54:27 +0800 Subject: [PATCH] feat: Ability to toggle whether to send discord webhooks upon pest destroyer start / stop --- .../com/jelly/farmhelperv2/config/FarmHelperConfig.java | 4 ++++ .../jelly/farmhelperv2/feature/impl/PestsDestroyer.java | 8 ++++++-- 2 files changed, 10 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 da0dbaec..10c3b30f 100644 --- a/src/main/java/com/jelly/farmhelperv2/config/FarmHelperConfig.java +++ b/src/main/java/com/jelly/farmhelperv2/config/FarmHelperConfig.java @@ -1339,6 +1339,10 @@ public static void triggerManuallyPestsDestroyer() { description = "Sends a notification if pests detection number has been exceeded" ) public static boolean sendNotificationIfPestsDetectionNumberExceeded = true; + @Switch(name = "Send Webhook log when pest destroyer starts/stops", category = PESTS_DESTROYER, subcategory = "Logs", + description = "Sends a webhook log when pest destroyer starts/stops" + ) + public static boolean sendWebhookLogWhenPestDestroyerStartsStops = true; // // diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/PestsDestroyer.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/PestsDestroyer.java index 174d14f2..4bd15827 100644 --- a/src/main/java/com/jelly/farmhelperv2/feature/impl/PestsDestroyer.java +++ b/src/main/java/com/jelly/farmhelperv2/feature/impl/PestsDestroyer.java @@ -155,7 +155,9 @@ public void start() { enabled = true; preparing = false; LogUtils.sendWarning("[Pests Destroyer] Starting killing shitters!"); - LogUtils.webhookLog("[Pests Destroyer]\\nStarting killing shitters!"); + if (FarmHelperConfig.sendWebhookLogWhenPestDestroyerStartsStops) { + LogUtils.webhookLog("[Pests Destroyer]\\nStarting killing shitters!"); + } }, MacroHandler.getInstance().isMacroToggled() ? (800 + (long) (Math.random() * 500)) : 0, TimeUnit.MILLISECONDS); IFeature.super.start(); } @@ -164,7 +166,9 @@ public void start() { public void stop() { if (enabled || preparing) { LogUtils.sendWarning("[Pests Destroyer] Stopping!"); - LogUtils.webhookLog("[Pests Destroyer]\\nStopping!"); + if (FarmHelperConfig.sendWebhookLogWhenPestDestroyerStartsStops) { + LogUtils.webhookLog("[Pests Destroyer]\\nStopping!"); + } if (GameStateHandler.getInstance().getPestsCount() == 0) { pestsLocations.clear(); }