aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/ChunkedStatsConfig.java4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/CustomScoreboardConfig.java20
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java14
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/EventsConfig.java11
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/PartyConfig.java7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/TitleAndFooterConfig.java26
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt18
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt15
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt17
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/WinterAPI.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/SpidersDenAPI.kt21
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ChunkedStatsLine.kt (renamed from src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ChunkedStat.kt)65
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt248
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboardConfigFix.kt119
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboardUtils.kt76
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardConfigElement.kt125
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardConfigEventElement.kt98
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt863
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt576
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardLine.kt18
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt205
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt23
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElement.kt33
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementBank.kt26
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementBits.kt32
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementChunkedStats.kt19
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementCold.kt25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementCookie.kt24
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementCopper.kt27
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementDate.kt12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementEmptyLine.kt9
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementEvents.kt19
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementFooter.kt18
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementGems.kt25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementHeat.kt24
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementIsland.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementLobbyCode.kt16
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementLocation.kt17
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementMayor.kt59
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementMotes.kt25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementNorthStars.kt25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementObjective.kt29
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementParty.kt40
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementPlayerAmount.kt20
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementPowder.kt50
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementPower.kt24
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementProfile.kt15
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementPurse.kt30
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementQuiver.kt48
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementSlayer.kt19
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementSoulflow.kt23
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementTime.kt23
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementTitle.kt31
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementTuning.kt42
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementUnknown.kt16
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/elements/ScoreboardElementVisiting.kt20
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEvent.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventActiveTablist.kt31
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventAnniversary.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventBroodmother.kt15
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventCarnival.kt35
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventDamage.kt23
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventDarkAuction.kt27
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventDojo.kt28
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventDungeons.kt29
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventEssence.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventFlightDuration.kt22
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventGarden.kt19
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventJacobContest.kt25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventJacobMedals.kt17
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventKuudra.kt27
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventMagmaBoss.kt32
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventMining.kt74
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventNewYear.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventQueue.kt20
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventRedstone.kt17
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventRift.kt30
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventServerClose.kt14
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventSpooky.kt29
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventStartingSoonTablist.kt25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventTrapper.kt25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventVoting.kt26
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/events/ScoreboardEventWinter.kt26
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/AuctionOutbidWarning.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt23
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/SizeLimitedCache.kt37
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/SizeLimitedSet.kt35
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt53
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedCache.kt10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedSet.kt5
94 files changed, 2403 insertions, 1883 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
index 95e39d1f7..aa930adb1 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
@@ -28,8 +28,8 @@ import at.hannibal2.skyhanni.utils.NumberUtil.formatDouble
import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
import at.hannibal2.skyhanni.utils.NumberUtil.formatLongOrUserError
import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNecessary
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
import at.hannibal2.skyhanni.utils.StringUtils.removeColor
import at.hannibal2.skyhanni.utils.TabListData
import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index 8228ae025..93c7d3407 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -12,7 +12,7 @@ import com.google.gson.JsonPrimitive
object ConfigUpdaterMigrator {
val logger = LorenzLogger("ConfigMigration")
- const val CONFIG_VERSION = 62
+ const val CONFIG_VERSION = 63
fun JsonElement.at(chain: List<String>, init: Boolean): JsonElement? {
if (chain.isEmpty()) return this
if (this !is JsonObject) return null
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/ChunkedStatsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/ChunkedStatsConfig.java
index 4293dd168..8e0941d30 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/ChunkedStatsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/ChunkedStatsConfig.java
@@ -1,6 +1,6 @@
package at.hannibal2.skyhanni.config.features.gui.customscoreboard;
-import at.hannibal2.skyhanni.features.gui.customscoreboard.ChunkedStat;
+import at.hannibal2.skyhanni.features.gui.customscoreboard.ChunkedStatsLine;
import com.google.gson.annotations.Expose;
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
@@ -17,7 +17,7 @@ public class ChunkedStatsConfig {