From 93fd9ece889b68349bb3b2bdfc6943e5c356424d Mon Sep 17 00:00:00 2001
From: NetheriteMiner <88792142+NetheriteMiner@users.noreply.github.com>
Date: Mon, 19 Jun 2023 15:20:02 -0400
Subject: Fix coins displaying null in RPC (#246)

---
 .../at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
index 20f203bb7..d114913bb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
@@ -108,7 +108,7 @@ enum class DiscordStatus(private val displayMessageSupplier: Supplier<String>?)
         }
         if (coins == "1") {
             lastKnownDisplayStrings[PURSE] = "1 Coin"
-        } else if (coins != "") {
+        } else if (coins != "" && coins != null) {
             lastKnownDisplayStrings[PURSE] = "$coins Coins"
         }
         lastKnownDisplayStrings[PURSE] ?: ""
-- 
cgit 


From 9594c23b95f795b25adc8be415ed38f1f46634fb Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 19 Jun 2023 21:20:18 +0200
Subject: addSeparators

---
 .../hannibal2/skyhanni/features/slayer/SlayerItemProfitTracker.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemProfitTracker.kt
index c04d662e2..9faa3511b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemProfitTracker.kt
@@ -196,7 +196,7 @@ object SlayerItemProfitTracker {
 
             val renderable = if (inventoryOpen) Renderable.clickAndHover(
                 text, listOf(
-                    "§7Dropped §e$timesDropped §7times.",
+                    "§7Dropped §e${timesDropped.addSeparators()} §7times.",
                     "§7Your drop rate: §c$perBoss",
                     "",
                     "§eClick to " + (if (hidden) "show" else "hide") + "!",
@@ -250,8 +250,8 @@ object SlayerItemProfitTracker {
         val slayerCompletedCount = itemLog.slayerCompletedCount
         addAsSingletonList(
             Renderable.hoverTips(
-                "§7Bosses killed: §e$slayerCompletedCount",
-                listOf("§7You killed the $itemLogCategory boss", "§e$slayerCompletedCount §7times.")
+                "§7Bosses killed: §e${slayerCompletedCount.addSeparators()}",
+                listOf("§7You killed the $itemLogCategory boss", "§e${slayerCompletedCount.addSeparators()} §7times.")
             )
         )
 
-- 
cgit 


From 13c636ff4ad49403c078b208dabd0b87972b0440 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 22 Jun 2023 14:23:26 +0200
Subject: Added rift timer

---
 .../hannibal2/skyhanni/features/rift/RiftTimer.kt  | 99 ++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt
new file mode 100644
index 000000000..d1fcc758d
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt
@@ -0,0 +1,99 @@
+package at.hannibal2.skyhanni.features.rift
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.events.ConfigLoadEvent
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzActionBarEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+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() = SkyHanniMod.feature.rift.timer
+    private var display = listOf<String>()
+    private var maxTime = 0L
+    private var latestTime = 0L
+    private val changes = mutableMapOf<Long, String>()
+
+    @SubscribeEvent
+    fun onConfigLoad(event: ConfigLoadEvent) {
+        display = emptyList()
+    }
+
+    @SubscribeEvent
+    fun onChatMessage(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+
+        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)
+        }
+    }
+
+    @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") {
+                    display = emptyList()
+                    return
+                }
+                val time = group("time")
+                val currentTime = formatTime(time)
+                update(currentTime)
+            }
+        }
+    }
+
+    private fun formatTime(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)
+
+        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
+
+        config.timerPosition.renderStrings(display, posLabel = "Rift Timer")
+    }
+
+    fun isEnabled() = LorenzUtils.inIsland(IslandType.THE_RIFT) && config.enabled
+}
-- 
cgit 


From 3dbc5b9a9fdb19c36b8707cc07c773b4e02ba4e0 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 22 Jun 2023 14:23:48 +0200
Subject: small bazaar changes

---
 .../at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
