From 0b1fa4dedc21e997234694d9d11805e4996b54b6 Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Sun, 19 Nov 2023 00:02:48 +0000 Subject: Internal Change: Auto-Prefix Chat Messages (#622) Add auto prefix to chat message methods. #622 --- .../hannibal2/skyhanni/config/commands/Commands.kt | 6 +- .../java/at/hannibal2/skyhanni/data/PartyAPI.kt | 8 +- .../hannibal2/skyhanni/data/ProfileStorageData.kt | 2 +- .../at/hannibal2/skyhanni/data/repo/RepoManager.kt | 24 +++-- .../at/hannibal2/skyhanni/events/LorenzEvent.kt | 2 +- .../bazaar/BazaarCancelledBuyOrderClipboard.kt | 4 +- .../skyhanni/features/bingo/BingoCardDisplay.kt | 6 +- .../skyhanni/features/bingo/BingoNextStepHelper.kt | 2 +- .../skyhanni/features/bingo/CompactBingoChat.kt | 2 +- .../skyhanni/features/chat/ChatFilterGui.kt | 6 +- .../features/chat/CompactBestiaryChatMessage.kt | 4 +- .../skyhanni/features/chat/PlayerDeathMessages.kt | 2 +- .../hannibal2/skyhanni/features/chat/Translator.kt | 8 +- .../features/combat/ghostcounter/GhostCounter.kt | 7 +- .../features/combat/ghostcounter/GhostUtil.kt | 6 +- .../skyhanni/features/commands/WikiManager.kt | 6 +- .../skyhanni/features/dungeon/DungeonCleanEnd.kt | 2 +- .../features/dungeon/DungeonDeathCounter.kt | 4 +- .../features/event/diana/BurrowWarpHelper.kt | 8 +- .../features/event/diana/GriffinPetWarning.kt | 2 +- .../event/diana/InquisitorWaypointShare.kt | 12 +-- .../features/fame/AccountUpgradeReminder.kt | 4 +- .../skyhanni/features/fame/CityProjectFeatures.kt | 4 +- .../features/fishing/FishingBaitWarnings.kt | 4 +- .../fishing/SeaCreatureMessageShortener.kt | 11 +-- .../skyhanni/features/fishing/SharkFishCounter.kt | 2 +- .../features/fishing/trophy/TrophyFishMessages.kt | 2 +- .../skyhanni/features/garden/AnitaMedalProfit.kt | 2 +- .../skyhanni/features/garden/GardenAPI.kt | 2 +- .../features/garden/GardenCropMilestoneFix.kt | 4 +- .../features/garden/GardenCropTimeCommand.kt | 12 +-- .../skyhanni/features/garden/GardenLevelDisplay.kt | 5 +- .../features/garden/GardenNextJacobContest.kt | 20 ++-- .../skyhanni/features/garden/GardenOptimalSpeed.kt | 4 +- .../features/garden/composter/ComposterDisplay.kt | 6 +- .../features/garden/composter/ComposterOverlay.kt | 18 ++-- .../composter/GardenComposterInventoryFeatures.kt | 8 +- .../garden/contest/JacobContestStatsSummary.kt | 12 +-- .../features/garden/farming/CropMoneyDisplay.kt | 2 +- .../features/garden/farming/CropSpeedMeter.kt | 4 +- .../garden/farming/FarmingWeightDisplay.kt | 17 ++-- .../garden/farming/GardenCropMilestoneDisplay.kt | 2 +- .../features/garden/farming/GardenStartLocation.kt | 15 +-- .../farming/WildStrawberryDyeNotification.kt | 4 +- .../garden/fortuneguide/CaptureFarmingGear.kt | 4 +- .../garden/inventory/GardenNextPlotPrice.kt | 7 +- .../features/garden/inventory/GardenPlotIcon.kt | 12 +-- .../garden/visitor/GardenVisitorFeatures.kt | 8 +- .../features/garden/visitor/GardenVisitorTimer.kt | 2 +- .../visitor/HighlightVisitorsOutsideOfGarden.kt | 2 +- .../features/garden/visitor/VisitorListener.kt | 7 +- .../features/inventory/HideNotClickableItems.kt | 2 +- .../features/inventory/tiarelay/TiaRelayHelper.kt | 4 +- .../skyhanni/features/mining/KingTalismanHelper.kt | 2 +- .../skyhanni/features/minion/MinionFeatures.kt | 2 +- .../skyhanni/features/misc/CollectionTracker.kt | 18 ++-- .../skyhanni/features/misc/FandomWikiFromMenus.kt | 6 +- .../skyhanni/features/misc/FixNEUHeavyPearls.kt | 2 +- .../skyhanni/features/misc/JoinCrystalHollows.kt | 10 +- .../skyhanni/features/misc/LimboTimeTracker.kt | 4 +- .../skyhanni/features/misc/LockMouseLook.kt | 6 +- .../skyhanni/features/misc/MarkedPlayerManager.kt | 10 +- .../skyhanni/features/misc/QuickModMenuSwitch.kt | 4 +- .../features/misc/SuperpairsClicksAlert.kt | 2 +- .../features/misc/discordrpc/DiscordRPCManager.kt | 16 +-- .../features/misc/items/EstimatedItemValue.kt | 2 +- .../massconfiguration/DefaultConfigFeatures.kt | 10 +- .../skyhanni/features/misc/update/UpdateManager.kt | 2 +- .../features/misc/visualwords/VisualWordGui.kt | 2 +- .../skyhanni/features/nether/PabloHelper.kt | 2 +- .../skyhanni/features/nether/QuestItemHelper.kt | 2 +- .../CrimsonIsleReputationHelper.kt | 2 +- .../dailyquest/DailyQuestHelper.kt | 2 +- .../reputationhelper/dailyquest/QuestLoader.kt | 2 +- .../area/stillgorechateau/RiftBloodEffigies.kt | 4 +- .../rift/everywhere/EnigmaSoulWaypoints.kt | 6 +- .../rift/everywhere/motes/ShowMotesNpcSellPrice.kt | 2 +- .../features/slayer/SlayerProfitTracker.kt | 10 +- .../skyhanni/features/slayer/SlayerQuestWarning.kt | 4 +- .../features/slayer/SlayerRngMeterDisplay.kt | 4 +- .../features/summonings/SummoningMobManager.kt | 4 +- .../test/SkyHanniConfigSearchResetCommand.kt | 5 +- .../skyhanni/test/SkyHanniDebugsAndTests.kt | 13 +-- .../java/at/hannibal2/skyhanni/test/TestBingo.kt | 4 +- .../at/hannibal2/skyhanni/test/TestExportTools.kt | 4 +- .../skyhanni/test/command/CopyItemCommand.kt | 6 +- .../test/command/CopyNearbyEntitiesCommand.kt | 4 +- .../test/command/CopyNearbyParticlesCommand.kt | 4 +- .../skyhanni/test/command/CopyScoreboardCommand.kt | 4 +- .../skyhanni/test/command/ErrorManager.kt | 13 +-- .../skyhanni/test/command/TestChatCommand.kt | 8 +- .../java/at/hannibal2/skyhanni/utils/APIUtil.kt | 6 +- .../java/at/hannibal2/skyhanni/utils/ItemUtils.kt | 4 +- .../at/hannibal2/skyhanni/utils/LorenzUtils.kt | 107 ++++++++++++++++++--- .../java/at/hannibal2/skyhanni/utils/OSUtils.kt | 6 +- .../java/at/hannibal2/skyhanni/utils/SoundUtils.kt | 4 +- .../at/hannibal2/skyhanni/utils/TabListData.kt | 8 +- .../skyhanni/utils/tracker/SkyHanniTracker.kt | 6 +- 98 files changed, 387 insertions(+), 296 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt index f59830810..a84c86c4f 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt @@ -376,7 +376,7 @@ object Commands { @JvmStatic fun openFortuneGuide() { if (!LorenzUtils.inSkyBlock) { - LorenzUtils.chat("§cJoin SkyBlock to open the fortune guide!") + LorenzUtils.chat("§cJoin SkyBlock to open the fortune guide!", false) } else { CaptureFarmingGear.captureFarmingGear() SkyHanniMod.screenToOpen = FFGuideGUI() @@ -386,7 +386,7 @@ object Commands { @JvmStatic fun openVisualWords() { if (!LorenzUtils.onHypixel) { - LorenzUtils.chat("§cYou need to join Hypixel to use this feature!") + LorenzUtils.chat("§cYou need to join Hypixel to use this feature!", false) } else { if (VisualWordGui.sbeConfigPath.exists()) VisualWordGui.drawImport = true SkyHanniMod.screenToOpen = VisualWordGui() @@ -395,7 +395,7 @@ object Commands { private fun clearFarmingItems() { val storage = GardenAPI.storage?.fortune ?: return - LorenzUtils.chat("§e[SkyHanni] clearing farming items") + LorenzUtils.chat("clearing farming items") storage.farmingItems.clear() storage.outdatedItems.clear() } diff --git a/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt index b9a6d84bb..90fe4783e 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt @@ -32,17 +32,17 @@ object PartyAPI { fun listMembers() { val size = partyMembers.size if (size == 0) { - LorenzUtils.chat("§e[SkyHanni] No tracked party members!") + LorenzUtils.chat("No tracked party members!") return } - LorenzUtils.chat("§a[SkyHanni] Tracked party members §7($size) §f:") + LorenzUtils.chat("Tracked party members §7($size) §f:", prefixColor = "§a") for (member in partyMembers) { - LorenzUtils.chat(" §a- §7$member") + LorenzUtils.chat(" §a- §7$member", false) } if (Random.nextDouble() < 0.1) { OSUtils.openBrowser("https://www.youtube.com/watch?v=iANP7ib7CPA") - LorenzUtils.hoverableChat("§7Are You Ready To Party?", listOf("§b~Spongebob")) + LorenzUtils.hoverableChat("§7Are You Ready To Party?", listOf("§b~Spongebob"), prefix = false) } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt index a8770e1f2..8e6f9bb7d 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt @@ -105,7 +105,7 @@ object ProfileStorageData { if (System.currentTimeMillis() > noTabListTime + 3_000) { noTabListTime = System.currentTimeMillis() LorenzUtils.chat( - "§c[SkyHanni] Extra Information from Tab list not found! " + + "Extra Information from Tab list not found! " + "Enable it: SkyBlock Menu ➜ Settings ➜ Personal ➜ User Interface ➜ Player List Info" ) } diff --git a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt index 593d9a652..9dcba5e8f 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt @@ -83,7 +83,7 @@ class RepoManager(private val configLocation: File) { if (unsuccessfulConstants.isEmpty()) { if (command) { - LorenzUtils.chat("§e[SkyHanni] §7The repo is already up to date!") + LorenzUtils.chat("§7The repo is already up to date!") atomicShouldManuallyReload.set(false) } return@supplyAsync false @@ -156,12 +156,13 @@ class RepoManager(private val configLocation: File) { } comp.complete(null) if (answerMessage.isNotEmpty() && !error) { - LorenzUtils.chat("§e[SkyHanni] §a$answerMessage") + LorenzUtils.chat("§a$answerMessage") } if (error) { LorenzUtils.clickableChat( - "§e[SkyHanni] Error with the repo detected, try /shupdaterepo to fix it!", - "shupdaterepo" + "Error with the repo detected, try /shupdaterepo to fix it!", + "shupdaterepo", + prefixColor = "§c" ) if (unsuccessfulConstants.isEmpty()) { unsuccessfulConstants.add("All Constants") @@ -174,9 +175,12 @@ class RepoManager(private val configLocation: File) { fun displayRepoStatus(joinEvent: Boolean) { if (joinEvent) { if (unsuccessfulConstants.isNotEmpty()) { - LorenzUtils.chat("§c[SkyHanni] §7Repo Issue! Some features may not work. Please report this error on the Discord!") - LorenzUtils.chat("§7Repo Auto Update Value: §c${SkyHanniMod.feature.dev.repoAutoUpdate}") - LorenzUtils.chat("§7If you have Repo Auto Update turned off, please try turning that on.\n§cUnsuccessful Constants §7(${unsuccessfulConstants.size}):") + LorenzUtils.error( + "§7Repo Issue! Some features may not work. Please report this error on the Discord!\n" + + "§7Repo Auto Update Value: §c${SkyHanniMod.feature.dev.repoAutoUpdate}\n" + + "§7If you have Repo Auto Update turned off, please try turning that on.\n" + + "§cUnsuccessful Constants §7(${unsuccessfulConstants.size}):" + ) for (constant in unsuccessfulConstants) { LorenzUtils.chat(" §e- §7$constant") } @@ -184,14 +188,14 @@ class RepoManager(private val configLocation: File) { return } if (unsuccessfulConstants.isEmpty() && successfulConstants.isNotEmpty()) { - LorenzUtils.chat("§a[SkyHanni] Repo working fine!") + LorenzUtils.chat("Repo working fine!", prefixColor = "§a") return } - if (successfulConstants.isNotEmpty()) LorenzUtils.chat("§a[SkyHanni] Successful Constants §7(${successfulConstants.size}):") + if (successfulConstants.isNotEmpty()) LorenzUtils.chat("Successful Constants §7(${successfulConstants.size}):", prefixColor = "§a") for (constant in successfulConstants) { LorenzUtils.chat(" §a- §7$constant") } - LorenzUtils.chat("§c[SkyHanni] Unsuccessful Constants §7(${unsuccessfulConstants.size}):") + LorenzUtils.chat("Unsuccessful Constants §7(${unsuccessfulConstants.size}):") for (constant in unsuccessfulConstants) { LorenzUtils.chat(" §e- §7$constant") } diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt index 2f39e381d..21f9d07e8 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt @@ -40,7 +40,7 @@ abstract class LorenzEvent : Event() { } if (errors > visibleErrors) { val hiddenErrors = errors - visibleErrors - LorenzUtils.chat("§c[SkyHanni] $hiddenErrors more errors in $eventName are hidden!") + LorenzUtils.error("$hiddenErrors more errors in $eventName are hidden!") } return if (isCancelable) isCanceled else false } diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt index 3fce3b4d3..38e012128 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt @@ -42,7 +42,7 @@ class BazaarCancelledBuyOrderClipboard { patternCancelledMessage.matchMatcher(event.message) { event.blockedReason = "bazaar cancelled buy order clipbaord" val coins = group("coins") - LorenzUtils.chat("§e[SkyHanni] Bazaar buy order cancelled. $latestAmount saved to clipboard. ($coins coins)") + LorenzUtils.chat("Bazaar buy order cancelled. $latestAmount saved to clipboard. ($coins coins)") latestAmount?.let { OSUtils.copyToClipboard(it.replace(",", "")) } latestAmount = null @@ -50,4 +50,4 @@ class BazaarCancelledBuyOrderClipboard { } fun isEnabled() = LorenzUtils.inSkyBlock && SkyHanniMod.feature.bazaar.cancelledBuyOrderClipboard -} \ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt index 0badd1e57..b59eae0b2 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt @@ -51,11 +51,11 @@ class BingoCardDisplay { fun toggleCommand() { if (!LorenzUtils.isBingoProfile) { - LorenzUtils.chat("§cThis command only works on a bingo profile!") + LorenzUtils.userError("This command only works on a bingo profile!") return } if (!config.enabled) { - LorenzUtils.chat("§cBingo Card is disabled in the config!") + LorenzUtils.userError("Bingo Card is disabled in the config!") return } toggleMode() @@ -189,4 +189,4 @@ class BingoCardDisplay { fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(2, "bingo", "event.bingo") } -} \ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt index fd077824b..8e74b434f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt @@ -200,7 +200,7 @@ class BingoNextStepHelper { done = true updateResult() if (!silent && config.stepHelper) { - LorenzUtils.chat("§e[SkyHanni] A bingo goal step is done! ($displayName)") + LorenzUtils.chat("A bingo goal step is done! ($displayName)") } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt index 5f49d40ce..e686191aa 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt @@ -93,7 +93,7 @@ class CompactBingoChat { if (message.contains("Trade") || message.contains("Recipe")) { val text = message.removeColor().replace(" ", "") if (text == "Trade" || text == "Recipe") { - collectionLevelUpLastLine?.let { LorenzUtils.chat(it) } + collectionLevelUpLastLine?.let { LorenzUtils.chat(it, false) } } } else { collectionLevelUpLastLine = message diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt index 05a3ba456..3c1586d61 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt @@ -61,11 +61,11 @@ class ChatFilterGui(private val history: List) { if (!isEnabled()) return if (args.size < 2 || args[0].length != 2) { // args[0] is the language code - LorenzUtils.chat("§cUsage: /shcopytranslation ") + LorenzUtils.userError("Usage: /shcopytranslation ") return } val language = args[0] @@ -163,7 +163,7 @@ class Translator { coroutineScope.launch { val translation = getTranslationFromEnglish(message, language) - LorenzUtils.chat("§e[SkyHanni] Copied translation to clipboard: $translation") + LorenzUtils.chat("Copied translation to clipboard: $translation") OSUtils.copyToClipboard(translation) } } 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 656ac7b9d..171e45f90 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 @@ -292,8 +292,9 @@ object GhostCounter { notifyCTModule = false if (isUsingCTGhostCounter()) { clickableChat( - "§6[SkyHanni] GhostCounterV3 ChatTriggers module has been detected, do you want to import saved data ? Click here to import data", - "shimportghostcounterdata" + "GhostCounterV3 ChatTriggers module has been detected, do you want to import saved data ? Click here to import data", + "shimportghostcounterdata", + prefixColor = "§6", ) } } @@ -478,7 +479,7 @@ object GhostCounter { fun onConfigLoad(event: ConfigLoadEvent) { if (storage?.configUpdateVersion == 0) { config.textFormatting.bestiaryFormatting.base = " &6Bestiary %display%: &b%value%" - chat("§e[SkyHanni] Your GhostCounter config has been automatically adjusted.") + chat("Your GhostCounter config has been automatically adjusted.") storage?.configUpdateVersion = CONFIG_VALUE_VERSION } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt index b5b833423..9c5de8c43 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt @@ -65,7 +65,7 @@ object GhostUtil { val c = ProfileStorageData.profileSpecific?.ghostCounter ?: return if (isUsingCTGhostCounter()) { if (c.ctDataImported) { - LorenzUtils.chat("§e[SkyHanni] §cYou already imported GhostCounterV3 data!") + LorenzUtils.userError("You already imported GhostCounterV3 data!") return } val json = ConfigManager.gson.fromJson( @@ -83,9 +83,9 @@ object GhostUtil { ?: json["TotalMF"].asDouble GhostData.Option.TOTALDROPS.add(json["TotalDrops"].asDouble) c.ctDataImported = true - LorenzUtils.chat("§e[SkyHanni] §aImported data successfully!") + LorenzUtils.chat("§aImported data successfully!") } else - LorenzUtils.chat("§e[SkyHanni] §cGhostCounterV3 ChatTriggers module not found!") + LorenzUtils.error("GhostCounterV3 ChatTriggers module not found!") } fun String.formatText(option: GhostData.Option) = formatText(option.getInt(), option.getInt(true)) 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 c515cb7f0..de7cc4408 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt @@ -43,7 +43,7 @@ class WikiManager { if (!(message.startsWith("/wiki"))) return event.isCanceled = true if (message == "/wiki") { - LorenzUtils.chat("§e[SkyHanni] Opening the Fandom Wiki..") + LorenzUtils.chat("Opening the Fandom Wiki..") OSUtils.openBrowser("${urlPrefix}Hypixel_SkyBlock_Wiki") } else if (message.startsWith("/wiki ") || message == ("/wikithis")) { //conditional to see if we need Special:Search page if (message == ("/wikithis")) { @@ -51,7 +51,7 @@ class WikiManager { wikiTheItem(itemInHand) } else { val search = packet.message.split("/wiki ").last() - LorenzUtils.chat("§e[SkyHanni] Searching the Fandom Wiki for §a$search") + LorenzUtils.chat("Searching the Fandom Wiki for §a$search") val wikiUrlCustom = "$urlSearchPrefix$search&scope=internal" OSUtils.openBrowser(wikiUrlCustom.replace(' ', '+')) } @@ -73,7 +73,7 @@ class WikiManager { private fun wikiTheItem(item: ItemStack) { val itemDisplayName = (item.nameWithEnchantment ?: return).replace("§a✔ ", "").replace("§c✖ ", "") val internalName = item.getInternalName().asString() - LorenzUtils.chat("§e[SkyHanni] Searching the Fandom Wiki for §a$itemDisplayName") + LorenzUtils.chat("Searching the Fandom Wiki for §a$itemDisplayName") val wikiUrlSearch = if (internalName != "NONE") "$urlSearchPrefix$internalName&scope=internal" else "$urlSearchPrefix${itemDisplayName.removeColor()}&scope=internal" OSUtils.openBrowser(wikiUrlSearch.replace(' ', '+')) diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt index 701ef74ee..07a4edf18 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt @@ -73,7 +73,7 @@ class DungeonCleanEnd { if (event.health <= 0.5) { val dungeonFloor = DungeonAPI.dungeonFloor - LorenzUtils.chat("§eFloor $dungeonFloor done!") + LorenzUtils.chat("§eFloor $dungeonFloor done!", false) bossDone = true } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt index b1db55502..88ab543f0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt @@ -53,7 +53,7 @@ class DungeonDeathCounter { if (isDeathMessage(event.message)) { deaths++ - LorenzUtils.chat("§c§l$deaths. DEATH!") + LorenzUtils.chat("§c§l$deaths. DEATH!", false) update() } } @@ -94,4 +94,4 @@ class DungeonDeathCounter { private fun isEnabled(): Boolean { return LorenzUtils.inDungeons && SkyHanniMod.feature.dungeon.deathCounterDisplay } -} \ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt index fdb41a87a..3c1486467 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt @@ -43,10 +43,8 @@ class BurrowWarpHelper { if (lastWarpTime.passedSince() < 1.seconds) { lastWarp?.let { it.unlocked = false - LorenzUtils.chat( - "§e[SkyHanni] Detected not having access to warp point §b${it.displayName}§e!\n" + - "§e[SkyHanni] Use §c/shresetburrowwarps §eonce you have activated this travel scroll." - ) + LorenzUtils.chat("Detected not having access to warp point §b${it.displayName}§e!") + LorenzUtils.chat("Use §c/shresetburrowwarps §eonce you have activated this travel scroll.") lastWarp = null currentWarp = null } @@ -84,7 +82,7 @@ class BurrowWarpHelper { fun resetDisabledWarps() { WarpPoint.entries.forEach { it.unlocked = true } - LorenzUtils.chat("§e[SkyHanni] Reset disabled burrow warps.") + LorenzUtils.chat("Reset disabled burrow warps.") } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinPetWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinPetWarning.kt index b7637624c..a756f208b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinPetWarning.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinPetWarning.kt @@ -20,7 +20,7 @@ class GriffinPetWarning { if (!DianaAPI.hasGriffinPet() && lastWarnTime.passedSince() > 30.seconds) { lastWarnTime = SimpleTimeMark.now() LorenzUtils.sendTitle("§cGriffin Pet!", 3.seconds) - LorenzUtils.chat("§e[SkyHanni] Reminder to use a Griffin pet for Mythological Ritual!") + LorenzUtils.chat("Reminder to use a Griffin pet for Mythological Ritual!") } } } 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 e466c88a0..c4f12a993 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 @@ -53,7 +53,7 @@ object InquisitorWaypointShare { fun test() { test = !test - LorenzUtils.chat("§e[SkyHanni] Inquisitor Test " + if (test) "Enabled" else "Disabled") + LorenzUtils.chat("Inquisitor Test " + if (test) "Enabled" else "Disabled") } @SubscribeEvent @@ -144,7 +144,7 @@ object InquisitorWaypointShare { } else { val keyName = KeyboardManager.getKeyName(config.keyBindShare) val message = - "§e[SkyHanni] §l§bYou found a Inquisitor! Press §l§chere §l§bor §c$keyName to share the location!" + "§l§bYou found a Inquisitor! Press §l§chere §l§bor §c$keyName to share the location!" LorenzUtils.clickableChat(message, "shshareinquis") } } @@ -189,7 +189,7 @@ object InquisitorWaypointShare { lastShareTime = System.currentTimeMillis() if (inquisitor == -1) { - LorenzUtils.chat("§c[SkyHanni] No Inquisitor Found!") + LorenzUtils.error("No Inquisitor Found!") return } @@ -200,7 +200,7 @@ object InquisitorWaypointShare { } if (inquisitor.isDead) { - LorenzUtils.chat("§cInquisitor is ded") + LorenzUtils.chat("§cInquisitor is dead") return } val location = inquisitor.getLorenzVec() @@ -229,7 +229,7 @@ object InquisitorWaypointShare { val cleanName = playerName.cleanPlayerName() if (!waypoints.containsKey(cleanName)) { - LorenzUtils.chat("§e[SkyHanni] $playerName §l§efound an inquisitor at §l§c$x $y $z!") + LorenzUtils.chat("$playerName §l§efound an inquisitor at §l§c$x $y $z!") if (cleanName != LorenzUtils.getPlayerName()) { LorenzUtils.sendTitle("§dINQUISITOR §efrom §b$cleanName", 5.seconds) SoundUtils.playBeepSound() @@ -256,7 +256,7 @@ object InquisitorWaypointShare { fun maybeRemove(playerName: String) { if (inquisitorsNearby.isEmpty()) { waypoints = waypoints.editCopy { remove(playerName) } - LorenzUtils.chat("§e[SkyHanni] Inquisitor from $playerName not found, deleting.") + LorenzUtils.chat("Inquisitor from $playerName not found, deleting.") } } } 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 436cf7b8f..6d010fae7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fame/AccountUpgradeReminder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fame/AccountUpgradeReminder.kt @@ -54,7 +54,7 @@ class AccountUpgradeReminder { lastReminderSend = SimpleTimeMark.now() LorenzUtils.clickableChat( - "§e[SkyHanni] The §a$upgrade §eupgrade has completed! §c(Click to disable these reminders)", + "The §a$upgrade §eupgrade has completed! §c(Click to disable these reminders)", "shstopaccountupgradereminder" ) } @@ -117,4 +117,4 @@ class AccountUpgradeReminder { SkyHanniMod.feature.misc.accountUpgradeReminder = false } } -} \ No newline at end of file +} 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 0d6f1cd75..d47e32981 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt @@ -42,7 +42,7 @@ class CityProjectFeatures { private val config get() = SkyHanniMod.feature.event.cityProject fun disable() { config.dailyReminder = false - LorenzUtils.chat("§c[SkyHanni] Disabled city project reminder messages!") + LorenzUtils.chat("Disabled city project reminder messages!") } } @@ -68,7 +68,7 @@ class CityProjectFeatures { lastReminderSend = System.currentTimeMillis() LorenzUtils.clickableChat( - "§e[SkyHanni] Daily City Project Reminder! (Click here to disable this reminder)", + "Daily City Project Reminder! (Click here to disable this reminder)", "shstopcityprojectreminder" ) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingBaitWarnings.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingBaitWarnings.kt index 8caf8cb20..7688a7f98 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingBaitWarnings.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingBaitWarnings.kt @@ -76,13 +76,13 @@ class FishingBaitWarnings { private fun showBaitChangeWarning(before: String, after: String) { SoundUtils.playClickSound() LorenzUtils.sendTitle("§eBait changed!", 2.seconds) - LorenzUtils.chat("§e[SkyHanni] Fishing Bait changed: $before -> $after") + LorenzUtils.chat("Fishing Bait changed: $before -> $after") } private fun showNoBaitWarning() { SoundUtils.playErrorSound() LorenzUtils.sendTitle("§cNo bait is used!", 2.seconds) - LorenzUtils.chat("§e[SkyHanni] You do not use any fishing baits!") + LorenzUtils.chat("You do not use any fishing baits!") } private fun isEnabled() = LorenzUtils.inSkyBlock && FishingAPI.hasFishingRodInHand() diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureMessageShortener.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureMessageShortener.kt index f9cb0d861..0525031c0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureMessageShortener.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureMessageShortener.kt @@ -15,17 +15,14 @@ class SeaCreatureMessageShortener { val seaCreature = event.seaCreature event.chatEvent.blockedReason = "sea_creature_caught" - var message = if (config.shortenFishingMessage) { + val doubleHookPrefix = if (config.compactDoubleHook && event.doubleHook) "§e§lDOUBLE HOOK! " else "" + val message = doubleHookPrefix + if (config.shortenFishingMessage) { "§9You caught a ${seaCreature.displayName}§9!" } else event.chatEvent.message - - if (config.compactDoubleHook && event.doubleHook) { - message = "§e§lDOUBLE HOOK! $message" - } - LorenzUtils.chat(message) + LorenzUtils.chat(message, false) if (seaCreature.fishingExperience == 0) { LorenzUtils.debug("no fishing exp set for " + seaCreature.name) } } -} \ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt index 8861f0663..bc9cb9724 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt @@ -48,7 +48,7 @@ class SharkFishCounter { counter < 350 -> "Like a pro!" else -> "How???" } - LorenzUtils.chat("§e[SkyHanni] You caught ${counter.addSeparators()} sharks during this fishing contest. $funnyComment") + LorenzUtils.chat("You caught ${counter.addSeparators()} sharks during this fishing contest. $funnyComment") counter = 0 } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt index 7723617a9..b1abdc2d5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt @@ -43,7 +43,7 @@ class TrophyFishMessages { event.blockedReason = "trophy_fish" if (config.enabled && config.design == 0 && amount == 1) { - LorenzUtils.chat("§6§lTROPHY FISH! §c§lFIRST §r$displayRarity $displayName") + LorenzUtils.chat("§6§lTROPHY FISH! §c§lFIRST §r$displayRarity $displayName", prefix = false) return } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt index 1d84eae92..b9c3520ae 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt @@ -99,7 +99,7 @@ class AnitaMedalProfit { for (rawItemName in requiredItems) { val pair = ItemUtils.readItemAmount(rawItemName) if (pair == null) { - LorenzUtils.error("§c[SkyHanni] Could not read item '$rawItemName'") + LorenzUtils.error("Could not read item '$rawItemName'") continue } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt index d6450e2d7..044d38a77 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt @@ -160,7 +160,7 @@ object GardenAPI { storage?.cropsPerSecond?.clear() GardenBestCropTime.reset() updateGardenTool() - LorenzUtils.chat("§e[SkyHanni] Manually reset all crop speed data!") + LorenzUtils.chat("Manually reset all crop speed data!") } @SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt index c60fd5086..f6c235cc1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt @@ -82,7 +82,7 @@ class GardenCropMilestoneFix { crop.setCounter(tabListValue) GardenCropMilestoneDisplay.update() if (!loadedCrops.contains(crop)) { - LorenzUtils.chat("§e[SkyHanni] Loaded ${crop.cropName} milestone data from $source!") + LorenzUtils.chat("Loaded ${crop.cropName} milestone data from $source!") loadedCrops.add(crop) } } else if (diff >= minDiff) { @@ -91,4 +91,4 @@ class GardenCropMilestoneFix { GardenCropMilestoneDisplay.update() } } -} \ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropTimeCommand.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropTimeCommand.kt index 228f133e9..92a01c7fb 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropTimeCommand.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropTimeCommand.kt @@ -16,12 +16,12 @@ object GardenCropTimeCommand { fun onCommand(args: Array) { if (!config.display) { - LorenzUtils.chat("§c[SkyHanni] §cshcroptime requires 'Show money per Hour' feature to be enabled to work!") + LorenzUtils.userError("shcroptime requires 'Show money per Hour' feature to be enabled to work!") return } if (args.size < 2) { - LorenzUtils.chat("§cUsage: /shcroptime ") + LorenzUtils.userError("Usage: /shcroptime ") return } @@ -29,7 +29,7 @@ object GardenCropTimeCommand { val amount = try { rawAmount.toInt() } catch (e: NumberFormatException) { - LorenzUtils.chat("§cNot a valid number: '$rawAmount'") + LorenzUtils.userError("Not a valid number: '$rawAmount'") return } @@ -64,10 +64,10 @@ object GardenCropTimeCommand { } if (map.isEmpty()) { - LorenzUtils.chat("§c[SkyHanni] §cNo crop item found for '$rawSearchName'") + LorenzUtils.error("No crop item found for '$rawSearchName'.") return } - LorenzUtils.chat("§e[SkyHanni] Crop Speed for ${map.size} items:\n" + map.sorted().keys.joinToString("\n")) + LorenzUtils.chat("Crop Speed for ${map.size} items:\n" + map.sorted().keys.joinToString("\n")) } -} \ No newline at end of file +} 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 d033255d2..50cf6b758 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt @@ -49,7 +49,8 @@ class GardenLevelDisplay { LorenzUtils.clickableChat( " \n§b§lGARDEN LEVEL UP §8$oldLevel ➜ §b$newLevel\n" + " §8+§aRespect from Elite Farmers and SkyHanni members :)\n ", - "/gardenlevels" + "/gardenlevels", + false ) } } @@ -118,4 +119,4 @@ class GardenLevelDisplay { event.move(3, "garden.gardenLevelDisplay", "garden.gardenLevels.display") event.move(3, "garden.gardenLevelPos", "garden.gardenLevels.pos") } -} \ No newline at end of file +} 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 af535615a..ef5d9a429 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt @@ -168,7 +168,7 @@ object GardenNextJacobContest { sendContests() } else { LorenzUtils.clickableChat( - "§e[SkyHanni] §2Click here to submit this years farming contests, thank you for helping everyone out!", + "§2Click here to submit this years farming contests, thank you for helping everyone out!", "shsendcontests" ) } @@ -217,7 +217,7 @@ object GardenNextJacobContest { if (array[0] == "enable") { config.shareAutomatically = 1 SkyHanniMod.feature.storage.contestSendingAsked = true - LorenzUtils.chat("§e[SkyHanni] §2Enabled automatic sharing of future contests!") + LorenzUtils.chat("§2Enabled automatic sharing of future contests!") } return } @@ -226,7 +226,7 @@ object GardenNextJacobContest { } if (!SkyHanniMod.feature.storage.contestSendingAsked && config.shareAutomatically == 0) { LorenzUtils.clickableChat( - "§e[SkyHanni] §2Click here to automatically share future contests!", + "§2Click here to automatically share future contests!", "shsendcontests enable" ) } @@ -318,7 +318,7 @@ object GardenNextJacobContest { lastWarningTime = System.currentTimeMillis() + 60_000 * 40 val cropText = crops.joinToString("§7, ") { "§a${it.cropName}" } - LorenzUtils.chat("§e[SkyHanni] Next farming contest: $cropText") + LorenzUtils.chat("Next farming contest: $cropText") LorenzUtils.sendTitle("§eFarming Contest!", 5.seconds) SoundUtils.playBeepSound() @@ -439,11 +439,11 @@ object GardenNextJacobContest { newContests[timestamp + contestDuration] = FarmingContest(timestamp + contestDuration, crops) } } else { - LorenzUtils.chat("§e[SkyHanni] This years contests aren't available to fetch automatically yet, please load them from your calender or wait 10 minutes!") + LorenzUtils.chat("This years contests aren't available to fetch automatically yet, please load them from your calender or wait 10 minutes!") } if (newContests.count() == maxContestsPerYear) { - LorenzUtils.chat("§e[SkyHanni] Successfully loaded this year's contests from elitebot.dev automatically!") + LorenzUtils.chat("Successfully loaded this year's contests from elitebot.dev automatically!") contests = newContests fetchedFromElite = true @@ -454,7 +454,7 @@ object GardenNextJacobContest { } } catch (e: Exception) { e.printStackTrace() - LorenzUtils.error("[SkyHanni] Failed to fetch upcoming contests. Please report this error if it continues to occur.") + LorenzUtils.error("Failed to fetch upcoming contests. Please report this error if it continues to occur.") } } @@ -484,13 +484,13 @@ object GardenNextJacobContest { val result = withContext(dispatcher) { APIUtil.postJSONIsSuccessful(url, body) } if (result) { - LorenzUtils.chat("§e[SkyHanni] Successfully submitted this years upcoming contests, thank you for helping everyone out!") + LorenzUtils.chat("Successfully submitted this years upcoming contests, thank you for helping everyone out!") } else { - LorenzUtils.error("[SkyHanni] Something went wrong submitting upcoming contests!") + LorenzUtils.error("Something went wrong submitting upcoming contests!") } } catch (e: Exception) { e.printStackTrace() - LorenzUtils.error("[SkyHanni] Failed to submit upcoming contests. Please report this error if it continues to occur.") + LorenzUtils.error("Failed to submit upcoming contests. Please report this error if it continues to occur.") null } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt index bff6d4b0e..967368915 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt @@ -105,7 +105,7 @@ class GardenOptimalSpeed { lastWarnTime = System.currentTimeMillis() LorenzUtils.sendTitle("§cWrong speed!", 3.seconds) cropInHand?.let { - LorenzUtils.chat("§e[SkyHanni] Wrong speed for ${it.cropName}: §f$currentSpeed §e(§f$optimalSpeed §eis optimal)") + LorenzUtils.chat("Wrong speed for ${it.cropName}: §f$currentSpeed §e(§f$optimalSpeed §eis optimal)") } } @@ -130,4 +130,4 @@ class GardenOptimalSpeed { event.move(3, "garden.optimalSpeedCustom.cactus", "garden.optimalSpeeds.customSpeed.cactus") event.move(3, "garden.optimalSpeedCustom.mushroom", "garden.optimalSpeeds.customSpeed.mushroom") } -} \ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt index 439b51b0c..2e089364c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt @@ -145,7 +145,7 @@ class ComposterDisplay { if (config.notifyLow.title) { LorenzUtils.sendTitle("§cYour Organic Matter is low", 4.seconds) } - LorenzUtils.chat("§e[SkyHanni] §cYour Organic Matter is low!") + LorenzUtils.chat("§cYour Organic Matter is low!") storage.informedAboutLowMatter = System.currentTimeMillis() + 60_000 * 5 } @@ -155,7 +155,7 @@ class ComposterDisplay { if (config.notifyLow.title) { LorenzUtils.sendTitle("§cYour Fuel is low", 4.seconds) } - LorenzUtils.chat("§e[SkyHanni] §cYour Fuel is low!") + LorenzUtils.chat("§cYour Fuel is low!") storage.informedAboutLowFuel = System.currentTimeMillis() + 60_000 * 5 } } @@ -202,7 +202,7 @@ class ComposterDisplay { if (System.currentTimeMillis() < storage.lastComposterEmptyWarningTime + 1000 * 60 * 2) return storage.lastComposterEmptyWarningTime = System.currentTimeMillis() - LorenzUtils.chat("§e[SkyHanni] $warningMessage") + LorenzUtils.chat(warningMessage) LorenzUtils.sendTitle("§eComposter Warning!", 3.seconds) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt index 557fec6d0..b99f059da 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt @@ -87,11 +87,11 @@ object ComposterOverlay { fun onCommand(args: Array) { if (args.size != 1) { - LorenzUtils.chat("§cUsage: /shtestcomposter ") + LorenzUtils.userError("Usage: /shtestcomposter ") return } testOffset = args[0].toInt() - LorenzUtils.chat("§e[SkyHanni] Composter test offset set to $testOffset.") + LorenzUtils.chat("Composter test offset set to $testOffset.") } @SubscribeEvent @@ -382,7 +382,7 @@ object ComposterOverlay { } val testOffset = if (testOffset_ > map.size) { - LorenzUtils.chat("§cSkyHanni] Invalid Composter Overlay Offset! $testOffset cannot be greater than ${map.size}!") + LorenzUtils.error("Invalid Composter Overlay Offset! $testOffset cannot be greater than ${map.size}!") ComposterOverlay.testOffset = 0 0 } else testOffset_ @@ -449,7 +449,7 @@ object ComposterOverlay { } val having = InventoryUtils.countItemsInLowerInventory { it.getInternalName_old() == internalName } if (having >= itemsNeeded) { - LorenzUtils.chat("§e[SkyHanni] $itemName §8x${itemsNeeded} §ealready found in inventory!") + LorenzUtils.chat("$itemName §8x${itemsNeeded} §ealready found in inventory!") return } @@ -463,16 +463,16 @@ object ComposterOverlay { val sackType = if (internalName == "VOLTA" || internalName == "OIL_BARREL") "Mining" else "Enchanted Agronomy" LorenzUtils.clickableChat( - "§e[SkyHanni] Sacks could not be loaded. Click here and open your §9$sackType Sack §eto update the data!", + "Sacks could not be loaded. Click here and open your §9$sackType Sack §eto update the data!", "sax" ) return } else if (amountInSacks == 0L) { SoundUtils.playErrorSound() if (LorenzUtils.noTradeMode) { - LorenzUtils.chat("§e[SkyHanni] No $itemName §efound in sacks.") + LorenzUtils.chat("No $itemName §efound in sacks.") } else { - LorenzUtils.chat("§e[SkyHanni] No $itemName §efound in sacks. Opening Bazaar.") + LorenzUtils.chat("No $itemName §efound in sacks. Opening Bazaar.") BazaarApi.searchForBazaarItem(itemName, itemsNeeded) } return @@ -481,10 +481,10 @@ object ComposterOverlay { LorenzUtils.sendCommandToServer("gfs $internalName ${itemsNeeded - having}") if (amountInSacks <= itemsNeeded - having) { if (LorenzUtils.noTradeMode) { - LorenzUtils.chat("§e[SkyHanni] You're out of $itemName §ein your sacks!") + LorenzUtils.chat("You're out of $itemName §ein your sacks!") } else { LorenzUtils.clickableChat( - "§e[SkyHanni] You're out of $itemName §ein your sacks! Click here to buy more on the Bazaar!", + "You're out of $itemName §ein your sacks! Click here to buy more on the Bazaar!", "bz ${itemName.removeColor()}" ) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt index 695092598..be6672d78 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt @@ -48,14 +48,14 @@ class GardenComposterInventoryFeatures { if (line == "") break val pair = ItemUtils.readItemAmount(line) if (pair == null) { - LorenzUtils.error("§c[SkyHanni] Could not read item '$line'") + LorenzUtils.error("Could not read item '$line'") continue } val (itemName, amount) = pair val internalName = NEUItems.getInternalNameOrNull(itemName) if (internalName == null) { - LorenzUtils.chat( - "§c[SkyHanni] Error reading internal name for item '$itemName§c' " + + LorenzUtils.error( + "Error reading internal name for item '$itemName§c' " + "(in GardenComposterInventoryFeatures)" ) continue @@ -102,4 +102,4 @@ class GardenComposterInventoryFeatures { event.move(3, "garden.composterUpgradePrice", "garden.composters.upgradePrice") event.move(3, "garden.composterHighLightUpgrade", "garden.composters.highlightUpgrade") } -} \ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt index 50a46b1e2..faa2ed534 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt @@ -32,7 +32,7 @@ class JacobContestStatsSummary { when (event.phase) { FarmingContestPhase.START -> { - LorenzUtils.chat("§e[SkyHanni] Started tracking your Jacob Contest Blocks Per Second!") + LorenzUtils.chat("Started tracking your Jacob Contest Blocks Per Second!") startTime = System.currentTimeMillis() } @@ -41,16 +41,16 @@ class JacobContestStatsSummary { val durationInSeconds = duration.toDouble() / 1000 val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2) val cropName = event.crop.cropName - LorenzUtils.chat("§e[SkyHanni] Stats for $cropName Contest:") + LorenzUtils.chat("Stats for $cropName Contest:") val time = TimeUtils.formatDuration(duration - 999) - LorenzUtils.chat("§e[SkyHanni] §7Blocks Broken in total: §e${blocksBroken.addSeparators()}") + LorenzUtils.chat("§7Blocks Broken in total: §e${blocksBroken.addSeparators()}") val color = getBlocksPerSecondColor(blocksPerSecond) - LorenzUtils.chat("§e[SkyHanni] §7Average Blocks Per Second: $color$blocksPerSecond") - LorenzUtils.chat("§e[SkyHanni] §7Participated for §b$time") + LorenzUtils.chat("§7Average Blocks Per Second: $color$blocksPerSecond") + LorenzUtils.chat("§7Participated for §b$time") } FarmingContestPhase.CHANGE -> { - LorenzUtils.chat("§e[SkyHanni] You changed the crop during the contest, resetting the Blocks Per Second calculation..") + LorenzUtils.chat("You changed the crop during the contest, resetting the Blocks Per Second calculation..") startTime = System.currentTimeMillis() } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt index 91abf10a4..b63b02f27 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt @@ -45,7 +45,7 @@ object CropMoneyDisplay { fun toggleShowCalculation() { showCalculation = !showCalculation - LorenzUtils.chat("§e[SkyHanni] Show crop money calculation: " + if (showCalculation) "enabled" else "disabled") + LorenzUtils.chat("Show crop money calculation: " + if (showCalculation) "enabled" else "disabled") update() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt index 8abe65ccf..fd337a361 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt @@ -118,7 +118,7 @@ class CropSpeedMeter { fun toggle() { enabled = !enabled - LorenzUtils.chat("§e[SkyHanni] Crop Speed Meter " + if (enabled) "§aEnabled" else "§cDisabled") + LorenzUtils.chat("Crop Speed Meter " + if (enabled) "§aEnabled" else "§cDisabled") startCrops = emptyMap() } @@ -132,4 +132,4 @@ class CropSpeedMeter { } fun isEnabled() = enabled && GardenAPI.inGarden() -} \ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt index 41976bf07..f32da7867 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt @@ -224,8 +224,8 @@ class FarmingWeightDisplay { // Check that the provided string is valid val parsed = value.toIntOrNull() ?: 0 if (parsed < 1 || parsed > goal) { - LorenzUtils.error("[SkyHanni] Invalid Farming Weight Overtake Goal!") - LorenzUtils.chat("§eEdit the Overtake Goal config value with a valid number [1-10000] to use this feature!") + LorenzUtils.error("Invalid Farming Weight Overtake Goal!") + LorenzUtils.chat("§eEdit the Overtake Goal config value with a valid number [1-10000] to use this feature!", false) config.ETAGoalRank = goal.toString() } else { goal = parsed @@ -255,7 +255,7 @@ class FarmingWeightDisplay { if (weightUntilOvertake < 0) { if (weightPerSecond > 0) { - farmingChatMessage("§e[SkyHanni] You passed §b$nextName §ein the Farming Weight Leaderboard!") + farmingChatMessage("You passed §b$nextName §ein the Farming Weight Leaderboard!") } // Lower leaderboard position @@ -386,7 +386,7 @@ class FarmingWeightDisplay { private fun chatOffScreenChange(direction: String, oldPosition: Int) { farmingChatMessage( - "§e[SkyHanni] §7Since your last visit to the §aGarden§7, " + + "§7Since your last visit to th