diff options
| -rw-r--r-- | detekt/baseline.xml | 2 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java | 4 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/ElectionAPI.kt (renamed from src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt) | 39 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/MayorData.kt (renamed from src/main/java/at/hannibal2/skyhanni/data/Mayors.kt) | 76 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt | 2 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt | 5 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt | 2 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementMayor.kt | 20 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/inventory/MinisterInCalendar.kt | 16 | ||||
| -rw-r--r-- | versions/1.8.9/detekt/baseline.xml | 2 |
10 files changed, 84 insertions, 84 deletions
diff --git a/detekt/baseline.xml b/detekt/baseline.xml index 6665e0399..fb620c666 100644 --- a/detekt/baseline.xml +++ b/detekt/baseline.xml @@ -30,9 +30,9 @@ <ID>CyclomaticComplexMethod:VampireSlayerFeatures.kt$VampireSlayerFeatures$private fun EntityOtherPlayerMP.process()</ID> <ID>CyclomaticComplexMethod:VisualWordGui.kt$VisualWordGui$override fun drawScreen(unusedX: Int, unusedY: Int, partialTicks: Float)</ID> <ID>InjectDispatcher:ClipboardUtils.kt$ClipboardUtils$IO</ID> + <ID>InjectDispatcher:ElectionAPI.kt$ElectionAPI$IO</ID> <ID>InjectDispatcher:GardenNextJacobContest.kt$GardenNextJacobContest$IO</ID> <ID>InjectDispatcher:HypixelBazaarFetcher.kt$HypixelBazaarFetcher$IO</ID> - <ID>InjectDispatcher:MayorAPI.kt$MayorAPI$IO</ID> <ID>LongMethod:CopyNearbyEntitiesCommand.kt$CopyNearbyEntitiesCommand$fun command(args: Array<String>)</ID> <ID>LongMethod:CropMoneyDisplay.kt$CropMoneyDisplay$private fun drawDisplay(): List<List<Any>></ID> <ID>LongMethod:GhostCounter.kt$GhostCounter$private fun drawDisplay()</ID> diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java index 9f92436cf..4607ab8df 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java @@ -1,7 +1,7 @@ package at.hannibal2.skyhanni.config.features.dev; import at.hannibal2.skyhanni.config.core.config.Position; -import at.hannibal2.skyhanni.data.Mayor; +import at.hannibal2.skyhanni.data.ElectionCandidate; import com.google.gson.annotations.Expose; import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown; @@ -145,7 +145,7 @@ public class DebugConfig { @Expose @ConfigOption(name = "Assume Mayor", desc = "Select a mayor to assume.") @ConfigEditorDropdown - public Property<Mayor> assumeMayor = Property.of(Mayor.DISABLED); + public Property<ElectionCandidate> assumeMayor = Property.of(ElectionCandidate.DISABLED); @Expose @ConfigOption(name = "Always April Fools", desc = "Always show April fools jokes.") diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/ElectionAPI.kt index 1cb023ecd..03a6a2e9c 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ElectionAPI.kt @@ -2,9 +2,8 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.ConfigManager -import at.hannibal2.skyhanni.data.Mayor.Companion.addPerks -import at.hannibal2.skyhanni.data.Mayor.Companion.getMayorFromPerk -import at.hannibal2.skyhanni.data.Mayor.Companion.setAssumeMayorJson +import at.hannibal2.skyhanni.data.ElectionCandidate.Companion.getMayorFromPerk +import at.hannibal2.skyhanni.data.ElectionCandidate.Companion.setAssumeMayorJson import at.hannibal2.skyhanni.data.Perk.Companion.getPerkFromName import at.hannibal2.skyhanni.data.jsonobjects.other.MayorCandidate import at.hannibal2.skyhanni.data.jsonobjects.other.MayorElection @@ -43,11 +42,13 @@ import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.minutes @SkyHanniModule -object MayorAPI { +object ElectionAPI { private val group = RepoPattern.group("mayorapi") - // TODO: Add Regex-test + /** + * REGEX-TEST: Schedules an extra §bFishing Festival §7event during the year. + */ val foxyExtraEventPattern by group.pattern( "foxy.extraevent", "Schedules an extra §.(?<event>.*) §.event during the year\\.", @@ -86,12 +87,12 @@ object MayorAPI { "§9Perkpocalypse Perks:", ) - var currentMayor: Mayor? = null + var currentMayor: ElectionCandidate? = null private set - var currentMinister: Mayor? = null + var currentMinister: ElectionCandidate? = null private set - private var lastMayor: Mayor? = null - var jerryExtraMayor: Pair<Mayor?, SimpleTimeMark> = null to SimpleTimeMark.farPast() + private var lastMayor: ElectionCandidate? = null + var jerryExtraMayor: Pair<ElectionCandidate?, SimpleTimeMark> = null to SimpleTimeMark.farPast() private set private var lastJerryExtraMayorReminder = SimpleTimeMark.farPast() @@ -111,11 +112,11 @@ object MayorAPI { * @param input: The name of the mayor * @return: The NotEnoughUpdates color of the mayor; If no mayor was found, it will return "§c" */ - fun mayorNameToColorCode(input: String): String = Mayor.getMayorFromName(input)?.color ?: "§c" + fun mayorNameToColorCode(input: String): String = ElectionCandidate.getMayorFromName(input)?.color ?: "§c" /** * @param input: The name of the mayor - * @return: The NotEnoughUpdates color of the mayor + the name of the mayor; If no mayor was found, it will return "§c[input]" + * @return: The NotEnoughUpdates color of the mayor with the name of the mayor; If no mayor was found, it will return "§c[input]" */ fun mayorNameWithColorCode(input: String) = mayorNameToColorCode(input) + input @@ -128,7 +129,8 @@ object MayorAPI { } if (!LorenzUtils.inSkyBlock) return - if (jerryExtraMayor.first != null && jerryExtraMayor.second.isInPast() && Mayor.JERRY.isActive()) { + if (!ElectionCandidate.JERRY.isActive()) return + if (jerryExtraMayor.first != null && jerryExtraMayor.second.isInPast()) { jerryExtraMayor = null to SimpleTimeMark.farPast() ChatUtils.clickableChat( "The Perkpocalypse Mayor has expired! Click here to update the new temporary Mayor.", @@ -136,7 +138,7 @@ object MayorAPI { ) } val misc = SkyHanniMod.feature.misc - if (Mayor.JERRY.isActive() && jerryExtraMayor.first == null && misc.unknownPerkpocalypseMayorWarning) { + if (jerryExtraMayor.first == null && misc.unknownPerkpocalypseMayorWarning) { if (lastJerryExtraMayorReminder.passedSince() < 5.minutes) return if (ReminderUtils.isBusy()) return lastJerryExtraMayorReminder = SimpleTimeMark.now() @@ -154,7 +156,7 @@ object MayorAPI { if (electionOverPattern.matches(event.message)) { lastMayor = currentMayor - currentMayor = Mayor.UNKNOWN + currentMayor = ElectionCandidate.UNKNOWN currentMinister = null } } @@ -211,7 +213,7 @@ object MayorAPI { private fun checkHypixelAPI(forceReload: Boolean = false) { if (!forceReload) { if (lastUpdate.passedSince() < 20.minutes) return - if (currentMayor == Mayor.UNKNOWN && lastUpdate.passedSince() < 1.minutes) return + if (currentMayor == ElectionCandidate.UNKNOWN && lastUpdate.passedSince() < 1.minutes) return } lastUpdate = SimpleTimeMark.now() @@ -241,10 +243,11 @@ object MayorAPI { @SubscribeEvent fun onConfigReload(event: ConfigLoadEvent) { - SkyHanniMod.feature.dev.debug.assumeMayor.onToggle { - val mayor = SkyHanniMod.feature.dev.debug.assumeMayor.get() + val config = SkyHanniMod.feature.dev.debug.assumeMayor + config.onToggle { + val mayor = config.get() - if (mayor == Mayor.DISABLED) { + if (mayor == ElectionCandidate.DISABLED) { checkHypixelAPI(forceReload = true) } else { mayor.addPerks(mayor.perks.toList()) diff --git a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorData.kt index 335648dc5..3d1558987 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/MayorData.kt @@ -1,12 +1,13 @@ package at.hannibal2.skyhanni.data -import at.hannibal2.skyhanni.data.MayorAPI.currentMayor -import at.hannibal2.skyhanni.data.MayorAPI.foxyExtraEventPattern +import at.hannibal2.skyhanni.data.ElectionAPI.currentMayor +import at.hannibal2.skyhanni.data.ElectionAPI.foxyExtraEventPattern +import at.hannibal2.skyhanni.data.Perk.Companion.toPerk import at.hannibal2.skyhanni.data.jsonobjects.other.MayorPerk import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher -enum class Mayor( +enum class ElectionCandidate( val mayorName: String, val color: String, vararg val perks: Perk, @@ -102,13 +103,17 @@ enum class Mayor( DISABLED("§cDisabled", "§7"), ; - val activePerks: MutableList<Perk> = mutableListOf() + val activePerks get() = this.perks.filter { it.isActive } override fun toString() = mayorName - fun addAllPerks(): Mayor { - activePerks.addAll(perks) + fun addPerks(perks: List<Perk>) { + this.perks.forEach { it.isActive = false } perks.forEach { it.isActive = true } + } + + fun addAllPerks(): ElectionCandidate { + this.perks.forEach { it.isActive = true } return this } @@ -116,13 +121,12 @@ enum class Mayor( companion object { - fun getMayorFromName(name: String): Mayor? = entries.firstOrNull { it.mayorName == name } + fun getMayorFromName(name: String): ElectionCandidate? = entries.firstOrNull { it.mayorName == name } - fun getMayorFromPerk(perk: Perk): Mayor? = entries.firstOrNull { it.perks.contains(perk) } + fun getMayorFromPerk(perk: Perk): ElectionCandidate? = entries.firstOrNull { it.perks.contains(perk) } - fun setAssumeMayorJson(name: String, perksJson: List<MayorPerk>): Mayor? { - val mayor = getMayorFromName(name) - if (mayor == null) { + fun setAssumeMayorJson(name: String, perksJson: List<MayorPerk>): ElectionCandidate? { + val mayor = getMayorFromName(name) ?: run { ErrorManager.logErrorStateWithData( "Unknown mayor found", "mayor name not in Mayor enum", @@ -133,38 +137,9 @@ enum class Mayor( return null } - val perks = perksJson.mapNotNull { perkJson -> - val perk = Perk.entries.firstOrNull { it.perkName == perkJson.renameIfFoxyExtraEventPerkFound() } - perk?.also { - it.description = perkJson.description - } - } - - mayor.addPerks(perks) + mayor.addPerks(perksJson.mapNotNull { it.toPerk() }) return mayor } - - fun Mayor.addPerks(perks: List<Perk>) { - perks.forEach { it.isActive = false } - activePerks.forEach { it.isActive = false } - activePerks.clear() - for (perk in perks.filter { perks.contains(it) }) { - perk.isActive = true - activePerks.add(perk) - } - } - - private fun MayorPerk.renameIfFoxyExtraEventPerkFound(): String { - val foxyExtraEventPairs = mapOf( - "Spooky Festival" to "Extra Event (Spooky)", - "Mining Fiesta" to "Extra Event (Mining)", - "Fishing Festival" to "Extra Event (Fishing)", - ) - - return foxyExtraEventPattern.matchMatcher(this.description) { - foxyExtraEventPairs.entries.firstOrNull { it.key == group("event") }?.value - } ?: this.name - } } } @@ -235,10 +210,29 @@ enum class Perk(val perkName: String) { var isActive = false var description = "§cDescription failed to load from the API." + var minister = false override fun toString(): String = "$perkName: $description" companion object { fun getPerkFromName(name: String): Perk? = entries.firstOrNull { it.perkName == name } + + fun MayorPerk.toPerk(): Perk? = getPerkFromName(this.renameIfFoxyExtraEventPerkFound())?.let { + it.description = this.description + it.minister = this.minister + it + } + + private fun MayorPerk.renameIfFoxyExtraEventPerkFound(): String { + val foxyExtraEventPairs = mapOf( + "Spooky Festival" to "Extra Event (Spooky)", + "Mining Fiesta" to "Extra Event (Mining)", + "Fishing Festival" to "Extra Event (Fishing)", + ) + + return foxyExtraEventPattern.matchMatcher(this.description) { + foxyExtraEventPairs.entries.firstOrNull { it.key == group("event") }?.value + } ?: this.name + } } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt index cd9f48b62..c115f00db 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt @@ -1,8 +1,8 @@ package at.hannibal2.skyhanni.features.event.diana import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.data.ElectionAPI.getElectionYear import at.hannibal2.skyhanni.data.ItemAddManager -import at.hannibal2.skyhanni.data.MayorAPI.getElectionYear import at.hannibal2.skyhanni.data.jsonobjects.repo.DianaDropsJson import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.ItemAddEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt index 64b33c934..997ff7fd7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt @@ -3,10 +3,9 @@ package at.hannibal2.skyhanni.features.event.diana import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator +import at.hannibal2.skyhanni.data.ElectionCandidate import at.hannibal2.skyhanni.data.EntityMovementData import at.hannibal2.skyhanni.data.IslandType -import at.hannibal2.skyhanni.data.Mayor -import at.hannibal2.skyhanni.data.MayorAPI.currentMayor import at.hannibal2.skyhanni.events.BlockClickEvent import at.hannibal2.skyhanni.events.BurrowDetectEvent import at.hannibal2.skyhanni.events.BurrowDugEvent @@ -402,7 +401,7 @@ object GriffinBurrowHelper { } if (!isEnabled()) { - if (currentMayor != Mayor.DIANA) { + if (!ElectionCandidate.DIANA.isActive()) { ChatUtils.chatAndOpenConfig( "§cSelect Diana as mayor overwrite!", SkyHanniMod.feature.dev.debug::assumeMayor, diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt index 55e422cab..dbd46cd34 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt @@ -1,7 +1,7 @@ package at.hannibal2.skyhanni.features.event.diana import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.data.MayorAPI.getElectionYear +import at.hannibal2.skyhanni.data.ElectionAPI.getElectionYear import at.hannibal2.skyhanni.events.ConfigLoadEvent import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.LorenzChatEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementMayor.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementMayor.kt index 2d5deaaa4..46f3bb48f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementMayor.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementMayor.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.features.gui.customscoreboard.elements -import at.hannibal2.skyhanni.data.MayorAPI +import at.hannibal2.skyhanni.data.ElectionAPI import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.mayorConfig import at.hannibal2.skyhanni.features.rift.RiftAPI import at.hannibal2.skyhanni.utils.TimeUtils.format @@ -9,15 +9,17 @@ import at.hannibal2.skyhanni.utils.TimeUtils.format // set 1s timer object ScoreboardElementMayor : ScoreboardElement() { override fun getDisplay() = buildList { - val currentMayorName = MayorAPI.currentMayor?.mayorName?.let { MayorAPI.mayorNameWithColorCode(it) } ?: return@buildList + val currentMayorName = ElectionAPI.currentMayor?.mayorName?.let { + ElectionAPI.mayorNameWithColorCode(it) + } ?: return@buildList val timeTillNextMayor = if (mayorConfig.showTimeTillNextMayor) { - "§7 (§e${MayorAPI.nextMayorTimestamp.timeUntil().format(maxUnits = 2)}§7)" + "§7 (§e${ElectionAPI.nextMayorTimestamp.timeUntil().format(maxUnits = 2)}§7)" } else "" add(currentMayorName + timeTillNextMayor) if (mayorConfig.showMayorPerks) { - MayorAPI.currentMayor?.activePerks?.forEach { perk -> + ElectionAPI.currentMayor?.activePerks?.forEach { perk -> add(" §7- §e${perk.perkName}") } } @@ -32,21 +34,23 @@ object ScoreboardElementMayor : ScoreboardElement() { override fun showIsland() = !RiftAPI.inRift() private fun addMinister() = buildList { - val ministerName = MayorAPI.currentMinister?.mayorName?.let { MayorAPI.mayorNameWithColorCode(it) } ?: return@buildList + val ministerName = ElectionAPI.currentMinister?.mayorName?.let { + ElectionAPI.mayorNameWithColorCode(it) + } ?: return@buildList add(ministerName) if (mayorConfig.showMayorPerks) { - MayorAPI.currentMinister?.activePerks?.forEach { perk -> + ElectionAPI.currentMinister?.activePerks?.forEach { perk -> add(" §7- §e${perk.perkName}") } } } private fun addJerryMayor() = buildList { - val jerryExtraMayor = MayorAPI.jerryExtraMayor + val jerryExtraMayor = ElectionAPI.jerryExtraMayor val extraMayor = jerryExtraMayor.first ?: return@buildList - val extraMayorName = MayorAPI.mayorNameWithColorCode(extraMayor.mayorName) + val extraMayorName = ElectionAPI.mayorNameWithColorCode(extraMayor.mayorName) val extraTimeTillNextMayor = if (mayorConfig.showTimeTillNextMayor) { " §7(§6${jerryExtraMayor.second.timeUntil().format(maxUnits = 2)}§7)" } else "" diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/MinisterInCalendar.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/MinisterInCalendar.kt index 892951c0f..054fed433 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/MinisterInCalendar.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/MinisterInCalendar.kt @@ -1,8 +1,8 @@ package at.hannibal2.skyhanni.features.inventory import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.data.Mayor -import at.hannibal2.skyhanni.data.MayorAPI +import at.hannibal2.skyhanni.data.ElectionAPI +import at.hannibal2.skyhanni.data.ElectionCandidate import at.hannibal2.skyhanni.events.InventoryCloseEvent import at.hannibal2.skyhanni.events.InventoryOpenEvent import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent @@ -41,11 +41,11 @@ object MinisterInCalendar { @SubscribeEvent fun onInventoryOpen(event: InventoryOpenEvent) { if (!isEnabled()) return - if (!MayorAPI.calendarGuiPattern.matches(InventoryUtils.openInventoryName())) return - val minister = MayorAPI.currentMinister ?: return + if (!ElectionAPI.calendarGuiPattern.matches(InventoryUtils.openInventoryName())) return + val minister = ElectionAPI.currentMinister ?: return val itemStack = "${minister.name}_MAYOR_MONSTER".asInternalName().getItemStack() - val ministerColor = MayorAPI.mayorNameToColorCode(minister.mayorName) + val ministerColor = ElectionAPI.mayorNameToColorCode(minister.mayorName) ministerItemStack = changeItem(ministerColor, minister, itemStack) } @@ -53,7 +53,7 @@ object MinisterInCalendar { @SubscribeEvent fun onInventoryClose(event: InventoryCloseEvent) { if (!isEnabled()) return - if (!MayorAPI.calendarGuiPattern.matches(InventoryUtils.openInventoryName())) return + if (!ElectionAPI.calendarGuiPattern.matches(InventoryUtils.openInventoryName())) return ministerItemStack = null } @@ -61,13 +61,13 @@ object MinisterInCalendar { fun replaceItem(event: ReplaceItemEvent) { if (!isEnabled()) return if (event.inventory !is ContainerLocalMenu || event.slot != MINISTER_SLOT) return - if (!MayorAPI.calendarGuiPattern.matches(InventoryUtils.openInventoryName())) return + if (!ElectionAPI.calendarGuiPattern.matches(InventoryUtils.openInventoryName())) return event.replace(ministerItemStack ?: return) } private fun changeItem( ministerColor: String, - minister: Mayor, + minister: ElectionCandidate, item: ItemStack, ): ItemStack? { val ministerDisplayName = "${ministerColor}Minister ${minister.mayorName}" diff --git a/versions/1.8.9/detekt/baseline.xml b/versions/1.8.9/detekt/baseline.xml index 6665e0399..fb620c666 100644 --- a/versions/1.8.9/detekt/baseline.xml +++ b/versions/1.8.9/detekt/baseline.xml @@ -30,9 +30,9 @@ <ID>CyclomaticComplexMethod:VampireSlayerFeatures.kt$VampireSlayerFeatures$private fun EntityOtherPlayerMP.process()</ID> <ID>CyclomaticComplexMethod:VisualWordGui.kt$VisualWordGui$override fun drawScreen(unusedX: Int, unusedY: Int, partialTicks: Float)</ID> <ID>InjectDispatcher:ClipboardUtils.kt$ClipboardUtils$IO</ID> + <ID>InjectDispatcher:ElectionAPI.kt$ElectionAPI$IO</ID> <ID>InjectDispatcher:GardenNextJacobContest.kt$GardenNextJacobContest$IO</ID> <ID>InjectDispatcher:HypixelBazaarFetcher.kt$HypixelBazaarFetcher$IO</ID> - <ID>InjectDispatcher:MayorAPI.kt$MayorAPI$IO</ID> <ID>LongMethod:CopyNearbyEntitiesCommand.kt$CopyNearbyEntitiesCommand$fun command(args: Array<String>)</ID> <ID>LongMethod:CropMoneyDisplay.kt$CropMoneyDisplay$private fun drawDisplay(): List<List<Any>></ID> <ID>LongMethod:GhostCounter.kt$GhostCounter$private fun drawDisplay()</ID> |