diff options
| author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2024-06-14 05:49:38 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-13 21:49:38 +0200 |
| commit | 5bd6a4cd3807d128ba55c336946531a8838c51c7 (patch) | |
| tree | 3b3b4589cb4e47541f8d12602682a37f44b18a80 /src/main/java/at/hannibal2/skyhanni/data/mob | |
| parent | e9c12d363a45d7cc1581fd882f3701b5388f4a8e (diff) | |
| download | skyhanni-5bd6a4cd3807d128ba55c336946531a8838c51c7.tar.gz skyhanni-5bd6a4cd3807d128ba55c336946531a8838c51c7.tar.bz2 skyhanni-5bd6a4cd3807d128ba55c336946531a8838c51c7.zip | |
Backend: Apply annotations to everything (#1983)
* add plugin
Co-authored-by: ThatGravyBoat <thatgravyboat@gmail.com>
* data and apis done
* other stuff done
* fix merge
* Backend: Classes -> Objects with annotation
* Backend: Apply annotations to everything
* fix test
* fix merge
* fix merge
* use annotation
* use annotation
* fix version number
* fix space
* bring back fix
* work on companion again now that they are all done
* oop
* fixed merge conflicts
---------
Co-authored-by: ThatGravyBoat <thatgravyboat@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data/mob')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt | 1 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt | 5 |
2 files changed, 2 insertions, 4 deletions
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 59cacde87..4eb79d6de 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt @@ -19,7 +19,6 @@ object MobData { val entityList get() = this.flatMap { listOf(it.baseEntity) + (it.extraEntities) } } - val players = MobSet() val displayNPCs = MobSet() val skyblockMobs = MobSet() 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 0c59a72ac..c1e17f06b 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt @@ -3,7 +3,6 @@ package at.hannibal2.skyhanni.data.mob import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.IslandType -import at.hannibal2.skyhanni.data.mob.MobData.logger import at.hannibal2.skyhanni.data.mob.MobFilter.isDisplayNPC import at.hannibal2.skyhanni.data.mob.MobFilter.isRealPlayer import at.hannibal2.skyhanni.data.mob.MobFilter.isSkyBlockMob @@ -133,7 +132,7 @@ object MobDetection { private fun getRetry(entity: EntityLivingBase) = MobData.retries[entity.entityId] /** @return always true */ - private fun mobDetectionError(string: String) = logger.log(string).let { true } + private fun mobDetectionError(string: String) = MobData.logger.log(string).let { true } /**@return a false means that it should try again (later)*/ private fun entitySpawn(entity: EntityLivingBase, roughType: Mob.Type): Boolean { @@ -267,7 +266,7 @@ object MobDetection { val entity = retry.entity if (retry.times == MAX_RETRIES) { - logger.log( + MobData.logger.log( "`${retry.entity.name}`${retry.entity.entityId} missed {\n " + "is already Found: ${MobData.entityToMob[retry.entity] != null})." + "\n Position: ${retry.entity.getLorenzVec()}\n " |