From 075368eb9d19578950fdb727bf2f195c63f41f3c Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Thu, 26 Oct 2023 12:51:44 +0100 Subject: Add Repo TODOs (#585) Add Repo TODOs #585 --- src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt | 2 ++ src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt | 1 + src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt | 1 + src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt | 1 + .../java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt | 1 + src/main/java/at/hannibal2/skyhanni/data/GardenCropUpgrades.kt | 1 + src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt | 1 + src/main/java/at/hannibal2/skyhanni/data/IslandType.kt | 1 + src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt | 1 + src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt | 1 + src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt | 1 + src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt | 1 + src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt | 1 + src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt | 1 + src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt | 1 + .../java/at/hannibal2/skyhanni/data/model/ComposterUpgrade.kt | 2 +- .../at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt | 1 + .../hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt | 2 +- .../at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt | 3 ++- .../at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt | 1 + .../skyhanni/features/chat/ArachneChatMessageHider.kt | 2 ++ .../at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt | 3 ++- .../skyhanni/features/event/diana/InquisitorWaypointShare.kt | 3 ++- .../at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt | 2 ++ .../features/garden/fortuneguide/CaptureFarmingGear.kt | 2 +- .../at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt | 8 ++++---- .../hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt | 2 +- .../hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt | 5 +++-- .../at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt | 2 ++ .../features/misc/compacttablist/AdvancedPlayerList.kt | 5 +++-- .../skyhanni/features/misc/compacttablist/TabListReader.kt | 1 + .../skyhanni/features/misc/compacttablist/TabStringType.kt | 1 + .../features/misc/teleportpad/TeleportPadCompactName.kt | 1 + .../features/misc/teleportpad/TeleportPadInventoryNumber.kt | 4 +++- .../hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt | 2 ++ .../hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt | 6 ++++-- .../features/rift/area/stillgorechateau/RiftBloodEffigies.kt | 2 +- .../skyhanni/features/rift/area/westvillage/KloonHacking.kt | 9 ++++++--- .../skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt | 10 ++++++---- .../hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt | 9 ++++++--- .../skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt | 5 ++++- .../features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt | 5 ++++- .../java/at/hannibal2/skyhanni/mixins/hooks/GuiIngameHook.kt | 1 + src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt | 3 ++- src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt | 8 +++++--- .../at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt | 4 +++- src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt | 1 + 47 files changed, 95 insertions(+), 36 deletions(-) (limited to 'src/main') diff --git a/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt index 43ea964ee..2476cbe73 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt @@ -15,6 +15,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class CollectionAPI { + // TODO USE SH-REPO private val counterPattern = "(?:.*) §e(?.*)§6\\/(?:.*)".toPattern() private val singleCounterPattern = "§7Total Collected: §e(?.*)".toPattern() @@ -66,6 +67,7 @@ class CollectionAPI { } companion object { + // TODO USE SH-REPO val collectionValue = mutableMapOf() private val collectionTier0Pattern = "§7Progress to .* I: .*".toPattern() diff --git a/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt b/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt index 873119171..cddf83d0b 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt @@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import net.minecraftforge.fml.common.eventhandler.SubscribeEvent object ActionBarStatsData { + // TODO USE SH-REPO private val patterns = mapOf( "health" to "§[c6](?[\\d,]+)/[\\d,]+❤.*".toPattern(), "defense" to ".*§a(?[\\d,]+)§a❈.*".toPattern(), diff --git a/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt b/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt index 83853ef59..021e59b91 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt @@ -19,6 +19,7 @@ import java.io.ByteArrayInputStream import java.util.Base64 class CropAccessoryData { + // TODO USE SH-REPO private val accessoryBagNamePattern = "Accessory Bag \\((\\d)/(\\d)\\)".toRegex() private var loadedAccessoryThisProfile = false private var ticks = 0 diff --git a/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt index 26a4046dd..9585e2ab0 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt @@ -16,6 +16,7 @@ import java.io.FileReader import java.util.UUID class FriendAPI { + // TODO USE SH-REPO private val file = File("config/skyhanni/friends.json") private val removedFriendPattern = ".*\n§r§eYou removed §r(?.*)§e from your friends list!§r§9§m\n.*".toPattern() diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt index 0b20821f8..ecbaee591 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt @@ -12,6 +12,7 @@ import net.minecraft.item.ItemStack import net.minecraftforge.fml.common.eventhandler.SubscribeEvent object GardenCropMilestones { + // TODO USE SH-REPO private val cropPattern = "§7Harvest §f(?.*) §7on .*".toPattern() private val totalPattern = "§7Total: §a(?.*)".toPattern() diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenCropUpgrades.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenCropUpgrades.kt index b1d1d3bf6..15a18ca26 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GardenCropUpgrades.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GardenCropUpgrades.kt @@ -12,6 +12,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class GardenCropUpgrades { + // TODO USE SH-REPO private val tierPattern = "§7Current Tier: §[0-9a-e](\\d)§7/§a9".toRegex() private val chatUpgradePattern = " {2}§r§6§lCROP UPGRADE §e§f([\\w ]+)§7 #(\\d)".toRegex() diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt index 1d34b7202..31bb7c047 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt @@ -19,6 +19,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import net.minecraftforge.fml.common.network.FMLNetworkEvent class HypixelData { + // TODO USE SH-REPO private val tabListProfilePattern = "§e§lProfile: §r§a(?.*)".toPattern() private val westVillageFarmArea = AxisAlignedBB(-54.0, 69.0, -115.0, -40.0, 75.0, -127.0) private val howlingCaveArea = AxisAlignedBB(-401.0, 50.0, -104.0, -337.0, 90.0, 36.0) diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt index af968d62e..9d52e3df5 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.data enum class IslandType(val displayName: String, val apiName: String = "null") { + // TODO USE SH-REPO PRIVATE_ISLAND("Private Island"), PRIVATE_ISLAND_GUEST("Private Island Guest"), THE_END("The End"), diff --git a/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt index c572628b7..b289d0110 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt @@ -34,6 +34,7 @@ object PartyAPI { @SubscribeEvent fun onChat(event: LorenzChatEvent) { + // TODO USE SH-REPO val message = event.message.trimWhiteSpaceAndResets().removeResets() // new member joined diff --git a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt index 2b4fcd7a8..63f77f2d2 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt @@ -31,6 +31,7 @@ object ProfileStorageData { @SubscribeEvent(priority = EventPriority.HIGHEST) fun onChat(event: LorenzChatEvent) { + // TODO USE SH-REPO "§7Switching to profile (?.*)\\.\\.\\.".toPattern().matchMatcher(event.message) { nextProfile = group("name").lowercase() loaded = false diff --git a/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt index d41e5ad7a..cb3b21031 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt @@ -10,6 +10,7 @@ import net.minecraft.client.Minecraft import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class PurseAPI { + // TODO USE SH-REPO private val pattern = "(Piggy|Purse): §6(?[\\d,]*).*".toPattern() private var currentPurse = 0.0 private var inventoryCloseTime = 0L diff --git a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt index 1004f9759..e01f4658b 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt @@ -32,6 +32,7 @@ object SackAPI { private var lastOpenedInventory = "" var inSackInventory = false + // TODO USE SH-REPO private val sackPattern = "^(.* Sack|Enchanted .* Sack)$".toPattern() private val numPattern = "(?:(?:§[0-9a-f](?I{1,3})§7:)?|(?:§7Stored:)?) (?§[0-9a-f])(?[0-9.,kKmMbB]+)§7/(?\\d+(?:[0-9.,]+)?[kKmMbB]?)".toPattern() diff --git a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt index 62c0a5503..71d84328c 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt @@ -12,6 +12,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class ScoreboardData { companion object { + // TODO USE SH-REPO private val splitIcons = listOf( "\uD83C\uDF6B", "\uD83D\uDCA3", diff --git a/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt b/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt index c847c1710..78c25e799 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt @@ -13,6 +13,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class SkillExperience { + // TODO USE SH-REPO private val actionBarPattern = ".*§3\\+.* (?.*) \\((?.*)/(?.*)\\).*".toPattern() private val inventoryPattern = ".* §e(?.*)§6/.*".toPattern() diff --git a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt index e02bc693d..f3c23700d 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt @@ -146,6 +146,7 @@ object SlayerAPI { } } + // TODO USE SH-REPO fun getSlayerTypeForCurrentArea() = when (LorenzUtils.skyBlockArea) { "Graveyard", "Coal Mine", diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/ComposterUpgrade.kt b/src/main/java/at/hannibal2/skyhanni/data/model/ComposterUpgrade.kt index f9f33d6cf..4712689dc 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/model/ComposterUpgrade.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/model/ComposterUpgrade.kt @@ -10,7 +10,7 @@ enum class ComposterUpgrade(val displayName: String, val slotNumber: Int) { companion object { private fun regexValues() = entries.joinToString("|") { it.displayName } - + // TODO USE SH-REPO val regex = "§a(?${regexValues()})(?: (?.*))?".toPattern() fun getByName(name: String) = entries.firstOrNull { it.displayName == name } 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 a2ec3dafc..0badd1e57 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt @@ -24,6 +24,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class BingoCardDisplay { private var display = emptyList() + // TODO USE SH-REPO private val goalCompletePattern = "§6§lBINGO GOAL COMPLETE! §r§e(?.*)".toPattern() init { 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 e7ebc2d9e..9222764b9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt @@ -28,7 +28,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class BingoNextStepHelper { private val config get() = SkyHanniMod.feature.event.bingo.bingoCard private var dirty = true - + // TODO USE SH-REPO private val crystalObtainedPattern = " *§r§e(?Topaz|Sapphire|Jade|Amethyst|Amber) Crystal".toPattern() private val itemIslandRequired = mutableMapOf() private val itemPreconditions = mutableMapOf() 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 3e40f0b85..5f49d40ce 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt @@ -18,6 +18,7 @@ class CompactBingoChat { private val healthPattern = " §r§7§8\\+§a.* §c❤ Health".toPattern() private val strengthPattern = " §r§7§8\\+§a. §c❁ Strength".toPattern() + // TODO USE SH-REPO @SubscribeEvent fun onChatMessage(event: LorenzChatEvent) { if (!config.enabled) return @@ -125,4 +126,4 @@ class CompactBingoChat { } return false } -} \ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt index 1470ace28..0dc99f595 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt @@ -23,6 +23,7 @@ import kotlin.time.Duration.Companion.seconds class MinionCraftHelper { private val config get() = SkyHanniMod.feature.event.bingo + // TODO USE SH-REPO private var minionNamePattern = "(?.*) Minion (?.*)".toPattern() private var display = emptyList() private var hasMinionInInventory = false diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt index d870197c7..72b28d013 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt @@ -10,6 +10,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class ArachneChatMessageHider { private val config get() = SkyHanniMod.feature.chat private var hideArachneDeadMessage = false + + // TODO USE SH-REPO private val arachneCallingPattern = "§4☄ §r.* §r§eplaced an §r§9Arachne's Calling§r§e!.*".toPattern() private val arachneCrystalPattern = "§4☄ §r.* §r§eplaced an Arachne Crystal! Something is awakening!".toPattern() diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt index 3296ab782..943490a55 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt @@ -17,6 +17,7 @@ class PlayerDeathMessages { private val lastTimePlayerSeen = mutableMapOf() + // TODO USE SH-REPO //§c ☠ §r§7§r§bZeroHazel§r§7 was killed by §r§8§lAshfang§r§7§r§7. private val deathMessagePattern = "§c ☠ §r§7§r§.(?.+)§r§7 (?.+)".toPattern() @@ -61,4 +62,4 @@ class PlayerDeathMessages { private fun isHideFarDeathsEnabled(): Boolean { return LorenzUtils.inSkyBlock && SkyHanniMod.feature.chat.hideFarDeathMessages && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight } -} \ No newline at end of file +} 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 b2de6cee7..ae8b1a892 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 @@ -29,10 +29,11 @@ import kotlin.time.Duration.Companion.seconds object InquisitorWaypointShare { private val config get() = SkyHanniMod.feature.event.diana.inquisitorSharing + + // TODO USE SH-REPO private val partyPattern = "§9Party §8> (?.*)§f: §rx: (?-?[0-9]{1,4}), y: (?-?[0-9]{1,4}), z: (?-?[0-9]{1,4})\\b".toPattern() private val diedPattern = "§9Party §8> (?.*)§f: §rInquisitor dead!".toPattern() - private var time = 0L private var testTime = 0L private var lastInquisitorMessage = "" 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 1238f41df..0d6f1cd75 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt @@ -34,6 +34,8 @@ class CityProjectFeatures { private var display = emptyList>() private var inInventory = false private var lastReminderSend = 0L + + // TODO USE SH-REPO private val contributeAgainPattern = "§7Contribute again: §e(?