diff options
| author | hannibal2 <24389977+hannibal002@users.noreply.github.com> | 2024-07-06 08:08:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-06 08:08:52 +0200 |
| commit | 7b3ed85d171c156f895fdbaeff4d18572fc0f18e (patch) | |
| tree | 0bbfeca0a796bdd6494548f9f161edbc7fb6b700 /src | |
| parent | 34ba8c5fb8304e7b568822f8d3f675a0f133c6da (diff) | |
| download | skyhanni-7b3ed85d171c156f895fdbaeff4d18572fc0f18e.tar.gz skyhanni-7b3ed85d171c156f895fdbaeff4d18572fc0f18e.tar.bz2 skyhanni-7b3ed85d171c156f895fdbaeff4d18572fc0f18e.zip | |
Backend: Fixed typos everywhere (#2175)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src')
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/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt @@ -10,6 +10,7 @@ enum class SkyblockStat(val icon: String) { DEFENSE("§a❈"), STRENGTH("§c❁"), INTELLIGENCE("§b✎"), + CRIT_DAMAGE("§9☠"), CRIT_CHANCE("§9☣"), FEROCITY("§c⫽"), diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt index 22ac4982b..f1a5001ad 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt @@ -75,23 +75,23 @@ class TextInput { } return } - val tcarriage = carriage + val carriage = carriage if (Keyboard.KEY_LEFT.isKeyClicked()) { - carriage = tcarriage?.moveCarriageLeft() ?: (textBox.length - 1) + this.carriage = carriage?.moveCarriageLeft() ?: (textBox.length - 1) return } if (Keyboard.KEY_RIGHT.isKeyClicked()) { - carriage = when { - tcarriage == null -> null - (tcarriage >= textBox.length - 1) -> null - else -> moveCarriageRight(tcarriage) + this.carriage = when { + carriage == null -> null + (carriage >= textBox.length - 1) -> null + else -> moveCarriageRight(carriage) } return } if (Keyboard.KEY_DELETE.isKeyClicked()) { // Does not work for some reason - if (tcarriage != null) { - textBox.removeRange(tcarriage, tcarriage + 1) + if (carriage != null) { + textBox.removeRange(carriage, carriage + 1) } else { textBox.dropLast(1) } @@ -103,27 +103,27 @@ class TextInput { val char = Keyboard.getEventCharacter() textBox = when (char) { Char(0) -> return - '\b' -> if (tcarriage != null) { - if (tcarriage == 0) { + '\b' -> if (carriage != null) { + if (carriage == 0) { textBox.substring(1) } else { - carriage = tcarriage.minus(1) - textBox.removeRange(tcarriage - 1, tcarriage) + this.carriage = carriage.minus(1) + textBox.removeRange(carriage - 1, carriage) } } else { textBox.dropLast(1) } - else -> if (tcarriage != null) { - carriage = tcarriage + 1 - textBox.insert(tcarriage, char) + else -> if (carriage != null) { + this.carriage = carriage + 1 + textBox.insert(carriage, char) } else { textBox + char } } } - private fun moveCarriageRight(tcarriage: Int) = tcarriage + 1 + private fun moveCarriageRight(carriage: Int) = carriage + 1 private fun Int.moveCarriageLeft(): Int = when { this > 0 -> this - 1 diff --git a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt index 1e9af5d69..74241946f 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt @@ -28,8 +28,8 @@ object RepoUtils { /** * Modified from https://www.journaldev.com/960/java-unzip-file-example */ - fun unzipIgnoreFirstFolder(zipFilePath: String, destDir: String) { - val dir = File(destDir) + fun unzipIgnoreFirstFolder(zipFilePath: String, destinationDirectory: String) { + val dir = File(destinationDirectory) // create output directory if it doesn't exist if (!dir.exists()) dir.mkdirs() val fis: FileInputStream @@ -43,7 +43,7 @@ object RepoUtils { if (!ze.isDirectory) { var fileName = ze.name fileName = fileName.substring(fileName.split("/").toTypedArray()[0].length + 1) - val newFile = File(destDir + File.separator + fileName) + val newFile = File(destinationDirectory + File.separator + fileName) // create directories for sub directories in zip File(newFile.parent).mkdirs() if (!isInTree(dir, newFile)) { @@ -71,7 +71,7 @@ object RepoUtils { e, "unzipIgnoreFirstFolder failed", "zipFilePath" to zipFilePath, - "destDir" to destDir, + "destinationDirectory" to destinationDirectory, ) } } diff --git a/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelupEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelUpEvent.kt index ac9d14662..d3f356da7 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelupEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelUpEvent.kt @@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events import at.hannibal2.skyhanni.features.skillprogress.SkillType -class SkillOverflowLevelupEvent(val skill: SkillType, val oldLevel: Int, val newLevel: Int) : LorenzEvent() +class SkillOverflowLevelUpEvent(val skill: SkillType, val oldLevel: Int, val newLevel: Int) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt index b04a081ea..1afa6859d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt @@ -73,7 +73,7 @@ object BingoCardReader { } val done = lore.any { it.contains("GOAL REACHED") } - val communtyGoalPercentage = readCommuntyGoalPercentage(lore) + val communityGoalPercentage = readCommunityGoalPercentage(lore) val hiddenGoalData = getHiddenGoalData(name, description, goalType) val visualDescription = hiddenGoalData.tipNote @@ -89,7 +89,7 @@ object BingoCardReader { this.done = done this.hiddenGoalData = hiddenGoalData } - communtyGoalPercentage?.let { + communityGoalPercentage?.let { bingoGoalDifference(bingoGoal, it) bingoGoal.communtyGoalPercentage = it } @@ -111,7 +111,7 @@ object BingoCardReader { ChatUtils.chat("$color${bingoGoal.displayName}: $oldFormat §b->" + " $newFormat") } - private fun readCommuntyGoalPercentage(lore: List<String>): Double? { + private fun readCommunityGoalPercentage(lore: List<String>): Double? { for (line in lore) { percentagePattern.matchMatcher(line) { return group("percentage").toDouble() / 100 diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt index daccd37e3..64148115d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt @@ -25,8 +25,9 @@ class BingoGoal { @Expose lateinit var hiddenGoalData: HiddenGoalData + // TODO rename communityGoalPercentage @Expose - var communtyGoalPercentage: Double? = null // TODO fix typo (Needs changes inside of storage) + var communtyGoalPercentage: Double? = null override fun toString(): String = displayName } diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt index 5ed2cdb8a..fd2b513cf 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt @@ -80,7 +80,7 @@ object FlareDisplay { if (!entity.canBeSeen()) continue if (entity.ticksExisted.ticks > MAX_FLARE_TIME) continue if (isAlreadyKnownFlare(entity)) continue - getFlareTypeForTexuture(entity)?.let { + getFlareTypeForTexture(entity)?.let { flares.add(Flare(it, entity)) } } @@ -131,7 +131,7 @@ object FlareDisplay { private fun getFlareForType(type: FlareType): Flare? = flares.firstOrNull { it.type == type } - private fun getFlareTypeForTexuture(entity: EntityArmorStand): FlareType? = + private fun getFlareTypeForTexture(entity: EntityArmorStand): FlareType? = flareSkins.entries.firstOrNull { entity.hasSkullTexture(it.key) }?.value private fun isAlreadyKnownFlare(entity: EntityArmorStand): Boolean = diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt index 5562a4bf4..3bc12fa4c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt @@ -84,7 +84,7 @@ enum class BossType( DUNGEON_F6_GIANT_1("§eBoulder Tosser", Type.DUNGEON_FLOOR_6, "§eGiant 1"), DUNGEON_F6_GIANT_2("§eSword Thrower", Type.DUNGEON_FLOOR_6, "§eGiant 2"), DUNGEON_F6_GIANT_3("§eBigfoot Jumper", Type.DUNGEON_FLOOR_6, "§eGiant 3"), - DUNGEON_F6_GIANT_4("§eLazer Shooter", Type.DUNGEON_FLOOR_6, "§eGiant 4"), + DUNGEON_F6_GIANT_4("§eLaser Shooter", Type.DUNGEON_FLOOR_6, "§eGiant 4"), DUNGEON_F6_SADAN("§cSadan", Type.DUNGEON_FLOOR_6), // TODO implement @@ -92,7 +92,7 @@ enum class BossType( MINOS_INQUISITOR("§5Minos Inquisitor", Type.DIANA_MOBS), MINOS_CHAMPION("§2Minos Champion", Type.DIANA_MOBS), - GAIA_CONSTURUCT("§2Gaia Construct", Type.DIANA_MOBS), + GAIA_CONSTRUCT("§2Gaia Construct", Type.DIANA_MOBS), MINOTAUR("§2Minotaur", Type.DIANA_MOBS), THUNDER("§cThunder", Type.SEA_CREATURES), @@ -121,7 +121,7 @@ enum class BossType( // TODO arachne - // TODO corelone + // TODO Corleone // TODO bal /** diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt index fb549e7c2..b7af2d72b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt @@ -888,7 +888,7 @@ object DamageIndicatorManager { } else { if (entityData != null && isEnabled() && config.hideVanillaNametag && entityData.isConfigEnabled()) { val name = entity.name - if (name.contains("Plaesmaflux")) return + if (name.contains("Plasmaflux")) return if (name.contains("Overflux")) return if (name.contains("Mana Flux")) return if (name.contains("Radiant")) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt index 3d54dce1b..e9b2f879b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt @@ -356,7 +356,7 @@ class MobFinder { } entity.hasMaxHealth(1_500_000) -> { - EntityResult(bossType = BossType.GAIA_CONSTURUCT) + EntityResult(bossType = BossType.GAIA_CONSTRUCT) } entity.hasMaxHealth(100_000_000) -> { diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt index 29b3c06e3..3bc3c85d4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt @@ -58,6 +58,7 @@ import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import io.github.moulberry.notenoughupdates.util.Utils import io.github.moulberry.notenoughupdates.util.XPInformation import net.minecraftforge.fml.common.eventhandler.SubscribeEvent +import org.apache.commons.io.FilenameUtils import java.io.File import java.text.NumberFormat import java.util.Locale @@ -70,8 +71,7 @@ object GhostCounter { val config get() = SkyHanniMod.feature.combat.ghostCounter val storage get() = ProfileStorageData.profileSpecific?.ghostCounter private var display = emptyList<List<Any>>() - var ghostCounterV3File = - File("." + File.separator + "config" + File.separator + "ChatTriggers" + File.separator + "modules" + File.separator + "GhostCounterV3" + File.separator + ".persistantData.json") + var ghostCounterV3File = File(FilenameUtils.separatorsToSystem("./config/ChatTriggers/modules/GhostCounterV3/.persistantData.json")) private val patternGroup = RepoPattern.group("combat.ghostcounter") private val skillXPPattern by patternGroup.pattern( diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt index 05b04982d..b6bcff3bd 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt @@ -96,7 +96,7 @@ object PartyChatCommands { if (isBlockedUser(name)) { if (config.showIgnoredReminder) ChatUtils.clickableChat( "§cIgnoring chat command from ${event.author}. " + - "Unignore them using /shignore remove <player> or click here!", + "Stop ignoring them using /shignore remove <player> or click here!", onClick = { blacklistModify(event.author) }, "§eClick to ignore ${event.author}!", ) diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt index ff6c277bb..8b2d60069 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt @@ -147,7 +147,7 @@ object CroesusChestTracker { unopenedPattern.anyMatches(lore) -> OpenedState.UNOPENED else -> ErrorManager.logErrorStateWithData( "Croesus Chest couldn't be read correctly.", - "Openstate check failed for chest.", + "Open state check failed for chest.", "run" to run, "lore" to lore ).run { null } diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt index d79ac47ce..f8d432613 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt @@ -249,7 +249,7 @@ object DungeonAPI { val bossCollections = bossStorage ?: return if (event.inventoryName == "Boss Collections") { - readallCollections(bossCollections, event.inventoryItems) + readAllCollections(bossCollections, event.inventoryItems) } else if (event.inventoryName.endsWith(" Collection")) { readOneMaxCollection(bossCollections, event.inventoryItems, event.inventoryName) } @@ -278,7 +278,7 @@ object DungeonAPI { } } - private fun readallCollections( + private fun readAllCollections( bossCollections: MutableMap<DungeonFloor, Int>, inventoryItems: Map<Int, ItemStack>, ) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt index 9d2c531a5..f0ce80b1b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt @@ -151,7 +151,7 @@ object DungeonHideItems { } if (config.hideHealerFairy) { - // Healer Fairy texture is stored in id 0, not id 4 for some reasos. + // Healer Fairy texture is stored in id 0, not id 4 for some reasons. if (entity.inventory[0]?.getSkullTexture() == HEALER_FAIRY_TEXTURE) { event.cancel() return diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt index d88f5c017..20cf553b8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt @@ -120,7 +120,7 @@ object DianaFixChat { if (hasSetToggleMusic) { ChatUtils.chat("Toggling the hypixel music has worked, good job!") } else if (hasSetParticleQuality) { - ChatUtils.chat("Changing the particle qualilty has worked, good job!") + ChatUtils.chat("Changing the particle quality has worked, good job!") } hasSetParticleQuality = false 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 6fe287021..35a783f7d 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 @@ -380,8 +380,8 @@ object GriffinBurrowHelper { val text = "§bWarp to " + warp.displayName val keybindSuffix = if (config.keyBindWarp != Keyboard.KEY_NONE) { - val keyname = KeyboardManager.getKeyName(config.keyBindWarp) - " §7(§ePress $keyname§7)" + val keyName = KeyboardManager.getKeyName(config.keyBindWarp) + " §7(§ePress $keyName§7)" } else "" if (lastTitleSentTime.passedSince() > 2.seconds) { lastTitleSentTime = SimpleTimeMark.now() diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt index d290c5df8..0bb5e3dc1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt @@ -36,7 +36,7 @@ object SoopyGuessBurrow { private var guessPoint: LorenzVec? = null private var lastSoundPoint: LorenzVec? = null - private var locs = mutableListOf<LorenzVec>() + private var locations = mutableListOf<LorenzVec>() private var dingSlope = mutableListOf<Float>() @@ -81,7 +81,7 @@ object SoopyGuessBurrow { lastSoundPoint = null firstParticlePoint = null distance = null - locs.clear() + locations.clear() } if (lastDingPitch == 0f) { @@ -91,7 +91,7 @@ object SoopyGuessBurrow { lastParticlePoint2 = null lastSoundPoint = null firstParticlePoint = null - locs.clear() + locations.clear() return } @@ -158,19 +158,19 @@ object SoopyGuessBurrow { } } if (run) { - if (locs.size < 100 && locs.isEmpty() || locs.last().distance(currLoc) != 0.0) { + if (locations.size < 100 && locations.isEmpty() || locations.last().distance(currLoc) != 0.0) { var distMultiplier = 1.0 - if (locs.size > 2) { - val predictedDist = 0.06507 * locs.size + 0.259 - val lastPos = locs.last() + if (locations.size > 2) { + val predictedDist = 0.06507 * locations.size + 0.259 + val lastPos = locations.last() val actualDist = currLoc.distance(lastPos) distMultiplier = actualDist / predictedDist } - locs.add(currLoc) + locations.add(currLoc) - if (locs.size > 5 && guessPoint != null) { + if (locations.size > 5 && guessPoint != null) { - val slopeThing = locs.zipWithNext { a, b -> + val slopeThing = locations.zipWithNext { a, b -> atan((a.x - b.x) / (a.z - b.z)) } @@ -186,14 +186,14 @@ object SoopyGuessBurrow { val pr2 = mutableListOf<LorenzVec>() val start = slopeThing.size - 1 - val lastPos = locs[start].toDoubleArray() - val lastPos2 = locs[start].toDoubleArray() + val lastPos = locations[start].toDoubleArray() + val lastPos2 = locations[start].toDoubleArray() var distCovered = 0.0 - val ySpeed = locs[locs.size - 1].x - locs[locs.size - 2].x / hypot( - locs[locs.size - 1].x - locs[locs.size - 2].x, - locs[locs.size - 1].z - locs[locs.size - 2].x + val ySpeed = locations[locations.size - 1].x - locations[locations.size - 2].x / hypot( + locations[locations.size - 1].x - locations[locations.size - 2].x, + locations[locations.size - 1].z - locations[locations.size - 2].x ) var i = start + 1 diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt index 44adceb6d..3ae865ac8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt @@ -360,12 +360,12 @@ object GardenPlotAPI { // Render horizontal val buildLimit = minHeight + 11 - val ints = if (showBuildLimit) { + val iterable = if (showBuildLimit) { (minHeight..maxHeight step 4) + buildLimit } else { minHeight..maxHeight step 4 } - for (y in ints) { + for (y in iterable) { val start = LorenzVec(chunkMinX, y, chunkMinZ) val isRedLine = y == buildLimit val color = if (isRedLine) Color.red else lineColor diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt index b3fd91d32..3e99c2683 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt @@ -116,7 +116,7 @@ object JacobContestTimeNeeded { ) { var lowBPSWarning = listOf<String>() val rawSpeed = speed.toDouble() - val speedForFormular = crop.getBps()?.let { + val speedForFormula = crop.getBps()?.let { if (it < 15) { val v = rawSpeed / it (v * 19.9).toInt() @@ -132,7 +132,7 @@ object JacobContestTimeNeeded { showLine = "§9${crop.cropName} §cBracket not revealed!" continue } - val timeInMinutes = (amount.toDouble() / speedForFormular).seconds + val timeInMinutes = (amount.toDouble() / speedForFormula).seconds val formatDuration = timeInMinutes.format() val color = if (timeInMinutes < 20.minutes) "§b" else "§c" var marking = "" diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt index 926f83d50..6494986af 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt @@ -53,7 +53,7 @@ class CropPage(val crop0: () -> CropType, sizeX: Int, sizeY: Int, paddingX: Int FortuneStats.entries.filter { it.isActive() && it !in headers }.map { it.getFarmingBar() } private fun equipDisplay(): Renderable = - Renderable.fixedSizeCollum( + Renderable.fixedSizeColumn( Renderable.verticalContainer( listOf( crop.farmingItem.getDisplay(), diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt index 0e891f444..a5b3a97b8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt @@ -50,7 +50,7 @@ object FixGhostEntities { recentlySpawnedEntities.addLast(packet.entityID) } else if (packet is S13PacketDestroyEntities) { for (entityID in packet.entityIDs) { - // ingore entities that got properly spawned and then removed + // ignore entities that got properly spawned and then removed if (entityID !in recentlySpawnedEntities) { recentlyRemovedEntities.addLast(entityID) if (recentlyRemovedEntities.size == 10) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt index 1f1f9dadd..9953199c8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt @@ -55,7 +55,7 @@ object PatcherSendCoordinates { split.first().toFloat() } else end.toFloat() patcherBeacon.add(PatcherBeacon(LorenzVec(x, y, z), description, System.currentTimeMillis() / 1000)) - logger.log("got patcher coords and username") + logger.log("got Patcher coords and username") } } @@ -76,10 +76,10 @@ object PatcherSendCoordinates { if (!event.isMod(10)) return val location = LocationUtils.playerLocation() - // removed patcher beacon! + // removed Patcher beacon! patcherBeacon.removeIf { System.currentTimeMillis() / 1000 > it.time + 5 && location.distanceIgnoreY(it.location) < 5 } - // removed patcher beacon after time! + // removed Patcher beacon after time! patcherBeacon.removeIf { System.currentTimeMillis() / 1000 > it.time + config.duration } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt index ac101a909..518ebbaf9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt @@ -39,9 +39,9 @@ object AdvancedPlayerList { ".*\\[(?<level>.*)] §r(?<name>.*)" ) - private var playerDatas = mutableMapOf<String, PlayerData>() + private var playerData = mutableMapOf<String, PlayerData>() - fun createTabLine(text: String, type: TabStringType) = playerDatas[text]?.let { + fun createTabLine(text: String, type: TabStringType) = playerData[text]?.let { TabLine(text, type, createCustomName(it)) } ?: TabLine(text, type) @@ -90,7 +90,7 @@ object AdvancedPlayerList { currentData[line] = it } } - playerDatas = currentData + playerData = currentData val prepare = currentData.entries val sorted = when (config.playerSortOrder) { @@ -127,7 +127,7 @@ object AdvancedPlayerList { } newList.addAll(newPlayerList) - val rest = original.drop(playerDatas.size + extraTitles + 1) + val rest = original.drop(playerData.size + extraTitles + 1) newList.addAll(rest) return newList } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt index baeb1df04..96759bc7d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt @@ -206,7 +206,7 @@ object DiscordLocationKey { "The Wasteland", "Throne Room" ) - // list of nether locations because there are sooo many (truncated some according to scoreboard) + // list of nether locations because there are soo many (truncated some according to scoreboard) private val specialRiftRPC = mapOf( "Enigma's Crib" to "wyld-woods", diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt index 2888cc707..0a0b6b238 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt @@ -41,10 +41,10 @@ object LimboTimeTracker { private const val FIRE_MULTIPLIER = 1.01F private var onFire = false - private val bedwarsLobbyLimbo = AxisAlignedBB(-662.0, 43.0, -76.0, -619.0, 86.0, -27.0) + private val bedWarsLobbyLimbo = AxisAlignedBB(-662.0, 43.0, -76.0, -619.0, 86.0, -27.0) private var doMigrate = false - private var unmigratedPB = 0 + private var notMigratedPB = 0 @SubscribeEvent fun onChat(event: LorenzChatEvent) { @@ -74,7 +74,7 @@ object LimboTimeTracker { } val lobbyName: String? = HypixelData.locrawData?.get("lobbyname")?.asString if (lobbyName.toString().startsWith("bedwarslobby")) { - if (bedwarsLobbyLimbo.isPlayerInside()) { + if (bedWarsLobbyLimbo.isPlayerInside()) { if (inFakeLimbo) return limboJoinTime = SimpleTimeMark.now() inLimbo = true @@ -182,23 +182,23 @@ object LimboTimeTracker { fun workaroundMigration(personalBest: Int) { doMigrate = true - unmigratedPB = personalBest + notMigratedPB = personalBest } @SubscribeEvent fun onHypixelJoin(event: HypixelJoinEvent) { if (!doMigrate) return - if (unmigratedPB != 0) { + if (notMigratedPB != 0) { ChatUtils.debug("Migrating limbo personalBest") - storage?.personalBest = unmigratedPB - storage?.userLuck = unmigratedPB * USER_LUCK_MULTIPLIER + storage?.personalBest = notMigratedPB + storage?.userLuck = notMigratedPB * USER_LUCK_MULTIPLIER } if ((storage?.personalBest ?: 0) > (storage?.playtime ?: 0)) { ChatUtils.debug("Migrating limbo playtime") storage?.playtime = (storage?.personalBest ?: 0) } doMigrate = false - unmigratedPB = 0 + notMigratedPB = 0 } fun isEnabled() = config.showTimeInLimbo diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt index 686f46827..c5d4f5ea4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt @@ -173,7 +173,7 @@ class QuestLoader(private val dailyQuestHelper: DailyQuestHelper) { } } - // TODO remove this workaround once hypixel fixes the bug that amount is not in tab list for minibosses + // TODO remove this workaround once hypixel fixes the bug that amount is not in tab list for mini bosses private fun fixMinibossAmount(quest: Quest, stack: ItemStack) { if (quest !is MiniBossQuest) return val storedAmount = quest.needAmount diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt index 647b2280b..ccb432f61 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt @@ -74,7 +74,7 @@ object RiftBloodEffigies { fun onRepoReload(event: RepositoryReloadEvent) { val newLocations = event.getConstant<RiftEffigiesJson>("RiftEffigies").locations if (newLocations.size != 6) { - error("Invalid rift effigies size: ${newLocations.size} (expeced 6)") + error("Invalid rift effigies size: ${newLocations.size} (expected 6)") } locations = newLocations } diff --git a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt index 2e033b7e4..d2a98daed 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt @@ -13,7 +13,7 @@ import at.hannibal2.skyhanni.events.ConfigLoadEvent import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.ProfileJoinEvent import at.hannibal2.skyhanni.events.SecondPassedEvent -import at.hannibal2.skyhanni.events.SkillOverflowLevelupEvent +import at.hannibal2.skyhanni.events.SkillOverflowLevelUpEvent import at.hannibal2.skyhanni.features.skillprogress.SkillUtil.XP_NEEDED_FOR_60 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.ChatUtils.chat @@ -156,7 +156,7 @@ object SkillProgress { } @SubscribeEvent - fun onLevelUp(event: SkillOverflowLevelupEvent) { + fun onLevelUp(event: SkillOverflowLevelUpEvent) { if (!isEnabled()) return if (!config.overflowConfig.enableInChat) return val skillName = event.skill.displayName diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt index 92c76e493..372c7daa9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt @@ -86,7 +86,7 @@ object SlayerProfitTracker { private val ItemTrackerData.TrackedItem.timesDropped get() = timesGained private fun addSlayerCosts(price: Double) { - require(price < 0) { "slayer costs can not be positve" } + require(price < 0) { "slayer costs can not be positive" } getTracker()?.modify { it.slayerSpawnCost += price.toInt() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt index 1d434e298..26e0822b1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt @@ -145,11 +145,11 @@ object SlayerRngMeterDisplay { fun onInventoryOpen(event: InventoryFullyOpenedEvent) { if (!isEnabled()) return - readRngmeterInventory(event) + readRngMeterInventory(event) readSlayerInventory(event) } - private fun readRngmeterInventory(event: InventoryFullyOpenedEvent) { + private fun readRngMeterInventory(event: InventoryFullyOpenedEvent) { val name = inventoryNamePattern.matchMatcher(event.inventoryName) { group("name") } ?: return diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt index c59747c09..c57c473c5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt @@ -180,7 +180,7 @@ object EndermanSlayerFeatures { it.isDead } - // Removing the beacon if It's still there after 7 sesconds. + // Removing the beacon if It's still there after 7 seconds. // This is just a workaround for the cases where the ServerBlockChangeEvent don't detect the beacon despawn info. val toRemove = sittingBeacon.filter { it.value.passedSince() > 7.seconds } if (toRemove.isNotEmpty()) { diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorRendererLivingEntity.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorRendererLivingEntity.java index d762dbb22..2635874a3 100644 --- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorRendererLivingEntity.java +++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorRendererLivingEntity.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.gen.Invoker; public interface AccessorRendererLivingEntity<T extends EntityLivingBase> extends AccessorRender<T> { @Invoker("setBrightness") - boolean setBrightness_skyhanni(T entitylivingbaseIn, float partialTicks, boolean combineTextures); + boolean setBrightness_skyhanni(T entityLivingBaseIn, float partialTicks, boolean combineTextures); @Invoker("unsetBrightness") void setBrightness_skyhanni(); diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java index 7ffcfef8f..6fb71ccc0 100644 --- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java +++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java @@ -28,7 +28,7 @@ public class MixinContributorRendererEntityLiving<T extends EntityLivingBase> { @Redirect( method = "rotateCorpse", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/EntityPlayer;isWearing(Lnet/minecraft/entity/player/EnumPlayerModelParts;)Z")) - private boolean alwaysMarkAsHavingCape(EntityPlayer instance, EnumPlayerModelParts p_175148_1_) { + private boolean alwaysMarkAsHavingCape(EntityPlayer instance, EnumPlayerModelParts enumPlayerModelParts) { // Always returning true here ensures maximal compatibility with other mods. This will no longer block other mods from implementing this same mixin. return true; } diff --git a/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt b/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt index 5898b5d98..4bf183d74 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt @@ -24,7 +24,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object TestCopyBestiaryValues { - class BestiarityObject { // TODO fix typo + class BestiaryObject { // TODO fix typo @Expose var name: String = "" @@ -72,7 +72,7 @@ object TestCopyBestiaryValues { private fun copy(titleItem: ItemStack, inventoryItems: Map<Int, ItemStack>) { val titleName = titleItem.name.removeWordsAtEnd(1) - val obj = BestiarityObject() + val obj = BestiaryObject() obj.name = titleName obj.texture = titleItem.getSkullTexture() ?: "no texture found" obj.skullOwner = titleItem.getSkullOwner() ?: "no skullOwner found" diff --git a/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt b/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt index 45b81a1ab..a42a10faf 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt @@ -37,7 +37,7 @@ class HotswapSupportImpl : HotswapSupportHandle { ?.makeAccessible() ?.removeFinal() if (instanceField != null) { - ChatUtils.chat("Reinjected static instance $newInstance!") + ChatUtils.chat("Re-injected static instance $newInstance!") instanceField.set(null, newInstance) } SkyHanniMod.modules.add(newInstance) diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt index 5edd33bc0..0ea909851 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt @@ -113,10 +113,10 @@ object CombatUtils { /** * Taken from NotEnoughUpdates */ - fun interp(now: Float, last: Float, lastupdate: Long): Float { + fun interp(now: Float, last: Float, lastUpdate: Long): Float { var interp = now if (last >= 0 && last != now) { - var factor = (System.currentTimeMillis() - lastupdate) / 1000f + var factor = (System.currentTimeMillis() - lastUpdate) / 1000f factor = LerpUtils.clampZeroOne(factor) interp = last + (now - last) * factor } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt index 889530cd6..97225369d 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt @@ -37,7 +37,7 @@ import java.lang.reflect.Method object EntityOutlineRenderer { private val entityRenderCache: CachedInfo = CachedInfo(null, null, null) - private var stopLookingForOptifine = false + private var stopLookingForOptiFine = false private var isMissingMixin = false private var isFastRender: Method? = null private var isShaders: Method? = null @@ -56,13 +56,13 @@ object EntityOutlineRenderer { */ private fun initSwapBuffer(): Framebuffer { val main = mc.framebuffer - val framebuffer = Framebuffer(main.framebufferTextureWidth, main.framebufferTextureHeight, true) - framebuffer.setFramebufferFilter(GL11.GL_NEAREST) - framebuffer.setFramebufferColor(0.0f, 0.0f, 0.0f, 0.0f) - return framebuffer + val frameBuffer = Framebuffer(main.framebufferTextureWidth, main.framebufferTextureHeight, true) + frameBuffer.setFramebufferFilter(GL11.GL_NEAREST) + frameBuffer.setFramebufferColor(0.0f, 0.0f, 0.0f, 0.0f) + return frameBuffer } - private fun updateFramebufferSize() { + private fun updateFrameBufferSize() { val width = mc.displayWidth val height = mc.displayHeight if (swapBuffer.framebufferWidth != width || swapBuffer.framebufferHeight != height) { @@ -94,7 +94,7 @@ object EntityOutlineRenderer { val renderGlobal = mc.renderGlobal as CustomRenderGlobal val renderManager = mc.renderManager mc.theWorld.theProfiler.endStartSection("entityOutlines") - updateFramebufferSize() + updateFrameBufferSize() // Clear and bind the outline framebuffer renderGlobal.frameBuffer.framebufferClear() @@ -216,7 +216,7 @@ object EntityOutlineRenderer { } /** - * Caches optifine settings and determines whether outlines should be rendered + * Caches OptiFine settings and determines whether outlines should be rendered * * @return `true` iff outlines should be rendered */ @@ -232,8 +232,8 @@ object EntityOutlineRenderer { val renderGlobal = mc.renderGlobal as CustomRenderGlobal if (renderGlobal.frameBuffer == null || renderGlobal.shader == null || mc.thePlayer == null) return false - // Optifine Conditions - if (!stopLookingForOptifine && isFastRender == null) { + // OptiFine Conditions + if (!stopLookingForOptiFine && isFastRender == null) { try { val config = Class.forName("Config") try { @@ -241,12 +241,12 @@ object EntityOutlineRenderer { isShaders = config.getMethod("isShaders") isAntialiasing = config.getMethod("isAntialiasing") } catch (ex: Exception) { - logger.log("Couldn't find Optifine methods for entity outlines.") - stopLookingForOptifine = true + logger.log("Couldn't find OptiFine methods for entity outlines.") + stopLookingForOptiFine = true } } catch (ex: Exception) { - logger.log("Couldn't find Optifine for entity outlines.") - stopLookingForOptifine = true + logger.log("Couldn't find OptiFine for entity outlines.") + stopLookingForOptiFine = true } } var isFastRenderValue = false @@ -258,9 +258,9 @@ object EntityOutlineRenderer { isShadersValue = isShaders!!.invoke(null) as Boolean isAntialiasingValue = isAntialiasing!!.invoke(null) as Boolean } catch (ex: IllegalAccessException) { - logger.log("An error occurred while calling Optifine methods for entity outlines... $ex") + logger.log("An error occurred while calling OptiFine methods for entity outlines... $ex") } catch (ex: InvocationTargetException) { - logger.log("An error occurred while calling Optifine methods for entity outlines... $ex") + logger.log("An error occurred while calling OptiFine methods for entity outlines... $ex") } } return !isFastRenderValue && !isShadersValue && !isAntialiasingValue @@ -373,15 +373,15 @@ object EntityOutlineRenderer { val xrayOutlineEvent = RenderEntityOutlineEvent(RenderEntityOutlineEvent.Type.XRAY, null) xrayOutlineEvent.postAndCatch() // Get all entities to render no xray outlines, using pre-filtered entities (no need to test xray outlined entities) - val noxrayOutlineEvent = RenderEntityOutlineEvent( + val noXrayOutlineEvent = RenderEntityOutlineEvent( RenderEntityOutlineEvent.Type.NO_XRAY, xrayOutlineEvent.entitiesToChooseFrom ) - noxrayOutlineEvent.postAndCatch() + noXrayOutlineEvent.postAndCatch() // Cache the entities for future use entityRenderCache.xrayCache = xrayOutlineEvent.entitiesToOutline - entityRenderCache.noXrayCache = noxrayOutlineEvent.entitiesToOutline - entityRenderCache.noOutlineCache = noxrayOutlineEvent.entitiesToChooseFrom + entityRenderCache.noXrayCache = noXrayOutlineEvent.entitiesToOutline + entityRenderCache.noOutlineCache = noXrayOutlineEvent.entitiesToChooseFrom emptyLastTick = if (isCacheEmpty()) { if (!emptyLastTick) { renderGlobal.frameBuffer.framebufferClear() diff --git a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt index ab0afd93c..d2c24ceca 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt @@ -76,7 +76,7 @@ object InventoryUtils { val booleanField = storage.javaClass.getDeclaredField("enableStorageGUI3") booleanField.get(storage) as Boolean } catch (e: Throwable) { - ErrorManager.logErrorWithData(e, "Could not read NEU config to determine if the neu storage is emabled.") + ErrorManager.logErrorWithData(e, "Could not read NEU config to determine if the neu storage is enabled.") false } } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt index c094df489..5edc227dd 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt @@ -295,7 +295,7 @@ object ItemUtils { private val itemAmountCache = mutableMapOf<String, Pair<String, Int>>() fun readItemAmount(originalInput: String): Pair<String, Int>? { - // This workaround fixes 'Tubto Cacti I Book' + // This workaround fixes 'Turbo Cacti I Book' val input = (if (originalInput.endsWith(" Book")) { originalInput.replace(" Book", "") } else originalInput).removeResets() diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt index e322b5ae3..b9a790d31 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt @@ -62,9 +62,9 @@ object LocationUtils { val t1 = (this.minBox() - origin) * rayDirectionInverse val t2 = (this.maxBox() - origin) * rayDirectionInverse - val tmin = max(t1.minOfEachElement(t2).max(), Double.NEGATIVE_INFINITY) - val tmax = min(t1.maxOfEachElement(t2).min(), Double.POSITIVE_INFINITY) - return tmax >= tmin && tmax >= 0.0 + val tMin = max(t1.minOfEachElement(t2).max(), Double.NEGATIVE_INFINITY) + val tMax = min(t1.maxOfEachElement(t2).min(), Double.POSITIVE_INFINITY) + return tMax >= tMin && tMax >= 0.0 } fun AxisAlignedBB.union(aabbs: List<AxisAlignedBB>?): AxisAlignedBB? { diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt index ee9228609..ea2a935a3 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt @@ -126,7 +126,7 @@ object LorenzUtils { val EntityLivingBase.baseMaxHealth: Int get() = this.getEntityAttribute(SharedMonsterAttributes.maxHealth).baseValue.toInt() - // TODO create extenstion function + // TODO create extension function fun formatPercentage(percentage: Double): String = formatPercentage(percentage, "0.00") fun formatPercentage(percentage: Double, format: String?): String = diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt index fe9e9df6a..1f389e51b 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt @@ -215,7 +215,7 @@ object RenderUtils { val bottomOffset = 0 val topOffset = bottomOffset + height val tessellator = Tessellator.getInstance() - val worldrenderer = tessellator.worldRenderer + val worldRenderer = tessellator.worldRenderer Minecraft.getMinecraft().textureManager.bindTexture(beaconBeam) GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 10497.0f) GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, 10497.0f) @@ -244,59 +244,59 @@ object RenderUtils { val d11 = 0.5 + sin(d2 + 5.497787143782138) * 0.2 val d14 = -1.0 + d1 val d15 = height.toDouble() * 2.5 + d14 - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR) - worldrenderer.pos(x + d4, y + topOffset, z + d5).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR) + worldRenderer.pos(x + d4, y + topOffset, z + d5).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + d4, y + bottomOffset, z + d5).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d6, y + bottomOffset, z + d7).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d6, y + topOffset, z + d7).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.pos(x + d4, y + bottomOffset, z + d5).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d6, y + bottomOffset, z + d7).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d6, y + topOffset, z + d7).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + d10, y + topOffset, z + d11).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.pos(x + d10, y + topOffset, z + d11).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + d10, y + bottomOffset, z + d11).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d8, y + bottomOffset, z + d9).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d8, y + topOffset, z + d9).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.pos(x + d10, y + bottomOffset, z + d11).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d8, y + bottomOffset, z + d9).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d8, y + topOffset, z + d9).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + d6, y + topOffset, z + d7).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.pos(x + d6, y + topOffset, z + d7).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + d6, y + bottomOffset, z + d7).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d10, y + bottomOffset, z + d11).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d10, y + topOffset, z + d11).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.pos(x + d6, y + bottomOffset, z + d7).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d10, y + bottomOffset, z + d11).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d10, y + topOffset, z + d11).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + d8, y + topOffset, z + d9).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.pos(x + d8, y + topOffset, z + d9).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + d8, y + bottomOffset, z + d9).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d4, y + bottomOffset, z + d5).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d4, y + topOffset, z + d5).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.pos(x + d8, y + bottomOffset, z + d9).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d4, y + bottomOffset, z + d5).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d4, y + topOffset, z + d5).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() tessellator.draw() GlStateManager.disableCull() val d12 = -1.0 + d1 val d13 = height + d12 - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR) - worldrenderer.pos(x + 0.2, y + topOffset, z + 0.2).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR) + worldRenderer.pos(x + 0.2, y + topOffset, z + 0.2).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + 0.2, y + bottomOffset, z + 0.2).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.8, y + bottomOffset, z + 0.2).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.8, y + topOffset, z + 0.2).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.pos(x + 0.2, y + bottomOffset, z + 0.2).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.8, y + bottomOffset, z + 0.2).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.8, y + topOffset, z + 0.2).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + 0.8, y + topOffset, z + 0.8).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.pos(x + 0.8, y + topOffset, z + 0.8).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + 0.8, y + bottomOffset, z + 0.8).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.2, y + bottomOffset, z + 0.8).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.2, y + topOffset, z + 0.8).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.pos(x + 0.8, y + bottomOffset, z + 0.8).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.2, y + bottomOffset, z + 0.8).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.2, y + topOffset, z + 0.8).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + 0.8, y + topOffset, z + 0.2).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.pos(x + 0.8, y + topOffset, z + 0.2).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + 0.8, y + bottomOffset, z + 0.2).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.8, y + bottomOffset, z + 0.8).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.8, y + topOffset, z + 0.8).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.pos(x + 0.8, y + bottomOffset, z + 0.2).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.8, y + bottomOffset, z + 0.8).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.8, y + topOffset, z + 0.8).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + 0.2, y + topOffset, z + 0.8).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.pos(x + 0.2, y + topOffset, z + 0.8).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + 0.2, y + bottomOffset, z + 0.8).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.2, y + bottomOffset, z + 0.2).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.2, y + topOffset, z + 0.2).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.pos(x + 0.2, y + bottomOffset, z + 0.8).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.2, y + bottomOffset, z + 0.2).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.2, y + topOffset, z + 0.2).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() tessellator.draw() } @@ -809,19 +809,19 @@ object RenderUtils { bindCamera() val tessellator = Tessellator.getInstance() - val worldrenderer = tessellator.worldRenderer - worldrenderer.begin(GL11.GL_QUAD_STRIP, DefaultVertexFormats.POSITION) + val worldRenderer = tessellator.worldRenderer + worldRenderer.begin(GL11.GL_QUAD_STRIP, DefaultVertexFormats.POSITION) var currentAngle = 0f val angleStep = 0.1f while (currentAngle < 2 * Math.PI) { val xOffset = radius * cos(currentAngle.toDouble()).toFloat() val zOffset = radius * sin(currentAngle.toDouble()).toFloat() - worldrenderer.pos(x + xOffset, y + height, z + zOffset).endVertex() - worldrenderer.pos(x + xOffset, y + 0, z + zOffset).endVertex() + worldRenderer.pos(x + xOffset, y + height, z + zOffset).endVertex() + worldRenderer.pos(x + xOffset, y + 0, z + zOffset).endVertex() currentAngle += angleStep } - worldrenderer.pos(x + radius, y + height, z).endVertex() - worldrenderer.pos(x + radius, y + 0.0, z).endVertex() + worldRenderer.pos(x + radius, y + height, z).endVertex() + worldRenderer.pos(x + radius, y + 0.0, z).endVertex() tessellator.draw() GlStateManager.enableCull() @@ -1388,9 +1388,9 @@ object RenderUtils { GlStateManager.depthMask(false) } GlStateManager.color(color.red / 255f, color.green / 255f, color.blue / 255f, color.alpha / 255f) - val ctrlpoints = p1.toFloatArray() + p2.toFloatArray() + p3.toFloatArray() + val ctrlPoints = p1.toFloatArray() + p2.toFloatArray() + p3.toFloatArray() bezier2Buffer.clear() - ctrlpoints.forEach { + ctrlPoints.forEach { bezier2Buffer.put(it) } bezier2Buffer.flip() @@ -1477,8 +1477,6 @@ object RenderUtils { GlStateManager.disableTexture2D() GlStateManager.disableCull() - val tessellator = Tessellator.getInstance() - GlStateManager.pushMatrix() RenderUtils.translate(getViewerPos(partialTicks).negated()) getViewerPos(partialTicks) diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt index 1780764cd..2b3ece2c7 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt @@ -327,7 +327,7 @@ object SkyBlockItemModifierUtils { fun getByName(name: String): GemstoneSlotType = entries.firstOrNull { name.uppercase(Locale.ENGLISH).contains(it.name) } - ?: error("Unknwon GemstoneSlotType: '$name'") + ?: error("Unknown GemstoneSlotType: '$name'") fun getColorCode(name: String) = getByName(name).colorCode } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt index b51c83295..b12668d72 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt @@ -250,10 +250,16 @@ interface Renderable { val openGui = guiScreen?.javaClass?.name ?: "none" val isInNeuPv = openGui == "io.github.moulberry.notenoughupdates.profileviewer.GuiProfileViewer" val neuFocus = NEUItems.neuHasFocus() - val isInSkyTilsPv = openGui == "gg.skytils.skytilsmod.gui.profile.ProfileGui" + val isInSkytilsPv = openGui == "gg.skytils.skytilsmod.gui.profile.ProfileGui" - val result = isGuiScreen && isGuiPositionEditor && inMenu && isNotInSignAndOnSlot && isConfigScreen && - !isInNeuPv && !isInSkyTilsPv && !neuFocus + val result = isGuiScreen && + isGuiPositionEditor && + inMenu && + isNotInSignAndOnSlot && + isConfigScreen && + !isInNeuPv && + !isInSkytilsPv && + !neuFocus if (debug) { if (!result) { @@ -266,7 +272,7 @@ interface Renderable { if (!isConfigScreen) logger.log("isConfigScreen") if (isInNeuPv) logger.log("isInNeuPv") if (neuFocus) logger.log("neuFocus") - if (isInSkyTilsPv) logger.log("isInSkyTilsPv") + if (isInSkytilsPv) logger.log("isInSkytilsPv") logger.log("") } else { logger.log("allowed click") @@ -647,7 +653,7 @@ interface Renderable { } } - fun fixedSizeCollum( + fun fixedSizeColumn( content: Renderable, height: Int, horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT, diff --git a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt index 8f55a8b1f..8d26cf46a 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt @@ -58,7 +58,7 @@ object RepoPatternManager { */ private var usedKeys: NavigableMap<String, CommonPatternInfo<*, *>> = TreeMap() - private var wasPreinitialized = false + private var wasPreInitialized = false private val isInDevEnv = try { Launch.blackboard["fml.deobfuscatedEnvironment"] as Boolean } catch (_: Exception) { @@ -261,7 +261,7 @@ object RepoPatternManager { @HandleEvent fun onPreInitFinished(event: PreInitFinishedEvent) { - wasPreinitialized = true + wasPreInitialized = true val dumpDirective = System.getenv("SKYHANNI_DUMP_REGEXES") if (dumpDirective.isNullOrBlank()) return val (sourceLabel, path) = dumpDirective.split(":", limit = 2) @@ -274,7 +274,7 @@ object RepoPatternManager { fun of(key: String, fallback: String, parentKeyHolder: RepoPatternKeyOwner? = null): RepoPattern { verifyKeyShape(key) - if (wasPreinitialized && !config.tolerateLateRegistration) { + if (wasPreInitialized && !config.tolerateLateRegistration) { crash("Illegal late initialization of repo pattern. Repo pattern needs to be created during pre-initialization.") } if (key in usedKeys) { @@ -289,7 +289,7 @@ object RepoPatternManager { parentKeyHolder: RepoPatternKeyOwner? = null, ): RepoPatternList { verifyKeyShape(key) - if (wasPreinitialized && !config.tolerateLateRegistration) { + if (wasPreInitialized && !config.tolerateLateRegistration) { crash("Illegal late initialization of repo pattern. Repo pattern needs to be created during pre-initialization.") } if (key in usedKeys) { diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt index c110d6d6e..83e812149 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt @@ -66,7 +66,7 @@ abstract class Shader(val vertex: String, val fragment: String) { ShaderHelper.glLinkProgram(shaderProgram) - if (ShaderHelper.glGetProgrami(shaderProgram, ShaderHelper.GL_LINK_STATUS) == GL11.GL_FALSE) { + if (ShaderHelper.glGetProgramInt(shaderProgram, ShaderHelper.GL_LINK_STATUS) == GL11.GL_FALSE) { val errorMessage = "Failed to link vertex shader $vertex and fragment shader $fragment. Features that " + "utilise this shader will not work correctly, if at all" val errorLog = StringUtils.trim(ShaderHelper.glGetShaderInfoLog(shaderProgram, 1024)) diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt index 89efd7d9f..1e8062500 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt @@ -82,11 +82,11 @@ class ShaderHelper { ) else GL20.glGetProgramInfoLog(program, maxLength) } - fun glGetProgrami(program: Int, pname: Int): Int { + fun glGetProgramInt(program: Int, pName: Int): Int { return if (USING_ARB_SHADERS) ARBShaderObjects.glGetObjectParameteriARB( program, - pname - ) else GL20.glGetProgrami(program, pname) + pName + ) else GL20.glGetProgrami(program, pName) } fun glUseProgram(program: Int) { @@ -115,11 +115,11 @@ class ShaderHelper { if (USING_ARB_SHADERS) ARBShaderObjects.glCompileShaderARB(shader) else GL20.glCompileShader(shader) } - fun glGetShaderi(shader: Int, pname: Int): Int { + fun glGetShaderInt(shader: Int, pName: Int): Int { return if (USING_ARB_SHADERS) ARBShaderObjects.glGetObjectParameteriARB( shader, - pname - ) else GL20.glGetShaderi(shader, pname) + pName + ) else GL20.glGetShaderi(shader, pName) } fun glGetShaderInfoLog(shader: Int, maxLength: Int): String { diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt index 057e0a031..39a2fe302 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt @@ -71,7 +71,7 @@ object ShaderManager { ShaderHelper.glShaderSource(shaderID, source.toString()) ShaderHelper.glCompileShader(shaderID) - if (ShaderHelper.glGetShaderi(shaderID, ShaderHelper.GL_COMPILE_STATUS) == 0) { + if (ShaderHelper.glGetShaderInt(shaderID, ShaderHelper.GL_COMPILE_STATUS) == 0) { val errorMessage = "Failed to compile shader $fileName${type.extension}. Features that utilise this " + "shader will not work correctly, if at all" val errorLog = StringUtils.trim(ShaderHelper.glGetShaderInfoLog(shaderID, 1024)) diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt index 5fa12dbb6..4b871377b 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt @@ -24,7 +24,7 @@ abstract class ItemTrackerData : TrackerData() { resetItems() } - fun additem(internalName: NEUInternalName, stackSize: Int) { + fun addItem(internalName: NEUInternalName, stackSize: Int) { val item = items.getOrPut(internalName) { TrackedItem() } item.timesGained++ diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt index f7bafb7f3..21f115746 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt @@ -37,7 +37,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>( fun addItem(internalName: NEUInternalName, amount: Int) { modify { - it.additem(internalName, amount) + it.addItem(internalName, amount) } getSharedTracker()?.let { val hidden = it.get(DisplayMode.TOTAL).items[internalName]!!.hidden |