From 0285ad425aa036ea2a91cb570f92e357b8bddc32 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 4 Aug 2023 20:54:54 +0200
Subject: moving rift classes around for no reason

---
 .../at/hannibal2/skyhanni/features/rift/RiftAPI.kt |  30 ++
 .../hannibal2/skyhanni/features/rift/RiftTimer.kt  |  93 ------
 .../features/rift/ShowMotesNpcSellPrice.kt         | 187 -----------
 .../features/rift/VampireSlayerFeatures.kt         | 359 ---------------------
 .../skyhanni/features/rift/area/RiftLarva.kt       |   2 +-
 .../rift/area/colosseum/BlobbercystsHighlight.kt   |   2 +-
 .../rift/area/dreadfarm/RiftAgaricusCap.kt         |   2 +-
 .../area/dreadfarm/RiftWiltedBerberisHelper.kt     |   2 +-
 .../rift/area/dreadfarm/VoltHighlighter.kt         |   2 +-
 .../area/livingcave/LivingCaveDefenseBlocks.kt     |   2 +-
 .../area/livingcave/LivingCaveLivingMetalHelper.kt |   2 +-
 .../area/livingcave/LivingMetalSuitProgress.kt     |   2 +-
 .../rift/area/mirrorverse/DanceRoomHelper.kt       |   2 +-
 .../rift/area/mirrorverse/RiftLavaMazeParkour.kt   |   2 +-
 .../rift/area/mirrorverse/RiftUpsideDownParkour.kt |   2 +-
 .../rift/area/mirrorverse/TubulatorParkour.kt      |   2 +-
 .../area/stillgorechateau/RiftBloodEffigies.kt     |   2 +-
 .../features/rift/area/westvillage/KloonHacking.kt |   2 +-
 .../features/rift/area/wyldwoods/RiftOdonata.kt    |   2 +-
 .../rift/area/wyldwoods/ShyCruxWarnings.kt         |   2 +-
 .../rift/everywhere/CruxTalismanDisplay.kt         |   1 +
 .../rift/everywhere/EnigmaSoulWaypoints.kt         |   1 +
 .../features/rift/everywhere/HighlightRiftGuide.kt |   1 +
 .../skyhanni/features/rift/everywhere/RiftAPI.kt   |  30 --
 .../rift/everywhere/RiftHorsezookaHider.kt         |   1 +
 .../features/rift/everywhere/RiftMotesOrb.kt       |   1 +
 .../skyhanni/features/rift/everywhere/RiftTimer.kt |  93 ++++++
 .../rift/everywhere/ShowMotesNpcSellPrice.kt       | 187 +++++++++++
 28 files changed, 331 insertions(+), 685 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/ShowMotesNpcSellPrice.kt
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/VampireSlayerFeatures.kt
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftAPI.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/ShowMotesNpcSellPrice.kt

