aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/combat
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/combat
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/combat')
-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
5 files changed, 9 insertions, 9 deletions
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(