index fa11ee786..a2106bf15 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
@@ -58,7 +58,7 @@ class BazaarBestSellMethod {
             val result = NumberUtil.format(totalDiff.toInt())
 
             val name = NEUItems.getItemStack(internalName).nameWithEnchantment
-            return "§b$name§f sell difference: §e$result coins"
+            return "$name§7 sell difference: §6$result coins"
         } catch (e: Error) {
             e.printStackTrace()
             return ""
@@ -72,7 +72,5 @@ class BazaarBestSellMethod {
         SkyHanniMod.feature.bazaar.bestSellMethodPos.renderString(display, posLabel = "Bazaar Best Sell Method")
     }
 
-    private fun isEnabled(): Boolean {
-        return LorenzUtils.inSkyBlock && SkyHanniMod.feature.bazaar.bestSellMethod
-    }
+    private fun isEnabled() = LorenzUtils.inSkyBlock && SkyHanniMod.feature.bazaar.bestSellMethod
 }
\ No newline at end of file
-- 
cgit 


From 5165ad2ce09b9bde3e10c27dbe0af691019f70cc Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Thu, 22 Jun 2023 22:30:30 +1000
Subject: add rift (#250)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt   | 8 ++++++++
 src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt

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

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..ea2f929e6
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt
@@ -0,0 +1,8 @@
+package at.hannibal2.skyhanni.features.rift
+
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.utils.LorenzUtils
+
+object RiftAPI {
+    fun inRift() = LorenzUtils.inIsland(IslandType.THE_RIFT)
+}
\ 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
index d1fcc758d..c95393ac2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt
@@ -1,7 +1,6 @@
 package at.hannibal2.skyhanni.features.rift
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzActionBarEvent
@@ -95,5 +94,5 @@ class RiftTimer {
         config.timerPosition.renderStrings(display, posLabel = "Rift Timer")
     }
 
-    fun isEnabled() = LorenzUtils.inIsland(IslandType.THE_RIFT) && config.enabled
+    fun isEnabled() = RiftAPI.inRift() && config.enabled
 }
-- 
cgit 


From bda471a30833208d73c691d9bd167bf3d2626ea5 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Thu, 22 Jun 2023 22:33:32 +1000
Subject: carrot message (#249)

---
 .../skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
index 2da6f89b5..d52535f0d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
@@ -191,7 +191,6 @@ class CaptureFarmingGear {
         }
     }
 
-    //todo pet level up
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
         if (!LorenzUtils.inSkyBlock) return
@@ -226,5 +225,8 @@ class CaptureFarmingGear {
         if (msg == "Yum! You gain +5☘ Farming Fortune for 48 hours!") {
             hidden.cakeExpiring = System.currentTimeMillis() + 172800000
         }
+        if (msg == "CARROTS EXPORTATION COMPLETE!") {
+            hidden.carrotFortune = true
+        }
     }
 }
-- 
cgit 


From 80809a9d62e42155bc520848a1cdd55721d980b0 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Thu, 22 Jun 2023 22:37:53 +1000
Subject: Merge pull request #247

* done without testing

* fix and diff pos outside of garden
---
 .../skyhanni/features/garden/GardenYawAndPitch.kt       | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt
index 59356f30d..f569a0f21 100755
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.garden
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GardenToolChangeEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import net.minecraft.client.Minecraft
@@ -16,8 +17,10 @@ class GardenYawAndPitch {
 
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) {
-        if (!isEnabled()) return
-        if (GardenAPI.toolInHand == null) return
+        if (!LorenzUtils.inSkyBlock) return
+        if (!config.enabled) return
+        if (!GardenAPI.inGarden() && !config.showEverywhere) return
+        if (GardenAPI.toolInHand == null && !config.showWithoutTool) return
 
         val player = Minecraft.getMinecraft().thePlayer
 
@@ -38,13 +41,15 @@ class GardenYawAndPitch {
             "§aYaw: §f${yaw.toDouble().round(config.yawPrecision)}",
             "§aPitch: §f${pitch.toDouble().round(config.pitchPrecision)}",
         )
-        config.pos.renderStrings(displayList, posLabel = "Yaw and Pitch")
+        if (GardenAPI.inGarden()) {
+            config.pos.renderStrings(displayList, posLabel = "Yaw and Pitch")
+        } else {
+            config.posOutside.renderStrings(displayList, posLabel = "Yaw and Pitch")
+        }
     }
 
     @SubscribeEvent
     fun onGardenToolChange(event: GardenToolChangeEvent) {
         lastChange = System.currentTimeMillis()
     }
