Updated to 6.35.9

This reverts commit 06bcb10958.

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoConfig.kt

@@ -103,11 +103,13 @@ open class EcoConfig(
     }
 
     override fun getSubsectionOrNull(path: String): Config? {
-        return get(path) as? Config
+        return (get(path) as? Config)?.apply { this.addInjectablePlaceholder(injections) }
     }
 
     override fun getSubsectionsOrNull(path: String): List<Config>? {
-        return (get(path) as? Iterable<Config>)?.toList()
+        return (get(path) as? Iterable<Config>)
+            ?.map { it.apply { this.addInjectablePlaceholder(injections) } }
+            ?.toList()
     }
 
     override fun getType(): ConfigType {

eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt

@@ -26,6 +26,8 @@ import org.bukkit.inventory.ItemFlag
 import org.bukkit.persistence.PersistentDataContainer
 import org.bukkit.persistence.PersistentDataType
 import kotlin.experimental.and
+import kotlin.experimental.inv
+import kotlin.experimental.or
 
 @Suppress("UsePropertyAccessSyntax")
 class EcoFastItemStack(
@@ -149,35 +151,29 @@ class EcoFastItemStack(
     override fun getDisplayName(): String = displayNameComponent.toLegacy()
 
     override fun addItemFlags(vararg hideFlags: ItemFlag) {
-        for (flag in hideFlags) {
-            this.flagBits = this.flagBits or getBitModifier(flag)
+        for (f in hideFlags) {
+            this.flagBits = this.flagBits or getBitModifier(f)
         }
 
         apply()
     }
 
     override fun removeItemFlags(vararg hideFlags: ItemFlag) {
-        for (flag in hideFlags) {
-            this.flagBits = this.flagBits and getBitModifier(flag)
+        for (f in hideFlags) {
+            this.flagBits = this.flagBits and getBitModifier(f).inv()
         }
 
         apply()
     }
 
-    override fun getItemFlags(): MutableSet<ItemFlag> {
-        val flags = mutableSetOf<ItemFlag>()
-
-        var flagArr: Array<ItemFlag>
-        val size = ItemFlag.values().also { flagArr = it }.size
-
-        for (i in 0 until size) {
-            val flag = flagArr[i]
-            if (this.hasItemFlag(flag)) {
-                flags.add(flag)
+    override fun getItemFlags(): Set<ItemFlag> {
+        val currentFlags = mutableSetOf<ItemFlag>()
+        for (f in ItemFlag.values()) {
+            if (hasItemFlag(f)) {
+                currentFlags.add(f)
             }
         }
-
-        return flags
+        return currentFlags
     }
 
     override fun hasItemFlag(flag: ItemFlag): Boolean {
@@ -194,15 +190,15 @@ class EcoFastItemStack(
     }
 
     @Suppress("UNNECESSARY_NOT_NULL_ASSERTION")
-    private var flagBits: Int
+    private var flagBits: Byte
         get() =
             if (handle.hasTag() && handle.getTag()!!.contains(
                     "HideFlags",
                     99
                 )
-            ) handle.getTag()!!.getInt("HideFlags") else 0
+            ) handle.getTag()!!.getInt("HideFlags").toByte() else 0
         set(value) =
-            handle.getOrCreateTag().putInt("HideFlags", value)
+            handle.getOrCreateTag().putInt("HideFlags", value.toInt())
 
     override fun getRepairCost(): Int {
         return handle.getBaseRepairCost()
@@ -268,8 +264,8 @@ class EcoFastItemStack(
         bukkit.mergeIfNeeded(handle)
     }
 
-    private fun getBitModifier(hideFlag: ItemFlag): Int {
-        return 1 shl hideFlag.ordinal
+    private fun getBitModifier(hideFlag: ItemFlag): Byte {
+        return (1 shl hideFlag.ordinal).toByte()
     }
 
     override fun unwrap(): org.bukkit.inventory.ItemStack {

gradle.properties

@@ -1,3 +1,3 @@
-version = 6.35.6
+version = 6.35.9
 plugin-name = eco
 kotlin.code.style = official