diff options
Diffstat (limited to 'src/main')
3 files changed, 11 insertions, 8 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt index b40255449..0e35e602f 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt @@ -392,7 +392,7 @@ object SkillAPI { ChatUtils.chat("§bSkill Custom Goal Level") val map = storage?.filter { it.value.customGoalLevel != 0 } ?: return if (map.isEmpty()) { - ChatUtils.chat("§cYou haven't set any custom goals yet!") + ChatUtils.userError("You haven't set any custom goals yet!") } map.forEach { (skill, data) -> ChatUtils.chat("§e${skill.displayName}: §b${data.customGoalLevel}") diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt index af56be8e7..e72ad09c5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt @@ -50,7 +50,7 @@ object WikiManager { } if (message == ("/wikithis")) { val itemInHand = InventoryUtils.getItemInHand() ?: run { - ChatUtils.chat("§cYou must be holding an item to use this command!") + ChatUtils.userError("You must be holding an item to use this command!") return } wikiTheItem(itemInHand, config.autoOpenWiki) @@ -79,7 +79,7 @@ object WikiManager { fun otherWikiCommands(args: Array<String>, useFandom: Boolean, wikithis: Boolean = false) { if (wikithis && !LorenzUtils.inSkyBlock) { - ChatUtils.chat("§cYou must be in SkyBlock to do this!") + ChatUtils.userError("You must be in SkyBlock to do this!") return } @@ -88,7 +88,7 @@ object WikiManager { if (wikithis) { val itemInHand = InventoryUtils.getItemInHand() ?: run { - ChatUtils.chat("§cYou must be holding an item to use this command!") + ChatUtils.userError("You must be holding an item to use this command!") return } wikiTheItem(itemInHand, false, useFandom = useFandom) @@ -102,8 +102,10 @@ object WikiManager { } fun sendWikiMessage( - search: String = "", displaySearch: String = search, - autoOpen: Boolean = config.autoOpenWiki, useFandom: Boolean = config.useFandom + search: String = "", + displaySearch: String = search, + autoOpen: Boolean = config.autoOpenWiki, + useFandom: Boolean = config.useFandom, ) { val wiki = if (useFandom) "SkyBlock Fandom Wiki" else "Official SkyBlock Wiki" val urlPrefix = if (useFandom) FANDOM_URL_PREFIX else OFFICIAL_URL_PREFIX diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt index 01d84daa3..1515ee3dc 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt @@ -74,7 +74,7 @@ object TpsCounter { fun tpsCommand() { if (display.isEmpty()) { - ChatUtils.chat("§cNo tps data available, make sure you have the setting on.") + ChatUtils.userError("No tps data available, make sure you have the setting on.") return } ChatUtils.chat(display) @@ -101,7 +101,8 @@ object TpsCounter { config.tpsDisplayPosition.renderString(display, posLabel = "Tps Display") } - private fun isEnabled() = LorenzUtils.onHypixel && config.tpsDisplay && + private fun isEnabled() = LorenzUtils.onHypixel && + config.tpsDisplay && (LorenzUtils.inSkyBlock || OutsideSbFeature.TPS_DISPLAY.isSelected()) @SubscribeEvent |