highlight used jewels

ImplementsLegend · Nov 29, 2024 · ea86c51 · ea86c51
1 parent c47ed70
commit ea86c51
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/main/java/implementslegendkt/mod/vaultjp/screen/composition/JewelStorageComposition.kt b/src/main/java/implementslegendkt/mod/vaultjp/screen/composition/JewelStorageComposition.kt
@@ -33,7 +33,7 @@ class JewelStorageComposition(
     private var pageCount = 1
 
     @JvmRecord
-    data class OrderEntry(val slotPointer: Int, val usefulness: Double)
+    data class OrderEntry(val slotPointer: Int, val usefulness: Double,val size:Int,val isAccepted: Boolean)
 
     private lateinit var jewelOrder: Array<OrderEntry?>
     private var dirty = true
@@ -45,7 +45,6 @@ class JewelStorageComposition(
     }
 
     private fun composeMainInv(screen: JewelPurposerScreen, midX: Int, midY: Int) {
-        val acceptedJewels = getJewels(screen.menu.tileEntity)
         screen.background {
             texture = { ResourceLocation("vaultjp:textures/gui/jewel_inv.png") }
             srcRect = { Rect2i(0, 0, 158, 158) }
@@ -72,8 +71,7 @@ class JewelStorageComposition(
                     ) else item
                 }
                 val isAccepted = {
-                    val value = jewelIndex()
-                    acceptedJewels.any { it == value }
+                    jewelOrder[slotCopy + jewelInvScroll]!!.isAccepted
                 }
                 shouldHighlight={
                     it || isAccepted()
@@ -147,23 +145,31 @@ class JewelStorageComposition(
         jewelOrder = arrayOfNulls(64 * pageCount)
 
         var orderIndex = 0
-        for (contentIndex in cont.indices) {
+        repeat (cont.size) {contentIndex->
             if (cont[contentIndex].overSizedStack().item is JewelItem) {
-                jewelOrder[orderIndex] =
-                    OrderEntry(contentIndex, usefulnessCalculator(cont[contentIndex].stack()))
+                jewelOrder[orderIndex] = OrderEntry(contentIndex, usefulnessCalculator(cont[contentIndex].stack()),10,false)
                 orderIndex++
             }
         }
         var contentIndex = 0
         while (contentIndex < cont.size && orderIndex < 64 * pageCount) {
             if (cont[contentIndex].overSizedStack().item !is JewelItem) {
-                jewelOrder[orderIndex] = OrderEntry(contentIndex, usefulnessCalculator(ItemStack.EMPTY))
+                jewelOrder[orderIndex] = OrderEntry(contentIndex, usefulnessCalculator(ItemStack.EMPTY),10,false)
                 orderIndex++
             }
             contentIndex++
         }
 
         Arrays.sort(jewelOrder, Comparator.comparingDouble { it: OrderEntry? -> -it!!.usefulness })
+        val jewels = getJewels(tile).toSet()
+        jewelOrder.indices.forEach {
+            if(jewelOrder[it]!!.slotPointer in jewels)jewelOrder[it]=jewelOrder[it]!!.copy(isAccepted = true)
+        }
+        /*
+        jewels.forEach {
+            if(it>-1)
+            jewelOrder[it]=jewelOrder[it]!!.copy(isAccepted = true)
+        }*/
         dirty = false
     }
 

diff --git a/.../java/implementslegendkt/mod/vaultjp/screen/composition/PurposeConfiguratorComposition.kt b/.../java/implementslegendkt/mod/vaultjp/screen/composition/PurposeConfiguratorComposition.kt
@@ -117,7 +117,7 @@ class PurposeConfiguratorComposition(private val markDirty: ()->Unit) : Composit
             midY + i - 96,
             "vaultjp.config_entry.max_size",
             { sizeLimit.toDouble() },
-            { sizeLimit = it.toInt() },
+            { markDirty(); sizeLimit = it.toInt() },
             1.0
         ) //screen.getAttrUsefulness(p));
         i += 12