summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/combat
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2024-04-24 09:31:44 +0200
committerGitHub <noreply@github.com>2024-04-24 09:31:44 +0200
commitc6b6f1fd9377896df0d17f1951cb84c2a1ffd24a (patch)
tree08469230a6bcd1eca867d839d6d2b789087450bb /src/main/java/at/hannibal2/skyhanni/features/combat
parentf9b776fc3c3d09e0992816932118569ac5399431 (diff)
downloadskyhanni-c6b6f1fd9377896df0d17f1951cb84c2a1ffd24a.tar.gz
skyhanni-c6b6f1fd9377896df0d17f1951cb84c2a1ffd24a.tar.bz2
skyhanni-c6b6f1fd9377896df0d17f1951cb84c2a1ffd24a.zip
Backend: Replace Internal Commands (#1522)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/combat')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt8
2 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
index a8ccc5a85..aa462726a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
@@ -257,7 +257,7 @@ object EnderNodeTracker {
return newList
}
- fun resetCommand(args: Array<String>) {
- tracker.resetCommand(args, "shresetendernodetracker")
+ fun resetCommand() {
+ tracker.resetCommand()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
index 0b0a444d9..dcac24f63 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
@@ -24,8 +24,8 @@ import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostUtil.isUsingCTGho
import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostUtil.preFormat
import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostUtil.prettyTime
import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi.Companion.getBazaarData
+import at.hannibal2.skyhanni.utils.ChatUtils
import at.hannibal2.skyhanni.utils.ChatUtils.chat
-import at.hannibal2.skyhanni.utils.ChatUtils.clickableChat
import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
import at.hannibal2.skyhanni.utils.CombatUtils._isKilling
import at.hannibal2.skyhanni.utils.CombatUtils.calculateETA
@@ -318,9 +318,11 @@ object GhostCounter {
if (notifyCTModule && ProfileStorageData.profileSpecific?.ghostCounter?.ctDataImported != true) {
notifyCTModule = false
if (isUsingCTGhostCounter()) {
- clickableChat(
+ ChatUtils.clickableChat(
"GhostCounterV3 ChatTriggers module has been detected, do you want to import saved data ? Click here to import data",
- "shimportghostcounterdata",
+ onClick = {
+ GhostUtil.importCTGhostCounterData()
+ },
prefixColor = "ยง6",
)
}