Merge branch 'hannibal002:beta' into frozen_treasure_tracker

12 files changed, 242 insertions, 15 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt
index 5e2321e24..e6f646ef1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt
@@ -48,8 +48,13 @@ class BazaarDataHolder {
 
     fun getData(internalName: String) = bazaarData[internalName] ?: createNewData(internalName)
 
-    private fun createNewData(internalName: String): BazaarData {
-        val displayName = NEUItems.getItemStack(internalName).name!!.removeColor()
+    private fun createNewData(internalName: String): BazaarData? {
+        val stack = NEUItems.getItemStackOrNull(internalName)
+        if (stack == null) {
+            LorenzUtils.debug("Bazaar data is null: '$internalName'")
+            return null
+        }
+        val displayName = stack.name!!.removeColor()
         val sellPrice = NEUItems.getPrice(internalName, true)
         val buyPrice = NEUItems.getPrice(internalName, false)
         val npcPrice = npcPrices[internalName].let {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
index 6682ffa81..7f6ee3670 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
@@ -100,6 +100,7 @@ class BurrowWarpHelper {
         //        CRYPT("Crypt", LorenzVec(-190, 74, -88), 25),
         DA("Dark Auction", LorenzVec(91, 74, 173), 2),
         MUSEUM("Museum", LorenzVec(-75, 76, 81), 2),
+        WIZARD("Wizard", LorenzVec(42.5, 122.0, 69.0), 5),
         ;
 
         fun distance(other: LorenzVec): Double = other.distance(location) + extraBlocks
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
index 4ddfb0cf0..60680897b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.events.RenderItemTipEvent
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.cleanName
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzUtils.between
@@ -159,6 +160,17 @@ class ItemDisplayOverlayFeatures {
                 }
             }
         }
+
+        if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(12)) {
+            if (item.getInternalName() == "LARVA_HOOK") {
+                for (line in item.getLore()) {
+                    "§7§7You may harvest §6(?<amount>.)/.*".toPattern().matchMatcher(line) {
+                        return group("amount")
+                    }
+                }
+            }
+        }
+
         return ""
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt
index 96d1bb74f..e64a56ed5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt
@@ -6,13 +6,12 @@ import at.hannibal2.skyhanni.events.BlockClickEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.RenderUtils
-import at.hannibal2.skyhanni.utils.SpecialColour
 import net.minecraft.client.Minecraft
 import net.minecraft.util.EnumParticleTypes
 import net.minecraftforge.client.event.RenderWorldLastEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.awt.Color
 
 class FireVeilWandParticles {
 
@@ -48,8 +47,7 @@ class FireVeilWandParticles {
         if (SkyHanniMod.feature.itemAbilities.fireVeilWandDisplay != 1) return
         if (System.currentTimeMillis() > lastClick + 5_500) return
 
-        val color =
-            Color(SpecialColour.specialToChromaRGB(SkyHanniMod.feature.itemAbilities.fireVeilWandDisplayColor), true)
+        val color = SkyHanniMod.feature.itemAbilities.fireVeilWandDisplayColor.toChromaColor()
 
         RenderUtils.drawCircle(Minecraft.getMinecraft().thePlayer, event.partialTicks, 3.5, color)
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt
index 721248658..8507deb6e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PocketSackInASackDisplay.kt
@@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 class PocketSackInASackDisplay {
 
     private val config get() = SkyHanniMod.feature.misc.pocketSackInASack
-    private val valPattern = "§5§o§7This sack is stitched with (?<number>.*)".toPattern()
+    private val valPattern = "§5§o§7This sack is stitched with (?<number>.*)§7.".toPattern()
 
     @SubscribeEvent
     fun onRenderItemOverlayPost(event: GuiRenderItemEvent.RenderOverlayEvent.GuiRenderItemPost) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt
index 3b6470660..b31a7f574 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt
@@ -29,6 +29,7 @@ class EstimatedWardrobePrice {
 
         var index = 3
         val toolTip = event.toolTip
+        if (toolTip.size < 4) return
         toolTip.add(index++, "")
         toolTip.add(index++, "§aEstimated Armor Value:")
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/CruxWarnings.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/CruxWarnings.kt
new file mode 100644
index 000000000..39834a6bd
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/CruxWarnings.kt
@@ -0,0 +1,32 @@
+package at.hannibal2.skyhanni.features.rift
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.TitleUtils
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
+import net.minecraft.client.Minecraft
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+class CruxWarnings {
+    private val shyNames = arrayOf("I'm ugly! :(", "Eek!", "Don't look at me!", "Look away!")
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        if (event.isMod(2)) {
+            checkForShy()
+        }
+    }
+
+    private fun checkForShy() {
+        try {
+            if (!(RiftAPI.inRift() || !SkyHanniMod.feature.rift.crux.shyWarning)) return
+            val list = Minecraft.getMinecraft().theWorld?.getLoadedEntityList() ?: return
+            if (list.any { it.name in shyNames && it.distanceToPlayer() < 8 }) {
+                TitleUtils.sendTitle("§eLook away!", 250)
+            }
+        } catch (e: Throwable) {
+            CopyErrorCommand.logError(e, "Check for Shy failed")
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/HighlightRiftGuide.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/HighlightRiftGuide.kt
index a8bf69fba..45b2daeb9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/HighlightRiftGuide.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/HighlightRiftGuide.kt
@@ -24,7 +24,7 @@ class HighlightRiftGuide {
 
         val inGuide = event.inventoryItems[40]?.getLore()?.let {
             if (it.size == 1) {
-                it[0] == "§7To Rift Guide"
+                it[0].startsWith("§7To Rift Guide")
             } else false
         } ?: false
         if (!inGuide) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAgaricusCap.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAgaricusCap.kt
new file mode 100644
index 000000000..c4b452396
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAgaricusCap.kt
@@ -0,0 +1,70 @@
+package at.hannibal2.skyhanni.features.rift
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.utils.*
+import at.hannibal2.skyhanni.utils.BlockUtils.getBlockStateAt
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
+import net.minecraftforge.client.event.RenderWorldLastEvent
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+class RiftAgaricusCap {
+    private val config get() = SkyHanniMod.feature.rift
+    private var startTime = 0L
+    private var location: LorenzVec? = null
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        if (!isEnabled()) return
+        val area = LorenzUtils.skyBlockArea
+        if (area != "West Village" && area != "Dreadfarm") return
+
+        location = updateLocation()
+    }
+
+    private fun updateLocation(): LorenzVec? {
+        if (InventoryUtils.getItemInHand()?.getInternalName() != "FARMING_WAND") return null
+        val currentLocation = BlockUtils.getBlockLookingAt() ?: return null
+
+        when (currentLocation.getBlockStateAt().toString()) {
+            "minecraft:brown_mushroom" -> {
+                return if (location != currentLocation) {
+                    startTime = System.currentTimeMillis()
+                    currentLocation
+                } else {
+                    if (startTime == -1L) {
+                        startTime = System.currentTimeMillis()
+                    }
+                    location
+                }
+            }
+
+            "minecraft:red_mushroom" -> {
+                if (location == currentLocation) {
+                    startTime = -1L
+                    return location
+                }
+            }
+        }
+        return null
+    }
+
+    @SubscribeEvent
+    fun onRenderWorld(event: RenderWorldLastEvent) {
+        if (!isEnabled()) return
+
+        val location = location?.add(0.0, 0.6, 0.0) ?: return
+
+        if (startTime == -1L) {
+            event.drawDynamicText(location, "§cClick!", 1.5)
+            return
+        }
+
+        val countDown = System.currentTimeMillis() - startTime
+        val format = TimeUtils.formatDuration(countDown - 1000, showMilliSeconds = true)
+        event.drawDynamicText(location, "§b$format", 1.5)
+    }
+
+    fun isEnabled() = RiftAPI.inRift() && config.agaricusCap
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftLarva.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftLarva.kt
new file mode 100644
index 000000000..93df913c8
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftLarva.kt
@@ -0,0 +1,51 @@
+package at.hannibal2.skyhanni.features.rift
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.events.withAlpha
+import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
+import at.hannibal2.skyhanni.utils.EntityUtils.hasSkullTexture
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.LorenzUtils.toChromaColor
+import net.minecraft.client.Minecraft
+import net.minecraft.entity.item.EntityArmorStand
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+class RiftLarva {
+    private val config get() = SkyHanniMod.feature.rift.larvas
+    private var hasHookInHand = false
+    val larvaSkullTexture =
+        "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTgzYjMwZTlkMTM1YjA1MTkwZWVhMmMzYWM2MWUyYWI1NWEyZDgxZTFhNThkYmIyNjk4M2ExNDA4MjY2NCJ9fX0="
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        if (!isEnabled()) return
+
+        checkHand()
+        if (!hasHookInHand) return
+
+        if (event.isMod(20)) {
+            findLarvas()
+        }
+    }
+
+    private fun checkHand() {
+        hasHookInHand = InventoryUtils.getItemInHand()?.getInternalName() == "LARVA_HOOK"
+    }
+
+    private fun findLarvas() {
+
+        val list = Minecraft.getMinecraft().theWorld?.loadedEntityList ?: return
+        for (stand in list.filterIsInstance<EntityArmorStand>()) {
+            if (stand.hasSkullTexture(larvaSkullTexture)) {
+                RenderLivingEntityHelper.setEntityColor(
+                    stand,
+                    config.highlightColor.toChromaColor().withAlpha(1)
+                ) { isEnabled() && hasHookInHand }
+            }
+        }
+    }
+
+    fun isEnabled() = RiftAPI.inRift() && config.highlight
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftOdonata.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftOdonata.kt
new file mode 100644
index 000000000..7c3fae78b
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftOdonata.kt
@@ -0,0 +1,51 @@
+package at.hannibal2.skyhanni.features.rift
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.events.withAlpha
+import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
+import at.hannibal2.skyhanni.utils.EntityUtils.hasSkullTexture
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.LorenzUtils.toChromaColor
+import net.minecraft.client.Minecraft
+import net.minecraft.entity.item.EntityArmorStand
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+class RiftOdonata {
+    private val config get() = SkyHanniMod.feature.rift.odonata
+    private var hasBottleInHand = false
+    val odonataSkullTexture =
+        "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWZkODA2ZGVmZGZkZjU5YjFmMjYwOWM4ZWUzNjQ2NjZkZTY2MTI3YTYyMzQxNWI1NDMwYzkzNThjNjAxZWY3YyJ9fX0="
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        if (!isEnabled()) return
+
+        checkHand()
+        if (!hasBottleInHand) return
+
+        if (event.isMod(20)) {
+            findOdonatas()
+        }
+    }
+
+    private fun checkHand() {
+        hasBottleInHand = InventoryUtils.getItemInHand()?.getInternalName() == "EMPTY_ODONATA_BOTTLE"
+    }
+
+    private fun findOdonatas() {
+
+        val list = Minecraft.getMinecraft().theWorld?.loadedEntityList ?: return
+        for (stand in list.filterIsInstance<EntityArmorStand>()) {
+            if (stand.hasSkullTexture(odonataSkullTexture)) {
+                RenderLivingEntityHelper.setEntityColor(
+                    stand,
+                    config.highlightColor.toChromaColor().withAlpha(1)
+                ) { isEnabled() && hasBottleInHand }
+            }
+        }
+    }
+
+    fun isEnabled() = RiftAPI.inRift() && config.highlight
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt
index 6fe16c981..3901d8370 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt
@@ -21,6 +21,8 @@ class RiftTimer {
     @SubscribeEvent
     fun onJoinWorld(ignored: WorldEvent.Load) {
         display = emptyList()
+        maxTime = 0
+        latestTime = 0
     }
 
     @SubscribeEvent
@@ -30,7 +32,7 @@ class RiftTimer {
         val message = event.message
         "    §r§7You have §r§a(?<time>.*)ф §r§7left before the rift collapses!".toPattern().matchMatcher(message) {
             val time = group("time")
-            maxTime = formatTime(time)
+            maxTime = getTime(time)
         }
     }
 
@@ -43,23 +45,27 @@ class RiftTimer {
             "§(?<color>[a7])(?<time>.*)ф Left.*".toPattern().matchMatcher(entry) {
                 val color = group("color")
                 if (color == "7") {
-                    display = emptyList()
+                    val currentTime = getTime(group("time"))
+                    if (currentTime > maxTime) {
+                        maxTime = currentTime
+                        update(currentTime)
+                    }
                     return
                 }
-                val time = group("time")
-                val currentTime = formatTime(time)
-                update(currentTime)
+                update(getTime(group("time")))
             }
         }
     }
 
-    private fun formatTime(time: String) = TimeUtils.getMillis(time.replace("m", "m "))
+    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
-        addDiff(diff)
+        if (latestTime != maxTime) {
+            addDiff(diff)
+        }
 
         val currentFormat = TimeUtils.formatDuration(currentTime)
         val percentage = LorenzUtils.formatPercentage(currentTime.toDouble() / maxTime)