diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
8 files changed, 34 insertions, 9 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ClickType.kt b/src/main/java/at/hannibal2/skyhanni/data/ClickType.kt index b008978f0..97b3fc87a 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ClickType.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ClickType.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.data enum class ClickType { - LEFT_CLICK, RIGHT_CLICK + LEFT_CLICK, + RIGHT_CLICK, } diff --git a/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt index 224ce9979..2815db0ab 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt @@ -33,6 +33,7 @@ object FriendAPI { "addbest", ".*\n(?<name>.*)§a is now a best friend!§r§9§m\n.*" ) + /** * REGEX-TEST: * §eClick here to view §bAaronL_Jackson§e's profile diff --git a/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt index ff8f4b5e4..9bbccc161 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt @@ -24,7 +24,7 @@ object PurseAPI { private var inventoryCloseTime = 0L var currentPurse = 0.0 - private set + private set @SubscribeEvent fun onInventoryClose(event: InventoryCloseEvent) { diff --git a/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt index 702e29cb5..662d2e921 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt @@ -263,8 +263,8 @@ object QuiverAPI { private fun checkChestplate() { val wasWearing = wearingSkeletonMasterChestplate - wearingSkeletonMasterChestplate = InventoryUtils.getChestplate()?.getInternalName()?.equals( - SKELETON_MASTER_CHESTPLATE) ?: false + wearingSkeletonMasterChestplate = + InventoryUtils.getChestplate()?.getInternalName() == SKELETON_MASTER_CHESTPLATE if (wasWearing != wearingSkeletonMasterChestplate) { QuiverUpdateEvent(currentArrow, currentAmount, shouldHideAmount()).postAndCatch() } 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 { |