From ea1385c77ffa8b9a4f98811fbf3e767c30d9edf7 Mon Sep 17 00:00:00 2001 From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com> Date: Sun, 26 May 2024 12:23:02 +0200 Subject: Fix Typos (#1897) --- .../at/hannibal2/skyhanni/features/bingo/BingoAPI.kt | 2 +- .../skyhanni/features/bingo/card/goals/BingoGoal.kt | 2 +- .../at/hannibal2/skyhanni/features/chat/Translator.kt | 2 +- .../features/combat/mobs/AreaMiniBossFeatures.kt | 2 +- .../skyhanni/features/event/diana/DianaFixChat.kt | 4 ++-- .../skyhanni/features/event/diana/GriffinBurrowHelper.kt | 2 +- .../features/event/diana/GriffinBurrowParticleFinder.kt | 4 ++-- .../skyhanni/features/event/diana/SoopyGuessBurrow.kt | 16 ++++++++-------- .../skyhanni/features/fishing/ShowFishingItemName.kt | 4 ++-- .../skyhanni/features/garden/GardenOptimalSpeed.kt | 2 +- .../features/garden/visitor/VisitorRewardWarning.kt | 2 +- .../inventory/chocolatefactory/ChocolateFactoryStats.kt | 2 +- .../chocolatefactory/ChocolateFactoryTimeTowerManager.kt | 2 +- .../features/itemabilities/FireVeilWandParticles.kt | 2 +- .../itemabilities/abilitycooldown/ItemAbilityCooldown.kt | 2 +- .../mining/fossilexcavator/FossilExcavatorAPI.kt | 2 +- .../mining/fossilexcavator/solver/FossilSolverDisplay.kt | 2 +- .../skyhanni/features/mining/mineshaft/CorpseAPI.kt | 2 +- .../features/misc/discordrpc/DiscordRPCManager.kt | 6 +++--- .../features/misc/visualwords/ModifyVisualWords.kt | 2 +- .../features/nether/ashfang/AshfangFreezeCooldown.kt | 2 +- .../features/rift/area/westvillage/VerminHighlighter.kt | 8 ++++---- 22 files changed, 37 insertions(+), 37 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features') diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt index ccfd85ef7..afd4f43d8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt @@ -52,7 +52,7 @@ object BingoAPI { add(" guide: '${goal.guide}'") add(" done: '${goal.done}'") add(" highlight: '${goal.highlight}'") - add(" communtyGoalPercentage: '${goal.communtyGoalPercentage}'") + add(" communityGoalPercentage: '${goal.communtyGoalPercentage}'") val hiddenGoalData = goal.hiddenGoalData add(" hiddenGoalData") add(" unknownTip: '${hiddenGoalData.unknownTip}'") 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 120e66112..daccd37e3 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 @@ -26,7 +26,7 @@ class BingoGoal { lateinit var hiddenGoalData: HiddenGoalData @Expose - var communtyGoalPercentage: Double? = null + var communtyGoalPercentage: Double? = null // TODO fix typo (Needs changes inside of storage) override fun toString(): String = displayName } diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt index e513871fe..683fe1857 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt @@ -20,7 +20,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.net.URLDecoder import java.net.URLEncoder -// TODO split into two classes: TranslatorCommand and GoogleTransaltor. only communicates via getTranslationFromEnglish and getTranslationToEnglish +// TODO split into two classes: TranslatorCommand and GoogleTranslator. only communicates via getTranslationFromEnglish and getTranslationToEnglish class Translator { private val messageContentRegex = Regex(".*: (.*)") diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/AreaMiniBossFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/AreaMiniBossFeatures.kt index 06802413a..f64467203 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/AreaMiniBossFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/AreaMiniBossFeatures.kt @@ -123,7 +123,7 @@ class AreaMiniBossFeatures { LorenzVec(-565.0, 41.0, -307.1), LorenzVec(-573.2, 51.0, -353.4), ), - MILLENIA_AGED_BLAZE( + MILLENNIA_AGED_BLAZE( EntityBlaze::class.java, 30_000_000, LorenzColor.DARK_RED, 60, LorenzVec(-292.5, 97.0, -999.7), LorenzVec(-232.3, 77.0, -951.1), 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 04de77ce9..9ba94fe86 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 @@ -34,7 +34,7 @@ class DianaFixChat { lastErrorTime = SimpleTimeMark.farPast() return } - // particles dont work if a valid target point is close + // particles don't work if a valid target point is close if (GriffinBurrowHelper.targetLocation != null) return val spadeUse = lastSpadeUse.passedSince() if (spadeUse <= 3.seconds) return @@ -71,7 +71,7 @@ class DianaFixChat { lastToggleMusicPrompt = SimpleTimeMark.now() ChatUtils.clickableChat( "§cError detecting Diana Guess! Changing the Particle Quality has not worked :( " + - "§eClick here to disable hypixel music!", + "§eClick here to disable hypixel music!", onClick = { hasSetToggleMusic = true HypixelCommands.toggleMusic() 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 c1485bcad..24bc891a8 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 @@ -232,7 +232,7 @@ object GriffinBurrowHelper { while (!isValidGround(gY)) { gY-- if (gY < 65) { - // no ground detected, find lowest block below air + // no ground detected, find the lowest block below air return null } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt index fc43cdd95..f2fc89c5b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt @@ -30,7 +30,7 @@ object GriffinBurrowParticleFinder { private val burrows = mutableMapOf() private var lastDugParticleBurrow: LorenzVec? = null - // This exist to detect the unlucky timing when the user opens a burrow before it gets fully deteced + // This exists to detect the unlucky timing when the user opens a burrow before it gets fully detected private var fakeBurrow: LorenzVec? = null @SubscribeEvent @@ -172,7 +172,7 @@ object GriffinBurrowParticleFinder { if (location == fakeBurrow) { fakeBurrow = null - // This exist to detect the unlucky timing when the user opens a burrow before it gets fully deteced + // This exists to detect the unlucky timing when the user opens a burrow before it gets fully detected tryDig(location, ignoreFound = true) return } 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 125bf718f..73fbc21a5 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 @@ -202,17 +202,17 @@ class SoopyGuessBurrow { val xOff = dist * sin(y) val zOff = dist * cos(y) - val dencity = 5 + val density = 5 - for (o in 0..dencity) { - lastPos[0] += xOff / dencity - lastPos[2] += zOff / dencity + for (o in 0..density) { + lastPos[0] += xOff / density + lastPos[2] += zOff / density - lastPos[1] += ySpeed * dist / dencity - lastPos2[1] += ySpeed * dist / dencity + lastPos[1] += ySpeed * dist / density + lastPos2[1] += ySpeed * dist / density - lastPos2[0] -= xOff / dencity - lastPos2[2] -= zOff / dencity + lastPos2[0] -= xOff / density + lastPos2[2] -= zOff / density pr1.add(lastPos.toLorenzVec()) pr2.add(lastPos2.toLorenzVec()) diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt index 2ce023100..13bd451f7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt @@ -33,7 +33,7 @@ class ShowFishingItemName { if (!isEnabled()) return for (entityItem in EntityUtils.getEntitiesNextToPlayer(15.0)) { val itemStack = entityItem.entityItem - // Hypixel sometimes replaces the bait item mid air with a stone + // Hypixel sometimes replaces the bait item midair with a stone if (itemStack.name.removeColor() == "Stone") continue var text = "" @@ -43,7 +43,7 @@ class ShowFishingItemName { if (itemStack.getSkullTexture() in cheapCoins) { text = "§6Coins" } else { - val name = itemStack.name.transformIf({isBait}) { "§7" + this.removeColor() } + val name = itemStack.name.transformIf({ isBait }) { "§7" + this.removeColor() } text += if (isBait) "§c§l- §r" else "§a§l+ §r" val size = itemStack.stackSize diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt index fd73ec730..fcd7fcf9f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt @@ -33,7 +33,7 @@ class GardenOptimalSpeed { /** * This speed value represents the walking speed, not the speed stat. - * blocks per second = 4.317 * speed / 100 + * Blocks per second = 4.317 * speed / 100 * * It has an absolute speed cap of 500, and items that normally increase the cap do not apply here: * (Black Cat pet, Cactus knife, Racing Helmet or Young Dragon Armor) diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorRewardWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorRewardWarning.kt index 75d0af8bb..b62f65cad 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorRewardWarning.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorRewardWarning.kt @@ -68,7 +68,7 @@ class VisitorRewardWarning { return } - // all but shift clicktypes work for accepting visitor + // all but shift click types work for accepting visitor if (event.clickTypeEnum == GuiContainerEvent.ClickType.SHIFT) return if (isRefuseSlot) { VisitorAPI.changeStatus(visitor, VisitorAPI.VisitorStatus.REFUSED, "refused") diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt index 87aa21023..04bf1b595 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt @@ -57,7 +57,7 @@ object ChocolateFactoryStats { "§6${ChocolateFactoryTimeTowerManager.timeTowerCharges()}" } - val timeTowerFull = ChocolateFactoryTimeTowerManager.timeTowerFullTimemark() + val timeTowerFull = ChocolateFactoryTimeTowerManager.timeTowerFullTimeMark() val prestigeEstimate = ChocolateAmount.PRESTIGE.formattedTimeUntilGoal(ChocolateFactoryAPI.chocolateForPrestige) val chocolateUntilPrestigeCalculation = diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTimeTowerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTimeTowerManager.kt index 695d1d480..530bd7558 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTimeTowerManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTimeTowerManager.kt @@ -123,7 +123,7 @@ object ChocolateFactoryTimeTowerManager { } } - fun timeTowerFullTimemark(): SimpleTimeMark { + fun timeTowerFullTimeMark(): SimpleTimeMark { val profileStorage = profileStorage ?: return SimpleTimeMark.farPast() if (timeTowerFull()) return SimpleTimeMark.farPast() val nextChargeDuration = SimpleTimeMark(profileStorage.nextTimeTower) diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt index 8e6b92bed..f299d4e3c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt @@ -43,7 +43,7 @@ class FireVeilWandParticles { if (event.clickType != ClickType.RIGHT_CLICK) return val internalName = event.itemInHand?.getInternalName() - if (AshfangFreezeCooldown.iscurrentlyFrozen()) return + if (AshfangFreezeCooldown.isCurrentlyFrozen()) return if (internalName == item) { lastClick = SimpleTimeMark.now() diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt index 910896271..8e81ef16f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt @@ -178,7 +178,7 @@ class ItemAbilityCooldown { @SubscribeEvent fun onItemClick(event: ItemClickEvent) { - if (AshfangFreezeCooldown.iscurrentlyFrozen()) return + if (AshfangFreezeCooldown.isCurrentlyFrozen()) return handleItemClick(event.itemInHand) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/FossilExcavatorAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/FossilExcavatorAPI.kt index 56b3242b9..764bf1d6d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/FossilExcavatorAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/FossilExcavatorAPI.kt @@ -111,7 +111,7 @@ object FossilExcavatorAPI { */ ItemUtils.readItemAmount(group("item")) } ?: return - // Workaround: If it is a enchanted book, we assume it is a paleontologist I book + // Workaround: If it is an enchanted book, we assume it is a paleontologist I book if (pair.first.let { it == "§fEnchanted" || it == "§fEnchanted Book" }) { pair = "§9Paleontologist I" to pair.second } diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt index 5ddf8b857..49dade3fc 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt @@ -184,7 +184,7 @@ object FossilSolverDisplay { if (!isEnabled()) return if (inExcavatorMenu) { - // render here so they can move it around. As if you press key while doing the excavator you lose the scrap + // Render here so they can move it around. As if you press key while doing the excavator you lose the scrap config.position.renderString("§eExcavator solver gui", posLabel = "Fossil Excavator Solver") return } diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/CorpseAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/CorpseAPI.kt index db16e4d58..28e24724d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/CorpseAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/CorpseAPI.kt @@ -75,7 +75,7 @@ class CorpseAPI { */ ItemUtils.readItemAmount(group("item")) } ?: return - // Workaround: If it is a enchanted book, we assume it is a paleontologist I book + // Workaround: If it is an enchanted book, we assume it is a paleontologist I book if (pair.first.let { it == "§fEnchanted" || it == "§fEnchanted Book" }) { // pair = "Paleontologist I" to pair.second pair = "§9Ice Cold I" to pair.second diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt index ec022920c..b132561ff 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt @@ -85,8 +85,8 @@ object DiscordRPCManager : IPCListener { logger.warn("Failed to connect to RPC!", ex) ChatUtils.clickableChat( "Discord Rich Presence was unable to start! " + - "This usually happens when you join SkyBlock when Discord is not started. " + - "Please run /shrpcstart to retry once you have launched Discord.", + "This usually happens when you join SkyBlock when Discord is not started. " + + "Please run /shrpcstart to retry once you have launched Discord.", onClick = { startCommand() } @@ -164,7 +164,7 @@ object DiscordRPCManager : IPCListener { @SubscribeEvent fun onTick(event: LorenzTickEvent) { - // the mod has already started the connection process. this variable is my way of running a function when + // The mod has already started the connection process. This variable is my way of running a function when // the player joins SkyBlock but only running it again once they join and leave. if (started || !isEnabled()) return if (LorenzUtils.inSkyBlock) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/ModifyVisualWords.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/ModifyVisualWords.kt index b0a9d651e..8afc503dd 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/ModifyVisualWords.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/ModifyVisualWords.kt @@ -45,7 +45,7 @@ object ModifyVisualWords { } } - // Disabled, as its only a novelty for 30 seconds and will annoy after that everyone. + // Disabled, as it's only a novelty for 30 seconds and will annoy after that everyone. /* if (LorenzUtils.isAprilFoolsDay && !FontRendererHook.cameFromChat && Random.nextDouble() < 0.02) { modifiedText = modifiedText.replace(reverseRegex) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt index 87ff3b5f0..e1ac0aea0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt @@ -52,7 +52,7 @@ object AshfangFreezeCooldown { } } - fun iscurrentlyFrozen(): Boolean { + fun isCurrentlyFrozen(): Boolean { val passedSince = lastHit.passedSince() val maxDuration = 3.seconds val duration = maxDuration - passedSince diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminHighlighter.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminHighlighter.kt index 534f8bc02..5cf2368f0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminHighlighter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminHighlighter.kt @@ -23,7 +23,7 @@ import kotlin.time.Duration.Companion.minutes class VerminHighlighter { private val config get() = RiftAPI.config.area.westVillage.verminHighlight - private val checkedEntites = TimeLimitedSet(1.minutes) + private val checkedEntities = TimeLimitedSet(1.minutes) // TODO repo private val fly = @@ -37,8 +37,8 @@ class VerminHighlighter { for (entity in EntityUtils.getEntities()) { val id = entity.entityId - if (id in checkedEntites) continue - checkedEntites.add(id) + if (id in checkedEntities) continue + checkedEntities.add(id) if (!isVermin(entity)) continue val color = config.color.get().toChromaColor().withAlpha(60) @@ -50,7 +50,7 @@ class VerminHighlighter { fun onConfigLoad(event: ConfigLoadEvent) { ConditionalUtils.onToggle(config.color) { // running setEntityColorWithNoHurtTime() again - checkedEntites.clear() + checkedEntities.clear() } } -- cgit