(limited to 'src/main/java/at/hannibal2/skyhanni/features/rift')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt
new file mode 100644
index 000000000..15ff1c658
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt
@@ -0,0 +1,30 @@
+package at.hannibal2.skyhanni.features.rift
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.features.RiftConfig
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_new
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NEUInternalName
+import net.minecraft.item.ItemStack
+
+object RiftAPI {
+    fun inRift() = LorenzUtils.inIsland(IslandType.THE_RIFT)
+
+    val config: RiftConfig get() = SkyHanniMod.feature.rift
+
+    // internal name -> motes
+    var motesPrice = emptyMap<NEUInternalName, Double>()
+
+    fun ItemStack.motesNpcPrice(): Double? {
+        val baseMotes = motesPrice[getInternalName_new()] ?: return null
+        val burgerStacks = config.motes.burgerStacks
+        val pricePer = baseMotes + (burgerStacks * 5) * baseMotes / 100
+        return pricePer * stackSize
+    }
+
+    fun inLivingCave() = LorenzUtils.skyBlockArea == "Living Cave"
+    fun inLivingStillness() = LorenzUtils.skyBlockArea == "Living Stillness"
+    fun inStillgoreChateau() = LorenzUtils.skyBlockArea == "Stillgore Château" || LorenzUtils.skyBlockArea == "Oubliette"
+    fun inDreadfarm() = LorenzUtils.skyBlockArea == "Dreadfarm"
+}
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt
deleted file mode 100644
index e9aa4726e..000000000
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-package at.hannibal2.skyhanni.features.rift
-
-import at.hannibal2.skyhanni.events.GuiRenderEvent
-import at.hannibal2.skyhanni.events.LorenzActionBarEvent
-import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
-import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
-import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
-import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
-import at.hannibal2.skyhanni.utils.TimeUtils
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-
-class RiftTimer {
-    private val config get() = RiftAPI.config.timer
-    private var display = emptyList<String>()
-    private var maxTime = 0L
-    private var latestTime = 0L
-    private val changes = mutableMapOf<Long, String>()
-
-    @SubscribeEvent
-    fun onWorldChange(event: LorenzWorldChangeEvent) {
-        display = emptyList()
-        maxTime = 0
-        latestTime = 0
-    }
-
-    @SubscribeEvent
-    fun onActionBar(event: LorenzActionBarEvent) {
-        if (!isEnabled()) return
-
-        val message = event.message
-        for (entry in message.split("     ")) {
-            "§(?<color>[a7])(?<time>.*)ф Left.*".toPattern().matchMatcher(entry) {
-                val color = group("color")
-                if (color == "7") {
-                    val currentTime = getTime(group("time"))
-                    if (currentTime > maxTime) {
-                        maxTime = currentTime
-                        update(currentTime)
-                    }
-                    return
-                }
-                update(getTime(group("time")))
-            }
-        }
-    }
-
-    private fun getTime(time: String) = TimeUtils.getMillis(time.replace("m", "m "))
-
-    private fun update(currentTime: Long) {
-        if (currentTime == latestTime) return
-        val diff = (currentTime - latestTime) + 1000
-        latestTime = currentTime
-        if (latestTime != maxTime) {
-            addDiff(diff)
-        }
-
-        val currentFormat = TimeUtils.formatDuration(currentTime)
-        val percentage = LorenzUtils.formatPercentage(currentTime.toDouble() / maxTime)
-        val percentageFormat = if (config.percentage) " §7($percentage)" else ""
-        val maxTimeFormat = if (config.maxTime) "§7/§b" + TimeUtils.formatDuration(maxTime) else ""
-        val color = if (currentTime <= 60_000) "§c" else if (currentTime <= 60_000 * 5) "§e" else "§b"
-        val firstLine = "§eRift Timer: $color$currentFormat$maxTimeFormat$percentageFormat"
-
-        display = buildList {
-            add(firstLine)
-            changes.keys.removeIf { System.currentTimeMillis() > it + 4_000 }
-            for (entry in changes.values) {
-                add(entry)
-            }
-        }
-    }
-
-    private fun addDiff(diff: Long) {
-        val diffFormat = if (diff > 0) {
-            "§a+${TimeUtils.formatDuration(diff)}"
-        } else if (diff < 0) {
-            "§c-${TimeUtils.formatDuration(-diff)}"
-        } else return
-
-        changes[System.currentTimeMillis()] = diffFormat
-    }
-
-    @SubscribeEvent
-    fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) {
-        if (!isEnabled()) return
-        if (LorenzUtils.skyBlockArea == "Mirrorverse") return
-
-        config.timerPosition.renderStrings(display, posLabel = "Rift Timer")
-    }
-
-    fun isEnabled() = RiftAPI.inRift() && config.enabled
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/ShowMotesNpcSellPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/ShowMotesNpcSellPrice.kt
deleted file mode 100644
index 476cb7ee4..000000000
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/ShowMotesNpcSellPrice.kt
+++ /dev/null
@@ -1,187 +0,0 @@
-package at.hannibal2.skyhanni.features.rift
-
-import at.hannibal2.skyhanni.events.*
-import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
-import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI.motesNpcPrice
-import at.hannibal2.skyhanni.utils.InventoryUtils
-import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
-import at.hannibal2.skyhanni.utils.LorenzColor
-import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
-import at.hannibal2.skyhanni.utils.LorenzUtils.addSelector
-import at.hannibal2.skyhanni.utils.LorenzUtils.chat
-import at.hannibal2.skyhanni.utils.NEUItems
-import at.hannibal2.skyhanni.utils.NumberUtil
-import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
-import at.hannibal2.skyhanni.utils.RenderUtils.highlight
-import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
-import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
-import at.hannibal2.skyhanni.utils.renderables.Renderable
-import net.minecraftforge.event.entity.player.ItemTooltipEvent
-import net.minecraftforge.fml.common.eventhandler.EventPriority
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-
-class ShowMotesNpcSellPrice {
-    private val config get() = RiftAPI.config.motes
-    private var display = emptyList<List<Any>>()
-    private val pattern = ".*(?:§\\w)+You have (?:§\\w)+(?<amount>\\d) Grubber Stacks.*".toPattern()
-    private val itemMap = mutableMapOf<String, Pair<MutableList<Int>, Double>>()
-    private var inInventory = false
-    private val slotList = mutableListOf<Int>()
-
-    @SubscribeEvent
-    fun onBackgroundDraw(event: GuiRenderEvent.ChestBackgroundRenderEvent) {
-        if (!isInventoryValueEnabled()) return
-        if (inInventory) {
-            config.inventoryValue.position.renderStringsAndItems(
-                display,
-                itemScale = 1.3,
-                posLabel = "Inventory Motes Value"
-            )
-        }
-    }
-
-    @SubscribeEvent
-    fun onTick(event: LorenzTickEvent) {
-        if (!isInventoryValueEnabled()) return
-        if (event.isMod(10))
-            processItems()
-    }
-
-    @SubscribeEvent(priority = EventPriority.LOW)
-    fun onDrawSelectedTemplate(event: GuiContainerEvent.BackgroundDrawnEvent) {
-        if (!isInventoryValueEnabled()) return
-        val name = InventoryUtils.openInventoryName()
-        if (!name.contains("Rift Storage")) return
-        for (slot in InventoryUtils.getItemsInOpenChest()) {
-            if (slotList.contains(slot.slotIndex))
-                slot highlight LorenzColor.GREEN
-        }
-    }
-
-    @SubscribeEvent
-    fun onItemTooltipLow(event: ItemTooltipEvent) {
-        if (!isShowPriceEnabled()) return
-
-        val itemStack = event.itemStack ?: return
-
-        val baseMotes = itemStack.motesNpcPrice() ?: return
-        val burgerStacks = config.burgerStacks
-        val burgerText = if (burgerStacks > 0) "(${burgerStacks}x≡) " else ""
-        val size = itemStack.stackSize
-        if (size > 1) {
-            event.toolTip.add("§6NPC price: $burgerText§d${baseMotes.addSeparators()} Motes §7($size x §d${(baseMotes / size).addSeparators()} Motes§7)")
-        } else {
-            event.toolTip.add("§6NPC price: $burgerText§d${baseMotes.addSeparators()} Motes")
-        }
-    }
-
-    @SubscribeEvent
-    fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
-        reset()
-    }
-
-    @SubscribeEvent
-    fun onInventoryClose(event: InventoryCloseEvent) {
-        reset()
-    }
-
-    private fun reset() {
-        if (!isInventoryValueEnabled()) return
-        itemMap.clear()
-        slotList.clear()
-        inInventory = false
-    }
-
-    private fun processItems() {
-        val inventoryName = InventoryUtils.openInventoryName()
-        if (!inventoryName.contains("Rift Storage")) return
-        val stacks = InventoryUtils.getItemsInOpenChest().map { it.slotIndex to it.stack }
-        itemMap.clear()
-        for ((index, stack) in stacks) {
-            val itemValue = stack.motesNpcPrice() ?: continue
-            if (itemMap.contains(stack.getInternalName())) {
-                val (oldIndex, oldValue) = itemMap[stack.getInternalName()] ?: return
-                oldIndex.add(index)
-                itemMap[stack.getInternalName()] = Pair(oldIndex, oldValue + itemValue)
-            } else {
-                itemMap[stack.getInternalName()] = Pair(mutableListOf(index), itemValue)
-            }
-        }
-        inInventory = true
-        update()
-    }
-
-    @SubscribeEvent
-    fun onChat(event: LorenzChatEvent) {
-        if (!RiftAPI.inRift()) return
-        pattern.matchMatcher(event.message) {
-            config.burgerStacks = group("amount").toInt()
-            chat("§6[SkyHanni] Set your McGrubber's burger stacks to ${group("amount")}.")
-        }
-    }
-
-    private fun update() {
-        display = drawDisplay()
-    }
-
-    private fun drawDisplay() = buildList<List<Any>> {
-        val newDisplay = mutableListOf<List<Any>>()
-        newDisplay.addAsSingletonList("§7Item Values:")
-        val sorted = itemMap.toList().sortedByDescending { it.second.second }.toMap().toMutableMap()
-
-        for ((internalName, pair) in sorted) {
-            newDisplay.add(buildList {
-                val (index, value) = pair
-                val dashColor = if (slotList.containsAll(index)) "§a" else "§7"
-                add("  $dashColor- ")
-                val stack = NEUItems.getItemStack(internalName)
-                add(stack)
-                val price = value.formatPrice()
-                val valuePer = stack.motesNpcPrice() ?: continue
-                val tips = buildList {
-                    add("§eClick to highlight in the chest !")
-                    add("§6Value per: §d$valuePer Motes")
-                    add("§6Total in chest: §d${(value / valuePer).toInt()}")
-                }
-                add(Renderable.clickAndHover("§6${stack.displayName}: §b$price", tips) {
-                    for (slot in InventoryUtils.getItemsInOpenChest()) {
-                        if (index.contains(slot.slotIndex)) {
-                            if (slotList.contains(slot.slotIndex)) {
-                                slotList.remove(slot.slotIndex)
-                            } else {
-                                slotList.add(slot.slotIndex)
-                            }
-                        }
-                    }
-                })
-            })
-        }
-        val total = itemMap.values.fold(0.0) { acc, pair -> acc + pair.second }.formatPrice()
-        newDisplay.addAsSingletonList("§7Total price: §b$total")
-        val name = FormatType.values()[config.inventoryValue.formatType].type
-        newDisplay.addAsSingletonList("§7Price format: §c$name")
-        newDisplay.addSelector(" ", FormatType.values(),
-            getName = { type -> type.type },
-            isCurrent = { it.ordinal == config.inventoryValue.formatType },
-            onChange = {
-                config.inventoryValue.formatType = it.ordinal
-                update()
-            })
-        return newDisplay
-    }
-
-    enum class FormatType(val type: String) {
-        SHORT("Short"),
-        LONG("Long")
-    }
-
-    private fun Double.formatPrice(): String = when (config.inventoryValue.formatType) {
-        0 -> NumberUtil.format(this)
-        1 -> this.addSeparators()
-        else -> "0"
-    }
-
-    private fun isShowPriceEnabled() = RiftAPI.inRift() && config.showPrice
-
-    private fun isInventoryValueEnabled() = RiftAPI.inRift() && config.inventoryValue.enabled
-}
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
 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/TubulatorParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt
