More SlotType changes, updated eco to 6.70.0

Author: WillFP

core/build.gradle.kts

@@ -4,7 +4,7 @@ dependencies {
     }
     implementation("com.willfp:ModelEngineBridge:1.3.0")
 
-    compileOnly("com.willfp:eco:6.69.0")
+    compileOnly("com.willfp:eco:6.70.0")
     compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT")
     compileOnly("net.kyori:adventure-text-minimessage:4.14.0")
 

core/src/main/kotlin/com/willfp/libreforge/LibreforgeSpigotPlugin.kt

@@ -190,7 +190,7 @@ class LibreforgeSpigotPlugin : EcoPlugin() {
     }
 
     override fun getMinimumEcoVersion(): String {
-        return "6.69.0"
+        return "6.70.0"
     }
 
     /**

core/src/main/kotlin/com/willfp/libreforge/slot/ItemHolderFinder.kt

@@ -43,8 +43,6 @@ abstract class ItemHolderFinder<T : Holder> {
     private fun doFindHolders(entity: LivingEntity, slot: SlotType): List<TypedProvidedHolder<T>> {
         val items = slot.getItems(entity)
 
-        // FIXME: This will lead to holders with the 'any' slot being double-counted.
-
         val holders = items.map { item ->
             this.find(item)
                 .filter { holder -> isValidInSlot(holder, slot) }
@@ -77,8 +75,7 @@ abstract class ItemHolderFinder<T : Holder> {
                 val entity = dispatcher.get<LivingEntity>() ?: return@get emptyList()
 
                 // Only check for non-combined slot types
-                val slots = SlotTypes.values().filterNot { it is CombinedSlotType }
-                slots.flatMap { slot -> findHolders(entity, slot) }
+                SlotTypes.baseTypes.flatMap { slot -> findHolders(entity, slot) }
             }
         }
     }

core/src/main/kotlin/com/willfp/libreforge/slot/SlotTypes.kt

@@ -17,6 +17,9 @@ object SlotTypes : Registry<SlotType>() {
     @Deprecated("Use SlotTypeMainhand instead", ReplaceWith("SlotTypeMainhand"), level = DeprecationLevel.ERROR)
     val mainHandSlot = SlotTypeMainhand
 
+    lateinit var baseTypes: List<SlotType>
+        private set
+
     override fun get(id: String): SlotType? {
         val existing = super.get(id)
 
@@ -25,6 +28,18 @@ object SlotTypes : Registry<SlotType>() {
             return existing
         }
 
+        // Prevent registering numeric slot types that correspond to armor slots
+        val idInt = id.toIntOrNull()
+        if (idInt != null) {
+            when (idInt) {
+                40 -> return SlotTypeOffhand
+                36 -> return SlotTypeBoots
+                37 -> return SlotTypeLeggings
+                38 -> return SlotTypeChestplate
+                39 -> return SlotTypeHelmet
+            }
+        }
+
         // Create new slot type if it doesn't exist
         return createNew(id)
             ?.apply { register(this) }
@@ -38,13 +53,22 @@ object SlotTypes : Registry<SlotType>() {
             )
         }
 
-        if (id.toIntOrNull() != null) {
-            return NumericSlotType(id.toInt())
+        val idInt = id.toIntOrNull()
+        if (idInt != null) {
+            return NumericSlotType(idInt)
         }
 
         return null
     }
 
+    override fun onRegister(element: SlotType) {
+        baseTypes = values().filter { it !is CombinedSlotType }
+    }
+
+    override fun onRemove(element: SlotType) {
+        baseTypes = values().filter { it !is CombinedSlotType }
+    }
+
     init {
         register(SlotTypeAny)
         register(SlotTypeArmor)
@@ -56,5 +80,10 @@ object SlotTypes : Registry<SlotType>() {
         register(SlotTypeHelmet)
         register(SlotTypeLeggings)
         register(SlotTypeOffhand)
+
+        // Register all numeric slots
+        (0..45).forEach {
+            get(it.toString())
+        }
     }
 }

core/src/main/kotlin/com/willfp/libreforge/slot/impl/SlotTypeAny.kt

@@ -1,12 +1,17 @@
 package com.willfp.libreforge.slot.impl
 
 import com.willfp.eco.core.drops.DropQueue
+import com.willfp.libreforge.slot.CombinedSlotType
 import com.willfp.libreforge.slot.SlotType
+import com.willfp.libreforge.slot.SlotTypes
 import org.bukkit.entity.LivingEntity
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 
-object SlotTypeAny : SlotType("any") {
+object SlotTypeAny : CombinedSlotType("any") {
+    override val types: List<SlotType>
+        get() = SlotTypes.baseTypes
+
     override fun addToSlot(player: Player, item: ItemStack): Boolean {
         DropQueue(player)
             .addItem(item)

loader/src/main/kotlin/com/willfp/libreforge/loader/LibreforgePlugin.kt

@@ -211,7 +211,7 @@ abstract class LibreforgePlugin : EcoPlugin() {
     }
 
     override fun getMinimumEcoVersion(): String {
-        return "6.63.0"
+        return "6.67.3"
     }
 
     /**