moving rift classes around for no reason

25 files changed, 27 insertions, 381 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt
index 4e500d21f..15ff1c658 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.features.rift.everywhere
+package at.hannibal2.skyhanni.features.rift
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.features.RiftConfig
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/VampireSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/VampireSlayerFeatures.kt
deleted file mode 100644
index 41b6a3ea9..000000000
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/VampireSlayerFeatures.kt
+++ /dev/null
@@ -1,359 +0,0 @@
-package at.hannibal2.skyhanni.features.rift
-
-import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.data.ClickType
-import at.hannibal2.skyhanni.data.TitleUtils
-import at.hannibal2.skyhanni.events.*
-import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
-import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
-import at.hannibal2.skyhanni.test.GriffinUtils.drawWaypointFilled
-import at.hannibal2.skyhanni.utils.*
-import at.hannibal2.skyhanni.utils.EntityUtils.getAllNameTagsInRadiusWith
-import at.hannibal2.skyhanni.utils.EntityUtils.hasSkullTexture
-import at.hannibal2.skyhanni.utils.EntityUtils.isNPC
-import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth
-import at.hannibal2.skyhanni.utils.LorenzUtils.editCopy
-import at.hannibal2.skyhanni.utils.LorenzUtils.toChromaColor
-import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
-import at.hannibal2.skyhanni.utils.RenderUtils.drawColor
-import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
-import at.hannibal2.skyhanni.utils.RenderUtils.exactLocation
-import at.hannibal2.skyhanni.utils.SoundUtils.playSound
-import kotlinx.coroutines.*
-import net.minecraft.client.Minecraft
-import net.minecraft.client.entity.EntityOtherPlayerMP
-import net.minecraft.client.renderer.GlStateManager
-import net.minecraft.entity.EntityLivingBase
-import net.minecraft.entity.item.EntityArmorStand
-import net.minecraft.util.EnumParticleTypes
-import net.minecraftforge.client.event.RenderLivingEvent
-import net.minecraftforge.client.event.RenderWorldLastEvent
-import net.minecraftforge.event.entity.living.LivingDeathEvent
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import kotlin.time.Duration.Companion.milliseconds
-
-object VampireSlayerFeatures {
-
-    private val config get() = SkyHanniMod.feature.slayer.vampireSlayerConfig
-    private val configOwnBoss get() = config.ownBoss
-    private val configOtherBoss get() = config.othersBoss
-    private val configCoopBoss get() = config.coopBoss
-    private val configBloodIcor get() = config.bloodIchor
-    private val configKillerSpring get() = config.killerSpring
-
-    private val entityList = mutableListOf<EntityLivingBase>()
-    private val taggedEntityList = mutableListOf<Int>()
-    private var standList = mapOf<EntityArmorStand, EntityOtherPlayerMP>()
-    private val username get() = LorenzUtils.getPlayerName()
-    private val bloodIchorTexture =
-        "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzAzNDA5MjNhNmRlNDgyNWExNzY4MTNkMTMzNTAzZWZmMTg2ZGIwODk2ZTMyYjY3MDQ5MjhjMmEyYmY2ODQyMiJ9fX0="
-    private val killerSpringTexture =
-        "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzdmN2E3YmM4YWM4NmYyM2NhN2JmOThhZmViNzY5NjAyMjdlMTgzMmZlMjA5YTMwMjZmNmNlYjhiZGU3NGY1NCJ9fX0="
-    private var nextClawSend = 0L
-
-    @SubscribeEvent
-    fun onTick(event: LorenzTickEvent) {
-        if (!isEnabled()) return
-        if (!event.isMod(5)) return
-        val start = LocationUtils.playerLocation()
-        if (configOwnBoss.highlight || configOtherBoss.highlight || configCoopBoss.highlight) {
-            EntityUtils.getEntities<EntityOtherPlayerMP>().forEach {
-                val vec = it.position.toLorenzVec()
-                val distance = start.distance(vec)
-                if (distance <= 15)
-                    it.process()
-            }
-        }
-        if (configBloodIcor.highlight || configKillerSpring.highlight) {
-            EntityUtils.getEntities<EntityArmorStand>().forEach { stand ->
-                val vec = stand.position.toLorenzVec()
-                val distance = start.distance(vec)
-                val isIchor = stand.hasSkullTexture(bloodIchorTexture)
-                if (isIchor || stand.hasSkullTexture(killerSpringTexture)) {
-                    val color = (if (isIchor) configBloodIcor.color else configKillerSpring.color)
-                        .toChromaColor().withAlpha(config.withAlpha)
-                    if (distance <= 15) {
-                        RenderLivingEntityHelper.setEntityColor(
-                            stand,
-                            color
-                        ) { isEnabled() }
-                        if (isIchor)
-                            entityList.add(stand)
-                    }
-                }
-            }
-        }
-        if (event.repeatSeconds(1)) {
-            entityList.editCopy { removeIf { it.isDead } }
-        }
-    }
-
-    private fun EntityOtherPlayerMP.process() {
-        if (name != "Bloodfiend ") return
-
-        if (configOwnBoss.twinClawsTitle || configOtherBoss.twinClawsTitle || configCoopBoss.twinClawsTitle) {
-            getAllNameTagsInRadiusWith("TWINCLAWS").forEach { stand ->
-                if (".*(?:§(?:\\d|\\w))+TWINCLAWS (?:§(?:\\w|\\d))+[0-9.,]+s.*".toRegex().matches(stand.name)) {
-                    val coopList = configCoopBoss.coopMembers.split(",").toList()
-                    val containUser = getAllNameTagsInRadiusWith("Spawned by").any {
-                        it.name.contains(username)
-                    }
-                    val containCoop = getAllNameTagsInRadiusWith("Spawned by").any {
-                        coopList.isNotEmpty() && configCoopBoss.highlight && coopList.any { it2 ->
-                            var contain = false
-                            if (".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*).*".toRegex().matches(it.name)) {
-                                val name = ".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*)".toRegex()
-                                    .find(it.name)?.groupValues?.get(1)
-                                contain = it2 == name
-                            }
-                            contain
-                        }
-                    }
-                    val shouldSendTitle =
-                        if (containUser && configOwnBoss.twinClawsTitle) true
-                        else if (containCoop && configCoopBoss.twinClawsTitle) true
-                        else taggedEntityList.contains(this.entityId) && configOtherBoss.twinClawsTitle
-
-                    val shouldSendSound =
-                        if (containUser && configOwnBoss.twinClawsSound) true
-                        else if (containCoop && configCoopBoss.twinClawsSound) true
-                        else taggedEntityList.contains(this.entityId) && configOtherBoss.twinClawsSound
-
-                    if (shouldSendTitle || shouldSendSound) {
-                        SkyHanniMod.coroutineScope.launch {
-                            delay(config.twinclawsDelay.milliseconds)
-                            withContext(MinecraftDispatcher) {
-                                if (nextClawSend < System.currentTimeMillis()) {
-                                    if (shouldSendSound)
-                                        playTwinclawsSound()
-                                    if (shouldSendTitle)
-                                        TitleUtils.sendTitle("§6§lTWINCLAWS", (1750 - config.twinclawsDelay), 2.6)
-                                    nextClawSend = System.currentTimeMillis() + 5000
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        getAllNameTagsInRadiusWith("Spawned by").forEach {
-            val coopList = configCoopBoss.coopMembers.split(",").toList()
-            val containUser = it.name.contains(username)
-            val containCoop = coopList.isNotEmpty() && coopList.any { it2 ->
-                var contain = false
-                if (".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*).*".toRegex().matches(it.name)) {
-                    val name =
-                        ".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*)".toRegex().find(it.name)?.groupValues?.get(1)
-                    contain = it2 == name
-                }
-                contain
-            }
-            val neededHealth = when (baseMaxHealth) {
-                625 -> 125f // t1
-                1100 -> 220f // t2
-                1800 -> 360f // t3
-                2400 -> 480f // t4
-                else -> 600f // t5
-            }
-            if (containUser && taggedEntityList.contains(this.entityId)) {
-                taggedEntityList.remove(this.entityId)
-            }
-            val canUseSteak = health <= neededHealth
-            val ownBoss = configOwnBoss.highlight && containUser && isNPC()
-            val otherBoss = configOtherBoss.highlight && taggedEntityList.contains(this.entityId) && isNPC()
-            val coopBoss = configCoopBoss.highlight && containCoop && isNPC()
-            val shouldRender = if (ownBoss) true else if (otherBoss) true else coopBoss
-
-            val color =
-                if (canUseSteak && config.changeColorWhenCanSteak)
-                    config.steakColor.color()
-                else if (ownBoss) configOwnBoss.highlightColor.color()
-                else if (otherBoss) configOtherBoss.highlightColor.color()
-                else if (coopBoss) configCoopBoss.highlightColor.color()
-                else 0
-
-            val shouldSendSteakTitle =
-                if (canUseSteak && configOwnBoss.steakAlert && containUser) true
-                else if (canUseSteak && configOtherBoss.steakAlert && taggedEntityList.contains(this.entityId)) true
-                else canUseSteak && configCoopBoss.steakAlert && containCoop
-
-            if (shouldSendSteakTitle)
-                TitleUtils.sendTitle("§c§lSTEAK!", 300, 2.6)
-
-            if (shouldRender) {
-                RenderLivingEntityHelper.setEntityColor(this, color) { isEnabled() }
-                RenderLivingEntityHelper.setNoHurtTime(this) { isEnabled() }
-                entityList.add(this)
-            }
-        }
-    }
-
-    private fun playTwinclawsSound() {
-        CoroutineScope(Dispatchers.Default).launch {
-            repeat(15) {
-                delay(50)
-                SoundUtils.createSound("random.orb", 0.5f).playSound()
-            }
-        }
-    }
-
-    private fun EntityOtherPlayerMP.isHighlighted(): Boolean {
-        return entityList.contains(this) || taggedEntityList.contains(this.entityId)
-    }
-
-    private fun String.color(): Int {
-        return toChromaColor().withAlpha(config.withAlpha)
-    }
-
-    @SubscribeEvent
-    fun onEntityHit(event: EntityClickEvent) {
-        if (!isEnabled()) return
-        if (event.clickType != ClickType.LEFT_CLICK) return
-        if (event.clickedEntity !is EntityOtherPlayerMP) return
-        if (!event.clickedEntity.isNPC()) return
-        val coopList = configCoopBoss.coopMembers.split(",").toList()
-        event.clickedEntity.getAllNameTagsInRadiusWith("Spawned by").forEach {
-            val containCoop = coopList.isNotEmpty() && coopList.any { it2 ->
-                var contain = false
-                if (".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*).*".toRegex().matches(it.name)) {
-                    val name =
-                        ".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*)".toRegex().find(it.name)?.groupValues?.get(1)
-                    contain = it2 == name
-                }
-                contain
-            }
-            if (it.name.contains(username) || containCoop) return
-            if (!taggedEntityList.contains(event.clickedEntity.entityId)) {
-                taggedEntityList.add(event.clickedEntity.entityId)
-            }
-        }
-    }
-
-    @SubscribeEvent
-    fun onLivingDeath(event: LivingDeathEvent) {
-        if (!isEnabled()) return
-        val entity = event.entity
-        if (entityList.contains(entity)) {
-            entityList.remove(entity)
-        }
-        if (taggedEntityList.contains(entity.entityId)) {
-            taggedEntityList.remove(entity.entityId)
-        }
-    }
-
-    @SubscribeEvent
-    fun pre(event: RenderLivingEvent.Pre<EntityOtherPlayerMP>) {
-        if (!isEnabled()) return
-        if (!config.seeThrough) return
-        if (entityList.contains(event.entity) && LocationUtils.canSee(
-                LocationUtils.playerEyeLocation(),
-                event.entity.getLorenzVec()
-            )
-        ) {
-            GlStateManager.disableDepth()
-        }
-    }
-
-    @SubscribeEvent
-    fun pre(event: RenderLivingEvent.Post<EntityOtherPlayerMP>) {
-        if (!isEnabled()) return
-        if (!config.seeThrough) return
-        if (entityList.contains(event.entity) && LocationUtils.canSee(
-                LocationUtils.playerEyeLocation(),
-                event.entity.getLorenzVec()
-            )
-        ) {
-            GlStateManager.enableDepth()
-        }
-    }
-
-    @SubscribeEvent
-    fun onWorldRender(event: RenderWorldLastEvent) {
-        if (!isEnabled()) return
-        val start = LocationUtils.playerLocation()
-
-        if (config.drawLine) {
-            Minecraft.getMinecraft().theWorld.loadedEntityList.filterIsInstance<EntityOtherPlayerMP>().forEach {
-                if (it.isHighlighted()) {
-                    val vec = event.exactLocation(it)
-                    val distance = start.distance(vec)
-                    if (distance <= 15) {
-                        val p = Minecraft.getMinecraft().thePlayer
-                        val add = if (p.isSneaking) LorenzVec(0.0, 1.54, 0.0) else LorenzVec(0.0, 1.62, 0.0)
-                        event.draw3DLine(event.exactLocation(p).add(add), vec.add(0.0, 1.54, 0.0), config.lineColor.toChromaColor(), config.lineWidth, true)
-                    }
-                }
-            }
-        }
-        if (configBloodIcor.highlight || configKillerSpring.highlight) {
-            Minecraft.getMinecraft().theWorld.loadedEntityList.filterIsInstance<EntityArmorStand>().forEach { stand ->
-                val vec = stand.position.toLorenzVec()
-                val distance = start.distance(vec)
-                val isIchor = stand.hasSkullTexture(bloodIchorTexture)
-                val isSpring = stand.hasSkullTexture(killerSpringTexture)
-                if ((isIchor && config.bloodIchor.highlight) || (isSpring && config.killerSpring.highlight)) {
-                    val color = (if (isIchor) configBloodIcor.color else configKillerSpring.color)
-                        .toChromaColor().withAlpha(config.withAlpha)
-                    if (distance <= 15) {
-                        RenderLivingEntityHelper.setEntityColor(
-                            stand,
-                            color
-                        ) { isEnabled() }
-
-                        val linesColorStart = (if (isIchor) configBloodIcor.linesColor else configKillerSpring.linesColor).toChromaColor()
-                        val text = if (isIchor) "§4Ichor" else "§4Spring"
-                        event.drawColor(stand.position.toLorenzVec().add(0.0, 2.0, 0.0), LorenzColor.DARK_RED, alpha = 1f)
-                        event.drawDynamicText(stand.position.toLorenzVec().add(0.5, 2.5, 0.5), text, 1.5, ignoreBlocks = false)
-                        for ((player, stand2) in standList) {
-                            if ((configBloodIcor.showLines && isIchor) || (configKillerSpring.showLines && isSpring))
-                                event.draw3DLine(
-                                    event.exactLocation(player).add(0.0, 1.5, 0.0),
-                                    event.exactLocation(stand2).add(0.0, 1.5, 0.0),
-                                    // stand2.position.toLorenzVec().add(0.0, 1.5, 0.0),
-                                    linesColorStart,
-                                    3,
-                                    true)
-                        }
-                    }
-                    if (configBloodIcor.renderBeam && isIchor) {
-                        if (stand.isEntityAlive) {
-                            event.drawWaypointFilled(
-                                event.exactLocation(stand).add(0, -2, 0),
-                                configBloodIcor.color.toChromaColor(),
-                                beacon = true
-                            )
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-    @SubscribeEvent
-    fun onWorldChange(event: LorenzWorldChangeEvent) {
-        entityList.clear()
-        taggedEntityList.clear()
-        standList = mutableMapOf()
-    }
-
-
-    @SubscribeEvent
-    fun onParticle(event: ReceiveParticleEvent) {
-        if (!isEnabled()) return
-        val loc = event.location
-        EntityUtils.getEntitiesNearby<EntityOtherPlayerMP>(loc, 3.0).forEach {
-            if (it.isHighlighted()) {
-                if (event.type == EnumParticleTypes.ENCHANTMENT_TABLE) {
-                    EntityUtils.getEntitiesNearby<EntityArmorStand>(event.location, 3.0).forEach { stand ->
-                        if (stand.hasSkullTexture(killerSpringTexture) || stand.hasSkullTexture(bloodIchorTexture)) {
-                            standList = standList.editCopy { this[stand] = it }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    fun isEnabled() = RiftAPI.inRift() && RiftAPI.inStillgoreChateau()
-}
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/RiftLarva.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/RiftLarva.kt
index 29ef4447c..8c7ca46a4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/RiftLarva.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/RiftLarva.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.rift.area
 
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.withAlpha
-import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
+import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
 import at.hannibal2.skyhanni.utils.EntityUtils.getEntities
 import at.hannibal2.skyhanni.utils.EntityUtils.hasSkullTexture
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 b012f46d4..ceb8b5931 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
@@ -4,7 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.withAlpha
-import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
+import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
 import at.hannibal2.skyhanni.utils.EntityUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftAgaricusCap.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftAgaricusCap.kt
index d7bbf541d..1df1ea82f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftAgaricusCap.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftAgaricusCap.kt
@@ -1,7 +1,7 @@
 package at.hannibal2.skyhanni.features.rift.area.dreadfarm
 
 import at.hannibal2.skyhanni.events.LorenzTickEvent
-import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
+import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.utils.*
 import at.hannibal2.skyhanni.utils.BlockUtils.getBlockStateAt
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt
index 2ee5ab31f..fae8f61ce 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.rift.area.dreadfarm
 
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
-import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
+import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.utils.BlockUtils.getBlockAt
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
index e53e2b339..38c9ceb7c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
@@ -1,7 +1,7 @@
 package at.hannibal2.skyhanni.features.rift.area.dreadfarm
 
 import at.hannibal2.skyhanni.events.EntityEquipmentChangeEvent
-import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
+import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
 import at.hannibal2.skyhanni.utils.EntityUtils.getEntities
 import at.hannibal2.skyhanni.utils.ItemUtils.getSkullTexture
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt
index 78c4dbfb7..8d09c1e3e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt
@@ -4,7 +4,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
 import at.hannibal2.skyhanni.events.ServerBlockChangeEvent
 import at.hannibal2.skyhanni.events.withAlpha
-import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
+import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
 import at.hannibal2.skyhanni.test.GriffinUtils.drawWaypointFilled
 import at.hannibal2.skyhanni.utils.EntityUtils
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt
index 032ce3746..8f49d189a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt
@@ -5,7 +5,7 @@ import at.hannibal2.skyhanni.events.BlockClickEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
 import at.hannibal2.skyhanni.events.ServerBlockChangeEvent
 import at.hannibal2.skyhanni.events.TitleReceivedEvent
-import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
+import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.test.GriffinUtils.drawWaypointFilled
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt
index 5b2eb4562..e9671a3a4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.rift.area.livingcave
 
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
-import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
+import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt
index 5b9b0cd8f..6e848ab8d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.rift.area.mirrorverse
 
 
 import at.hannibal2.skyhanni.events.*
-import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
+import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.utils.LocationUtils.isPlayerInside
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.StringUtils.firstLetterUppercase
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt
index 7bbcca209..61bfd6a9c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt
@@ -4,7 +4,7 @@ import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
-import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
+import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.ParkourHelper
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt
index bcf697a07..a4d550815 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt
@@ -4,7 +4,7 @@ import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
-import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
+import at.hannibal2.skyhanni.features.rift.RiftAPI