aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorThunderblade73 <85900443+Thunderblade73@users.noreply.github.com>2024-05-26 12:23:02 +0200
committerGitHub <noreply@github.com>2024-05-26 12:23:02 +0200
commitea1385c77ffa8b9a4f98811fbf3e767c30d9edf7 (patch)
tree668444c961f0e8fc23cf5e52b38c11e33ad74b11 /src/main
parenta214c141696f054b79c6ac13cb309992e3ac95d1 (diff)
downloadskyhanni-ea1385c77ffa8b9a4f98811fbf3e767c30d9edf7.tar.gz
skyhanni-ea1385c77ffa8b9a4f98811fbf3e767c30d9edf7.tar.bz2
skyhanni-ea1385c77ffa8b9a4f98811fbf3e767c30d9edf7.zip
Fix Typos (#1897)
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/fishing/BarnTimerConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryConfig.java4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/TiaRelayConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/itemability/ChickenHeadConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/AdvancedPlayerListConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/misc/cosmetic/ArrowTrailConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/mobs/AreaMiniBossFeatures.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt16
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorRewardWarning.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTimeTowerManager.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/FossilExcavatorAPI.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/CorpseAPI.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/ModifyVisualWords.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminHighlighter.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/mixins/init/BeforeForLoopInjectionPoint.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyEntitiesCommand.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ConditionalUtils.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt2
40 files changed, 59 insertions, 59 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
index 5c85c97ec..f4f870b72 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
@@ -216,7 +216,7 @@ class ConfigManager {
}
}
- // Some position elements dont need config links as they dont have a config option.
+ // Some position elements don't need config links as they don't have a config option.
private val ignoredMissingConfigLinks = listOf(
// commands
"features.garden.GardenConfig.cropSpeedMeterPos",
@@ -292,7 +292,7 @@ class ConfigManager {
run()
} catch (e: Throwable) {
e.printStackTrace()
- LorenzUtils.shutdownMinecraft("Config is corrupt inside developement enviroment.")
+ LorenzUtils.shutdownMinecraft("Config is corrupt inside development environment.")
}
} else {
run()
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/BarnTimerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/BarnTimerConfig.java
index 1cc46da60..c5992856b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/BarnTimerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/BarnTimerConfig.java
@@ -61,7 +61,7 @@ public class BarnTimerConfig {
public boolean wormLimitAlert = true;
@Expose
- @ConfigOption(name = "Reset Timer Hotkey", desc = "Press this key to reset the timer manualy")
+ @ConfigOption(name = "Reset Timer Hotkey", desc = "Press this key to reset the timer manually")
@ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
public int manualResetTimer = Keyboard.KEY_NONE;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryConfig.java
index 3f86dfefe..db49702d9 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryConfig.java
@@ -126,13 +126,13 @@ public class ChocolateFactoryConfig {
public Position position = new Position(163, 160, false, true);
@Expose
- @ConfigOption(name = "Compact On Click", desc = "Compact the item toolip when clicking on the chocolate.")
+ @ConfigOption(name = "Compact On Click", desc = "Compact the item tooltip when clicking on the chocolate.")
@ConfigEditorBoolean
@FeatureToggle
public boolean compactOnClick = true;
@Expose
- @ConfigOption(name = "Always Compact", desc = "Always Compact the item toolip on the chocolate. Requires the above option to be enabled.")
+ @ConfigOption(name = "Always Compact", desc = "Always Compact the item tooltip on the chocolate. Requires the above option to be enabled.")
@ConfigEditorBoolean
public boolean compactOnClickAlways = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/TiaRelayConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/TiaRelayConfig.java
index 16dfbb8ef..c51707f45 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/TiaRelayConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/TiaRelayConfig.java
@@ -8,7 +8,7 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
public class TiaRelayConfig {
@Expose
- @ConfigOption(name = "Sound Puzzle Helper", desc = "Helps with solving the sound puzzle for Tia (The 9 Operator Chips to do maintainance for the Abiphone Network).")
+ @ConfigOption(name = "Sound Puzzle Helper", desc = "Helps with solving the sound puzzle for Tia (The 9 Operator Chips to do maintenance for the Abiphone Network).")
@ConfigEditorBoolean
@FeatureToggle
public boolean soundHelper = true;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/itemability/ChickenHeadConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/itemability/ChickenHeadConfig.java
index 68dce34a5..ecae45026 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/itemability/ChickenHeadConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/itemability/ChickenHeadConfig.java
@@ -10,7 +10,7 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
public class ChickenHeadConfig {
@Expose
- @ConfigOption(name = "Checken Head Timer", desc = "Show the cooldown until the next time you can lay an egg with the Chicken Head.")
+ @ConfigOption(name = "Chicken Head Timer", desc = "Show the cooldown until the next time you can lay an egg with the Chicken Head.")
@ConfigEditorBoolean
@FeatureToggle
public boolean displayTimer = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/AdvancedPlayerListConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/AdvancedPlayerListConfig.java
index a7652967e..d28f107fb 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/AdvancedPlayerListConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/AdvancedPlayerListConfig.java
@@ -81,7 +81,7 @@ public class AdvancedPlayerListConfig {
public boolean useLevelColorForName = false;
@Expose
- @ConfigOption(name = "Bingo Rank Number", desc = "Show the number of the bingo rank next to the icon. Useful if you are not so familar with bingo.")
+ @ConfigOption(name = "Bingo Rank Number", desc = "Show the number of the bingo rank next to the icon. Useful if you are not so familiar with bingo.")
@ConfigEditorBoolean
public boolean showBingoRankNumber = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/cosmetic/ArrowTrailConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/cosmetic/ArrowTrailConfig.java
index 9195de6f8..203b47075 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/cosmetic/ArrowTrailConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/cosmetic/ArrowTrailConfig.java
@@ -15,7 +15,7 @@ public class ArrowTrailConfig {
public boolean enabled = false;
@Expose
- @ConfigOption(name = "Hide Nonplayer Arrows", desc = "Only shows for arrows the player has shot.")
+ @ConfigOption(name = "Hide Non-player Arrows", desc = "Only shows for arrows the player has shot.")
@ConfigEditorBoolean
public boolean hideOtherArrows = true;
diff --git a/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt
index c40b291e6..f2e3a02ce 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt
@@ -90,7 +90,7 @@ object QuiverAPI {
"(?:§.)*You've added (?:§.)*(?<type>.*) x(?<amount>.*) (?:§.)*to your quiver!"
)
- // Bows that don't use the players arrows, checked using the SkyBlock Id
+ // Bows that don't use the players arrows, checked using the SkyBlock ID
private val fakeBowsPattern by group.pattern("fakebows", "^(BOSS_SPIRIT_BOW|CRYPT_BOW)$")
private val quiverInventoryNamePattern by group.pattern("quivername", "^Quiver$")
private val quiverInventoryPattern by group.pattern(
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 cd9465264..db39e98c5 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt
@@ -68,7 +68,7 @@ object HypixelBazaarFetcher {
}
if (internalName.getItemStackOrNull() == null) {
- // Items that exist in Hypixel's Bazaar API, but not in NEU repo (not visible in in the ingame bazaar).
+ // Items that exist in Hypixel's Bazaar API, but not in NEU repo (not visible in the ingame bazaar).
// Should only include Enchants
if (LorenzUtils.debug)
println("Unknown bazaar product: $key/$internalName")
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<LorenzVec, Burrow>()
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<EntityItem>(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<Int>(1.minutes)
+ private val checkedEntities = TimeLimitedSet<Int>(1.minutes)
// TODO repo
private val fly =
@@ -37,8 +37,8 @@ class VerminHighlighter {
for (entity in EntityUtils.getEntities<EntityLivingBase>()) {
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()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/init/BeforeForLoopInjectionPoint.java b/src/main/java/at/hannibal2/skyhanni/mixins/init/BeforeForLoopInjectionPoint.java
index 5316a8258..c3b47e9ee 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/init/BeforeForLoopInjectionPoint.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/init/BeforeForLoopInjectionPoint.java
@@ -21,7 +21,7 @@ import java.util.Collection;
* }
* }
* </pre>
- * Does not work for more complex instructions which call functions or do other operations inside of the for loop header.
+ * Does not work for more complex instructions which call functions or do other operations inside the for loop header.
* Does not work for {@link java.util.Iterator iterators}.
*
* <p>Set the lvIndex arg to specify which lvIndex to search for when selecting the loop.</p>
diff --git a/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt b/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt
index 76ebba30e..08d0322c5 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt
@@ -22,7 +22,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
object TestCopyBestiaryValues {
- class BestiarityObject {
+ class BestiarityObject { // TODO fix typo
@Expose
var name: String = ""
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyEntitiesCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyEntitiesCommand.kt
index 276e5477a..f50d4cb45 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyEntitiesCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyEntitiesCommand.kt
@@ -235,7 +235,7 @@ object CopyNearbyEntitiesCommand {
add("Name: ${mob.name}")
add("Type: ${mob.mobType}")
add("Base Entity: ${mob.baseEntity.asString()}")
- add("Armorstand: ${mob.armorStand?.asString()}")
+ add("ArmorStand: ${mob.armorStand?.asString()}")
if (mob.extraEntities.isNotEmpty()) {
add("Extra Entities")
addAll(mob.extraEntities.map { " " + it.asString() })
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
index 1448cd250..94cdc4f0d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
@@ -67,7 +67,7 @@ object ChatUtils {
* Why deprecate this? Even if this message is descriptive for the user and the developer,
* we don't want inconsistencies in errors, and we would need to search
* for the code line where this error gets printed any way.
- * so it's better to use the stack trace still.
+ * So it's better to use the stack trace still.
*
* @param message The message to be sent
*
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt
index b7dbce754..52656f6ad 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt
@@ -5,7 +5,7 @@ import kotlin.math.max
object ColorUtils {
- /** transfer string colors from the config to java.awt.Color */
+ /** Transfer string colors from the config to java.awt.Color */
fun String.toChromaColor() = Color(toChromaColorInt(), true)
fun String.toChromaColorInt() = SpecialColour.specialToChromaRGB(this)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ConditionalUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ConditionalUtils.kt
index 1ee91774b..00aec1dc5 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ConditionalUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ConditionalUtils.kt
@@ -5,8 +5,8 @@ import io.github.notenoughupdates.moulconfig.observer.Property
object ConditionalUtils {
- fun <T> T.transformIf(condition: T.() -> Boolean, transofmration: T.() -> T) =
- if (condition()) transofmration(this) else this
+ fun <T> T.transformIf(condition: T.() -> Boolean, transformation: T.() -> T) =
+ if (condition()) transformation(this) else this
fun <T> T.conditionalTransform(condition: Boolean, ifTrue: T.() -> Any, ifFalse: T.() -> Any) =
if (condition) ifTrue(this) else ifFalse(this)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index be314a030..90ef85025 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -344,13 +344,13 @@ object ItemUtils {
fun NEUInternalName.isRune(): Boolean = contains("_RUNE;")
- // use when showing the item name to the user (in guis, chat message, etc), not for comparing
+ // use when showing the item name to the user (in guis, chat message, etc.), not for comparing
val ItemStack.itemName: String
get() = getInternalName().itemName
val ItemStack.itemNameWithoutColor: String get() = itemName.removeColor()
- // use when showing the item name to the user (in guis, chat message, etc), not for comparing
+ // use when showing the item name to the user (in guis, chat message, etc.), not for comparing
val NEUInternalName.itemName: String
get() = itemNameCache.getOrPut(this) { grabItemName() }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
index 5df1915c0..d533dfc42 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
@@ -46,7 +46,7 @@ object NumberUtil {
fun format(value: Number, preciseBillions: Boolean = false): String {
@Suppress("NAME_SHADOWING")
val value = value.toLong()
- // Long.MIN_VALUE == -Long.MIN_VALUE so we need an adjustment here
+ // Long.MIN_VALUE == -Long.MIN_VALUE, so we need an adjustment here
if (value == Long.MIN_VALUE) return format(Long.MIN_VALUE + 1, preciseBillions)
if (value < 0) return "-" + format(-value, preciseBillions)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
index 4e5bce010..4e87646fe 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
@@ -464,7 +464,7 @@ object StringUtils {
}
/**
- * Removes starting and ending reset formattings that dont sever a benefit at all.
+ * Removes starting and ending reset formattings that don't sever a benefit at all.
*/
fun String.stripHypixelMessage(): String {
var message = this