-
-    private fun isEnabled() = GardenAPI.inGarden() && config.enabled
-}
+}
\ No newline at end of file
-- 
cgit 


From b3e289dbec40cdd0632bac41f510d94af545983c Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 22 Jun 2023 15:13:05 +0200
Subject: Add Rift Highlight Guide

---
 .../skyhanni/features/rift/HighlightRiftGuide.kt   | 63 ++++++++++++++++++++++
 .../hannibal2/skyhanni/features/rift/RiftTimer.kt  |  4 +-
 2 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/HighlightRiftGuide.kt

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/HighlightRiftGuide.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/HighlightRiftGuide.kt
new file mode 100644
index 000000000..a8bf69fba
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/HighlightRiftGuide.kt
@@ -0,0 +1,63 @@
+package at.hannibal2.skyhanni.features.rift
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.GuiContainerEvent
+import at.hannibal2.skyhanni.events.InventoryCloseEvent
+import at.hannibal2.skyhanni.events.InventoryOpenEvent
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.RenderUtils.highlight
+import net.minecraftforge.fml.common.eventhandler.EventPriority
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+class HighlightRiftGuide {
+    private val config get() = SkyHanniMod.feature.rift
+    private var inInventory = false
+    private var highlightedItems = listOf<Int>()
+
+    @SubscribeEvent
+    fun onInventoryOpen(event: InventoryOpenEvent) {
+        inInventory = false
+
+        if (!isEnabled()) return
+
+        val inGuide = event.inventoryItems[40]?.getLore()?.let {
+            if (it.size == 1) {
+                it[0] == "§7To Rift Guide"
+            } else false
+        } ?: false
+        if (!inGuide) return
+
+        val highlightedItems = mutableListOf<Int>()
+        for ((slot, stack) in event.inventoryItems) {
+            val lore = stack.getLore()
+            if (lore.isNotEmpty()) {
+                if (lore.last() == "§8✖ Not completed yet!") {
+                    highlightedItems.add(slot)
+                }
+            }
+        }
+        inInventory = true
+        this.highlightedItems = highlightedItems
+    }
+
+    @SubscribeEvent
+    fun onInventoryClose(event: InventoryCloseEvent) {
+        inInventory = false
+    }
+
+    @SubscribeEvent(priority = EventPriority.LOW)
+    fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) {
+        if (!isEnabled()) return
+        if (!inInventory) return
+
+        for (slot in InventoryUtils.getItemsInOpenChest()) {
+            if (slot.slotIndex in highlightedItems) {
+                slot highlight LorenzColor.YELLOW
+            }
+        }
+    }
+
+    fun isEnabled() = RiftAPI.inRift() && config.highlightGuide
+}
\ 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
index c95393ac2..6fe16c981 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt
@@ -1,7 +1,6 @@
 package at.hannibal2.skyhanni.features.rift
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzActionBarEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
@@ -9,6 +8,7 @@ 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.event.world.WorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class RiftTimer {
@@ -19,7 +19,7 @@ class RiftTimer {
     private val changes = mutableMapOf<Long, String>()
 
     @SubscribeEvent
-    fun onConfigLoad(event: ConfigLoadEvent) {
+    fun onJoinWorld(ignored: WorldEvent.Load) {
         display = emptyList()
     }
 
-- 
cgit