aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2024-07-06 08:08:52 +0200
committerGitHub <noreply@github.com>2024-07-06 08:08:52 +0200
commit7b3ed85d171c156f895fdbaeff4d18572fc0f18e (patch)
tree0bbfeca0a796bdd6494548f9f161edbc7fb6b700 /src/main/java/at/hannibal2/skyhanni/features
parent34ba8c5fb8304e7b568822f8d3f675a0f133c6da (diff)
downloadskyhanni-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/main/java/at/hannibal2/skyhanni/features')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt30
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt16
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt2
28 files changed, 67 insertions, 66 deletions
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()) {