summaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt15
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerChatManager.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt11
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt9
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/CompactSplashPotionMessage.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/translation/Translator.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt9
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonRankTabListColor.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalReminder.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt15
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EasterEggWaypoints.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fame/ReminderUtils.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/ThunderSparksHighlight.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/ToolTooltipTweaks.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotMenuHighlighting.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestFinder.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsGuide.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventType.kt24
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/HideFarEntities.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/LesserOrbHider.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ParticleHider.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminHighlighter.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/kloon/KloonHacking.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/RiftLarva.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/RiftOdonata.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillTooltip.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/WorldEdit.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt18
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt5
81 files changed, 271 insertions, 91 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
index ba8e42d66..95e39d1f7 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
@@ -324,7 +324,14 @@ object SkillAPI {
val nextLevelDiff = levelArray.getOrNull(level)?.toDouble() ?: 7_600_000.0
val nextLevelProgress = nextLevelDiff * xpPercentage / 100
val totalXp = levelXp + nextLevelProgress
- updateSkillInfo(existingLevel, level, nextLevelProgress.toLong(), nextLevelDiff.toLong(), totalXp.toLong(), matcher.group("gained"))
+ updateSkillInfo(
+ existingLevel,
+ level,
+ nextLevelProgress.toLong(),
+ nextLevelDiff.toLong(),
+ totalXp.toLong(),
+ matcher.group("gained"),
+ )
} else {
val exactLevel = getLevelExact(needed)
val levelXp = calculateLevelXp(existingLevel.level - 1).toLong() + current
@@ -468,7 +475,9 @@ object SkillAPI {
val skill = storage?.get(skillType) ?: return
if (targetLevel <= skill.overflowLevel) {
- ChatUtils.userError("Custom goal level ($targetLevel) must be greater than your current level (${skill.overflowLevel}).")
+ ChatUtils.userError(
+ "Custom goal level ($targetLevel) must be greater than your current level (${skill.overflowLevel})."
+ )
return
}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
index b00fc7a8f..24a3748c6 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
@@ -151,7 +151,10 @@ class ConfigManager {
}
if (missingConfigLink) {
println("")
- println("This crash is here to remind you to fix the missing @ConfigLink annotation over your new config position config element.")
+ println(
+ "This crash is here to remind you to fix the missing " +
+ "@ConfigLink annotation over your new config position config element."
+ )
println("")
println("Steps to fix:")
println("1. Search for `WEE WOO WEE WOO` in the console output.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index c9ae8c2c7..f6d6c72de 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -81,7 +81,10 @@ object ConfigUpdaterMigrator {
}
val newParentElement = new.at(np.dropLast(1), true)
if (newParentElement !is JsonObject) {
- logger.log("Catastrophic: element at path $old could not be relocated to $new, since another element already inhabits that path")
+ logger.log(
+ "Catastrophic: element at path $old could not be relocated to $new, " +
+ "since another element already inhabits that path"
+ )
return
}
movesPerformed++
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 208beafe4..89f314135 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -174,8 +174,8 @@ object Commands {
callback { GhostUtil.importCTGhostCounterData() }
}
event.register("shcroptime") {
- description = "Calculates with your current crop per second speed " +
- "how long you need to farm a crop to collect this amount of items"
+ description =
+ "Calculates with your current crop per second speed " + "how long you need to farm a crop to collect this amount of items"
category = CommandCategory.USERS_ACTIVE
callback { GardenCropTimeCommand.onCommand(it) }
}
@@ -205,8 +205,9 @@ object Commands {
callback { FarmingWeightDisplay.lookUpCommand(it) }
}
event.register("shcopytranslation") {
- description = "Copy the translation of a message in another language to your clipboard.\n" +
- "Uses a language code that can be found at the end of a translation message."
+ description =
+ "Copy the translation of a message in another language to your clipboard.\n" +
+ "Uses a 2 letter language code that can be found at the end of a translation message."
category = CommandCategory.USERS_ACTIVE
callback { Translator.fromNativeLanguage(it) }
}
@@ -585,7 +586,8 @@ object Commands {
callback { ItemPriceUtils.debugItemPrice(it) }
}
event.register("shdebugscoreboard") {
- description = "Monitors the scoreboard changes: " +
+ description =
+ "Monitors the scoreboard changes: " +
"Prints the raw scoreboard lines in the console after each update, with time since last update."
category = CommandCategory.DEVELOPER_DEBUG
callback { ScoreboardData.toggleMonitor() }
@@ -740,7 +742,8 @@ object Commands {
callback { TitleManager.command(it) }
}
event.register("shresetconfig") {
- description = "Reloads the config manager and rendering processors of MoulConfig. " +
+ description =
+ "Reloads the config manager and rendering processors of MoulConfig. " +
"This §cWILL RESET §7your config, but also updating the java config files " +
"(names, description, orderings and stuff)."
category = CommandCategory.DEVELOPER_TEST
diff --git a/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt
index e9e58fa46..022a18d92 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt
@@ -68,7 +68,8 @@ object BitsAPI {
private val bitsFromFameRankUpChatPattern by bitsChatGroup.pattern(
"rankup.bits",
- "§eYou gained §3(?<amount>.*) Bits Available §ecompounded from all your §epreviously eaten §6cookies§e! Click here to open §6cookie menu§e!",
+ "§eYou gained §3(?<amount>.*) Bits Available §ecompounded from all your " +
+ "§epreviously eaten §6cookies§e! Click here to open §6cookie menu§e!",
)
private val fameRankUpPattern by bitsChatGroup.pattern(
diff --git a/src/main/j