feat: Sort Chest Profit items by value

Skytils · Feb 25, 2025 · c2c0956 · c2c0956
1 parent e90f2c3
commit c2c0956
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/crimson/KuudraChestProfit.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/crimson/KuudraChestProfit.kt
@@ -41,6 +41,7 @@ import net.minecraft.item.ItemStack
 import net.minecraftforge.event.world.WorldEvent
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.util.TreeSet
 
 
 /**
@@ -154,7 +155,7 @@ object KuudraChestProfit {
 
         var keyNeeded: KuudraKey? = null
         var value = 0.0
-        val items = ArrayList<KuudraChestLootItem>()
+        val items = TreeSet<KuudraChestLootItem>().descendingSet()
 
         fun reset() {
             keyNeeded = null
@@ -204,7 +205,9 @@ object KuudraChestProfit {
     }
 
     private var textShadow_ = SmartFontRenderer.TextShadow.NORMAL
-    private class KuudraChestLootItem(var stackSize: Int, var displayText: String, var value: Double)
+    private data class KuudraChestLootItem(var stackSize: Int, var displayText: String, var value: Double) : Comparable<KuudraChestLootItem> {
+        override fun compareTo(other: KuudraChestLootItem): Int = value.compareTo(other.value)
+    }
     class KuudraChestProfitElement : GuiElement("Kuudra Chest Profit", x = 200, y = 120) {
         override fun render() {
             if (toggled && SBInfo.mode == SkyblockIsland.KuudraHollow.mode) {

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/DungeonChestProfit.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/DungeonChestProfit.kt
@@ -44,6 +44,7 @@ import net.minecraftforge.event.world.WorldEvent
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.awt.Color
+import java.util.TreeSet
 
 
 /**
@@ -268,7 +269,7 @@ object DungeonChestProfit {
 
         var price = 0.0
         var value = 0.0
-        var items = ArrayList<DungeonChestLootItem>()
+        var items = TreeSet<DungeonChestLootItem>().descendingSet()
         val profit
             get() = value - price
 
@@ -289,7 +290,9 @@ object DungeonChestProfit {
     }
 
     private var textShadow_ = SmartFontRenderer.TextShadow.NORMAL
-    private class DungeonChestLootItem(var item: ItemStack, var value: Double)
+    private data class DungeonChestLootItem(var item: ItemStack, var value: Double) : Comparable<DungeonChestLootItem> {
+        override fun compareTo(other: DungeonChestLootItem): Int = value.compareTo(other.value)
+    }
     class DungeonChestProfitElement : GuiElement("Dungeon Chest Profit", x = 200, y = 120) {
         override fun render() {
             if (toggled && (Utils.inDungeons || SBInfo.mode == SkyblockIsland.DungeonHub.mode)) {