Merge remote-tracking branch 'origin/hide-crop-fortune-warnings' into…

… hide-crop-fortune-warnings
hannibal002 · Dec 24, 2024 · 6fe0b0d · 6fe0b0d
2 parents cf7b2f4 + 9906736
commit 6fe0b0d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/NucleusBarriersBox.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/NucleusBarriersBox.kt
@@ -14,6 +14,7 @@ import net.minecraft.util.AxisAlignedBB
 import net.minecraft.util.BlockPos
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
+// TODO move into mining category and package
 @SkyHanniModule
 object NucleusBarriersBox {
     private val config get() = SkyHanniMod.feature.mining.crystalHighlighter

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestAPI.kt
@@ -9,6 +9,7 @@ import at.hannibal2.skyhanni.events.garden.farming.FarmingContestEvent
 import at.hannibal2.skyhanni.features.garden.CropType
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.CollectionUtils.nextAfter
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
@@ -98,7 +99,19 @@ object FarmingContestAPI {
     private fun readCurrentCrop(): CropType? {
         val line = ScoreboardData.sidebarLinesFormatted.nextAfter("§eJacob's Contest") ?: return null
         return sidebarCropPattern.matchMatcher(line) {
-            CropType.getByName(group("crop"))
+            val cropName = group("crop")
+            try {
+                CropType.getByName(cropName)
+            } catch (e: IllegalStateException) {
+                ScoreboardData.sidebarLinesFormatted
+                ErrorManager.logErrorWithData(
+                    e, "Farming contest read current crop failed",
+                    "cropName" to cropName,
+                    "line" to line,
+                    "sidebarLinesFormatted" to ScoreboardData.sidebarLinesFormatted,
+                )
+                null
+            }
         }
     }
 

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CircularList.kt b/src/main/java/at/hannibal2/skyhanni/utils/CircularList.kt
@@ -1,5 +1,13 @@
 package at.hannibal2.skyhanni.utils
 
+/**
+ * A generic, immutable circular list that cycles through its elements infinitely.
+ *
+ * @param T The type of elements in the circular list.
+ * @property items A list of elements to be accessed in a circular manner.
+ * @constructor Creates a CircularList with the given elements.
+ * @throws IllegalArgumentException if the list is empty.
+ */
 class CircularList<T>(private val items: List<T>) {
 
     constructor(vararg elements: T) : this(elements.asList())