From 9f3562c243f9b161ce87a14ee7dd5ee74e9677df Mon Sep 17 00:00:00 2001
From: Obsidianninja11 <obsidianninja11@gmail.com>
Date: Tue, 26 Dec 2023 22:32:24 -0900
Subject: [PATCH 01/23] wip live contest stats

---
 .../config/features/garden/GardenConfig.java  | 14 +--
 .../garden/JacobContestStatsConfig.java       | 60 ++++++++++++
 .../contest/JacobContestStatsSummary.kt       | 92 ++++++++++++++++++-
 3 files changed, 156 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
index b541cd0ee171..7a210daea070 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
@@ -119,6 +119,11 @@ public class GardenConfig {
     @Accordion
     public GardenCommandsConfig gardenCommands = new GardenCommandsConfig();
 
+    @Expose
+    @ConfigOption(name = "Jacob Contest Stats", desc = "")
+    @Accordion
+    public JacobContestStatsConfig jacobContestStats = new JacobContestStatsConfig();
+
     @Expose
     @ConfigOption(name = "Plot Price", desc = "Show the price of the plot in coins when inside the Configure Plots inventory.")
     @ConfigEditorBoolean
@@ -191,15 +196,6 @@ public class GardenConfig {
     @Expose
     public Position jacobContextTimesPos = new Position(-359, 149, false, true);
 
-    @Expose
-    @ConfigOption(
-        name = "Contest Summary",
-        desc = "Show the average Blocks Per Second and blocks clicked at the end of a Jacob Farming Contest in chat."
-    )
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean jacobContestSummary = true;
-
     @Expose
     @ConfigOption(name = "Always Finnegan", desc = "Forcefully set the Finnegan Farming Simulator perk to be active. This is useful if the auto mayor detection fails.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
new file mode 100644
index 000000000000..d876c6827229
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
@@ -0,0 +1,60 @@
+package at.hannibal2.skyhanni.config.features.garden;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
+import com.google.gson.annotations.Expose;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList;
+import io.github.moulberry.moulconfig.annotations.ConfigOption;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class JacobContestStatsConfig {
+
+    @Expose
+    @ConfigOption(
+        name = "Contest Stats",
+        desc = "Show contest stats during a contest and after a contest in chat."
+    )
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean jacobContestSummary = true;
+
+    @Expose
+    @ConfigOption(name = "Contest Stats Text", desc = "Drag to change the order of the overlay."
+    )
+    @ConfigEditorDraggableList
+    public List<ContestStatsTextEntry> text = new ArrayList<>(Arrays.asList(
+        ContestStatsTextEntry.TITLE,
+        ContestStatsTextEntry.TIME_PARTICIPATED,
+        ContestStatsTextEntry.BLOCKS_BROKEN,
+        ContestStatsTextEntry.BPS,
+        ContestStatsTextEntry.POSITION,
+        ContestStatsTextEntry.PREDICTED_SCORE
+    ));
+
+    public enum ContestStatsTextEntry {
+        TITLE("§e§lWheat Contest Stats"),
+        TIME_PARTICIPATED("§7Participating for §b18m 23s"),
+        BLOCKS_BROKEN("§7Blocks Broken: §e21,972"),
+        BPS("§7Blocks per Second: §c19.92"),
+        POSITION("§7Estimated Position: §b5th §7§7(Top §b0.4% §7◆ 1.1k)"),
+        PREDICTED_SCORE("§7Predicted Score: §e432,123");
+
+        private final String str;
+
+        ContestStatsTextEntry(String str) {
+            this.str = str;
+        }
+
+        @Override
+        public String toString() {
+            return str;
+        }
+    }
+
+    @Expose
+    public Position pos = new Position(-112, -143, false, true);
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index 72dc37621b47..0feb5c435ee5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -1,19 +1,37 @@
 package at.hannibal2.skyhanni.features.garden.contest
 
 import at.hannibal2.skyhanni.data.ClickType
+import at.hannibal2.skyhanni.data.ScoreboardData
 import at.hannibal2.skyhanni.events.CropClickEvent
 import at.hannibal2.skyhanni.events.FarmingContestEvent
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.ScoreboardChangeEvent
+import at.hannibal2.skyhanni.events.TabListUpdateEvent
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
+import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
+import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.TimeUtils
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.math.roundToInt
 
 class JacobContestStatsSummary {
-    private val config get() = GardenAPI.config
+    private val config get() = GardenAPI.config.jacobContestStats
     private var blocksBroken = 0
     private var startTime = 0L
+    private var percent = 0.0
+    private var participants = 0
+    private var contestStats = emptyList<List<Any>>()
+
+    private val tabContestPattern =
+        " §r(§e○|§6☘) §r§f(?<crop>.+) §r§f◆ §r§f§lTOP §r§e§l(?<percent>(\\d|[.])+)% §r§f◆ (?<participants>.+) ☻".toPattern()
+    private val scoreboardContestTimeLeftPattern = "(§e○|§6☘) §f(?<crop>.+) §a(?<time>\\d+m\\d+s)".toPattern()
+    private val scoreboardContestScorePattern = " (Collected|(?<medal>§b§lDIAMOND|§3§lPLATINUM|§6§lGOLD|§f§lSILVER|§c§lBRONZE) §fwith) §e(?<amount>.+)".toPattern()
 
     @SubscribeEvent
     fun onBlockClick(event: CropClickEvent) {
@@ -25,6 +43,78 @@ class JacobContestStatsSummary {
         }
     }
 
+    @SubscribeEvent
+    fun onTabListUpdate(event: TabListUpdateEvent) {
+//         println("enabled: ${isEnabled()} incontest: ${FarmingContestAPI.inContest}")
+        if (!isEnabled()) return
+        if (!FarmingContestAPI.inContest) return
+//         println("tab list updated")
+        for (line in event.tabList) {
+            tabContestPattern.matchMatcher(line) {
+//                 println(group("crop"))
+                if (group("crop") == FarmingContestAPI.contestCrop?.cropName) {
+                    percent = group("percent").toDouble() / 100
+                    participants = group("participants").formatNumber().toInt()
+
+//                     println("percent: $percent participants: $participants")
+                }
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun onScoreBoardUpdate(event: ScoreboardChangeEvent) {
+        if (!isEnabled()) return
+
+        for (line in event.newList) {
+            println(line)
+            scoreboardContestTimeLeftPattern.matchMatcher(line) {
+                println(group("crop"))
+                println(group("time"))
+            }
+            scoreboardContestScorePattern.matchMatcher("line") {
+                println(group("medal"))
+                println(group("amount"))
+            }
+        }
+        update()
+    }
+
+
+    fun update() {
+        contestStats = emptyList()
+        val duration = System.currentTimeMillis() - startTime
+        val durationInSeconds = duration.toDouble() / 1000
+        val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
+        val cropName = FarmingContestAPI.contestCrop?.cropName
+        val time = TimeUtils.formatDuration(duration - 999)
+        val position = (percent * participants).roundToInt() + 1
+
+        val unsortedList = buildList<List<Any>> {
+            addAsSingletonList("§e§l$cropName Contest Stats")
+            addAsSingletonList("§7Participating for §b$time")
+            addAsSingletonList("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
+            addAsSingletonList("§7Blocks per Second: §c$blocksPerSecond")
+            addAsSingletonList("§7Estimated Position: §b$position §7§7(Top §b${percent * 100}% §7◆ $participants)")
+            addAsSingletonList("§7Predicted Score: §eidk pattern yet")
+        }
+
+        println(unsortedList)
+        val sortedList = mutableListOf<List<Any>>()
+        for (index in config.text) {
+            sortedList.add(unsortedList[index.ordinal])
+        }
+        println(sortedList)
+        contestStats = sortedList
+        println(contestStats)
+    }
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
+        if (!isEnabled()) return
+        config.pos.renderStringsAndItems(contestStats, posLabel = "Jacob Contest Stats")
+    }
+
     @SubscribeEvent
     fun onFarmingContestEvent(event: FarmingContestEvent) {
         if (!isEnabled()) return

From 8e15045a9db36e522746460074a40dd7ec47bc29 Mon Sep 17 00:00:00 2001
From: Obsidianninja11 <obsidianninja11@gmail.com>
Date: Wed, 27 Dec 2023 17:44:08 -0900
Subject: [PATCH 02/23] It's actually working now :o

---
 .../contest/JacobContestStatsSummary.kt       | 78 +++++++++++--------
 1 file changed, 47 insertions(+), 31 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index 0feb5c435ee5..b2ec89443091 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -1,7 +1,6 @@
 package at.hannibal2.skyhanni.features.garden.contest
 
 import at.hannibal2.skyhanni.data.ClickType
-import at.hannibal2.skyhanni.data.ScoreboardData
 import at.hannibal2.skyhanni.events.CropClickEvent
 import at.hannibal2.skyhanni.events.FarmingContestEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
@@ -13,9 +12,9 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
+import at.hannibal2.skyhanni.utils.NumberUtil.format
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
-import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.TimeUtils
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.math.roundToInt
@@ -24,39 +23,40 @@ class JacobContestStatsSummary {
     private val config get() = GardenAPI.config.jacobContestStats
     private var blocksBroken = 0
     private var startTime = 0L
+    private var startTimeIntoContest = 0L
     private var percent = 0.0
     private var participants = 0
+    private var medalColor = ""
+    private var predictedScore = 0L
     private var contestStats = emptyList<List<Any>>()
 
-    private val tabContestPattern =
-        " §r(§e○|§6☘) §r§f(?<crop>.+) §r§f◆ §r§f§lTOP §r§e§l(?<percent>(\\d|[.])+)% §r§f◆ (?<participants>.+) ☻".toPattern()
+    private val tabContestPattern = " §r(§e○|§6☘) §r§f(?<crop>.+) §r§f◆ §r§f§lTOP §r(?<color>§.)§l(?<percent>(\\d|[.])+)% §r§f◆ (?<participants>.+) ☻".toPattern()
     private val scoreboardContestTimeLeftPattern = "(§e○|§6☘) §f(?<crop>.+) §a(?<time>\\d+m\\d+s)".toPattern()
     private val scoreboardContestScorePattern = " (Collected|(?<medal>§b§lDIAMOND|§3§lPLATINUM|§6§lGOLD|§f§lSILVER|§c§lBRONZE) §fwith) §e(?<amount>.+)".toPattern()
 
     @SubscribeEvent
     fun onBlockClick(event: CropClickEvent) {
         if (!isEnabled()) return
+        if (!FarmingContestAPI.inContest) return
         if (event.clickType != ClickType.LEFT_CLICK) return
 
-        if (FarmingContestAPI.inContest && event.crop == FarmingContestAPI.contestCrop) {
+        if (event.crop == FarmingContestAPI.contestCrop) {
             blocksBroken++
         }
     }
 
     @SubscribeEvent
     fun onTabListUpdate(event: TabListUpdateEvent) {
-//         println("enabled: ${isEnabled()} incontest: ${FarmingContestAPI.inContest}")
         if (!isEnabled()) return
         if (!FarmingContestAPI.inContest) return
-//         println("tab list updated")
+
         for (line in event.tabList) {
             tabContestPattern.matchMatcher(line) {
-//                 println(group("crop"))
                 if (group("crop") == FarmingContestAPI.contestCrop?.cropName) {
                     percent = group("percent").toDouble() / 100
                     participants = group("participants").formatNumber().toInt()
-
-//                     println("percent: $percent participants: $participants")
+                    medalColor = group("color")
+                    update()
                 }
             }
         }
@@ -65,53 +65,63 @@ class JacobContestStatsSummary {
     @SubscribeEvent
     fun onScoreBoardUpdate(event: ScoreboardChangeEvent) {
         if (!isEnabled()) return
+        if (!FarmingContestAPI.inContest) return
+
+        var timeLeft = 0L
+        var amount = 0L
 
         for (line in event.newList) {
-            println(line)
             scoreboardContestTimeLeftPattern.matchMatcher(line) {
-                println(group("crop"))
-                println(group("time"))
+                timeLeft = TimeUtils.getDuration(group("time")).inWholeSeconds
             }
-            scoreboardContestScorePattern.matchMatcher("line") {
-                println(group("medal"))
-                println(group("amount"))
+            scoreboardContestScorePattern.matchMatcher(line) {
+                amount = group("amount").fixScoreAmount()
             }
         }
+
+        predictedScore = ((amount / (1200 - timeLeft - startTimeIntoContest)) * 1199) // 1199 seems to be more accurate than 1200
         update()
     }
 
+    private fun String.fixScoreAmount() =
+        this.formatNumber() * when (this.split(',').last().length) {
+            2 -> 10
+            1 -> 100
+            else -> 1
+        }
 
     fun update() {
         contestStats = emptyList()
+        val cropName = FarmingContestAPI.contestCrop?.cropName
         val duration = System.currentTimeMillis() - startTime
         val durationInSeconds = duration.toDouble() / 1000
         val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
-        val cropName = FarmingContestAPI.contestCrop?.cropName
-        val time = TimeUtils.formatDuration(duration - 999)
         val position = (percent * participants).roundToInt() + 1
+        val formattedPercent = (percent * 100).round(1)
 
         val unsortedList = buildList<List<Any>> {
             addAsSingletonList("§e§l$cropName Contest Stats")
-            addAsSingletonList("§7Participating for §b$time")
+            addAsSingletonList("§7Started §b${TimeUtils.formatDuration(startTimeIntoContest*1000)} §7into contest")
             addAsSingletonList("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
             addAsSingletonList("§7Blocks per Second: §c$blocksPerSecond")
-            addAsSingletonList("§7Estimated Position: §b$position §7§7(Top §b${percent * 100}% §7◆ $participants)")
-            addAsSingletonList("§7Predicted Score: §eidk pattern yet")
+            if (percent == 0.0 && participants == 0)
+                addAsSingletonList("§7Est. Position: §eNo data yet")
+            else addAsSingletonList("§7Est. Position: $medalColor$position §7(Top $medalColor$formattedPercent% §7◆ ${format(participants)})")
+            addAsSingletonList("§7Predicted Score: §e${predictedScore.addSeparators()}")
         }
 
-        println(unsortedList)
         val sortedList = mutableListOf<List<Any>>()
         for (index in config.text) {
             sortedList.add(unsortedList[index.ordinal])
         }
-        println(sortedList)
         contestStats = sortedList
-        println(contestStats)
     }
 
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
         if (!isEnabled()) return
+        if (!FarmingContestAPI.inContest) return
+
         config.pos.renderStringsAndItems(contestStats, posLabel = "Jacob Contest Stats")
     }
 
@@ -123,30 +133,36 @@ class JacobContestStatsSummary {
             FarmingContestPhase.START -> {
                 LorenzUtils.chat("Started tracking your Jacob Contest Blocks Per Second!")
                 startTime = System.currentTimeMillis()
+                startTimeIntoContest = ((startTime % 3600000) - 900000) / 1000
+                LorenzUtils.chat("starttime: $startTime intocontest: $startTimeIntoContest")
             }
 
             FarmingContestPhase.STOP -> {
+                val cropName = event.crop.cropName
                 val duration = System.currentTimeMillis() - startTime
                 val durationInSeconds = duration.toDouble() / 1000
                 val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
-                val cropName = event.crop.cropName
-                LorenzUtils.chat("Stats for $cropName Contest:")
                 val time = TimeUtils.formatDuration(duration - 999)
-                LorenzUtils.chat("§7Blocks Broken in total: §e${blocksBroken.addSeparators()}")
-                val color = getBlocksPerSecondColor(blocksPerSecond)
-                LorenzUtils.chat("§7Average Blocks Per Second: $color$blocksPerSecond")
+                val position = (percent * participants).roundToInt() + 1
+                val formattedPercent = (percent * 100).round(1)
+
+                LorenzUtils.chat("§l$cropName Contest Stats")
                 LorenzUtils.chat("§7Participated for §b$time")
+                LorenzUtils.chat("§7Total Blocks Broken: §e${blocksBroken.addSeparators()}")
+                LorenzUtils.chat("§7Average Blocks Per Second: §c$blocksPerSecond")
+                LorenzUtils.chat("§7Est. Position: $medalColor$position §7(Top $medalColor$formattedPercent% §7◆ ${format(participants)})")
             }
 
             FarmingContestPhase.CHANGE -> {
                 LorenzUtils.chat("You changed the crop during the contest, resetting the Blocks Per Second calculation..")
                 startTime = System.currentTimeMillis()
+                startTimeIntoContest = ((startTime % 3600000) - 900000) / 1000
             }
         }
         blocksBroken = 0
+        percent = 0.0
+        participants = 0
     }
 
-    private fun getBlocksPerSecondColor(blocksPerSecond: Double) = if (blocksPerSecond > 19) "§c" else "§a"
-
     fun isEnabled() = GardenAPI.inGarden() && config.jacobContestSummary
 }

From 95757aabb57b18d05186bece1576b623835cf3c7 Mon Sep 17 00:00:00 2001
From: Obsidianninja11 <obsidianninja11@gmail.com>
Date: Wed, 27 Dec 2023 17:50:43 -0900
Subject: [PATCH 03/23] Forgot to delete debugging line

---
 .../skyhanni/features/garden/contest/JacobContestStatsSummary.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index b2ec89443091..56c7eeb93ad7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -134,7 +134,6 @@ class JacobContestStatsSummary {
                 LorenzUtils.chat("Started tracking your Jacob Contest Blocks Per Second!")
                 startTime = System.currentTimeMillis()
                 startTimeIntoContest = ((startTime % 3600000) - 900000) / 1000
-                LorenzUtils.chat("starttime: $startTime intocontest: $startTimeIntoContest")
             }
 
             FarmingContestPhase.STOP -> {

From 55b109a6317084dae432978716854bee594bf74b Mon Sep 17 00:00:00 2001
From: Obsidian <108832807+Obsidianninja11@users.noreply.github.com>
Date: Wed, 27 Dec 2023 20:21:34 -0900
Subject: [PATCH 04/23] Better example data

---
 .../features/garden/JacobContestStatsConfig.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
index d876c6827229..7783ff3c9339 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
@@ -36,12 +36,12 @@ public class JacobContestStatsConfig {
     ));
 
     public enum ContestStatsTextEntry {
-        TITLE("§e§lWheat Contest Stats"),
-        TIME_PARTICIPATED("§7Participating for §b18m 23s"),
-        BLOCKS_BROKEN("§7Blocks Broken: §e21,972"),
-        BPS("§7Blocks per Second: §c19.92"),
-        POSITION("§7Estimated Position: §b5th §7§7(Top §b0.4% §7◆ 1.1k)"),
-        PREDICTED_SCORE("§7Predicted Score: §e432,123");
+        TITLE("§e§lSugar Cane Contest Stats"),
+        TIME_PARTICIPATED("§7Started §b3s §7into contest"),
+        BLOCKS_BROKEN("§7Blocks Broken: §e14,781"),
+        BPS("§7Blocks per Second: §c19.94"),
+        POSITION("§7Estimated Position: §b2nd §7§7(Top §b0.1% §7◆675)"),
+        PREDICTED_SCORE("§7Predicted Score: §e915,600");
 
         private final String str;
 

From cd1aedcb09537e2634674a1c60958d02e795fd71 Mon Sep 17 00:00:00 2001
From: Obsidian <108832807+Obsidianninja11@users.noreply.github.com>
Date: Thu, 28 Dec 2023 13:52:30 -0900
Subject: [PATCH 05/23] Actually 1200 is better than 1199 i think

---
 .../features/garden/contest/JacobContestStatsSummary.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index 56c7eeb93ad7..22885687042b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -79,7 +79,7 @@ class JacobContestStatsSummary {
             }
         }
 
-        predictedScore = ((amount / (1200 - timeLeft - startTimeIntoContest)) * 1199) // 1199 seems to be more accurate than 1200
+        predictedScore = ((amount / (1200 - timeLeft - startTimeIntoContest)) * 1200)
         update()
     }
 

From a70b87b0b7a2e18d5c67ac5f236559c17f64eae7 Mon Sep 17 00:00:00 2001
From: Obsidian <108832807+Obsidianninja11@users.noreply.github.com>
Date: Thu, 28 Dec 2023 13:58:28 -0900
Subject: [PATCH 06/23] Better default position

---
 .../config/features/garden/JacobContestStatsConfig.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
index 7783ff3c9339..3908dcf85c43 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
@@ -56,5 +56,5 @@ public String toString() {
     }
 
     @Expose
-    public Position pos = new Position(-112, -143, false, true);
+    public Position pos = new Position(0, 240, false, true);
 }

From ee3d26de02e6e8bf9858cb48adb3d496b67dab84 Mon Sep 17 00:00:00 2001
From: Obsidianninja11 <obsidianninja11@gmail.com>
Date: Thu, 28 Dec 2023 21:09:09 -0900
Subject: [PATCH 07/23] More accurate score prediction (especially when
 starting late)

---
 .../contest/JacobContestStatsSummary.kt       | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index 22885687042b..27f55aa2ac4f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -18,12 +18,13 @@ import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.TimeUtils
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.math.roundToInt
+import kotlin.math.roundToLong
 
 class JacobContestStatsSummary {
     private val config get() = GardenAPI.config.jacobContestStats
     private var blocksBroken = 0
     private var startTime = 0L
-    private var startTimeIntoContest = 0L
+    private var startTimeIntoContest = 0.0
     private var percent = 0.0
     private var participants = 0
     private var medalColor = ""
@@ -68,7 +69,7 @@ class JacobContestStatsSummary {
         if (!FarmingContestAPI.inContest) return
 
         var timeLeft = 0L
-        var amount = 0L
+        var amount = 0.0
 
         for (line in event.newList) {
             scoreboardContestTimeLeftPattern.matchMatcher(line) {
@@ -79,15 +80,15 @@ class JacobContestStatsSummary {
             }
         }
 
-        predictedScore = ((amount / (1200 - timeLeft - startTimeIntoContest)) * 1200)
+        predictedScore = ((amount / (1200 - timeLeft - startTimeIntoContest)) * (1200 - startTimeIntoContest)).roundToLong()
         update()
     }
 
-    private fun String.fixScoreAmount() =
+    private fun String.fixScoreAmount(): Double =
         this.formatNumber() * when (this.split(',').last().length) {
-            2 -> 10
-            1 -> 100
-            else -> 1
+            2 -> 10.0
+            1 -> 100.0
+            else -> 1.0
         }
 
     fun update() {
@@ -101,7 +102,7 @@ class JacobContestStatsSummary {
 
         val unsortedList = buildList<List<Any>> {
             addAsSingletonList("§e§l$cropName Contest Stats")
-            addAsSingletonList("§7Started §b${TimeUtils.formatDuration(startTimeIntoContest*1000)} §7into contest")
+            addAsSingletonList("§7Started §b${TimeUtils.formatDuration((startTimeIntoContest * 1000).toLong(), showMilliSeconds = true)} §7into contest (${startTimeIntoContest})")
             addAsSingletonList("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
             addAsSingletonList("§7Blocks per Second: §c$blocksPerSecond")
             if (percent == 0.0 && participants == 0)
@@ -133,7 +134,7 @@ class JacobContestStatsSummary {
             FarmingContestPhase.START -> {
                 LorenzUtils.chat("Started tracking your Jacob Contest Blocks Per Second!")
                 startTime = System.currentTimeMillis()
-                startTimeIntoContest = ((startTime % 3600000) - 900000) / 1000
+                startTimeIntoContest = ((startTime.toDouble() % 3600000) - 900000) / 1000
             }
 
             FarmingContestPhase.STOP -> {
@@ -155,7 +156,7 @@ class JacobContestStatsSummary {
             FarmingContestPhase.CHANGE -> {
                 LorenzUtils.chat("You changed the crop during the contest, resetting the Blocks Per Second calculation..")
                 startTime = System.currentTimeMillis()
-                startTimeIntoContest = ((startTime % 3600000) - 900000) / 1000
+                startTimeIntoContest = ((startTime.toDouble() % 3600000) - 900000) / 1000
             }
         }
         blocksBroken = 0

From d47380f7918c656d0ae301d793477f48116f7baf Mon Sep 17 00:00:00 2001
From: Obsidian <108832807+Obsidianninja11@users.noreply.github.com>
Date: Thu, 28 Dec 2023 21:47:39 -0900
Subject: [PATCH 08/23] subtract 999 ms bc weird utils adds 999 ms wtf?!

---
 .../features/garden/contest/JacobContestStatsSummary.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index 27f55aa2ac4f..9ecadb4f48c9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -102,7 +102,7 @@ class JacobContestStatsSummary {
 
         val unsortedList = buildList<List<Any>> {
             addAsSingletonList("§e§l$cropName Contest Stats")
-            addAsSingletonList("§7Started §b${TimeUtils.formatDuration((startTimeIntoContest * 1000).toLong(), showMilliSeconds = true)} §7into contest (${startTimeIntoContest})")
+            addAsSingletonList("§7Started §b${TimeUtils.formatDuration((startTimeIntoContest * 1000 - 999).toLong(), showMilliSeconds = true)} §7into contest (${startTimeIntoContest})")
             addAsSingletonList("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
             addAsSingletonList("§7Blocks per Second: §c$blocksPerSecond")
             if (percent == 0.0 && participants == 0)

From 726a5c72afb2f978caf36aab93decffc30d6a70c Mon Sep 17 00:00:00 2001
From: Obsidian <108832807+Obsidianninja11@users.noreply.github.com>
Date: Fri, 29 Dec 2023 08:33:52 -0900
Subject: [PATCH 09/23] Removed debug info (forgot to remove before oops)

---
 .../features/garden/contest/JacobContestStatsSummary.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index 9ecadb4f48c9..63929b786a1d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -102,7 +102,7 @@ class JacobContestStatsSummary {
 
         val unsortedList = buildList<List<Any>> {
             addAsSingletonList("§e§l$cropName Contest Stats")
-            addAsSingletonList("§7Started §b${TimeUtils.formatDuration((startTimeIntoContest * 1000 - 999).toLong(), showMilliSeconds = true)} §7into contest (${startTimeIntoContest})")
+            addAsSingletonList("§7Started §b${TimeUtils.formatDuration((startTimeIntoContest * 1000 - 999).toLong(), showMilliSeconds = true)} §7into contest")
             addAsSingletonList("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
             addAsSingletonList("§7Blocks per Second: §c$blocksPerSecond")
             if (percent == 0.0 && participants == 0)

From 21c04d8ba5441180311589c29c24e70ed111e6df Mon Sep 17 00:00:00 2001
From: Obsidian <108832807+Obsidianninja11@users.noreply.github.com>
Date: Sun, 31 Dec 2023 00:58:30 -0900
Subject: [PATCH 10/23] Use RepoPattern

---
 .../garden/contest/JacobContestStatsSummary.kt   | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index 63929b786a1d..e566c6248e39 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -14,6 +14,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
 import at.hannibal2.skyhanni.utils.NumberUtil.format
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.TimeUtils
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -31,9 +32,18 @@ class JacobContestStatsSummary {
     private var predictedScore = 0L
     private var contestStats = emptyList<List<Any>>()
 
-    private val tabContestPattern = " §r(§e○|§6☘) §r§f(?<crop>.+) §r§f◆ §r§f§lTOP §r(?<color>§.)§l(?<percent>(\\d|[.])+)% §r§f◆ (?<participants>.+) ☻".toPattern()
-    private val scoreboardContestTimeLeftPattern = "(§e○|§6☘) §f(?<crop>.+) §a(?<time>\\d+m\\d+s)".toPattern()
-    private val scoreboardContestScorePattern = " (Collected|(?<medal>§b§lDIAMOND|§3§lPLATINUM|§6§lGOLD|§f§lSILVER|§c§lBRONZE) §fwith) §e(?<amount>.+)".toPattern()
+    private val tabContestPattern by RepoPattern.pattern(
+        "garden.jacob.contest.tab.data",
+        " §r(§e○|§6☘) §r§f(?<crop>.+) §r§f◆ §r§f§lTOP §r(?<color>§.)§l(?<percent>(\\d|[.])+)% §r§f◆ (?<participants>.+) ☻"
+    )
+    private val scoreboardContestTimeLeftPattern by RepoPattern.pattern(
+        "garden.jacob.contest.scoreboard.time.left",
+        "(§e○|§6☘) §f(?<crop>.+) §a(?<time>\\d+m\\d+s)"
+    )
+    private val scoreboardContestScorePattern by RepoPattern.pattern(
+        "garden.jacob.contest.scoreboard.score",
+        " (Collected|(?<medal>§b§lDIAMOND|§3§lPLATINUM|§6§lGOLD|§f§lSILVER|§c§lBRONZE) §fwith) §e(?<amount>.+)"
+    )
 
     @SubscribeEvent
     fun onBlockClick(event: CropClickEvent) {

From 7071bb18aabbe8f9653bbed8662a1a4a7a5bd1ae Mon Sep 17 00:00:00 2001
From: Obsidianninja11 <obsidianninja11@gmail.com>
Date: Mon, 1 Jan 2024 16:02:48 -0900
Subject: [PATCH 11/23] Fixes

---
 .../garden/JacobContestStatsConfig.java       |  8 ++---
 .../contest/JacobContestStatsSummary.kt       | 34 +++++++++----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
index 3908dcf85c43..bc091157e0aa 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
@@ -28,7 +28,7 @@ public class JacobContestStatsConfig {
     @ConfigEditorDraggableList
     public List<ContestStatsTextEntry> text = new ArrayList<>(Arrays.asList(
         ContestStatsTextEntry.TITLE,
-        ContestStatsTextEntry.TIME_PARTICIPATED,
+        ContestStatsTextEntry.TIME,
         ContestStatsTextEntry.BLOCKS_BROKEN,
         ContestStatsTextEntry.BPS,
         ContestStatsTextEntry.POSITION,
@@ -37,11 +37,11 @@ public class JacobContestStatsConfig {
 
     public enum ContestStatsTextEntry {
         TITLE("§e§lSugar Cane Contest Stats"),
-        TIME_PARTICIPATED("§7Started §b3s §7into contest"),
+        TIME("§7Started §b3.1s §7into contest"),
         BLOCKS_BROKEN("§7Blocks Broken: §e14,781"),
         BPS("§7Blocks per Second: §c19.94"),
-        POSITION("§7Estimated Position: §b2nd §7§7(Top §b0.1% §7◆675)"),
-        PREDICTED_SCORE("§7Predicted Score: §e915,600");
+        POSITION("§7Est. Position: §b2nd §7§7(Top §b0.1% §7◆ 675)"),
+        PREDICTED_SCORE("§7Predicted Score: §e915,430");
 
         private final String str;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index e566c6248e39..c7ddbbf83a5e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -8,12 +8,12 @@ import at.hannibal2.skyhanni.events.ScoreboardChangeEvent
 import at.hannibal2.skyhanni.events.TabListUpdateEvent
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.addSuffix
 import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
 import at.hannibal2.skyhanni.utils.NumberUtil.format
-import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
+import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.TimeUtils
@@ -30,7 +30,7 @@ class JacobContestStatsSummary {
     private var participants = 0
     private var medalColor = ""
     private var predictedScore = 0L
-    private var contestStats = emptyList<List<Any>>()
+    private var contestStats = mutableListOf<String>()
 
     private val tabContestPattern by RepoPattern.pattern(
         "garden.jacob.contest.tab.data",
@@ -102,7 +102,7 @@ class JacobContestStatsSummary {
         }
 
     fun update() {
-        contestStats = emptyList()
+        contestStats.clear()
         val cropName = FarmingContestAPI.contestCrop?.cropName
         val duration = System.currentTimeMillis() - startTime
         val durationInSeconds = duration.toDouble() / 1000
@@ -110,22 +110,20 @@ class JacobContestStatsSummary {
         val position = (percent * participants).roundToInt() + 1
         val formattedPercent = (percent * 100).round(1)
 
-        val unsortedList = buildList<List<Any>> {
-            addAsSingletonList("§e§l$cropName Contest Stats")
-            addAsSingletonList("§7Started §b${TimeUtils.formatDuration((startTimeIntoContest * 1000 - 999).toLong(), showMilliSeconds = true)} §7into contest")
-            addAsSingletonList("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
-            addAsSingletonList("§7Blocks per Second: §c$blocksPerSecond")
-            if (percent == 0.0 && participants == 0)
-                addAsSingletonList("§7Est. Position: §eNo data yet")
-            else addAsSingletonList("§7Est. Position: $medalColor$position §7(Top $medalColor$formattedPercent% §7◆ ${format(participants)})")
-            addAsSingletonList("§7Predicted Score: §e${predictedScore.addSeparators()}")
-        }
+        val unsortedList = mutableListOf<String>()
+        unsortedList.add("§e§l$cropName Contest Stats")
+        unsortedList.add("§7Started §b${TimeUtils.formatDuration((startTimeIntoContest * 1000 - 999).toLong(), showMilliSeconds = true)} §7into contest")
+        unsortedList.add("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
+        unsortedList.add("§7Blocks per Second: §c$blocksPerSecond")
+        if (percent == 0.0 && participants == 0)
+            unsortedList.add("§7Est. Position: §eNo data yet")
+        else unsortedList.add("§7Est. Position: $medalColor${position.addSuffix()} §7(Top $medalColor$formattedPercent% §7◆ ${format(participants)})")
+        unsortedList.add("§7Predicted Score: §e${predictedScore.addSeparators()}")
+
 
-        val sortedList = mutableListOf<List<Any>>()
         for (index in config.text) {
-            sortedList.add(unsortedList[index.ordinal])
+            contestStats.add(unsortedList[index.ordinal])
         }
-        contestStats = sortedList
     }
 
     @SubscribeEvent
@@ -133,7 +131,7 @@ class JacobContestStatsSummary {
         if (!isEnabled()) return
         if (!FarmingContestAPI.inContest) return
 
-        config.pos.renderStringsAndItems(contestStats, posLabel = "Jacob Contest Stats")
+        config.pos.renderStrings(contestStats, 2, "Jacob Contest Stats")
     }
 
     @SubscribeEvent

From 9867ac0e9054fbe215da2be2057ed262fc758571 Mon Sep 17 00:00:00 2001
From: Obsidianninja11 <obsidianninja11@gmail.com>
Date: Mon, 1 Jan 2024 16:06:14 -0900
Subject: [PATCH 12/23] Revert "Fixes"

This reverts commit 7071bb18aabbe8f9653bbed8662a1a4a7a5bd1ae.
---
 .../garden/JacobContestStatsConfig.java       |  8 ++---
 .../contest/JacobContestStatsSummary.kt       | 34 ++++++++++---------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
index bc091157e0aa..3908dcf85c43 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
@@ -28,7 +28,7 @@ public class JacobContestStatsConfig {
     @ConfigEditorDraggableList
     public List<ContestStatsTextEntry> text = new ArrayList<>(Arrays.asList(
         ContestStatsTextEntry.TITLE,
-        ContestStatsTextEntry.TIME,
+        ContestStatsTextEntry.TIME_PARTICIPATED,
         ContestStatsTextEntry.BLOCKS_BROKEN,
         ContestStatsTextEntry.BPS,
         ContestStatsTextEntry.POSITION,
@@ -37,11 +37,11 @@ public class JacobContestStatsConfig {
 
     public enum ContestStatsTextEntry {
         TITLE("§e§lSugar Cane Contest Stats"),
-        TIME("§7Started §b3.1s §7into contest"),
+        TIME_PARTICIPATED("§7Started §b3s §7into contest"),
         BLOCKS_BROKEN("§7Blocks Broken: §e14,781"),
         BPS("§7Blocks per Second: §c19.94"),
-        POSITION("§7Est. Position: §b2nd §7§7(Top §b0.1% §7◆ 675)"),
-        PREDICTED_SCORE("§7Predicted Score: §e915,430");
+        POSITION("§7Estimated Position: §b2nd §7§7(Top §b0.1% §7◆675)"),
+        PREDICTED_SCORE("§7Predicted Score: §e915,600");
 
         private final String str;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index c7ddbbf83a5e..e566c6248e39 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -8,12 +8,12 @@ import at.hannibal2.skyhanni.events.ScoreboardChangeEvent
 import at.hannibal2.skyhanni.events.TabListUpdateEvent
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
-import at.hannibal2.skyhanni.utils.NumberUtil.addSuffix
 import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
 import at.hannibal2.skyhanni.utils.NumberUtil.format
-import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
+import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.TimeUtils
@@ -30,7 +30,7 @@ class JacobContestStatsSummary {
     private var participants = 0
     private var medalColor = ""
     private var predictedScore = 0L
-    private var contestStats = mutableListOf<String>()
+    private var contestStats = emptyList<List<Any>>()
 
     private val tabContestPattern by RepoPattern.pattern(
         "garden.jacob.contest.tab.data",
@@ -102,7 +102,7 @@ class JacobContestStatsSummary {
         }
 
     fun update() {
-        contestStats.clear()
+        contestStats = emptyList()
         val cropName = FarmingContestAPI.contestCrop?.cropName
         val duration = System.currentTimeMillis() - startTime
         val durationInSeconds = duration.toDouble() / 1000
@@ -110,20 +110,22 @@ class JacobContestStatsSummary {
         val position = (percent * participants).roundToInt() + 1
         val formattedPercent = (percent * 100).round(1)
 
-        val unsortedList = mutableListOf<String>()
-        unsortedList.add("§e§l$cropName Contest Stats")
-        unsortedList.add("§7Started §b${TimeUtils.formatDuration((startTimeIntoContest * 1000 - 999).toLong(), showMilliSeconds = true)} §7into contest")
-        unsortedList.add("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
-        unsortedList.add("§7Blocks per Second: §c$blocksPerSecond")
-        if (percent == 0.0 && participants == 0)
-            unsortedList.add("§7Est. Position: §eNo data yet")
-        else unsortedList.add("§7Est. Position: $medalColor${position.addSuffix()} §7(Top $medalColor$formattedPercent% §7◆ ${format(participants)})")
-        unsortedList.add("§7Predicted Score: §e${predictedScore.addSeparators()}")
-
+        val unsortedList = buildList<List<Any>> {
+            addAsSingletonList("§e§l$cropName Contest Stats")
+            addAsSingletonList("§7Started §b${TimeUtils.formatDuration((startTimeIntoContest * 1000 - 999).toLong(), showMilliSeconds = true)} §7into contest")
+            addAsSingletonList("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
+            addAsSingletonList("§7Blocks per Second: §c$blocksPerSecond")
+            if (percent == 0.0 && participants == 0)
+                addAsSingletonList("§7Est. Position: §eNo data yet")
+            else addAsSingletonList("§7Est. Position: $medalColor$position §7(Top $medalColor$formattedPercent% §7◆ ${format(participants)})")
+            addAsSingletonList("§7Predicted Score: §e${predictedScore.addSeparators()}")
+        }
 
+        val sortedList = mutableListOf<List<Any>>()
         for (index in config.text) {
-            contestStats.add(unsortedList[index.ordinal])
+            sortedList.add(unsortedList[index.ordinal])
         }
+        contestStats = sortedList
     }
 
     @SubscribeEvent
@@ -131,7 +133,7 @@ class JacobContestStatsSummary {
         if (!isEnabled()) return
         if (!FarmingContestAPI.inContest) return
 
-        config.pos.renderStrings(contestStats, 2, "Jacob Contest Stats")
+        config.pos.renderStringsAndItems(contestStats, posLabel = "Jacob Contest Stats")
     }
 
     @SubscribeEvent

From 3038c22364cd6e6a4b102991a31d3970218df9b0 Mon Sep 17 00:00:00 2001
From: Obsidianninja11 <obsidianninja11@gmail.com>
Date: Mon, 1 Jan 2024 16:09:33 -0900
Subject: [PATCH 13/23] Fixed some stuff

---
 .../garden/JacobContestStatsConfig.java       |  8 ++--
 .../contest/JacobContestStatsSummary.kt       | 38 +++++++++----------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
index 3908dcf85c43..bc091157e0aa 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
@@ -28,7 +28,7 @@ public class JacobContestStatsConfig {
     @ConfigEditorDraggableList
     public List<ContestStatsTextEntry> text = new ArrayList<>(Arrays.asList(
         ContestStatsTextEntry.TITLE,
-        ContestStatsTextEntry.TIME_PARTICIPATED,
+        ContestStatsTextEntry.TIME,
         ContestStatsTextEntry.BLOCKS_BROKEN,
         ContestStatsTextEntry.BPS,
         ContestStatsTextEntry.POSITION,
@@ -37,11 +37,11 @@ public class JacobContestStatsConfig {
 
     public enum ContestStatsTextEntry {
         TITLE("§e§lSugar Cane Contest Stats"),
-        TIME_PARTICIPATED("§7Started §b3s §7into contest"),
+        TIME("§7Started §b3.1s §7into contest"),
         BLOCKS_BROKEN("§7Blocks Broken: §e14,781"),
         BPS("§7Blocks per Second: §c19.94"),
-        POSITION("§7Estimated Position: §b2nd §7§7(Top §b0.1% §7◆675)"),
-        PREDICTED_SCORE("§7Predicted Score: §e915,600");
+        POSITION("§7Est. Position: §b2nd §7§7(Top §b0.1% §7◆ 675)"),
+        PREDICTED_SCORE("§7Predicted Score: §e915,430");
 
         private final String str;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index e566c6248e39..76afd1ffef01 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -8,12 +8,12 @@ import at.hannibal2.skyhanni.events.ScoreboardChangeEvent
 import at.hannibal2.skyhanni.events.TabListUpdateEvent
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.addSuffix
 import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
 import at.hannibal2.skyhanni.utils.NumberUtil.format
-import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
+import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.TimeUtils
@@ -30,7 +30,7 @@ class JacobContestStatsSummary {
     private var participants = 0
     private var medalColor = ""
     private var predictedScore = 0L
-    private var contestStats = emptyList<List<Any>>()
+    private var contestStats = mutableListOf<String>()
 
     private val tabContestPattern by RepoPattern.pattern(
         "garden.jacob.contest.tab.data",
@@ -102,7 +102,7 @@ class JacobContestStatsSummary {
         }
 
     fun update() {
-        contestStats = emptyList()
+        contestStats.clear()
         val cropName = FarmingContestAPI.contestCrop?.cropName
         val duration = System.currentTimeMillis() - startTime
         val durationInSeconds = duration.toDouble() / 1000
@@ -110,22 +110,20 @@ class JacobContestStatsSummary {
         val position = (percent * participants).roundToInt() + 1
         val formattedPercent = (percent * 100).round(1)
 
-        val unsortedList = buildList<List<Any>> {
-            addAsSingletonList("§e§l$cropName Contest Stats")
-            addAsSingletonList("§7Started §b${TimeUtils.formatDuration((startTimeIntoContest * 1000 - 999).toLong(), showMilliSeconds = true)} §7into contest")
-            addAsSingletonList("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
-            addAsSingletonList("§7Blocks per Second: §c$blocksPerSecond")
-            if (percent == 0.0 && participants == 0)
-                addAsSingletonList("§7Est. Position: §eNo data yet")
-            else addAsSingletonList("§7Est. Position: $medalColor$position §7(Top $medalColor$formattedPercent% §7◆ ${format(participants)})")
-            addAsSingletonList("§7Predicted Score: §e${predictedScore.addSeparators()}")
-        }
+        val unsortedList = mutableListOf<String>()
+        unsortedList.add("§e§l$cropName Contest Stats")
+        unsortedList.add("§7Started §b${TimeUtils.formatDuration((startTimeIntoContest * 1000 - 999).toLong(), showMilliSeconds = true)} §7into contest")
+        unsortedList.add("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
+        unsortedList.add("§7Blocks per Second: §c$blocksPerSecond")
+        if (percent == 0.0 && participants == 0)
+            unsortedList.add("§7Est. Position: §eNo data yet")
+        else unsortedList.add("§7Est. Position: $medalColor${position.addSuffix()} §7(Top $medalColor$formattedPercent% §7◆ ${format(participants)})")
+        unsortedList.add("§7Predicted Score: §e${predictedScore.addSeparators()}")
+
 
-        val sortedList = mutableListOf<List<Any>>()
         for (index in config.text) {
-            sortedList.add(unsortedList[index.ordinal])
+            contestStats.add(unsortedList[index.ordinal])
         }
-        contestStats = sortedList
     }
 
     @SubscribeEvent
@@ -133,7 +131,7 @@ class JacobContestStatsSummary {
         if (!isEnabled()) return
         if (!FarmingContestAPI.inContest) return
 
-        config.pos.renderStringsAndItems(contestStats, posLabel = "Jacob Contest Stats")
+        config.pos.renderStrings(contestStats, 2, "Jacob Contest Stats")
     }
 
     @SubscribeEvent
@@ -159,8 +157,8 @@ class JacobContestStatsSummary {
                 LorenzUtils.chat("§l$cropName Contest Stats")
                 LorenzUtils.chat("§7Participated for §b$time")
                 LorenzUtils.chat("§7Total Blocks Broken: §e${blocksBroken.addSeparators()}")
-                LorenzUtils.chat("§7Average Blocks Per Second: §c$blocksPerSecond")
-                LorenzUtils.chat("§7Est. Position: $medalColor$position §7(Top $medalColor$formattedPercent% §7◆ ${format(participants)})")
+                LorenzUtils.chat("§7Average Blocks per Second: §c$blocksPerSecond")
+                LorenzUtils.chat("§7Est. Position: $medalColor${position.addSuffix()} §7(Top $medalColor$formattedPercent% §7◆ ${format(participants)})")
             }
 
             FarmingContestPhase.CHANGE -> {

From df479b1b2ade09de81fcd9fd92296caa6f5747f2 Mon Sep 17 00:00:00 2001
From: Obsidian <108832807+Obsidianninja11@users.noreply.github.com>
Date: Tue, 2 Jan 2024 00:29:43 -0900
Subject: [PATCH 14/23] Minor code cleanup + consistencies

---
 .../features/garden/contest/JacobContestStatsSummary.kt    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index 76afd1ffef01..c3571285ebc7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -109,10 +109,11 @@ class JacobContestStatsSummary {
         val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
         val position = (percent * participants).roundToInt() + 1
         val formattedPercent = (percent * 100).round(1)
+        val startTime = TimeUtils.formatDuration((startTimeIntoContest * 1000 - 999).toLong(), showMilliSeconds = true)
 
         val unsortedList = mutableListOf<String>()
         unsortedList.add("§e§l$cropName Contest Stats")
-        unsortedList.add("§7Started §b${TimeUtils.formatDuration((startTimeIntoContest * 1000 - 999).toLong(), showMilliSeconds = true)} §7into contest")
+        unsortedList.add("§7Started §b$startTime §7into contest")
         unsortedList.add("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
         unsortedList.add("§7Blocks per Second: §c$blocksPerSecond")
         if (percent == 0.0 && participants == 0)
@@ -142,7 +143,7 @@ class JacobContestStatsSummary {
             FarmingContestPhase.START -> {
                 LorenzUtils.chat("Started tracking your Jacob Contest Blocks Per Second!")
                 startTime = System.currentTimeMillis()
-                startTimeIntoContest = ((startTime.toDouble() % 3600000) - 900000) / 1000
+                startTimeIntoContest = ((startTime.toDouble() % 3600000) - 900000) / 1000 // TODO test if this breaks for non whole hr time zones (gmt+0.5 etc)
             }
 
             FarmingContestPhase.STOP -> {
@@ -150,7 +151,7 @@ class JacobContestStatsSummary {
                 val duration = System.currentTimeMillis() - startTime
                 val durationInSeconds = duration.toDouble() / 1000
                 val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
-                val time = TimeUtils.formatDuration(duration - 999)
+                val time = TimeUtils.formatDuration(duration - 999, showMilliSeconds = true)
                 val position = (percent * participants).roundToInt() + 1
                 val formattedPercent = (percent * 100).round(1)
 

From 05c02bd06319a1c2bd1a7c27632c5cc07937531b Mon Sep 17 00:00:00 2001
From: Obsidianninja11 <obsidianninja11@gmail.com>
Date: Mon, 8 Apr 2024 14:43:56 -0800
Subject: [PATCH 15/23] Fixes

---
 .../garden/JacobContestStatsConfig.java       |  4 +-
 .../contest/JacobContestStatsSummary.kt       | 69 ++++++++-----------
 2 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
index bc091157e0aa..90ef508df9b6 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
@@ -37,10 +37,10 @@ public class JacobContestStatsConfig {
 
     public enum ContestStatsTextEntry {
         TITLE("§e§lSugar Cane Contest Stats"),
-        TIME("§7Started §b3.1s §7into contest"),
+        TIME("§7Started §b3s §7into contest"),
         BLOCKS_BROKEN("§7Blocks Broken: §e14,781"),
         BPS("§7Blocks per Second: §c19.94"),
-        POSITION("§7Est. Position: §b2nd §7§7(Top §b0.1% §7◆ 675)"),
+        POSITION("§7Position: Top §b0.1%"),
         PREDICTED_SCORE("§7Predicted Score: §e915,430");
 
         private final String str;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index 3ba9d4b0af28..27fa240741c4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -10,37 +10,30 @@ import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
-import at.hannibal2.skyhanni.utils.NumberUtil.addSuffix
-import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
-import at.hannibal2.skyhanni.utils.NumberUtil.format
+import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
-import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.TimeUtils
-import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.TimeUtils.format
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import kotlin.math.roundToInt
-import kotlin.math.roundToLong
 
 class JacobContestStatsSummary {
     private val config get() = GardenAPI.config.jacobContestStats
     private var blocksBroken = 0
     private var startTime = 0L
-    private var startTimeIntoContest = 0.0
-    private var percent = 0.0
-    private var participants = 0
+    private var startTimeIntoContest: Long? = null
+    private var percent = -1.0
     private var medalColor = ""
     private var predictedScore = 0L
     private var contestStats = mutableListOf<String>()
 
     private val tabContestPattern by RepoPattern.pattern(
         "garden.jacob.contest.tab.data",
-        " §r(§e○|§6☘) §r§f(?<crop>.+) §r§f◆ §r§f§lTOP §r(?<color>§.)§l(?<percent>(\\d|[.])+)% §r§f◆ (?<participants>.+) ☻"
+        " §r(§e○|§6☘) §r§f(?<crop>.+) §r§f◆ Top §r(?<color>§.)(?<percent>(\\d|[.])+)%"
     )
     private val scoreboardContestTimeLeftPattern by RepoPattern.pattern(
         "garden.jacob.contest.scoreboard.time.left",
-        "(§e○|§6☘) §f(?<crop>.+) §a(?<time>\\d+m\\d+s)"
+        " (§e○|§6☘) §f(?<crop>.+) §a(?<time>\\d+m\\d+s)"
     )
     private val scoreboardContestScorePattern by RepoPattern.pattern(
         "garden.jacob.contest.scoreboard.score",
@@ -67,7 +60,6 @@ class JacobContestStatsSummary {
             tabContestPattern.matchMatcher(line) {
                 if (group("crop") == FarmingContestAPI.contestCrop?.cropName) {
                     percent = group("percent").toDouble() / 100
-                    participants = group("participants").formatNumber().toInt()
                     medalColor = group("color")
                     update()
                 }
@@ -91,36 +83,37 @@ class JacobContestStatsSummary {
                 amount = group("amount").fixScoreAmount()
             }
         }
-
-        predictedScore = ((amount / (1200 - timeLeft - startTimeIntoContest)) * (1200 - startTimeIntoContest)).roundToLong()
+        val fixedStartTime = startTimeIntoContest
+        if (fixedStartTime == null) {
+            startTimeIntoContest = 1200 - timeLeft
+            predictedScore = amount.toLong()
+        }
+        else predictedScore = ((amount / (1200 - timeLeft - fixedStartTime)) * (1200 - fixedStartTime)).toLong()
         update()
     }
 
     private fun String.fixScoreAmount(): Double =
-        this.formatNumber() * when (this.split(',').last().length) {
+        this.formatLong() * when (this.split(',').last().length) {
             2 -> 10.0
             1 -> 100.0
             else -> 1.0
         }
 
     fun update() {
+        val formattedStartTime = TimeUtils.formatDuration(((startTimeIntoContest ?: return) * 1000 - 999))
         contestStats.clear()
         val cropName = FarmingContestAPI.contestCrop?.cropName
         val duration = System.currentTimeMillis() - startTime
         val durationInSeconds = duration.toDouble() / 1000
         val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
-        val position = (percent * participants).roundToInt() + 1
-        val formattedPercent = (percent * 100).round(1)
-        val startTime = TimeUtils.formatDuration((startTimeIntoContest * 1000 - 999).toLong(), showMilliSeconds = true)
+        val position = if (percent == -1.0) "§eNo data yet" else "Top $medalColor${(percent * 100).round(1)}%"
 
         val unsortedList = mutableListOf<String>()
         unsortedList.add("§e§l$cropName Contest Stats")
-        unsortedList.add("§7Started §b$startTime §7into contest")
+        unsortedList.add("§7Started §b$formattedStartTime §7into contest")
         unsortedList.add("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
         unsortedList.add("§7Blocks per Second: §c$blocksPerSecond")
-        if (percent == 0.0 && participants == 0)
-            unsortedList.add("§7Est. Position: §eNo data yet")
-        else unsortedList.add("§7Est. Position: $medalColor${position.addSuffix()} §7(Top $medalColor$formattedPercent% §7◆ ${format(participants)})")
+        unsortedList.add("§7Position: $position")
         unsortedList.add("§7Predicted Score: §e${predictedScore.addSeparators()}")
 
 
@@ -143,9 +136,9 @@ class JacobContestStatsSummary {
 
         when (event.phase) {
             FarmingContestPhase.START -> {
-                LorenzUtils.chat("Started tracking your Jacob Contest Blocks Per Second!")
+                ChatUtils.chat("Started tracking your Jacob Contest Blocks Per Second!")
                 startTime = System.currentTimeMillis()
-                startTimeIntoContest = ((startTime.toDouble() % 3600000) - 900000) / 1000 // TODO test if this breaks for non whole hr time zones (gmt+0.5 etc)
+                startTimeIntoContest = null
             }
 
             FarmingContestPhase.STOP -> {
@@ -153,26 +146,24 @@ class JacobContestStatsSummary {
                 val duration = System.currentTimeMillis() - startTime
                 val durationInSeconds = duration.toDouble() / 1000
                 val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
-                val time = TimeUtils.formatDuration(duration - 999, showMilliSeconds = true)
-                val position = (percent * participants).roundToInt() + 1
-                val formattedPercent = (percent * 100).round(1)
-
-                LorenzUtils.chat("§l$cropName Contest Stats")
-                LorenzUtils.chat("§7Participated for §b$time")
-                LorenzUtils.chat("§7Total Blocks Broken: §e${blocksBroken.addSeparators()}")
-                LorenzUtils.chat("§7Average Blocks per Second: §c$blocksPerSecond")
-                LorenzUtils.chat("§7Est. Position: $medalColor${position.addSuffix()} §7(Top $medalColor$formattedPercent% §7◆ ${format(participants)})")
+                val time = TimeUtils.formatDuration(duration - 999)
+                val position = if (percent == -1.0) "§eNo data" else "§fTop $medalColor${(percent * 100).round(1)}%"
+
+                ChatUtils.chat("§l$cropName Contest Stats")
+                ChatUtils.chat("§7Participated for §b$time")
+                ChatUtils.chat("§7Total Blocks Broken: §e${blocksBroken.addSeparators()}")
+                ChatUtils.chat("§7Average Blocks per Second: §c$blocksPerSecond")
+                ChatUtils.chat("§7Position: $position")
             }
 
             FarmingContestPhase.CHANGE -> {
-                LorenzUtils.chat("You changed the crop during the contest, resetting the Blocks Per Second calculation..")
+                ChatUtils.chat("You changed the crop during the contest, resetting the Blocks Per Second calculation..")
                 startTime = System.currentTimeMillis()
-                startTimeIntoContest = ((startTime.toDouble() % 3600000) - 900000) / 1000
+                startTimeIntoContest = null
             }
         }
         blocksBroken = 0
-        percent = 0.0
-        participants = 0
+        percent = -1.0
     }
 
     fun isEnabled() = GardenAPI.inGarden() && config.jacobContestSummary

From a9666b676048e5301a7826d5de638ec47ed25e41 Mon Sep 17 00:00:00 2001
From: Obsidianninja11 <obsidianninja11@gmail.com>
Date: Mon, 8 Apr 2024 15:01:01 -0800
Subject: [PATCH 16/23] Fix

---
 .../config/features/garden/JacobContestStatsConfig.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
index 90ef508df9b6..48b1f92ba6de 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
@@ -3,9 +3,9 @@
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList;
-import io.github.moulberry.moulconfig.annotations.ConfigOption;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 import java.util.ArrayList;
 import java.util.Arrays;

From cb41ea13ddbc8485ec866bfd6954dd9d1f1e5f7e Mon Sep 17 00:00:00 2001
From: Obsidianninja11 <obsidianninja11@gmail.com>
Date: Wed, 10 Apr 2024 17:31:54 -0800
Subject: [PATCH 17/23] Fixes + simpletimemark

---
 .../config/features/garden/GardenConfig.java  | 13 +++-----
 .../garden/JacobContestStatsConfig.java       |  7 +++--
 .../contest/JacobContestStatsSummary.kt       | 31 +++++++++++++------
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
index fc157c48a22d..b638ce26398f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
@@ -191,6 +191,10 @@ public class GardenConfig {
     @FeatureToggle
     public boolean jacobContestTimes = true;
 
+    @Expose
+    @ConfigLink(owner = GardenConfig.class, field = "jacobContestTimes")
+    public Position jacobContestTimesPosition = new Position(-359, 149, false, true);
+
     @Expose
     @ConfigOption(
         name = "Custom BPS",
@@ -209,15 +213,6 @@ public class GardenConfig {
     )
     public double jacobContestCustomBpsValue = 19.9;
 
-    @Expose
-    @ConfigLink(owner = GardenConfig.class, field = "jacobContestTimes")
-    public Position jacobContestTimesPosition = new Position(-359, 149, false, true);
-
-    @Expose
-    @ConfigOption(name = "Always Finnegan", desc = "Forcefully set the Finnegan Farming Simulator perk to be active. This is useful if the auto mayor detection fails.")
-    @ConfigEditorBoolean
-    public boolean forcefullyEnabledAlwaysFinnegan = false;
-
     @Expose
     public Position cropSpeedMeterPos = new Position(278, -236, false, true);
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
index 48b1f92ba6de..733c1a69334f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
@@ -5,6 +5,7 @@
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 import java.util.ArrayList;
@@ -28,7 +29,7 @@ public class JacobContestStatsConfig {
     @ConfigEditorDraggableList
     public List<ContestStatsTextEntry> text = new ArrayList<>(Arrays.asList(
         ContestStatsTextEntry.TITLE,
-        ContestStatsTextEntry.TIME,
+        ContestStatsTextEntry.START_TIME,
         ContestStatsTextEntry.BLOCKS_BROKEN,
         ContestStatsTextEntry.BPS,
         ContestStatsTextEntry.POSITION,
@@ -37,7 +38,8 @@ public class JacobContestStatsConfig {
 
     public enum ContestStatsTextEntry {
         TITLE("§e§lSugar Cane Contest Stats"),
-        TIME("§7Started §b3s §7into contest"),
+        START_TIME("§7Started §b3s §7into contest"),
+        PARTICIPATED_TIME("§7Participated for §b15m 25s"),
         BLOCKS_BROKEN("§7Blocks Broken: §e14,781"),
         BPS("§7Blocks per Second: §c19.94"),
         POSITION("§7Position: Top §b0.1%"),
@@ -56,5 +58,6 @@ public String toString() {
     }
 
     @Expose
+    @ConfigLink(owner = JacobContestStatsConfig.class, field = "jacobContestSummary")
     public Position pos = new Position(0, 240, false, true);
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index d5a6d80b3730..68e099f398fe 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -12,15 +12,18 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.TimeUtils
+import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.DurationUnit
 
 class JacobContestStatsSummary {
     private val config get() = GardenAPI.config.jacobContestStats
     private var blocksBroken = 0
-    private var startTime = 0L
+    private var startTime = SimpleTimeMark.farPast()
     private var startTimeIntoContest: Long? = null
     private var percent = -1.0
     private var medalColor = ""
@@ -83,12 +86,17 @@ class JacobContestStatsSummary {
                 amount = group("amount").fixScoreAmount()
             }
         }
+        if (timeLeft == 0L && amount == 0.0) return
+
         val fixedStartTime = startTimeIntoContest
         if (fixedStartTime == null) {
             startTimeIntoContest = 1200 - timeLeft
             predictedScore = amount.toLong()
+        } else {
+            predictedScore = if (1200 - timeLeft - fixedStartTime > 5) {
+                ((amount / (1200 - timeLeft - fixedStartTime)) * (1200 - fixedStartTime)).toLong()
+            } else amount.toLong()
         }
-        else predictedScore = ((amount / (1200 - timeLeft - fixedStartTime)) * (1200 - fixedStartTime)).toLong()
         update()
     }
 
@@ -103,14 +111,16 @@ class JacobContestStatsSummary {
         val formattedStartTime = TimeUtils.formatDuration(((startTimeIntoContest ?: return) * 1000 - 999))
         contestStats.clear()
         val cropName = FarmingContestAPI.contestCrop?.cropName
-        val duration = System.currentTimeMillis() - startTime
-        val durationInSeconds = duration.toDouble() / 1000
+        val duration = startTime.passedSince()
+        val durationInSeconds = duration.toDouble(DurationUnit.SECONDS)
+        val timeParticipated = duration.format()
         val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
         val position = if (percent == -1.0) "§eNo data yet" else "Top $medalColor${(percent * 100).round(1)}%"
 
         val unsortedList = mutableListOf<String>()
         unsortedList.add("§e§l$cropName Contest Stats")
         unsortedList.add("§7Started §b$formattedStartTime §7into contest")
+        unsortedList.add("§7Participated for §b$timeParticipated")
         unsortedList.add("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
         unsortedList.add("§7Blocks per Second: §c$blocksPerSecond")
         unsortedList.add("§7Position: $position")
@@ -137,20 +147,21 @@ class JacobContestStatsSummary {
         when (event.phase) {
             FarmingContestPhase.START -> {
                 ChatUtils.chat("Started tracking your Jacob Contest Blocks Per Second!")
-                startTime = System.currentTimeMillis()
+                startTime = SimpleTimeMark.now()
                 startTimeIntoContest = null
             }
 
             FarmingContestPhase.STOP -> {
                 val cropName = event.crop.cropName
-                val duration = System.currentTimeMillis() - startTime
-                val durationInSeconds = duration.toDouble() / 1000
+                val duration = startTime.passedSince()
+                val durationInSeconds = duration.toDouble(DurationUnit.SECONDS)
                 val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
-                val time = TimeUtils.formatDuration(duration - 999)
+                val time = TimeUtils.formatDuration(duration.toLong(DurationUnit.MILLISECONDS) - 999)
+                val timeTest = startTime.passedSince().format()
                 val position = if (percent == -1.0) "§eNo data" else "§fTop $medalColor${(percent * 100).round(1)}%"
 
                 ChatUtils.chat("§l$cropName Contest Stats")
-                ChatUtils.chat("§7Participated for §b$time")
+                ChatUtils.chat("§7Participated for §b$time: $timeTest")
                 ChatUtils.chat("§7Total Blocks Broken: §e${blocksBroken.addSeparators()}")
                 ChatUtils.chat("§7Average Blocks per Second: §c$blocksPerSecond")
                 ChatUtils.chat("§7Position: $position")
@@ -158,7 +169,7 @@ class JacobContestStatsSummary {
 
             FarmingContestPhase.CHANGE -> {
                 ChatUtils.chat("You changed the crop during the contest, resetting the Blocks Per Second calculation..")
-                startTime = System.currentTimeMillis()
+                startTime = SimpleTimeMark.now()
                 startTimeIntoContest = null
             }
         }

From c44804614e89a7d38893efc5ab83c38cfeb91189 Mon Sep 17 00:00:00 2001
From: Obsidianninja11 <obsidianninja11@gmail.com>
Date: Wed, 10 Apr 2024 17:37:34 -0800
Subject: [PATCH 18/23] Removed debug thing (oops)

---
 .../features/garden/contest/JacobContestStatsSummary.kt      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index 68e099f398fe..7a5c44b56199 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -156,12 +156,11 @@ class JacobContestStatsSummary {
                 val duration = startTime.passedSince()
                 val durationInSeconds = duration.toDouble(DurationUnit.SECONDS)
                 val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
-                val time = TimeUtils.formatDuration(duration.toLong(DurationUnit.MILLISECONDS) - 999)
-                val timeTest = startTime.passedSince().format()
+                val time = startTime.passedSince().format()
                 val position = if (percent == -1.0) "§eNo data" else "§fTop $medalColor${(percent * 100).round(1)}%"
 
                 ChatUtils.chat("§l$cropName Contest Stats")
-                ChatUtils.chat("§7Participated for §b$time: $timeTest")
+                ChatUtils.chat("§7Participated for §b$time")
                 ChatUtils.chat("§7Total Blocks Broken: §e${blocksBroken.addSeparators()}")
                 ChatUtils.chat("§7Average Blocks per Second: §c$blocksPerSecond")
                 ChatUtils.chat("§7Position: $position")

From 11fc6004ffdc12d3927f1f39ae5ddc9e4449b919 Mon Sep 17 00:00:00 2001
From: Obsidianninja11 <obsidianninja11@gmail.com>
Date: Wed, 10 Apr 2024 23:27:58 -0800
Subject: [PATCH 19/23] Participated -> participating in live stats

---
 .../config/features/garden/JacobContestStatsConfig.java         | 2 +-
 .../features/garden/contest/JacobContestStatsSummary.kt         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
index 733c1a69334f..69289a822114 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/JacobContestStatsConfig.java
@@ -39,7 +39,7 @@ public class JacobContestStatsConfig {
     public enum ContestStatsTextEntry {
         TITLE("§e§lSugar Cane Contest Stats"),
         START_TIME("§7Started §b3s §7into contest"),
-        PARTICIPATED_TIME("§7Participated for §b15m 25s"),
+        PARTICIPATING_TIME("§7Participating for §b15m 25s"),
         BLOCKS_BROKEN("§7Blocks Broken: §e14,781"),
         BPS("§7Blocks per Second: §c19.94"),
         POSITION("§7Position: Top §b0.1%"),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index 7a5c44b56199..68f67054fd0e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -120,7 +120,7 @@ class JacobContestStatsSummary {
         val unsortedList = mutableListOf<String>()
         unsortedList.add("§e§l$cropName Contest Stats")
         unsortedList.add("§7Started §b$formattedStartTime §7into contest")
-        unsortedList.add("§7Participated for §b$timeParticipated")
+        unsortedList.add("§7Participating for §b$timeParticipated")
         unsortedList.add("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
         unsortedList.add("§7Blocks per Second: §c$blocksPerSecond")
         unsortedList.add("§7Position: $position")

From af102768decf257a49fc1375a8da37744aa96838 Mon Sep 17 00:00:00 2001
From: Obsidianninja11 <obsidianninja11@gmail.com>
Date: Wed, 29 May 2024 22:17:56 -0800
Subject: [PATCH 20/23] Some cleanup and fixes

---
 .../contest/JacobContestStatsSummary.kt       | 74 ++++++++++---------
 .../hannibal2/skyhanni/utils/LorenzUtils.kt   |  8 ++
 2 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index 68f67054fd0e..0ba8978bc82e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -8,26 +8,29 @@ import at.hannibal2.skyhanni.events.ScoreboardChangeEvent
 import at.hannibal2.skyhanni.events.TabListUpdateEvent
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.prettyRound
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.TimeUtils
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.seconds
 import kotlin.time.DurationUnit
 
 class JacobContestStatsSummary {
     private val config get() = GardenAPI.config.jacobContestStats
     private var blocksBroken = 0
-    private var startTime = SimpleTimeMark.farPast()
-    private var startTimeIntoContest: Long? = null
-    private var percent = -1.0
+    private var startTimeIrl = SimpleTimeMark.farPast()
+    private var startTimeRelative: Long? = null
+    private var startScore: Long? = null
+    private var predictedScore: Long? = null
+    private var percent: Double? = null
     private var medalColor = ""
-    private var predictedScore = 0L
     private var contestStats = mutableListOf<String>()
 
     private val tabContestPattern by RepoPattern.pattern(
@@ -61,11 +64,10 @@ class JacobContestStatsSummary {
 
         for (line in event.tabList) {
             tabContestPattern.matchMatcher(line) {
-                if (group("crop") == FarmingContestAPI.contestCrop?.cropName) {
-                    percent = group("percent").toDouble() / 100
-                    medalColor = group("color")
-                    update()
-                }
+                if (group("crop") != FarmingContestAPI.contestCrop?.cropName) return
+                percent = group("percent").toDouble() / 100
+                medalColor = group("color")
+                update()
             }
         }
     }
@@ -76,7 +78,7 @@ class JacobContestStatsSummary {
         if (!FarmingContestAPI.inContest) return
 
         var timeLeft = 0L
-        var amount = 0.0
+        var amount = 0L
 
         for (line in event.newList) {
             scoreboardContestTimeLeftPattern.matchMatcher(line) {
@@ -86,36 +88,38 @@ class JacobContestStatsSummary {
                 amount = group("amount").fixScoreAmount()
             }
         }
-        if (timeLeft == 0L && amount == 0.0) return
 
-        val fixedStartTime = startTimeIntoContest
-        if (fixedStartTime == null) {
-            startTimeIntoContest = 1200 - timeLeft
-            predictedScore = amount.toLong()
+        val fixedStartTime = startTimeRelative
+        val fixedStartScore = startScore
+        if (fixedStartTime == null || fixedStartScore == null) {
+            startTimeRelative = 1200 - timeLeft
+            startScore = amount
+            predictedScore = null
         } else {
-            predictedScore = if (1200 - timeLeft - fixedStartTime > 5) {
-                ((amount / (1200 - timeLeft - fixedStartTime)) * (1200 - fixedStartTime)).toLong()
-            } else amount.toLong()
+            val amountGained = amount - fixedStartScore
+            val timeParticipated = 1200 - timeLeft - fixedStartTime
+            predictedScore = amount + amountGained / timeParticipated * (1200 - fixedStartTime)
         }
         update()
     }
 
-    private fun String.fixScoreAmount(): Double =
+    private fun String.fixScoreAmount(): Long =
         this.formatLong() * when (this.split(',').last().length) {
-            2 -> 10.0
-            1 -> 100.0
-            else -> 1.0
+            2 -> 10
+            1 -> 100
+            else -> 1
         }
 
     fun update() {
-        val formattedStartTime = TimeUtils.formatDuration(((startTimeIntoContest ?: return) * 1000 - 999))
+        val formattedStartTime = ((startTimeRelative ?: return) * 1000 - 999).seconds.format()
         contestStats.clear()
         val cropName = FarmingContestAPI.contestCrop?.cropName
-        val duration = startTime.passedSince()
+        val duration = startTimeIrl.passedSince()
         val durationInSeconds = duration.toDouble(DurationUnit.SECONDS)
         val timeParticipated = duration.format()
         val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
-        val position = if (percent == -1.0) "§eNo data yet" else "Top $medalColor${(percent * 100).round(1)}%"
+        val formattedPercent = (percent?.times(100))?.prettyRound(1)
+        val position = if (percent == null) "§eNo data yet" else "Top $medalColor$formattedPercent%"
 
         val unsortedList = mutableListOf<String>()
         unsortedList.add("§e§l$cropName Contest Stats")
@@ -124,7 +128,7 @@ class JacobContestStatsSummary {
         unsortedList.add("§7Blocks Broken: §e${blocksBroken.addSeparators()}")
         unsortedList.add("§7Blocks per Second: §c$blocksPerSecond")
         unsortedList.add("§7Position: $position")
-        unsortedList.add("§7Predicted Score: §e${predictedScore.addSeparators()}")
+        unsortedList.add("§7Predicted Score: §e${predictedScore?.addSeparators() ?: "Calculating..."}")
 
 
         for (index in config.text) {
@@ -147,17 +151,17 @@ class JacobContestStatsSummary {
         when (event.phase) {
             FarmingContestPhase.START -> {
                 ChatUtils.chat("Started tracking your Jacob Contest Blocks Per Second!")
-                startTime = SimpleTimeMark.now()
-                startTimeIntoContest = null
+                startTimeIrl = SimpleTimeMark.now()
             }
 
             FarmingContestPhase.STOP -> {
                 val cropName = event.crop.cropName
-                val duration = startTime.passedSince()
+                val duration = startTimeIrl.passedSince()
                 val durationInSeconds = duration.toDouble(DurationUnit.SECONDS)
                 val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
-                val time = startTime.passedSince().format()
-                val position = if (percent == -1.0) "§eNo data" else "§fTop $medalColor${(percent * 100).round(1)}%"
+                val time = startTimeIrl.passedSince().format()
+                val formattedPercent = (percent?.times(100))?.prettyRound(1)
+                val position = if (percent == null) "§eNo data yet" else "Top $medalColor$formattedPercent%"
 
                 ChatUtils.chat("§l$cropName Contest Stats")
                 ChatUtils.chat("§7Participated for §b$time")
@@ -168,12 +172,12 @@ class JacobContestStatsSummary {
 
             FarmingContestPhase.CHANGE -> {
                 ChatUtils.chat("You changed the crop during the contest, resetting the Blocks Per Second calculation..")
-                startTime = SimpleTimeMark.now()
-                startTimeIntoContest = null
+                startTimeIrl = SimpleTimeMark.now()
             }
         }
+        startTimeRelative = null
+        percent = null
         blocksBroken = 0
-        percent = -1.0
     }
 
     fun isEnabled() = GardenAPI.inGarden() && config.jacobContestSummary
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index 2a351a7d99b1..d1621b7fdbd0 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -99,6 +99,14 @@ object LorenzUtils {
         return originalMessage.stripHypixelMessage()
     }
 
+    /**
+     * Only shows decimal places if necessary.
+     */
+    fun Double.prettyRound(decimals: Int): String {
+        val rounded = this.round(decimals)
+        return (if (rounded % 1 == 0.0) rounded else rounded.toInt()).toString()
+    }
+
     fun Double.round(decimals: Int): Double {
         var multiplier = 1.0
         repeat(decimals) { multiplier *= 10 }

From fc91b2f67e1d5bac18827d4be2928a64833f35ca Mon Sep 17 00:00:00 2001
From: Cal <cwolfson58@gmail.com>
Date: Thu, 6 Jun 2024 13:18:02 +1000
Subject: [PATCH 21/23] fix merge

---
 .../features/garden/contest/JacobContestStatsSummary.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index af1ee10afe98..cb074c8fb8ae 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -26,7 +26,7 @@ import kotlin.time.DurationUnit
 @SkyHanniModule
 object JacobContestStatsSummary {
 
-    private val config get() = GardenAPI.config
+    private val config get() = GardenAPI.config.jacobContestStats
     private var blocksBroken = 0
     private var startTimeIrl = SimpleTimeMark.farPast()
     private var startTimeRelative: Long? = null

From 059d884c74e7cee7843d56b76e4b1a151f59051f Mon Sep 17 00:00:00 2001
From: Obsidian <108832807+Obsidianninja11@users.noreply.github.com>
Date: Tue, 8 Oct 2024 23:44:10 -0800
Subject: [PATCH 22/23] Translator fix and sort of rewrite

---
 .../garden/contest/JacobContestStatsSummary.kt    | 15 +++++++--------
 .../at/hannibal2/skyhanni/utils/LorenzUtils.kt    |  8 --------
 .../at/hannibal2/skyhanni/utils/NumberUtil.kt     |  8 ++++++++
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index 8cc75f077dc0..d3b97cfe219e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -4,18 +4,17 @@ import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.events.CropClickEvent
 import at.hannibal2.skyhanni.events.FarmingContestEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
-import at.hannibal2.skyhanni.events.ScoreboardChangeEvent
+import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent
 import at.hannibal2.skyhanni.events.TabListUpdateEvent
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.prettyRound
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
+import at.hannibal2.skyhanni.utils.NumberUtil.prettyRound
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
-import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.TimeUtils
 import at.hannibal2.skyhanni.utils.TimeUtils.format
@@ -77,14 +76,14 @@ object JacobContestStatsSummary {
     }
 
     @SubscribeEvent
-    fun onScoreBoardUpdate(event: ScoreboardChangeEvent) {
+    fun onScoreBoardUpdate(event: ScoreboardUpdateEvent) {
         if (!isEnabled()) return
         if (!FarmingContestAPI.inContest) return
 
         var timeLeft = 0L
         var amount = 0L
 
-        for (line in event.newList) {
+        for (line in event.scoreboard) {
             scoreboardContestTimeLeftPattern.matchMatcher(line) {
                 timeLeft = TimeUtils.getDuration(group("time")).inWholeSeconds
             }
@@ -121,7 +120,7 @@ object JacobContestStatsSummary {
         val duration = startTimeIrl.passedSince()
         val durationInSeconds = duration.toDouble(DurationUnit.SECONDS)
         val timeParticipated = duration.format()
-        val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
+        val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).roundTo(2)
         val formattedPercent = (percent?.times(100))?.prettyRound(1)
         val position = if (percent == null) "§eNo data yet" else "Top $medalColor$formattedPercent%"
 
@@ -162,7 +161,7 @@ object JacobContestStatsSummary {
                 val cropName = event.crop.cropName
                 val duration = startTimeIrl.passedSince()
                 val durationInSeconds = duration.toDouble(DurationUnit.SECONDS)
-                val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
+                val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).roundTo(2)
                 val time = startTimeIrl.passedSince().format()
                 val formattedPercent = (percent?.times(100))?.prettyRound(1)
                 val position = if (percent == null) "§eNo data yet" else "Top $medalColor$formattedPercent%"
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index 012e5ea78f49..e4e74b0d213f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -101,14 +101,6 @@ object LorenzUtils {
         return originalMessage.stripHypixelMessage()
     }
 
-    /**
-     * Only shows decimal places if necessary.
-     */
-    fun Double.prettyRound(decimals: Int): String {
-        val rounded = this.round(decimals)
-        return (if (rounded % 1 == 0.0) rounded else rounded.toInt()).toString()
-    }
-
     @Deprecated("Use roundTo instead", ReplaceWith("this.roundTo(decimals)"))
     fun Double.round(decimals: Int) = this.roundTo(decimals)
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
index dc7c4828c431..8f4a681f05d8 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
@@ -76,6 +76,14 @@ object NumberUtil {
         }
     }
 
+    /**
+     * Only shows decimal places if necessary.
+     */
+    fun Double.prettyRound(decimals: Int): String {
+        val rounded = this.roundTo(decimals)
+        return (if (rounded % 1 == 0.0) rounded else rounded.toInt()).toString()
+    }
+
     /**
      * This code was unmodified and taken under CC BY-SA 3.0 license
      * @link https://stackoverflow.com/a/22186845

From 0752041b4764e9c9df2782ad31f2bc8ddc7c8472 Mon Sep 17 00:00:00 2001
From: Obsidian <108832807+Obsidianninja11@users.noreply.github.com>
Date: Tue, 8 Oct 2024 23:44:10 -0800
Subject: [PATCH 23/23] Fix merge

---
 .../garden/contest/JacobContestStatsSummary.kt    | 15 +++++++--------
 .../at/hannibal2/skyhanni/utils/LorenzUtils.kt    |  8 --------
 .../at/hannibal2/skyhanni/utils/NumberUtil.kt     |  8 ++++++++
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index 8cc75f077dc0..d3b97cfe219e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -4,18 +4,17 @@ import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.events.CropClickEvent
 import at.hannibal2.skyhanni.events.FarmingContestEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
-import at.hannibal2.skyhanni.events.ScoreboardChangeEvent
+import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent
 import at.hannibal2.skyhanni.events.TabListUpdateEvent
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.prettyRound
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
+import at.hannibal2.skyhanni.utils.NumberUtil.prettyRound
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
-import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.TimeUtils
 import at.hannibal2.skyhanni.utils.TimeUtils.format
@@ -77,14 +76,14 @@ object JacobContestStatsSummary {
     }
 
     @SubscribeEvent
-    fun onScoreBoardUpdate(event: ScoreboardChangeEvent) {
+    fun onScoreBoardUpdate(event: ScoreboardUpdateEvent) {
         if (!isEnabled()) return
         if (!FarmingContestAPI.inContest) return
 
         var timeLeft = 0L
         var amount = 0L
 
-        for (line in event.newList) {
+        for (line in event.scoreboard) {
             scoreboardContestTimeLeftPattern.matchMatcher(line) {
                 timeLeft = TimeUtils.getDuration(group("time")).inWholeSeconds
             }
@@ -121,7 +120,7 @@ object JacobContestStatsSummary {
         val duration = startTimeIrl.passedSince()
         val durationInSeconds = duration.toDouble(DurationUnit.SECONDS)
         val timeParticipated = duration.format()
-        val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
+        val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).roundTo(2)
         val formattedPercent = (percent?.times(100))?.prettyRound(1)
         val position = if (percent == null) "§eNo data yet" else "Top $medalColor$formattedPercent%"
 
@@ -162,7 +161,7 @@ object JacobContestStatsSummary {
                 val cropName = event.crop.cropName
                 val duration = startTimeIrl.passedSince()
                 val durationInSeconds = duration.toDouble(DurationUnit.SECONDS)
-                val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).round(2)
+                val blocksPerSecond = (blocksBroken.toDouble() / durationInSeconds).roundTo(2)
                 val time = startTimeIrl.passedSince().format()
                 val formattedPercent = (percent?.times(100))?.prettyRound(1)
                 val position = if (percent == null) "§eNo data yet" else "Top $medalColor$formattedPercent%"
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index 012e5ea78f49..e4e74b0d213f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -101,14 +101,6 @@ object LorenzUtils {
         return originalMessage.stripHypixelMessage()
     }
 
-    /**
-     * Only shows decimal places if necessary.
-     */
-    fun Double.prettyRound(decimals: Int): String {
-        val rounded = this.round(decimals)
-        return (if (rounded % 1 == 0.0) rounded else rounded.toInt()).toString()
-    }
-
     @Deprecated("Use roundTo instead", ReplaceWith("this.roundTo(decimals)"))
     fun Double.round(decimals: Int) = this.roundTo(decimals)
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
index dc7c4828c431..8f4a681f05d8 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
@@ -76,6 +76,14 @@ object NumberUtil {
         }
     }
 
+    /**
+     * Only shows decimal places if necessary.
+     */
+    fun Double.prettyRound(decimals: Int): String {
+        val rounded = this.roundTo(decimals)
+        return (if (rounded % 1 == 0.0) rounded else rounded.toInt()).toString()
+    }
+
     /**
      * This code was unmodified and taken under CC BY-SA 3.0 license
      * @link https://stackoverflow.com/a/22186845