summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features
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
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')
-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
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fame/AccountUpgradeReminder.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt20
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneAPI.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/DojoRankDisplay.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsGuide.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt2
26 files changed, 70 insertions, 52 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",
)
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
index 25b20b08a..4efc872a4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
@@ -149,8 +149,8 @@ object DianaProfitTracker {
allowedDrops = event.getConstant<DianaDrops>("DianaDrops").diana_drops
}
- fun resetCommand(args: Array<String>) {
- tracker.resetCommand(args, "shresetdianaprofittracker")
+ fun resetCommand() {
+ tracker.resetCommand()
}
private fun isEnabled() = DianaAPI.isDoingDiana() && config.enabled
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
index 33f7efab4..25fba4ceb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
@@ -172,7 +172,9 @@ object InquisitorWaypointShare {
val keyName = KeyboardManager.getKeyName(config.keyBindShare)
val message =
"§l§bYou found a Inquisitor! Press §l§chere §l§bor §c$keyName to share the location!"
- ChatUtils.clickableChat(message, "shshareinquis")
+ ChatUtils.clickableChat(message, onClick = {
+ sendInquisitor()
+ })
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
index 6b40b43db..0507f4b74 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
@@ -127,8 +127,8 @@ object MythologicalCreatureTracker {
tracker.renderDisplay(config.position)
}
- fun resetCommand(args: Array<String>) {
- tracker.resetCommand(args, "shresetmythologicalcreatureracker")
+ fun resetCommand() {
+ tracker.resetCommand()
}
private fun isEnabled() = DianaAPI.isDoingDiana() && config.enabled
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
index fbd9e246b..58659dce8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
@@ -190,7 +190,7 @@ object FrozenTreasureTracker {
private fun inGlacialCave() =
onJerryWorkshop() && ScoreboardData.sidebarLinesFormatted.contains(" §7⏣ §3Glacial Cave")
- fun resetCommand(args: Array<String>) {
- tracker.resetCommand(args, "shresetfrozentreasuretracker")
+ fun resetCommand() {
+ tracker.resetCommand()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fame/AccountUpgradeReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/fame/AccountUpgradeReminder.kt
index ca700e2b1..74645000a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fame/AccountUpgradeReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fame/AccountUpgradeReminder.kt
@@ -50,7 +50,9 @@ class AccountUpgradeReminder {
ChatUtils.clickableChat(
"The §a$upgrade §eupgrade has completed! §c(Click to disable these reminders)",
- "shstopaccountupgradereminder"
+ onClick = {
+ disable()
+ }
)
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt
index f5f45862e..d9631f55d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt
@@ -80,7 +80,9 @@ class CityProjectFeatures {
ChatUtils.clickableChat(
"Daily City Project Reminder! (Click here to disable this reminder)",
- "shstopcityprojectreminder"
+ onClick = {
+ disable()
+ }
)
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
index f13ea5824..b2eae869b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
@@ -237,8 +237,8 @@ object FishingProfitTracker {
tracker.firstUpdate()
}
- fun resetCommand(args: Array<String>) {
- tracker.resetCommand(args, "shresetfishingtracker")
+ fun resetCommand() {
+ tracker.resetCommand()
}
fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled && !LorenzUtils.inKuudraFight
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
index 5eab75fbd..847449e77 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
@@ -167,8 +167,8 @@ object SeaCreatureTracker {
tracker.renderDisplay(config.position)
}
- fun resetCommand(args: Array<String>) {
- tracker.resetCommand(args, "shresetseacreaturetracker")
+ fun resetCommand() {
+ tracker.resetCommand()
}
private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled && !isTrophyFishing && !LorenzUtils.inKuudraFight
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt
index 566589358..e39387c97 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt
@@ -94,7 +94,7 @@ class GardenLevelDisplay {
ChatUtils.clickableChat(
" \n§b§lGARDEN LEVEL UP §8$oldLevel ➜ §b$newLevel\n" +
" §8+§aRespect from Elite Farmers and SkyHanni members :)\n ",
- "/gardenlevels",
+ "gardenlevels",
false
)
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
index 471fc7e35..82ccc9a93 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
@@ -246,7 +246,9 @@ object GardenNextJacobContest {
} else {
ChatUtils.clickableChat(
"§2Click here to submit this year's farming contests. Thank you for helping everyone out!",
- "shsendcontests"
+ onClick = {
+ shareContests()
+ }
)
}
}
@@ -289,22 +291,18 @@ object GardenNextJacobContest {
}
}
- fun shareContestConfirmed(array: Array<String>) {
- if (array.size == 1) {
- if (array[0] == "enable") {
- config.shareAutomatically = ShareContestsEntry.AUTO
- SkyHanniMod.feature.storage.contestSendingAsked = true
- ChatUtils.chat("§2Enabled automatic sharing of future contests!")
- }
- return
- }
+ private fun shareContests() {
if (contests.size == MAX_CONTESTS_PER_YEAR) {
sendContests()
}
if (!SkyHanniMod.feature.storage.contestSendingAsked && config.shareAutomatically == ShareContestsEntry.ASK) {
ChatUtils.clickableChat(
"§2Click here to automatically share future contests!",
- "shsendcontests enable"
+ onClick = {
+ config.shareAutomatically = ShareContestsEntry.AUTO
+ SkyHanniMod.feature.storage.contestSendingAsked = true
+ ChatUtils.chat("§2Enabled automatic sharing of future contests!")
+ }
)
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt
index 46ff67a2b..be7008e36 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt
@@ -165,7 +165,7 @@ object ArmorDropTracker {
}
}
- fun resetCommand(args: Array<String>) {
- tracker.resetCommand(args, "shresetarmordroptracker")
+ fun resetCommand() {
+ tracker.resetCommand()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
index 49d38d7ba..6638cf2fa 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
@@ -172,7 +172,7 @@ object DicerRngDropTracker {
}
}
- fun resetCommand(args: Array<String>) {
- tracker.resetCommand(args, "shresetdicertracker")
+ fun resetCommand() {
+ tracker.resetCommand()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneAPI.kt
index 6ab266f44..9663f67f8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneAPI.kt
@@ -50,7 +50,9 @@ object FarmingLaneAPI {
ChatUtils.clickableChat(
"No ${crop.cropName} lane defined yet! Use §e/shlanedetection",
- command = "shlanedetection"
+ onClick = {
+ FarmingLaneCreator.commandLaneDetection()
+ }
)
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
index 8d6947ef7..bad0003d6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
@@ -139,8 +139,8 @@ object PestProfitTracker {
}
}
- fun resetCommand(args: Array<String>) {
- tracker.resetCommand(args, "shresetpestprofittracker")
+ fun resetCommand() {
+ tracker.resetCommand()
}
fun isEnabled() = GardenAPI.inGarden() && config.enabled
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
index 1faa94c81..447396d43 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
@@ -97,9 +97,8 @@ class HighlightVisitorsOutsideOfGarden {
if (isVisitor(entity) || (entity is EntityArmorStand && isVisitorNearby(entity.getLorenzVec()))) {
event.isCanceled = true
if (packet.action == C02PacketUseEntity.Action.INTERACT) {
- ChatUtils.clickableChat(
- "Blocked you from interacting with a visitor. Sneak to bypass or click here to change settings.",
- "/sh block interacting with visitors"
+ ChatUtils.chatAndOpenConfig("Blocked you from interacting with a visitor. Sneak to bypass or click here to change settings.",
+ GardenAPI.config.visitors::blockInteracting
)
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/DojoRankDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/DojoRankDisplay.kt
index 854063a07..85000714e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/DojoRankDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/DojoRankDisplay.kt
@@ -41,6 +41,7 @@ class DojoRankDisplay {
private fun drawDisplay(items: Collection<ItemStack>) = buildList {
if (belts.isEmpty()) {
+ // TODO make clickable
add("§cUnable to get Belts data, please run /shupdaterepo")
return@buildList
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsGuide.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsGuide.kt
index f0b72c539..94bb86d03 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsGuide.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsGuide.kt
@@ -107,7 +107,9 @@ class DeepCavernsGuide {
if (parkourHelper == null) {
ChatUtils.clickableChat(
"DeepCavernsParkour missing in SkyHanni Repo! Try /shupdaterepo to fix it!",
- "shupdaterepo",
+ onClick = {
+ SkyHanniMod.repo.updateRepo()
+ },
prefixColor = "§c"
)
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index 5ce5cef87..8940c9f59 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -371,7 +371,7 @@ object PowderTracker {
private fun isEnabled() = IslandType.CRYSTAL_HOLLOWS.isInIsland() && config.enabled
- fun resetCommand(args: Array<String>) {
- tracker.resetCommand(args, "shresetpowdertracker")
+ fun resetCommand() {
+ tracker.resetCommand()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt
index 60769b579..606dd7480 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt
@@ -78,7 +78,10 @@ object DiscordRPCManager : IPCListener {
ChatUtils.clickableChat(
"Discord Rich Presence was unable to start! " +
"This usually happens when you join SkyBlock when Discord is not started. " +
- "Please run /shrpcstart to retry once you have launched Discord.", "shrpcstart"
+ "Please run /shrpcstart to retry once you have launched Discord.",
+ onClick = {
+ startCommand()
+ }
)
}
} catch (ex: Throwable) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt
index ae7d22c41..8197c8ba9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt
@@ -36,7 +36,9 @@ object DefaultConfigFeatures {
ChatUtils.clickableChat(
"Looks like this is the first time you are using SkyHanni. " +
"Click here to configure default options, or run /shdefaultoptions.",
- "shdefaultoptions"
+ onClick = {
+ onCommand("null", "null")
+ }
)
} else if (updated) {
val lastVersion = knownToggles.keys.last { it != SkyHanniMod.version }
@@ -44,7 +46,9 @@ object DefaultConfigFeatures {
ChatUtils.clickableChat(
"Looks like you updated SkyHanni. " +
"Click here to configure the newly introduced options, or run $command.",
- command
+ onClick = {
+ onCommand(lastVersion, SkyHanniMod.version)
+ }
)
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt
index 0377e1467..4c6919eea 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt
@@ -8,9 +8,9 @@ import at.hannibal2.skyhanni.utils.ChatUtils
import at.hannibal2.skyhanni.utils.ConditionalUtils.onToggle
import at.hannibal2.skyhanni.utils.LorenzLogger
import com.google.gson.JsonElement
-import io.github.notenoughupdates.moulconfig.processor.MoulConfigProcessor
import io.github.moulberry.notenoughupdates.util.ApiUtil
import io.github.moulberry.notenoughupdates.util.MinecraftExecutor
+import io.github.notenoughupdates.moulconfig.processor.MoulConfigProcessor
import moe.nea.libautoupdate.CurrentVersion
import moe.nea.libautoupdate.PotentialUpdate
import moe.nea.libautoupdate.UpdateContext
@@ -99,10 +99,10 @@ object UpdateManager {
ChatUtils.chat("§aSkyHanni found a new update: ${it.update.versionName}, starting to download now. ")
queueUpdate()
} else if (config.autoUpdates) {
- ChatUtils.clickableChat(
+ ChatUtils.chatAndOpenConfig(
"§aSkyHanni found a new update: ${it.update.versionName}. " +
"Check §b/sh download update §afor more info.",
- "sh"
+ SkyHanniMod.feature.about::autoUpdates
)
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt
index 7c6828f2e..30a98b54a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt
@@ -37,6 +37,7 @@ object DanceRoomHelper {
if (instructions.isEmpty()) {
add("§cError fetching Dance Room Instructions!")
add("§cTry §e/shreloadlocalrepo §cor §e/shupdaterepo")
+ // TODO make clickable
}
for ((lineIndex, line) in instructions.withIndex()) {
addLine(lineIndex, line)?.let { add(it) }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt
index 0d349e9fb..afbfa2920 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt
@@ -176,8 +176,8 @@ object VerminTracker {
}
}
- fun resetCommand(args: Array<String>) {
- tracker.resetCommand(args, "shresetvermintracker")
+ fun resetCommand() {
+ tracker.resetCommand()
}
private fun isEnabled() = RiftAPI.inRift() && config.enabled
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt
index 711b49ffa..2187a72e1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt
@@ -249,6 +249,6 @@ object SlayerProfitTracker {
return
}
- getTracker()?.resetCommand(args, "shclearslayerprofits")
+ getTracker()?.resetCommand()
}
}