diff options
Diffstat (limited to 'src')
37 files changed, 74 insertions, 76 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt index 0c112d73a..3f2d39836 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt @@ -12,6 +12,7 @@ import java.io.IOException @Suppress("unused") class ConfigGuiForgeInterop : IModGuiFactory { + @Suppress("EmptyFunctionBlock") override fun initialize(minecraft: Minecraft) {} override fun mainConfigGuiClass() = WrappedSkyHanniConfig::class.java diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt index bf0f2ba0a..da4b54942 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt @@ -182,7 +182,7 @@ class ConfigManager { try { run() } catch (e: Throwable) { - e.printStackTrace() + logger.log(e.stackTraceToString()) LorenzUtils.shutdownMinecraft("Config is corrupt inside development environment.") } } else { @@ -194,7 +194,7 @@ class ConfigManager { logger.log("Loaded $fileName from file") } catch (e: Exception) { - e.printStackTrace() + logger.log(e.stackTraceToString()) val backupFile = file.resolveSibling("$fileName-${SimpleTimeMark.now().toMillis()}-backup.json") logger.log("Exception while reading $file. Will load blank $fileName and save backup to $backupFile") logger.log("Exception was $e") @@ -202,7 +202,7 @@ class ConfigManager { file.copyTo(backupFile) } catch (e: Exception) { logger.log("Could not create backup for $fileName file") - e.printStackTrace() + logger.log(e.stackTraceToString()) } } } @@ -239,7 +239,7 @@ class ConfigManager { move(unit, file, reason) } catch (e: IOException) { logger.log("Could not save $fileName file to $file") - e.printStackTrace() + logger.log(e.stackTraceToString()) } } diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt index ba3a57675..0adf1bed5 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt @@ -57,7 +57,7 @@ class GuiPositionEditor( } override fun drawScreen(mouseX: Int, mouseY: Int, partialTicks: Float) { - //Items aren't drawn due to a bug in neu rendering + // Items aren't drawn due to a bug in neu rendering drawDefaultBackground() if (oldScreen != null) { val accessor = oldScreen as AccessorGuiContainer diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt index b48805ef5..039bd7d28 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt @@ -218,7 +218,7 @@ object HypixelData { // This code is modified from NEU, and depends on NEU (or another mod) sending /locraw. private val jsonBracketPattern = "^\\{.+}".toPattern() - //todo convert to proper json object + // todo convert to proper json object fun checkForLocraw(message: String) { jsonBracketPattern.matchMatcher(message.removeColor()) { try { diff --git a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt index 9d635b1b9..45aec43d3 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt @@ -165,7 +165,6 @@ object MiningAPI { fun onBlockClick(event: BlockClickEvent) { if (!inCustomMiningIsland()) return if (event.clickType != ClickType.LEFT_CLICK) return - //println(event.getBlockState.properties) if (OreBlock.getByStateOrNull(event.getBlockState) == null) return recentClickedBlocks += event.position to SimpleTimeMark.now() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt index 964b25573..d058ddc50 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt @@ -27,7 +27,7 @@ object ChatFilter { private val config get() = SkyHanniMod.feature.chat.filterType private val dungeonConfig get() = SkyHanniMod.feature.dungeon.messageFilter - /// <editor-fold desc="Regex Patterns & Messages"> + // <editor-fold desc="Regex Patterns & Messages"> // Lobby Messages private val lobbyPatterns = listOf( // player join @@ -89,15 +89,19 @@ object ChatFilter { ) // Guild EXP + /** + * REGEX-TEST: §aYou earned §r§22 GEXP §r§afrom playing SkyBlock! + * REGEX-TEST: §aYou earned §r§22 GEXP §r§a+ §r§c210 Event EXP §r§afrom playing SkyBlock! + */ private val guildExpPatterns = listOf( - // §aYou earned §r§22 GEXP §r§afrom playing SkyBlock! - // §aYou earned §r§22 GEXP §r§a+ §r§c210 Event EXP §r§afrom playing SkyBlock! "§aYou earned §r§2.* GEXP (§r§a\\+ §r§.* Event EXP )?§r§afrom playing SkyBlock!".toPattern(), ) // Kill Combo + /** + * REGEX-TEST: §a§l+5 Kill Combo §r§8+§r§b3% §r§b? Magic Find + */ private val killComboPatterns = listOf( - //§a§l+5 Kill Combo §r§8+§r§b3% §r§b? Magic Find "§.§l\\+(.*) Kill Combo (.*)".toPattern(), "§cYour Kill Combo has expired! You reached a (.*) Kill Combo!".toPattern(), ) @@ -500,7 +504,7 @@ object ChatFilter { "slayer" to slayerMessageStartWith, "profile_join" to profileJoinMessageStartsWith, ) - /// </editor-fold> + // </editor-fold> @SubscribeEvent fun onChat(event: LorenzChatEvent) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt index 9c100ef47..698a67114 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt @@ -275,7 +275,7 @@ object PowderMiningChatFilter { // To simplify regex statements, this check is done outside val ssMessage = message.takeIf { it.startsWith(" ") }?.substring(4) ?: return null - //Powder + // Powder powderRewardPattern.matchMatcher(ssMessage) { if (config.powderFilterThreshold == 60000) return "powder_mining_powder" val amountStr = groupOrNull("amount") ?: "1" @@ -286,7 +286,7 @@ object PowderMiningChatFilter { } } - //Essence + // Essence essenceRewardPattern.matchMatcher(ssMessage) { if (config.essenceFilterThreshold == 20) return "powder_mining_essence" val amountStr = groupOrNull("amount") ?: "1" @@ -301,11 +301,11 @@ object PowderMiningChatFilter { blockGoblinEggs(ssMessage)?.let { return it } blockGemstones(ssMessage)?.let { return it } - //Fallback default + // Fallback default return null } - var rewardPatterns: Map<Pair<Pattern, PowderMiningFilterConfig.SimplePowderMiningRewardTypes>, String> = emptyMap() + private var rewardPatterns: Map<Pair<Pattern, PowderMiningFilterConfig.SimplePowderMiningRewardTypes>, String> = emptyMap() @SubscribeEvent(priority = EventPriority.HIGHEST) fun onRepoReload(event: RepositoryReloadEvent) { @@ -339,7 +339,7 @@ object PowderMiningChatFilter { if (config.goblinEggs == PowderMiningFilterConfig.GoblinEggFilterEntry.HIDE_ALL) return "powder_mining_goblin_eggs" return when (val colorStr = groupOrNull("color")?.lowercase()) { - //'Colorless', base goblin eggs will never be shown in this code path + // 'Colorless', base goblin eggs will never be shown in this code path null -> "powder_mining_goblin_eggs" "green" -> if (config.goblinEggs > PowderMiningFilterConfig.GoblinEggFilterEntry.GREEN_UP) { "powder_mining_goblin_eggs" @@ -380,7 +380,7 @@ object PowderMiningChatFilter { "amethyst" -> gemstoneConfig.amethystGemstones "jade" -> gemstoneConfig.jadeGemstones "topaz" -> gemstoneConfig.topazGemstones - //Failure case that should never be reached + // Failure case that should never be reached else -> return "no_filter" } diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt index d6c2e85c2..39a1f096a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt @@ -19,7 +19,7 @@ object GetFromSacksTabComplete { return GetFromSackAPI.sackListNames.map { it.replace(" ", "_") } } - //No subscribe since it needs to be called from the GetFromSackAPI + // No subscribe since it needs to be called from the GetFromSackAPI fun handleUnderlineReplace(event: MessageSendToServerEvent): MessageSendToServerEvent { if (!isEnabled()) return event diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt index a49369d83..1a566c225 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt @@ -16,7 +16,7 @@ object DungeonChatFilter { private val config get() = SkyHanniMod.feature.chat - /// <editor-fold desc="Patterns, Messages, and Maps"> + // <editor-fold desc="Patterns, Messages, and Maps"> // TODO USE SH-REPO private val endPatterns = listOf( "(.*) §r§eunlocked §r§d(.*) Essence §r§8x(.*)§r§e!".toPattern(), @@ -140,9 +140,12 @@ object DungeonChatFilter { private val pickupMessages = listOf( "§fYou found a §r§dWither Essence§r§f! Everyone gains an extra essence!" ) + + /** + * REGEX-TEST: §a[Berserk] §r§fMelee Damage §r§c48%§r§f -> §r§a88% + * REGEX-TEST: §a[Berserk] §r§fWalk Speed §r§c38§r§f -> §r§a68 + */ private val startPatterns = listOf( - //§a[Berserk] §r§fMelee Damage §r§c48%§r§f -> §r§a88% - //§a[Berserk] §r§fWalk Speed §r§c38§r§f -> §r§a68 "§a(.*) §r§f(.*) §r§c(.*)§r§f -> §r§a(.*)".toPattern() ) private val startMessages = listOf( @@ -188,7 +191,7 @@ object DungeonChatFilter { private val messagesEndsWithMap: Map<MessageTypes, List<String>> = mapOf( MessageTypes.END to endMessagesEndWith, ) - /// </editor-fold> + // </editor-fold> @SubscribeEvent fun onChat(event: LorenzChatEvent) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonRankTabListColor.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonRankTabListColor.kt index 80a60ba4b..3968a3d18 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonRankTabListColor.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonRankTabListColor.kt @@ -34,7 +34,7 @@ object DungeonRankTabListColor { val sbLevel = group("sbLevel") val rank = groupOrNull("rank") ?: "" val playerName = group("playerName") - //val symbols = group("symbols") + // val symbols = group("symbols") val className = group("className") val classLevel = group("classLevel") diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt index ec18d016b..b49eb0642 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt @@ -61,10 +61,10 @@ object CarnivalZombieShootout { ) enum class ZombieType(val points: Int, val helmet: String, val color: Color) { - LEATHER(30, "Leather Cap", Color(165, 42, 42)), //Brown - IRON(50, "Iron Helmet", Color(192, 192, 192)), //Silver - GOLD(80, "Golden Helmet", Color(255, 215, 0)), //Gold - DIAMOND(120, "Diamond Helmet", Color(44, 214, 250)) //Diamond + LEATHER(30, "Leather Cap", Color(165, 42, 42)), // Brown + IRON(50, "Iron Helmet", Color(192, 192, 192)), // Silver + GOLD(80, "Golden Helmet", Color(255, 215, 0)), // Gold + DIAMOND(120, "Diamond Helmet", Color(44, 214, 250)) // Diamond } @SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt index e84d93dfa..9fbb3e527 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt @@ -262,7 +262,7 @@ object HoppityCollectionStats { else -> "" // Never happens } - //List indexing is weird + // List indexing is weird existingLore[replaceIndex - 1] = "§7Obtained by $operationFormat §6$displayAmount" existingLore[replaceIndex] = "§7all-time §6Chocolate." return existingLore 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 da461d749..24edf8d43 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 @@ -372,8 +372,8 @@ object FarmingWeightDisplay { private fun isEtaEnabled() = config.overtakeETA fun addCrop(crop: CropType, addedCounter: Int) { - //Prevent div-by-0 errors - if (addedCounter == 0) return; + // Prevent div-by-0 errors + if (addedCounter == 0) return val before = getExactWeight() localCounter[crop] = crop.getLocalCounter() + addedCounter diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt index 959ab43e4..e8b2d55e4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt @@ -112,8 +112,8 @@ object CaptureFarmingGear { val currentCrop = itemStack.getCropType() if (currentCrop == null) { - //todo better fall back items - //todo Daedalus axe + // todo better fall back items + // todo Daedalus axe } else { currentCrop.farmingItem.setItem(itemStack) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt index c002284ab..b05acf959 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt @@ -21,7 +21,7 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 update(content, footer) } - //TODO split up this 240 lines function + // TODO split up this 240 lines function fun getPage(): Pair<List<List<Renderable>>, List<Renderable>> { val content = mutableListOf<MutableList<Renderable>>() val footer = mutableListOf<Renderable>() diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt index c1b6a3d8f..52e49d26f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt @@ -82,10 +82,10 @@ object GardenVisitorCompactChat { visitorNameFormatted = "$visitorColor$visitorName" } - //If visitor name has not yet been matched, we aren't looking at a visitor accept message, and can ignore this. - if (visitorNameFormatted.isBlank()) return; + // If visitor name has not yet been matched, we aren't looking at a visitor accept message, and can ignore this. + if (visitorNameFormatted.isBlank()) return - //Match rewards and transform + // Match rewards and transform visitorRewardPattern.matchMatcher(transformedMessage) { val rewardColor = groupOrNull("rewardcolor") val amountColor = groupOrNull("amountcolor") @@ -105,7 +105,7 @@ object GardenVisitorCompactChat { if (altAmount == null) "" else "$altAmount " } - //Don't add name for copper, farming XP, garden XP, or bits + // Don't add name for copper, farming XP, garden XP, or bits val rewardString = if (discardRewardNamePattern.matcher(reward).matches()) "" else reward rewardsList.add( @@ -127,8 +127,8 @@ object GardenVisitorCompactChat { } private fun sendCompact() { - //This prevents commission rewards, crop milestone data, etc. from triggering incorrectly - if (visitorNameFormatted.isBlank()) return; + // This prevents commission rewards, crop milestone data, etc. from triggering incorrectly + if (visitorNameFormatted.isBlank()) return if (visitorAcceptedChat.isNotEmpty()) { ChatUtils.hoverableChat(createCompactVisitorMessage(), hover = visitorAcceptedChat, prefix = false) diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt index 6b3620c18..152fc1b7c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt @@ -228,7 +228,7 @@ object GardenVisitorDropStatistics { return "$amount" } - //todo this should just save when changed not once a second + // todo this should just save when changed not once a second @SubscribeEvent fun onSecondPassed(event: SecondPassedEvent) { saveAndUpdate() diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt index 05aaeba80..0247a4547 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt @@ -148,7 +148,7 @@ object ItemPickupLog { if (cursorItem != null) { val hash = cursorItem.hash() - //this prevents items inside hypixel guis counting when picked up + // this prevents items inside hypixel guis counting when picked up if (oldItemList.contains(hash)) { inventoryItems.add(cursorItem) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt index fcd940d02..2854b47df 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt @@ -379,8 +379,6 @@ object ReforgeHelper { colorReforgeStone(hoverColor, hoveredReforge?.rawReforgeStoneName ?: "Random Basic Reforge") } else { inventoryContainer?.getSlot(reforgeItem)?.highlight(hoverColor) - - //?.get(reforgeItem)?. = hoverColor } hoveredReforge = null } diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt index eb15f6165..26de0fa1c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt @@ -153,7 +153,7 @@ object SackDisplay { ), ) ) - //TOOD add cache + // TODO add cache addItemStack("MAGMA_FISH".asInternalName()) } if (config.showPrice && price != 0L) addAlignedNumber("§6${format(price)}") diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryC |