diff options
Diffstat (limited to 'src/main/java')
65 files changed, 215 insertions, 205 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt index 5c9c3017a..b40255449 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt @@ -8,7 +8,7 @@ import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.events.NeuRepositoryReloadEvent import at.hannibal2.skyhanni.events.SecondPassedEvent import at.hannibal2.skyhanni.events.SkillExpGainEvent -import at.hannibal2.skyhanni.events.SkillOverflowLevelupEvent +import at.hannibal2.skyhanni.events.SkillOverflowLevelUpEvent import at.hannibal2.skyhanni.features.skillprogress.SkillProgress import at.hannibal2.skyhanni.features.skillprogress.SkillType import at.hannibal2.skyhanni.features.skillprogress.SkillUtil.SPACE_SPLITTER @@ -266,7 +266,7 @@ object SkillAPI { currentXp ) if (skillInfo.overflowLevel > 60 && levelOverflow == skillInfo.overflowLevel + 1) - SkillOverflowLevelupEvent(skillType, skillInfo.overflowLevel, levelOverflow).postAndCatch() + SkillOverflowLevelUpEvent(skillType, skillInfo.overflowLevel, levelOverflow).postAndCatch() skillInfo.apply { this.level = level 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 4afced89b..959f81973 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt @@ -382,7 +382,7 @@ object Commands { ) { SkyHanniDebugsAndTests.toggleRender() } registerCommand( "shcarrolyn", - "Toggels if the specified crops effect is active from carrolyn", + "Toggles if the specified crops effect is active from carrolyn", ) { CaptureFarmingGear.handelCarrolyn(it) } @@ -392,11 +392,11 @@ object Commands { ) { SkyHanniMod.repo.displayRepoStatus(false) } registerCommand( "shclearkismet", - "Cleares the saved values of the applied kismet feathers in Croesus", + "Clears the saved values of the applied kismet feathers in Croesus", ) { CroesusChestTracker.resetChest() } registerCommand( "shkingfix", - "Reseting the local King Talisman Helper offset.", + "Resets the local King Talisman Helper offset.", ) { KingTalismanHelper.kingFix() } registerCommand( "shupdate", @@ -544,7 +544,7 @@ object Commands { "(names, description, orderings and stuff).", ) { SkyHanniDebugsAndTests.resetConfigCommand() } registerCommand( - "readcropmilestonefromclipboard", + "shreadcropmilestonefromclipboard", "Read crop milestone from clipboard. This helps fixing wrong crop milestone data", ) { GardenCropMilestonesCommunityFix.readDataFromClipboard() } registerCommand( 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 8b58e4919..d6a0eb064 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 @@ -132,8 +132,9 @@ public class DebugConfig { public boolean currentAreaDebug = true; @Expose - @ConfigOption(name = "Oreblock Name", desc = "Show the OreBlock you are currently looking at.") + @ConfigOption(name = "OreBlock Name", desc = "Show the OreBlock you are currently looking at.") @ConfigEditorBoolean + // TODO rename to rayTracedOreBlock public boolean raytracedOreblock = true; @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java index 4d1653b89..132c0d827 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java @@ -74,7 +74,7 @@ public class DianaConfig { @Expose @ConfigOption(name = "Mythological Creature Tracker", desc = "") @Accordion - // TODO renmae + // TODO rename mythologicalMobTracker public MythologicalMobTrackerConfig mythologicalMobtracker = new MythologicalMobTrackerConfig(); @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunitiesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunitiesConfig.java index 396ab0217..53c394469 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunitiesConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunitiesConfig.java @@ -15,6 +15,7 @@ public class GiftingOpportunitiesConfig { @Expose @ConfigOption(name = "Only While Holding Gift", desc = "Only highlight players you haven't gifted while holding a gift.") @ConfigEditorBoolean + // TODO highlightWithGiftOnly public boolean highlighWithGiftOnly = true; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java index f2bdf85d5..c4bbfacf3 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java @@ -79,7 +79,7 @@ public class GardenConfig { @Expose @ConfigOption(name = "Armor Drop Tracker", desc = "") @Accordion - // TODO renmae to armorDropTracker + // TODO rename to armorDropTracker public ArmorDropTrackerConfig farmingArmorDrop = new ArmorDropTrackerConfig(); @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java index e02ddfcc4..98226eeb1 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java @@ -16,7 +16,7 @@ public class ShoppingListConfig { public boolean display = true; @Expose - // TODO renmae "position" + // TODO rename "position" @ConfigLink(owner = ShoppingListConfig.class, field = "display") public Position pos = new Position(180, 170, false, true); diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java index 43bba7f8c..d479149b8 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java @@ -25,7 +25,7 @@ public class ReforgeHelperConfig { public boolean reforgeStonesOnlyHex = true; @Expose - @ConfigOption(name = "Show Diff", desc = "Shows the difference of the new reforge to the current one in the slecetion list.") + @ConfigOption(name = "Show Diff", desc = "Shows the difference of the new reforge to the current one in the selection list.") @ConfigEditorBoolean public boolean showDiff = false; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java index cc606e7aa..4a3aa732e 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java @@ -122,6 +122,7 @@ public class MiscConfig { @ConfigOption(name = "Armor Stands", desc = "Hide armor stands that are sometimes visible for a fraction of a second.") @ConfigEditorBoolean @FeatureToggle + // TODO rename to hideTemporaryArmorStands public boolean hideTemporaryArmorstands = true; @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/CompactTabListConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/CompactTabListConfig.java index 34939e567..4bf6d5731 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/CompactTabListConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/CompactTabListConfig.java @@ -20,7 +20,7 @@ public class CompactTabListConfig { @ConfigOption( name = "Toggle Tab", desc = "Use the tab key to toggle the tab list, not show tab list while the key is pressed. " + - "Similar to patcher's feature." + "Similar to Patcher's feature." ) @ConfigEditorBoolean public boolean toggleTab = false; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/EffigiesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/EffigiesConfig.java index 56fa6e686..668932668 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/EffigiesConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/EffigiesConfig.java @@ -27,6 +27,7 @@ public class EffigiesConfig { maxValue = 15, minStep = 1 ) + // TODO rename respawningSoonTime public int respwningSoonTime = 3; @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt index dd4a91fb9..94b1dc283 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt @@ -86,7 +86,7 @@ object HypixelData { "solo.profile.amount", "^\\s*(?:§.)*Island\\s*$", ) - private val scoreboardVisitingAmoutPattern by patternGroup.pattern( + private val scoreboardVisitingAmountPattern by patternGroup.pattern( "scoreboard.visiting.amount", "\\s+§.✌ §.\\(§.(?<currentamount>\\d+)§./(?<maxamount>\\d+)\\)", ) @@ -201,7 +201,7 @@ object HypixelData { } fun getMaxPlayersForCurrentServer(): Int { - ScoreboardData.sidebarLinesFormatted.matchFirst(scoreboardVisitingAmoutPattern) { + ScoreboardData.sidebarLinesFormatted.matchFirst(scoreboardVisitingAmountPattern) { return group("maxamount").toInt() } @@ -453,7 +453,7 @@ object HypixelData { islandType = getIslandType(foundIsland, guesting) } - // TODO dont send events when one of the arguments is none, at least when not on sb anymore + // TODO don't send events when one of the arguments is none, at least when not on sb anymore if (skyBlockIsland != islandType) { IslandChangeEvent(islandType, skyBlockIsland).postAndCatch() if (islandType == IslandType.UNKNOWN) { diff --git a/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt b/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt index dfbb08164..29a16944c 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt @@ -94,7 +94,7 @@ object HypixelBazaarFetcher { failedAttempts++ if (failedAttempts <= HIDDEN_FAILED_ATTEMPTS) { nextFetchTime = SimpleTimeMark.now() + 15.seconds - ChatUtils.debug("$userMessage. (errorMessage=${e.message}, failedAttepmts=$failedAttempts, $fetchType") + ChatUtils.debug("$userMessage. (errorMessage=${e.message}, failedAttempts=$failedAttempts, $fetchType") e.printStackTrace() } else { nextFetchTime = SimpleTimeMark.now() + 15.minutes @@ -102,7 +102,7 @@ object HypixelBazaarFetcher { e, userMessage, "fetchType" to fetchType, - "failedAttepmts" to failedAttempts, + "failedAttempts" to failedAttempts, "rawResponse" to rawResponse, ) } diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt index 76c97e662..ab5d1ca2d 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt @@ -60,7 +60,7 @@ value class Graph( { reader -> reader.beginObject() val list = mutableListOf<GraphNode>() - val neigbourMap = mutableMapOf<GraphNode, List<Pair<Int, Double>>>() + val neighbourMap = mutableMapOf<GraphNode, List<Pair<Int, Double>>>() while (reader.hasNext()) { val id = reader.nextName().toInt() reader.beginObject() @@ -93,10 +93,10 @@ value class Graph( } val node = GraphNode(id, position!!, name) list.add(node) - neigbourMap[node] = neighbors + neighbourMap[node] = neighbors reader.endObject() } - neigbourMap.forEach { (node, edge) -> + neighbourMap.forEach { (node, edge) -> node.neighbours = edge.associate { (id, distance) -> list.first { it.id == id } to distance } diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt index 161ec76f5..6fd65778e 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt +++ b/ |