aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/data/mob
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data/mob')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt11
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt11
4 files changed, 28 insertions, 5 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
index d35d46759..4a9323ae2 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
@@ -83,7 +83,16 @@ class Mob(
val extraEntities: List<EntityLivingBase> = extraEntitiesList
enum class Type {
- DISPLAY_NPC, SUMMON, BASIC, DUNGEON, BOSS, SLAYER, PLAYER, PROJECTILE, SPECIAL;
+ DISPLAY_NPC,
+ SUMMON,
+ BASIC,
+ DUNGEON,
+ BOSS,
+ SLAYER,
+ PLAYER,
+ PROJECTILE,
+ SPECIAL,
+ ;
fun isSkyblockMob() = when (this) {
BASIC, DUNGEON, BOSS, SLAYER -> true
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt
index 9ed5a4497..b8bf67f81 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt
@@ -43,7 +43,10 @@ class MobData {
}
internal enum class Result {
- Found, NotYetFound, Illegal, SomethingWentWrong
+ Found,
+ NotYetFound,
+ Illegal,
+ SomethingWentWrong,
}
internal class MobResult(val result: Result, val mob: Mob?) {
@@ -71,7 +74,7 @@ class MobData {
internal class RetryEntityInstancing(
var entity: EntityLivingBase,
var times: Int,
- val roughType: MobType
+ val roughType: MobType,
) {
override fun hashCode() = entity.entityId
override fun equals(other: Any?) = (other as? RetryEntityInstancing).hashCode() == this.hashCode()
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
index b31b2a47b..5629eefcf 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
@@ -168,7 +168,9 @@ class MobDetection {
/** For mobs that have default health of the entity */
private enum class EntityPacketType {
- SPIRIT_BAT, VILLAGER, CREEPER_VAIL
+ SPIRIT_BAT,
+ VILLAGER,
+ CREEPER_VAIL,
}
/** Handles some mobs that have default health of the entity, specially using the [EntityHealthUpdateEvent] */
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
index 134274620..33ab90e60 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
@@ -91,7 +91,16 @@ object MobFilter {
const val MINION_MOB_PREFIX = "Minion Mob "
enum class DungeonAttribute {
- Flaming, Stormy, Speedy, Fortified, Healthy, Healing, Boomer, Golden, Stealth;
+ Flaming,
+ Stormy,
+ Speedy,
+ Fortified,
+ Healthy,
+ Healing,
+ Boomer,
+ Golden,
+ Stealth,
+ ;
companion object {