From c6b6f1fd9377896df0d17f1951cb84c2a1ffd24a Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal002@users.noreply.github.com> Date: Wed, 24 Apr 2024 09:31:44 +0200 Subject: Backend: Replace Internal Commands (#1522) Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com> --- src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt | 4 +++- src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt | 1 + src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt | 9 +++++++-- .../at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt | 11 ++++------- 4 files changed, 15 insertions(+), 10 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/utils') diff --git a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt index 7e35d02b1..bd1077be4 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt @@ -68,7 +68,9 @@ object APIUtil { if (showApiErrors && apiName == "Hypixel API") { ChatUtils.clickableChat( "Problems with detecting the Hypixel API. §eClick here to hide this message for now.", - "shtogglehypixelapierrors" + onClick = { + toggleApiErrorMessages() + } ) } ErrorManager.logErrorWithData( diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt index b3861ce27..88d90c381 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt @@ -138,6 +138,7 @@ object ChatUtils { * * @see CHAT_PREFIX */ + //TODO rename to runHypixelCommand fun clickableChat(message: String, command: String, prefix: Boolean = true, prefixColor: String = "§e") { val msgPrefix = if (prefix) prefixColor + CHAT_PREFIX else "" val fullMessage = msgPrefix + message diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt b/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt index e37dda613..1ba5bc8fa 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt @@ -33,7 +33,7 @@ object TabListData { fun getHeader() = header fun getFooter() = footer - fun toggleDebugCommand() { + fun toggleDebug() { if (debugCache != null) { ChatUtils.chat("Disabled tab list debug.") debugCache = null @@ -48,7 +48,12 @@ object TabListData { fun copyCommand(args: Array) { if (debugCache != null) { - ChatUtils.clickableChat("Tab list debug is enabled!", "shdebugtablist") + ChatUtils.clickableChat( + "Tab list debug is enabled!", + onClick = { + toggleDebug() + } + ) return } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt index 565a84eff..170efc84c 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt @@ -50,15 +50,12 @@ open class SkyHanniTracker( fun isInventoryOpen() = inventoryOpen - fun resetCommand(args: Array, command: String) { - if (args.size == 1 && args[0].lowercase() == "confirm") { - reset(DisplayMode.TOTAL, "Reset total $name!") - return - } - + fun resetCommand() { ChatUtils.clickableChat( "Are you sure you want to reset your total $name? Click here to confirm.", - "$command confirm" + onClick = { + reset(DisplayMode.TOTAL, "Reset total $name!") + } ) } -- cgit