index a25c91cd8..cacf34d3f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt
@@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.rift.area.mirrorverse
 import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 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.LocationUtils.isPlayerInside
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.toChromaColor
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
index 2ee87320b..c613aa3a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
@@ -4,7 +4,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.events.ScoreboardRawChangeEvent
-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.*
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonHacking.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonHacking.kt
index d6398d95e..aeb73b42d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonHacking.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonHacking.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.rift.area.westvillage
 
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.events.*
-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.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/RiftOdonata.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/RiftOdonata.kt
index b8dd715f1..b7728663f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/RiftOdonata.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/RiftOdonata.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.rift.area.wyldwoods
 
 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/wyldwoods/ShyCruxWarnings.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/ShyCruxWarnings.kt
index f4a37b8a3..ad38e3cfe 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/ShyCruxWarnings.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/ShyCruxWarnings.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.rift.area.wyldwoods
 
 import at.hannibal2.skyhanni.data.TitleUtils
 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.EntityUtils
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
index 6531194b1..310f22b80 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.rift.everywhere
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
index acf379991..e30b167a6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.rift.everywhere
 
 import at.hannibal2.skyhanni.events.*
+import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.test.GriffinUtils.drawWaypointFilled
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/HighlightRiftGuide.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/HighlightRiftGuide.kt
index ebf00bae7..81def7af1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/HighlightRiftGuide.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/HighlightRiftGuide.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.rift.everywhere
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
+import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzColor
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftAPI.kt
deleted file mode 100644
index 4e500d21f..000000000
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftAPI.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package at.hannibal2.skyhanni.features.rift.everywhere
-
-import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.config.features.RiftConfig
-import at.hannibal2.skyhanni.data.IslandType
-import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_new
-import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.NEUInternalName
-import net.minecraft.item.ItemStack
-
-object RiftAPI {
-    fun inRift() = LorenzUtils.inIsland(IslandType.THE_RIFT)
-
-    val config: RiftConfig get() = SkyHanniMod.feature.rift
-
-    // internal name -> motes
-    var motesPrice = emptyMap<NEUInternalName, Double>()
-
-    fun ItemStack.motesNpcPrice(): Double? {
-        val baseMotes = motesPrice[getInternalName_new()] ?: return null
-        val burgerStacks = config.motes.burgerStacks
-        val pricePer = baseMotes + (burgerStacks * 5) * baseMotes / 100
-        return pricePer * stackSize
-    }
-
-    fun inLivingCave() = LorenzUtils.skyBlockArea == "Living Cave"
-    fun inLivingStillness() = LorenzUtils.skyBlockArea == "Living Stillness"
-    fun inStillgoreChateau() = LorenzUtils.skyBlockArea == "Stillgore Château" || LorenzUtils.skyBlockArea == "Oubliette"
-    fun inDreadfarm() = LorenzUtils.skyBlockArea == "Dreadfarm"
-}
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftHorsezookaHider.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftHorsezookaHider.kt
index cab024462..0ef0110ff 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftHorsezookaHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftHorsezookaHider.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.rift.everywhere
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
+import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import net.minecraft.entity.passive.EntityHorse
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftMotesOrb.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftMotesOrb.kt
index d7bd89eb4..66d6efaa9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftMotesOrb.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftMotesOrb.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.rift.everywhere
 
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
+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/everywhere/RiftTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt
new file mode 100644
index 000000000..eedd0b38d
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt
@@ -0,0 +1,93 @@
+package at.hannibal2.skyhanni.features.rift.everywhere
+
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzActionBarEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.features.rift.RiftAPI
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
+import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.TimeUtils
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+class RiftTimer {
+    private val config get() = RiftAPI.config.timer
+    private var display = emptyList<String>()
+    private var maxTime = 0L
+    private var latestTime = 0L
+    private val changes = mutableMapOf<Long, String>()
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        display = emptyList()
+        maxTime = 0
+        latestTime = 0
+    }
+
+    @SubscribeEvent
+    fun onActionBar(event: LorenzActionBarEvent) {
+        if (!isEnabled()) return
+
+        val message = event.message
+        for (entry in message.split("     ")) {
+            "§(?<color>[a7])(?<time>.*)ф Left.*".toPattern().matchMatcher(entry) {
+                val color = group("color")
+                if (color == "7") {
+                    val currentTime = getTime(group("time"))
+                    if (currentTime > maxTime) {
+                        maxTime = currentTime
+                        update(currentTime)
+                    }
+                    return
+                }
+                update(getTime(group("time")))
+            }
+        }
+    }
+
+    private fun getTime(time: String) = TimeUtils.getMillis(time.replace("m", "m "))
+
+    private fun update(currentTime: Long) {
+        if (currentTime == latestTime) return
+        val diff = (currentTime - latestTime) + 1000
+        latestTime = currentTime
+        if (latestTime != maxTime) {
+            addDiff(diff)
+        }
+
+        val currentFormat = TimeUtils.formatDuration(currentTime)
+        val percentage = LorenzUtils.formatPercentage(currentTime.toDouble() / maxTime)
+        val percentageFormat = if (config.percentage) " §7($percentage)" else ""
+        val maxTimeFormat = if (config.maxTime) "§7/§b" + TimeUtils.formatDuration(maxTime) else ""
+        val color = if (currentTime <= 60_000) "§c" else if (currentTime <= 60_000 * 5) "§e" else "§b"
+        val firstLine = "§eRift Timer: $color$currentFormat$maxTimeFormat$percentageFormat"
+
+        display = buildList {
+            add(firstLine)
+            changes.keys.removeIf { System.currentTimeMillis() > it + 4_000 }
+            for (entry in changes.values) {
+                add(entry)
+            }
+        }
+    }
+
+    private fun addDiff(diff: Long) {
+        val diffFormat = if (diff > 0) {
+            "§a+${TimeUtils.formatDuration(diff)}"
+        } else if (diff < 0) {
+            "§c-${TimeUtils.formatDuration(-diff)}"
+        } else return
+
+        changes[System.currentTimeMillis()] = diffFormat
+    }
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) {
+        if (!isEnabled()) return
+        if (LorenzUtils.skyBlockArea == "Mirrorverse") return
+
+        config.timerPosition.renderStrings(display, posLabel = "Rift Timer")
+    }
+
+    fun isEnabled() = RiftAPI.inRift() && config.enabled
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/ShowMotesNpcSellPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/ShowMotesNpcSellPrice.kt
new file mode 100644
index 000000000..ce48c62a0
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/ShowMotesNpcSellPrice.kt
@@ -0,0 +1,187 @@
+package at.hannibal2.skyhanni.features.rift.everywhere
+
+import at.hannibal2.skyhanni.events.*
+import at.hannibal2.skyhanni.features.rift.RiftAPI
+import at.hannibal2.skyhanni.features.rift.RiftAPI.motesNpcPrice
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
+import at.hannibal2.skyhanni.utils.LorenzUtils.addSelector
+import at.hannibal2.skyhanni.utils.LorenzUtils.chat
+import at.hannibal2.skyhanni.utils.NEUItems
+import at.hannibal2.skyhanni.utils.NumberUtil
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.RenderUtils.highlight
+import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
+import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import net.minecraftforge.event.entity.player.ItemTooltipEvent
+import net.minecraftforge.fml.common.eventhandler.EventPriority
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+class ShowMotesNpcSellPrice {
+    private val config get() = RiftAPI.config.motes
+    private var display = emptyList<List<Any>>()
+    private val pattern = ".*(?:§\\w)+You have (?:§\\w)+(?<amount>\\d) Grubber Stacks.*".toPattern()
+    private val itemMap = mutableMapOf<String, Pair<MutableList<Int>, Double>>()
+    private var inInventory = false
+    private val slotList = mutableListOf<Int>()
+
+    @SubscribeEvent
+    fun onBackgroundDraw(event: GuiRenderEvent.ChestBackgroundRenderEvent) {
+        if (!isInventoryValueEnabled()) return
+        if (inInventory) {
+            config.inventoryValue.position.renderStringsAndItems(
+                display,
+                itemScale = 1.3,
+                posLabel = "Inventory Motes Value"
+            )
+        }
+    }
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        if (!isInventoryValueEnabled()) return
+        if (event.isMod(10))
+            processItems()
+    }
+
+    @SubscribeEvent(priority = EventPriority.LOW)
+    fun onDrawSelectedTemplate(event: GuiContainerEvent.BackgroundDrawnEvent) {
+        if (!isInventoryValueEnabled()) return
+        val name = InventoryUtils.openInventoryName()
+        if (!name.contains("Rift Storage")) return
+        for (slot in InventoryUtils.getItemsInOpenChest()) {
+            if (slotList.contains(slot.slotIndex))
+                slot highlight LorenzColor.GREEN
+        }
+    }
+
+    @SubscribeEvent
+    fun onItemTooltipLow(event: ItemTooltipEvent) {
+        if (!isShowPriceEnabled()) return
+
+        val itemStack = event.itemStack ?: return
+
+        val baseMotes = itemStack.motesNpcPrice() ?: return
+        val burgerStacks = config.burgerStacks
+        val burgerText = if (burgerStacks > 0) "(${burgerStacks}x≡) " else ""
+        val size = itemStack.stackSize
+        if (size > 1) {
+            event.toolTip.add("§6NPC price: $burgerText§d${baseMotes.addSeparators()} Motes §7($size x §d${(baseMotes / size).addSeparators()} Motes§7)")
+        } else {
+            event.toolTip.add("§6NPC price: $burgerText§d${baseMotes.addSeparators()} Motes")
+        }
+    }
+
+    @SubscribeEvent
+    fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
+        reset()
+    }
+
+    @SubscribeEvent
+    fun onInventoryClose(event: InventoryCloseEvent) {
+        reset()
+    }
+
+    private fun reset() {
+        if (!isInventoryValueEnabled()) return
+        itemMap.clear()
+        slotList.clear()
+        inInventory = false
+    }
+
+    private fun processItems() {
+        val inventoryName = InventoryUtils.openInventoryName()
+        if (!inventoryName.contains("Rift Storage")) return
+        val stacks = InventoryUtils.getItemsInOpenChest().map { it.slotIndex to it.stack }
+        itemMap.clear()
+        for ((index, stack) in stacks) {
+            val itemValue = stack.motesNpcPrice() ?: continue
+            if (itemMap.contains(stack.getInternalName())) {
+                val (oldIndex, oldValue) = itemMap[stack.getInternalName()] ?: return
+                oldIndex.add(index)
+                itemMap[stack.getInternalName()] = Pair(oldIndex, oldValue + itemValue)
+            } else {
+                itemMap[stack.getInternalName()] = Pair(mutableListOf(index), itemValue)
+            }
+        }
+        inInventory = true
+        update()
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!RiftAPI.inRift()) return
+        pattern.matchMatcher(event.message) {
+            config.burgerStacks = group("amount").toInt()
+            chat("§6[SkyHanni] Set your McGrubber's burger stacks to ${group("amount")}.")
+        }
+    }
+
+    private fun update() {
+        display = drawDisplay()
+    }
+
+    private fun drawDisplay() = buildList<List<Any>> {
+        val newDisplay = mutableListOf<List<Any>>()
+        newDisplay.addAsSingletonList("§7Item Values:")
+        val sorted = itemMap.toList().sortedByDescending { it.second.second }.toMap().toMutableMap()
+
+        for ((internalName, pair) in sorted) {
+            newDisplay.add(buildList {
+                val (index, value) = pair
+                val dashColor = if (slotList.containsAll(index)) "§a" else "§7"
+                add("  $dashColor- ")
+                val stack = NEUItems.getItemStack(internalName)
+                add(stack)
+                val price = value.formatPrice()
+                val valuePer = stack.motesNpcPrice() ?: continue
+                val tips = buildList {
+                    add("§eClick to highlight in the chest !")
+                    add("§6Value per: §d$valuePer Motes")
+                    add("§6Total in chest: §d${(value / valuePer).toInt()}")
+                }
+                add(Renderable.clickAndHover("§6${stack.displayName}: §b$price", tips) {
+                    for (slot in InventoryUtils.getItemsInOpenChest()) {
+                        if (index.contains(slot.slotIndex)) {
+                            if (slotList.contains(slot.slotIndex)) {
+                                slotList.remove(slot.slotIndex)
+                            } else {
+                                slotList.add(slot.slotIndex)
+                            }
+                        }
+                    }
+                })
+            })
+        }
+        val total = itemMap.values.fold(0.0) { acc, pair -> acc + pair.second }.formatPrice()
+        newDisplay.addAsSingletonList("§7Total price: §b$total")
+        val name = FormatType.values()[config.inventoryValue.formatType].type
+        newDisplay.addAsSingletonList("§7Price format: §c$name")
+        newDisplay.addSelector(" ", FormatType.values(),
+            getName = { type -> type.type },
+            isCurrent = { it.ordinal == config.inventoryValue.formatType },
+            onChange = {
+                config.inventoryValue.formatType = it.ordinal
+                update()
+            })
+        return newDisplay
+    }
+
+    enum class FormatType(val