From 6880ecda00dbae5b50494644b02c5ff084387cce Mon Sep 17 00:00:00 2001 From: HiZe Date: Sat, 6 Jul 2024 20:29:11 +0200 Subject: [PATCH 1/6] Add support for hoppity abiphone calls --- build.gradle.kts | 2 +- .../be/hize/afknotifier/config/MainConfig.java | 5 +++++ .../be/hize/afknotifier/features/Notifier.kt | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 96cdcab..eddda51 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ plugins { // Constants: group = "be.hize" -version = "1.0.5" +version = "1.0.6" // Toolchains: java { diff --git a/src/main/kotlin/be/hize/afknotifier/config/MainConfig.java b/src/main/kotlin/be/hize/afknotifier/config/MainConfig.java index eb65c42..856ef35 100644 --- a/src/main/kotlin/be/hize/afknotifier/config/MainConfig.java +++ b/src/main/kotlin/be/hize/afknotifier/config/MainConfig.java @@ -73,4 +73,9 @@ public class MainConfig { @ConfigOption(name = "Retry", desc = "Number of time you want to retry checking if you are still on skyblock before sending the message.") @ConfigEditorSlider(minValue = 5, maxValue = 10, minStep = 1) public int retryValue = 10; + + @Expose + @ConfigOption(name = "Hoppity Call Notification", desc = "Will send a message when Hoppity calls.") + @ConfigEditorBoolean + public boolean hoppityCall = true; } diff --git a/src/main/kotlin/be/hize/afknotifier/features/Notifier.kt b/src/main/kotlin/be/hize/afknotifier/features/Notifier.kt index 4040c01..77f498d 100644 --- a/src/main/kotlin/be/hize/afknotifier/features/Notifier.kt +++ b/src/main/kotlin/be/hize/afknotifier/features/Notifier.kt @@ -40,8 +40,11 @@ object Notifier { private var restartReason = "" private var restartingIn = "" + //private var hoppityCall = false + private val restartingPattern = "§cServer closing: (?\\d+):(?\\d+) ?§8.*".toPattern() private val rebootReasonPattern = "§c\\[Important] §r§eThis server will restart soon: §r§b(?.*)".toPattern() + private val hoppityCallPattern = "§e✆ §aHoppity.*".toPattern() @SubscribeEvent fun onSecondPassed(event: SecondPassedEvent) { @@ -94,6 +97,19 @@ object Notifier { } } + @SubscribeEvent + fun onHoppityCall(event: ChatEvent) { + if (!isEnabled()) return + hoppityCallPattern.matchMatcher(event.message) { + //hoppityCall = true + logger.log("Detected Hoppity Call") + if (config.hoppityCall) { + DiscordUtil.sendAfkWarning("Hoppity has called %%user%%") + logger.log("Sending Hoppity Call Notification") + } + } + } + @SubscribeEvent fun onSkyblockJoin(event: SkyblockJoinEvent) { messageSent = false From c524a504d97cb2f2d0665d75b66c62d98539a9af Mon Sep 17 00:00:00 2001 From: Chiss5618 <78828070+Chiss5618@users.noreply.github.com> Date: Sat, 20 Jul 2024 09:52:57 -0500 Subject: [PATCH 2/6] removed config autosave logging --- .../kotlin/be/hize/afknotifier/config/core/ConfigManager.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/be/hize/afknotifier/config/core/ConfigManager.kt b/src/main/kotlin/be/hize/afknotifier/config/core/ConfigManager.kt index 235c570..2fd2629 100644 --- a/src/main/kotlin/be/hize/afknotifier/config/core/ConfigManager.kt +++ b/src/main/kotlin/be/hize/afknotifier/config/core/ConfigManager.kt @@ -99,10 +99,10 @@ object ConfigManager { } fun saveConfig(reason: String) { - println("saveConfig: $reason") + //println("saveConfig: $reason") val file = configFile ?: throw Error("Can not save config, configFile is null!") try { - println("Saving config file") + //println("Saving config file") file.parentFile.mkdirs() val unit = file.parentFile.resolve("config.json.write") unit.createNewFile() From 4f97614184192c7cb2096f5a48b582da2685a0a1 Mon Sep 17 00:00:00 2001 From: Chiss5618 <78828070+Chiss5618@users.noreply.github.com> Date: Sat, 20 Jul 2024 09:53:09 -0500 Subject: [PATCH 3/6] bump version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index eddda51..3d01605 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ plugins { // Constants: group = "be.hize" -version = "1.0.6" +version = "1.0.7" // Toolchains: java { From 91f94c01c457e4840e05d3e348cd8f10e2f449cb Mon Sep 17 00:00:00 2001 From: Chiss5618 <78828070+Chiss5618@users.noreply.github.com> Date: Sun, 21 Jul 2024 16:39:58 -0500 Subject: [PATCH 4/6] fixed hoppity call regex --- src/main/kotlin/be/hize/afknotifier/features/Notifier.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/be/hize/afknotifier/features/Notifier.kt b/src/main/kotlin/be/hize/afknotifier/features/Notifier.kt index 77f498d..ee66e9c 100644 --- a/src/main/kotlin/be/hize/afknotifier/features/Notifier.kt +++ b/src/main/kotlin/be/hize/afknotifier/features/Notifier.kt @@ -44,7 +44,7 @@ object Notifier { private val restartingPattern = "§cServer closing: (?\\d+):(?\\d+) ?§8.*".toPattern() private val rebootReasonPattern = "§c\\[Important] §r§eThis server will restart soon: §r§b(?.*)".toPattern() - private val hoppityCallPattern = "§e✆ §aHoppity.*".toPattern() + private val hoppityCallPattern = "§e✆ §r§aHoppity.*".toPattern() @SubscribeEvent fun onSecondPassed(event: SecondPassedEvent) { From 307c73d68e3c165f9a3bebccfa28fde2ae4f980b Mon Sep 17 00:00:00 2001 From: HiZe Date: Mon, 22 Jul 2024 03:16:27 +0200 Subject: [PATCH 5/6] clean --- src/main/kotlin/be/hize/afknotifier/features/Notifier.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/be/hize/afknotifier/features/Notifier.kt b/src/main/kotlin/be/hize/afknotifier/features/Notifier.kt index ee66e9c..cec6bc6 100644 --- a/src/main/kotlin/be/hize/afknotifier/features/Notifier.kt +++ b/src/main/kotlin/be/hize/afknotifier/features/Notifier.kt @@ -40,8 +40,6 @@ object Notifier { private var restartReason = "" private var restartingIn = "" - //private var hoppityCall = false - private val restartingPattern = "§cServer closing: (?\\d+):(?\\d+) ?§8.*".toPattern() private val rebootReasonPattern = "§c\\[Important] §r§eThis server will restart soon: §r§b(?.*)".toPattern() private val hoppityCallPattern = "§e✆ §r§aHoppity.*".toPattern() @@ -101,8 +99,7 @@ object Notifier { fun onHoppityCall(event: ChatEvent) { if (!isEnabled()) return hoppityCallPattern.matchMatcher(event.message) { - //hoppityCall = true - logger.log("Detected Hoppity Call") + logger.log("Detected Hoppity Call") if (config.hoppityCall) { DiscordUtil.sendAfkWarning("Hoppity has called %%user%%") logger.log("Sending Hoppity Call Notification") @@ -160,7 +157,7 @@ object Notifier { if (old == config.islandType) { if (config.onlyOnLobbyRestart && !lobbyRestarting) return DiscordUtil.sendAfkWarning( - config.islandLeaveMessage.replace("%%island%%", old.displayName.uppercase()) + config.islandLeaveMessage.replace("%%island%%", old.displayName.uppercase()), ) logger.log("Private island leave message sent.") islandMessageSent = true From f0523174b60d05b218ab728d3a3c8beab130aa28 Mon Sep 17 00:00:00 2001 From: HiZe Date: Mon, 22 Jul 2024 03:17:21 +0200 Subject: [PATCH 6/6] version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3d01605..eddda51 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ plugins { // Constants: group = "be.hize" -version = "1.0.7" +version = "1.0.6" // Toolchains: java {