aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-07-23 23:46:21 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-07-23 23:46:21 +0200
commit0b8066fcd9c3318723a29ffadeb7e2fbfeb0250e (patch)
treeb9cefd6f22580e1ea7a08a496a7e62fe00c89045
parentf43bac23acf79325f9f4de060b69c5c0b1d870eb (diff)
downloadskyhanni-0b8066fcd9c3318723a29ffadeb7e2fbfeb0250e.tar.gz
skyhanni-0b8066fcd9c3318723a29ffadeb7e2fbfeb0250e.tar.bz2
skyhanni-0b8066fcd9c3318723a29ffadeb7e2fbfeb0250e.zip
fixed names
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/BarnFishingTimer.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/HighlightMiningCommissionMobs.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ParticleHider.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ThunderSparksHighlight.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazes.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazingSouls.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/VampireSlayerFeatures.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/colosseum/BlobbercystsHighlight.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerHideParticles.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyEntitiesCommand.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt6
23 files changed, 32 insertions, 32 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
index 33e6fdd25..e2eae78f7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
@@ -57,7 +57,7 @@ class PlayerDeathMessages {
private fun checkOtherPlayers() {
val location = LocationUtils.playerLocation()
- for (otherPlayer in EntityUtils.getAllEntities<EntityOtherPlayerMP>()
+ for (otherPlayer in EntityUtils.getEntities<EntityOtherPlayerMP>()
.filter { it.getLorenzVec().distance(location) < 25 }) {
lastTimePlayerSeen[otherPlayer.name] = System.currentTimeMillis()
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
index 227790c3e..ece8bb32f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
@@ -300,7 +300,7 @@ class DamageIndicatorManager {
@SubscribeEvent
fun onTick(event: TickEvent.ClientTickEvent) {
if (!LorenzUtils.inSkyBlock) return
- for (entity in EntityUtils.getAllEntities<EntityLivingBase>()) {
+ for (entity in EntityUtils.getEntities<EntityLivingBase>()) {
checkEntity(entity)
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
index ad03f6c27..bde581543 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
@@ -579,7 +579,7 @@ class MobFinder {
private fun findGuardians() {
guardians.clear()
- for (entity in EntityUtils.getAllEntities<EntityGuardian>()) {
+ for (entity in EntityUtils.getEntities<EntityGuardian>()) {
//F3
if (entity.hasMaxHealth(1_000_000) || entity.hasMaxHealth(1_200_000)) {
guardians.add(entity)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
index 241d3d5b4..4daaf4dbf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
@@ -37,7 +37,7 @@ object DungeonLividFinder {
val dyeColor = blockLocation.getBlockStateAt().getValue(BlockStainedGlass.COLOR)
val chatColor = dyeColor.toLorenzColor()?.getChatColor() ?: return
- val lividEntity = EntityUtils.getAllEntities<EntityArmorStand>()
+ val lividEntity = EntityUtils.getEntities<EntityArmorStand>()
.firstOrNull { it.name.startsWith("${chatColor}﴾ ${chatColor}§lLivid") } ?: return
val aabb = with(lividEntity) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/BarnFishingTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/BarnFishingTimer.kt
index 3e88766c2..8ea8b1a59 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/BarnFishingTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/BarnFishingTimer.kt
@@ -59,7 +59,7 @@ class BarnFishingTimer {
}
}
- private fun countMobs() = EntityUtils.getAllEntities<EntityArmorStand>()
+ private fun countMobs() = EntityUtils.getEntities<EntityArmorStand>()
.map { it.name }
.count { it.endsWith("§c❤") }
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 8f98d54ca..9345b1552 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt
@@ -44,7 +44,7 @@ class ShowFishingItemName {
fun onRenderWorld(event: RenderWorldLastEvent) {
if (!isEnabled()) return
if (hasRodInHand) {
- for (entityItem in EntityUtils.getAllEntities<EntityItem>()) {
+ for (entityItem in EntityUtils.getEntities<EntityItem>()) {
val location = event.exactLocation(entityItem).add(0.0, 0.8, 0.0)
if (location.distance(LocationUtils.playerLocation()) > 15) continue
val itemStack = entityItem.entityItem
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index 3bd53b846..7d5edae2e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -600,7 +600,7 @@ class GardenVisitorFeatures {
}
private fun findEntity(nameTag: EntityArmorStand, visitor: Visitor) {
- for (entity in EntityUtils.getAllEntities<EntityArmorStand>()) {
+ for (entity in EntityUtils.getEntities<EntityArmorStand>()) {
if (entity.getLorenzVec().distanceIgnoreY(nameTag.getLorenzVec()) != 0.0) continue
visitor.entityId = entity.entityId
@@ -610,7 +610,7 @@ class GardenVisitorFeatures {
private fun findNametag(visitorName: String): EntityArmorStand? {
val foundVisitorNameTags = mutableListOf<EntityArmorStand>()
- for (entity in EntityUtils.getAllEntities<EntityArmorStand>()) {
+ for (entity in EntityUtils.getEntities<EntityArmorStand>()) {
if (entity.name.removeColor() == visitorName) {
foundVisitorNameTags.add(entity)
}
@@ -621,7 +621,7 @@ class GardenVisitorFeatures {
if (foundVisitorNameTags.size != 2) return null
for (tag in foundVisitorNameTags.toMutableList()) {
- for (entity in EntityUtils.getAllEntities<EntityArmorStand>()) {
+ for (entity in EntityUtils.getEntities<EntityArmorStand>()) {
if (entity in foundVisitorNameTags) continue
val distance = entity.getLorenzVec().distance(tag.getLorenzVec())
if (distance < 1.5 && entity.name == "§bSam") {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/HighlightMiningCommissionMobs.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/HighlightMiningCommissionMobs.kt
index 45614b3dc..563e0e214 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/HighlightMiningCommissionMobs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/HighlightMiningCommissionMobs.kt
@@ -48,7 +48,7 @@ class HighlightMiningCommissionMobs {
if (!isEnabled()) return
if (!event.isMod(40)) return
- val entities = EntityUtils.getAllEntities<EntityLivingBase>()
+ val entities = EntityUtils.getEntities<EntityLivingBase>()
for ((type, entity) in active.flatMap { type -> entities.map { type to it } }) {
if (type.isMob(entity)) {
RenderLivingEntityHelper.setEntityColor(entity, LorenzColor.YELLOW.toColor().withAlpha(127))
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
index 688649905..565b9728a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
@@ -47,7 +47,7 @@ class MarkedPlayerManager {
}
private fun findPlayers() {
- for (entity in EntityUtils.getAllEntities<EntityOtherPlayerMP>()) {
+ for (entity in EntityUtils.getEntities<EntityOtherPlayerMP>()) {
if (entity in markedPlayers.values) continue
val name = entity.name.lowercase()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ParticleHider.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ParticleHider.kt
index b91865aa3..74d33cbd9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/ParticleHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ParticleHider.kt
@@ -36,7 +36,7 @@ class ParticleHider {
if (SkyHanniMod.feature.misc.hideFireballParticles) {
if (type == EnumParticleTypes.SMOKE_NORMAL || type == EnumParticleTypes.SMOKE_LARGE) {
- for (entity in EntityUtils.getAllEntities<EntitySmallFireball>()) {
+ for (entity in EntityUtils.getEntities<EntitySmallFireball>()) {
val distance = entity.getLorenzVec().distance(event.location)
if (distance < 5) {
event.isCanceled = true
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ThunderSparksHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ThunderSparksHighlight.kt
index 81a20c679..5c1e56d51 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/ThunderSparksHighlight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ThunderSparksHighlight.kt
@@ -26,7 +26,7 @@ class ThunderSparksHighlight {
if (!isEnabled()) return
- EntityUtils.getAllEntities<EntityArmorStand>().filter {
+ EntityUtils.getEntities<EntityArmorStand>().filter {
it !in sparks && it.hasSkullTexture(texture)
}.forEach { sparks.add(it) }
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazes.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazes.kt
index 074fc191b..417dff187 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazes.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazes.kt
@@ -37,7 +37,7 @@ class AshfangBlazes {
}
if (nearAshfang) {
- for (entity in EntityUtils.getAllEntities<EntityBlaze>()
+ for (entity in EntityUtils.getEntities<EntityBlaze>()
.filter { it !in blazeColor.keys }) {
val list = entity.getAllNameTagsWith(2, "Ashfang")
if (list.size == 1) {
@@ -70,7 +70,7 @@ class AshfangBlazes {
}
private fun checkNearAshfang() {
- nearAshfang = EntityUtils.getAllEntities<EntityArmorStand>().any { it.name.contains("Ashfang") }
+ nearAshfang = EntityUtils.getEntities<EntityArmorStand>().any { it.name.contains("Ashfang") }
}
@SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazingSouls.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazingSouls.kt
index b9ecf3200..8c1a6647d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazingSouls.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazingSouls.kt
@@ -24,7 +24,7 @@ class AshfangBlazingSouls {
fun onTick(event: TickEvent.ClientTickEvent) {
if (!isEnabled()) return
- EntityUtils.getAllEntities<EntityArmorStand>()
+ EntityUtils.getEntities<EntityArmorStand>()
.filter { it !in souls && it.hasSkullTexture(texture)
}.forEach { souls.add(it) }
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt
index da9d134e6..aaff418a9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt
@@ -23,7 +23,7 @@ class AshfangGravityOrbs {
fun onTick(event: TickEvent.ClientTickEvent) {
if (!isEnabled()) return
- EntityUtils.getAllEntities<EntityArmorStand>()
+ EntityUtils.getEntities<EntityArmorStand>()
.filter { it !in orbs && it.hasSkullTexture(texture) }
.forEach { orbs.add(it) }
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt
index e21e23f07..7cd114d69 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt
@@ -22,7 +22,7 @@ class AshfangNextResetCooldown {
fun renderOverlay(event: ClientTickEvent) {
if (!isEnabled()) return
- if (EntityUtils.getAllEntities<EntityArmorStand>().any {
+ if (EntityUtils.getEntities<EntityArmorStand>().any {
it.posY > 145 && (it.name.contains("§c§9Ashfang Acolyte§r") || it.name.contains("§c§cAshfang Underling§r"))
}) {
spawnTime = System.currentTimeMillis()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/VampireSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/VampireSlayerFeatures.kt
index 4f23ce53e..9a771a36c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/VampireSlayerFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/VampireSlayerFeatures.kt
@@ -42,7 +42,7 @@ class VampireSlayerFeatures {
if (!event.isMod(5)) return
val start = LocationUtils.playerLocation()
if (config.ownBoss.highlight || config.othersBoss.highlight || config.coopsBossHighlight.highlight) {
- EntityUtils.getAllEntities<EntityOtherPlayerMP>().forEach {
+ EntityUtils.getEntities<EntityOtherPlayerMP>().forEach {
val vec = it.position.toLorenzVec()
val distance = start.distance(vec)
if (distance <= 15)
@@ -50,7 +50,7 @@ class VampireSlayerFeatures {
}
}
if (config.bloodIchor.highlight || config.killerSpring.highlight) {
- EntityUtils.getAllEntities<EntityArmorStand>().forEach { stand ->
+ EntityUtils.getEntities<EntityArmorStand>().forEach { stand ->
val vec = stand.position.toLorenzVec()
val distance = start.distance(vec)
val isIchor = stand.hasSkullTexture(bloodIchorTexture)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/colosseum/BlobbercystsHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/colosseum/BlobbercystsHighlight.kt
index 62f515045..74e9b2ae9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/colosseum/BlobbercystsHighlight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/colosseum/BlobbercystsHighlight.kt
@@ -23,7 +23,7 @@ class BlobbercystsHighlight {
fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return
if (!event.isMod(5)) return
- EntityUtils.getAllEntities<EntityOtherPlayerMP>().forEach {
+ EntityUtils.getEntities<EntityOtherPlayerMP>().forEach {
if (it.name == blobberName) {
RenderLivingEntityHelper.setEntityColor(it, Color.RED.withAlpha(80)) { isEnabled() }
RenderLivingEntityHelper.setNoHurtTime(it) { isEnabled() }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt
index 62a1428c8..e8b5204c3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt
@@ -31,7 +31,7 @@ class SlayerItemsOnGround {
if (!SlayerAPI.isInSlayerArea) return
if (!SlayerAPI.hasActiveSlayerQuest()) return
- for (entityItem in EntityUtils.getAllEntities<EntityItem>()) {
+ for (entityItem in EntityUtils.getEntities<EntityItem>()) {
val location = event.exactLocation(entityItem).add(0.0, 0.8, 0.0)
if (location.distance(LocationUtils.playerLocation()) > 15) continue
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerHideParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerHideParticles.kt
index e958dac8c..d6ae27f3b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerHideParticles.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerHideParticles.kt
@@ -20,7 +20,7 @@ class EndermanSlayerHideParticles {
fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return
- endermanLocations = EntityUtils.getAllEntities<EntityEnderman>().map { it.getLorenzVec() }
+ endermanLocations = EntityUtils.getEntities<EntityEnderman>().map { it.getLorenzVec() }
}
@SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
index cf69f0245..54e95cb2b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
@@ -75,7 +75,7 @@ class SummoningMobManager {
}
if (searchArmorStands) {
- EntityUtils.getAllEntities<EntityArmorStand>().filter { it !in summoningMobNametags }
+ EntityUtils.getEntities<EntityArmorStand>().filter { it !in summoningMobNametags }
.forEach {
val name = it.displayName.unformattedText
healthPattern.matchMatcher(name) {
@@ -92,7 +92,7 @@ class SummoningMobManager {
if (searchMobs) {
val playerLocation = LocationUtils.playerLocation()
- EntityUtils.getAllEntities<EntityLiving>().filter {
+ EntityUtils.getEntities<EntityLiving>().filter {
it !in summoningMobs.keys && it.getLorenzVec()
.distance(playerLocation) < 10 && it.ticksExisted < 2
}.forEach {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
index ad554d251..52cd428d6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
@@ -40,7 +40,7 @@ class SummoningSoulsName {
private fun check() {
val minecraft = Minecraft.getMinecraft()
- for (entity in EntityUtils.getAllEntities<EntityArmorStand>()) {
+ for (entity in EntityUtils.getEntities<EntityArmorStand>()) {
if (souls.contains(entity)) continue
if (entity.hasSkullTexture(texture)) {
@@ -59,7 +59,7 @@ class SummoningSoulsName {
}
}
- for (entity in EntityUtils.getAllEntities<EntityLiving>()) {
+ for (entity in EntityUtils.getEntities<EntityLiving>()) {
val consumer = entity.getNameTagWith(2, "§c❤")
if (consumer != null) {
if (!consumer.name.contains("§e0")) {
@@ -69,7 +69,7 @@ class SummoningSoulsName {
}
}
- val entityList = EntityUtils.getAllEntities<EntityArmorStand>()
+ val entityList = EntityUtils.getEntities<EntityArmorStand>()
souls.keys.removeIf { it !in entityList }
//TODO fix overhead!
// mobs.keys.removeIf { it !in world.loadedEntityList }
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 661436c5e..03f7065b1 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyEntitiesCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyEntitiesCommand.kt
@@ -30,7 +30,7 @@ object CopyNearbyEntitiesCommand {
val resultList = mutableListOf<String>()
var counter = 0
- for (entity in EntityUtils.getEntities()) {
+ for (entity in EntityUtils.getAllEntities()) {
val position = entity.position
val vec = position.toLorenzVec()
val distance = start.distance(vec)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
index 59f3f26b2..30a8025cf 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
@@ -132,7 +132,7 @@ object EntityUtils {
getEntitiesNearby(LocationUtils.playerLocation(), radius)
inline fun <reified T : Entity> getEntitiesNearby(location: LorenzVec, radius: Double): List<T> =
- getEntities().filterIsInstance<T>().filter { it.distanceTo(location) < radius }
+ getAllEntities().filterIsInstance<T>().filter { it.distanceTo(location) < radius }
fun EntityLivingBase.isAtFullHealth() = baseMaxHealth == health.toInt()
@@ -158,11 +158,11 @@ object EntityUtils {
fun EntityEnderman.getBlockInHand(): IBlockState? = heldBlockState
- inline fun <reified R: Entity> getAllEntities(): List<R> = getEntities().filterIsInstance<R>()
+ inline fun <reified R: Entity> getEntities(): List<R> = getAllEntities().filterIsInstance<R>()
inline fun <reified R: Entity> getEntitiesOrNull(): List<R>? = getAllEntitiesOrNull()?.filterIsInstance<R>()
- fun getEntities(): List<Entity> = getAllEntitiesOrNull() ?: error("minecraft.world.loadedEntityList is null.")
+ fun getAllEntities(): List<Entity> = getAllEntitiesOrNull() ?: error("minecraft.world.loadedEntityList is null.")
fun getAllEntitiesOrNull(): List<Entity>? = Minecraft.getMinecraft()?.theWorld?.loadedEntityList?.toMutableList()
} \ No newline at end of file