Updated to 6.65.6

This reverts commit 5cfb87e0

build.gradle.kts

@@ -28,6 +28,7 @@ dependencies {
     implementation(project(path = ":eco-core:core-nms:v1_19_R2", configuration = "reobf"))
     implementation(project(path = ":eco-core:core-nms:v1_19_R3", configuration = "reobf"))
     implementation(project(path = ":eco-core:core-nms:v1_20_R1", configuration = "reobf"))
+    implementation(project(path = ":eco-core:core-nms:v1_20_R2", configuration = "reobf"))
 }
 
 allprojects {
@@ -81,9 +82,6 @@ allprojects {
         // LibsDisguises
         maven("https://repo.md-5.net/content/groups/public/")
 
-        // UltraEconomy
-        maven("https://repo.techscode.com/repository/maven-releases/")
-
         // PlayerPoints
         maven("https://repo.rosewooddev.io/repository/public/")
 

eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java

@@ -597,7 +597,10 @@ public interface Config extends Cloneable, PlaceholderInjectable {
      */
     default double getDoubleFromExpression(@NotNull String path,
                                            @NotNull PlaceholderContext context) {
-        return NumberUtils.evaluateExpression(this.getString(path), context.withInjectableContext(this));
+        return Objects.requireNonNullElseGet(
+                this.getDoubleOrNull(path),
+                () -> NumberUtils.evaluateExpression(this.getString(path), context.withInjectableContext(this))
+        );
     }
 
     /**

eco-api/src/main/java/com/willfp/eco/core/display/Display.java

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.display;
 
+import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.fast.FastItemStack;
 import com.willfp.eco.core.integrations.guidetection.GUIDetectionManager;
 import com.willfp.eco.util.NamespacedKeyUtils;
@@ -68,8 +69,10 @@ public final class Display {
 
         Display.revert(itemStack);
 
-        if (!itemStack.hasItemMeta()) {
+        if (!Eco.get().getEcoPlugin().getConfigYml().getBool("display-without-meta")) {
-            return itemStack;
+            if (!itemStack.hasItemMeta()) {
+                return itemStack;
+            }
         }
 
         ItemStack original = itemStack.clone();

eco-api/src/main/java/com/willfp/eco/core/proxy/ProxyConstants.java

@@ -24,7 +24,8 @@ public final class ProxyConstants {
             "v1_19_R1",
             "v1_19_R2",
             "v1_19_R3",
-            "v1_20_R1"
+            "v1_20_R1",
+            "v1_20_R2"
     );
 
     private ProxyConstants() {

eco-core/core-backend/build.gradle.kts

@@ -6,7 +6,7 @@ dependencies {
     implementation("org.reflections:reflections:0.9.12")
     implementation("org.objenesis:objenesis:3.2")
 
-    compileOnly("org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT")
     compileOnly("me.clip:placeholderapi:2.10.10")
     compileOnly("net.kyori:adventure-text-minimessage:4.10.0")
     compileOnly("net.kyori:adventure-platform-bukkit:4.1.0")

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

@@ -112,6 +112,7 @@ private object YamlConfigTypeHandler : ConfigTypeHandler(ConfigType.YAML) {
         representer.defaultFlowStyle = DumperOptions.FlowStyle.BLOCK
 
         return Yaml(
+            @Suppress("DEPRECATION")
             YamlConstructor(),
             representer,
             yamlOptions,

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

@@ -16,11 +16,16 @@ open class EcoConfig(
     private val values = ConcurrentHashMap<String, Any?>()
 
     @Transient
-    var injections = ConcurrentHashMap<String, InjectablePlaceholder>()
+    private val injections = mutableMapOf<String, InjectablePlaceholder>()
 
-    fun init(values: Map<String, Any?>) {
+    @Transient
+    private var injectionHash = 0
+
+    fun init(values: Map<String, Any?>, injections: Map<String, InjectablePlaceholder>) {
         this.values.clear()
         this.values.putAll(values.normalizeToConfig(this.type))
+
+        this.addInjectablePlaceholder(injections.values)
     }
 
     override fun toPlaintext(): String {
@@ -179,6 +184,7 @@ open class EcoConfig(
     override fun addInjectablePlaceholder(placeholders: Iterable<InjectablePlaceholder>) {
         for (placeholder in placeholders) {
             injections[placeholder.pattern.pattern()] = placeholder
+            injectionHash = injectionHash xor placeholder.hashCode()
         }
     }
 
@@ -188,6 +194,7 @@ open class EcoConfig(
 
     override fun clearInjectedPlaceholders() {
         injections.clear()
+        injectionHash = 0 // Reset the hash
     }
 
     override fun toMap(): MutableMap<String, Any?> {
@@ -239,18 +246,6 @@ open class EcoConfig(
     }
 
     override fun hashCode(): Int {
-        /*
-        The keys are completely redundant, as they are only used to prevent
-        duplicate keys in the map. Therefore, we can ignore them and just
-        hash the actual placeholder values.
-         */
-
-        var injectionHash = 0
-
-        injections.forEachValue(5) {
-            injectionHash = injectionHash xor (it.hashCode() shl 5)
-        }
-
         // hashCode() has to compute extremely quickly, so we're using bitwise, because why not?
         // Fucking filthy to use identityHashCode here, but it should be extremely fast
         val identityHash = System.identityHashCode(this)

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

@@ -10,7 +10,6 @@ class EcoConfigSection(
     injections: Map<String, InjectablePlaceholder> = emptyMap()
 ) : EcoConfig(type) {
     init {
-        this.init(values)
+        this.init(values, injections)
-        this.injections = ConcurrentHashMap(injections)
     }
 }

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

@@ -91,7 +91,7 @@ open class EcoLoadableConfig(
     protected fun init(reader: Reader) {
         val string = reader.readToString()
         makeHeader(string)
-        super.init(type.toMap(string))
+        super.init(type.toMap(string), emptyMap())
     }
 
     fun init(file: File) {

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

@@ -50,7 +50,7 @@ open class EcoUpdatableConfig(
             val reader = BufferedReader(InputStreamReader(newIn, StandardCharsets.UTF_8))
 
             val config = EcoConfigSection(type, emptyMap())
-            config.init(type.toMap(reader.readToString()))
+            config.init(type.toMap(reader.readToString()), emptyMap())
             return config
         }
 

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/items/ArgParserHead.kt

@@ -48,6 +48,10 @@ object ArgParserHead : LookupArgParser {
             return null
         }
 
+        if (meta.owningPlayer!!.name.equals("null", true) || meta.owningPlayer!!.name == null) {
+            return null
+        }
+
         return "head:${meta.owningPlayer?.name}"
     }
 }

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/items/ArgParserTrim.kt

@@ -0,0 +1,50 @@
+package com.willfp.eco.internal.items
+
+import com.willfp.eco.core.items.args.LookupArgParser
+import org.bukkit.Color
+import org.bukkit.NamespacedKey
+import org.bukkit.Registry
+import org.bukkit.inventory.ItemStack
+import org.bukkit.inventory.meta.ArmorMeta
+import org.bukkit.inventory.meta.ItemMeta
+import org.bukkit.inventory.meta.LeatherArmorMeta
+import org.bukkit.inventory.meta.trim.ArmorTrim
+import org.bukkit.inventory.meta.trim.TrimMaterial
+import org.bukkit.inventory.meta.trim.TrimPattern
+import java.util.function.Predicate
+
+object ArgParserTrim : LookupArgParser {
+    override fun parseArguments(args: Array<out String>, meta: ItemMeta): Predicate<ItemStack>? {
+        if (meta !is ArmorMeta) return null
+
+        var material: TrimMaterial? = null
+        var pattern: TrimPattern? = null
+
+        for (arg in args) {
+            val argSplit = arg.split(":")
+            if (!argSplit[0].equals("trim", ignoreCase = true)) {
+                continue
+            }
+            material = Registry.TRIM_MATERIAL.get(NamespacedKey.minecraft(argSplit.getOrElse(1) {""}))
+            pattern = Registry.TRIM_PATTERN.get(NamespacedKey.minecraft(argSplit.getOrElse(2) {""}))
+        }
+
+        if (material == null || pattern == null) return null
+
+
+        meta.trim = ArmorTrim(material, pattern)
+
+        return Predicate {
+            val testMeta = it.itemMeta as? ArmorMeta ?: return@Predicate false
+            val trim = testMeta.trim ?: return@Predicate false
+            return@Predicate trim.material == material
+                    && trim.pattern == pattern
+        }
+    }
+
+    override fun serializeBack(meta: ItemMeta): String? {
+        val trim = (meta as? ArmorMeta)?.trim ?: return null
+
+        return "trim:${trim.material.key.key.lowercase()}:${trim.pattern.key.key.lowercase()}"
+    }
+}

eco-core/core-nms/v1_20_R2/build.gradle.kts

@@ -0,0 +1,39 @@
+plugins {
+    id("io.papermc.paperweight.userdev")
+}
+
+group = "com.willfp"
+version = rootProject.version
+
+dependencies {
+    implementation(project(":eco-core:core-nms:nms-common"))
+    paperweight.paperDevBundle("1.20.2-R0.1-SNAPSHOT")
+
+    implementation("net.kyori:adventure-text-minimessage:4.11.0") {
+        version {
+            strictly("4.11.0")
+        }
+        exclude(group = "net.kyori", module = "adventure-api")
+    }
+}
+
+tasks {
+    build {
+        dependsOn(reobfJar)
+    }
+
+    reobfJar {
+        mustRunAfter(shadowJar)
+    }
+
+    shadowJar {
+        relocate(
+            "com.willfp.eco.internal.spigot.proxy.common",
+            "com.willfp.eco.internal.spigot.proxy.v1_20_R2.common"
+        )
+        relocate(
+            "net.kyori.adventure.text.minimessage",
+            "com.willfp.eco.internal.spigot.proxy.v1_20_R2.minimessage"
+        )
+    }
+}

eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R2/BukkitCommands.kt

@@ -0,0 +1,35 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R2
+
+import com.willfp.eco.core.command.PluginCommandBase
+import com.willfp.eco.internal.spigot.proxy.BukkitCommandsProxy
+import org.bukkit.Bukkit
+import org.bukkit.command.Command
+import org.bukkit.command.SimpleCommandMap
+import org.bukkit.craftbukkit.v1_20_R2.CraftServer
+import java.lang.reflect.Field
+
+class BukkitCommands : BukkitCommandsProxy {
+    private val knownCommandsField: Field by lazy {
+        SimpleCommandMap::class.java.getDeclaredField("knownCommands")
+            .apply {
+                isAccessible = true
+            }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private val knownCommands: MutableMap<String, Command>
+        get() = knownCommandsField.get(getCommandMap()) as MutableMap<String, Command>
+
+    override fun getCommandMap(): SimpleCommandMap {
+        return (Bukkit.getServer() as CraftServer).commandMap
+    }
+
+    override fun syncCommands() {
+        (Bukkit.getServer() as CraftServer).syncCommands()
+    }
+
+    override fun unregisterCommand(command: PluginCommandBase) {
+        knownCommands.remove(command.name)
+        knownCommands.remove("${command.plugin.name.lowercase()}:${command.name}")
+    }
+}

eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R2/CommonsInitializer.kt

@@ -0,0 +1,159 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R2
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.internal.spigot.proxy.CommonsInitializerProxy
+import com.willfp.eco.internal.spigot.proxy.common.CommonsProvider
+import com.willfp.eco.internal.spigot.proxy.common.packet.PacketInjectorListener
+import com.willfp.eco.internal.spigot.proxy.common.toResourceLocation
+import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.Tag
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.item.Item
+import org.bukkit.Bukkit
+import org.bukkit.Material
+import org.bukkit.NamespacedKey
+import org.bukkit.craftbukkit.v1_20_R2.CraftServer
+import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity
+import org.bukkit.craftbukkit.v1_20_R2.entity.CraftMob
+import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer
+import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_20_R2.persistence.CraftPersistentDataContainer
+import org.bukkit.craftbukkit.v1_20_R2.persistence.CraftPersistentDataTypeRegistry
+import org.bukkit.craftbukkit.v1_20_R2.util.CraftMagicNumbers
+import org.bukkit.craftbukkit.v1_20_R2.util.CraftNamespacedKey
+import org.bukkit.entity.LivingEntity
+import org.bukkit.entity.Mob
+import org.bukkit.entity.Player
+import org.bukkit.inventory.ItemStack
+import org.bukkit.persistence.PersistentDataContainer
+import java.lang.reflect.Field
+
+class CommonsInitializer : CommonsInitializerProxy {
+    override fun init(plugin: EcoPlugin) {
+        CommonsProvider.setIfNeeded(CommonsProviderImpl)
+        plugin.onEnable {
+            plugin.eventManager.registerListener(PacketInjectorListener)
+        }
+    }
+
+    object CommonsProviderImpl : CommonsProvider {
+        private val cisHandle: Field = CraftItemStack::class.java.getDeclaredField("handle").apply {
+            isAccessible = true
+        }
+
+        private val pdcRegsitry = Class.forName("org.bukkit.craftbukkit.v1_20_R2.inventory.CraftMetaItem")
+            .getDeclaredField("DATA_TYPE_REGISTRY")
+            .apply { isAccessible = true }
+            .get(null) as CraftPersistentDataTypeRegistry
+
+        override val nbtTagString = CraftMagicNumbers.NBT.TAG_STRING
+
+        override fun toPathfinderMob(mob: Mob): PathfinderMob? {
+            val craft = mob as? CraftMob ?: return null
+            return craft.handle as? PathfinderMob
+        }
+
+        override fun toResourceLocation(namespacedKey: NamespacedKey): ResourceLocation =
+            CraftNamespacedKey.toMinecraft(namespacedKey)
+
+        override fun asNMSStack(itemStack: ItemStack): net.minecraft.world.item.ItemStack {
+            return if (itemStack !is CraftItemStack) {
+                CraftItemStack.asNMSCopy(itemStack)
+            } else {
+                cisHandle[itemStack] as net.minecraft.world.item.ItemStack? ?: CraftItemStack.asNMSCopy(itemStack)
+            }
+        }
+
+        override fun asBukkitStack(itemStack: net.minecraft.world.item.ItemStack): ItemStack {
+            return CraftItemStack.asCraftMirror(itemStack)
+        }
+
+        override fun mergeIfNeeded(itemStack: ItemStack, nmsStack: net.minecraft.world.item.ItemStack) {
+            if (itemStack !is CraftItemStack) {
+                itemStack.itemMeta = CraftItemStack.asCraftMirror(nmsStack).itemMeta
+            }
+        }
+
+        override fun toBukkitEntity(entity: net.minecraft.world.entity.LivingEntity): LivingEntity? =
+            CraftEntity.getEntity(Bukkit.getServer() as CraftServer, entity) as? LivingEntity
+
+        override fun makePdc(tag: CompoundTag, base: Boolean): PersistentDataContainer {
+            fun emptyPdc(): CraftPersistentDataContainer = CraftPersistentDataContainer(pdcRegsitry)
+
+            fun CompoundTag?.toPdc(): PersistentDataContainer {
+                val pdc = emptyPdc()
+                this ?: return pdc
+                val keys = this.allKeys
+                for (key in keys) {
+                    pdc.put(key, this[key])
+                }
+
+                return pdc
+            }
+
+            return if (base) {
+                tag.toPdc()
+            } else {
+                if (tag.contains("PublicBukkitValues")) {
+                    tag.getCompound("PublicBukkitValues").toPdc()
+                } else {
+                    emptyPdc()
+                }
+            }
+        }
+
+        override fun setPdc(
+            tag: CompoundTag,
+            pdc: PersistentDataContainer?,
+            item: net.minecraft.world.item.ItemStack?
+        ) {
+            fun CraftPersistentDataContainer.toTag(): CompoundTag {
+                val compound = CompoundTag()
+                val rawPublicMap: Map<String, Tag> = this.raw
+                for ((key, value) in rawPublicMap) {
+                    compound.put(key, value)
+                }
+
+                return compound
+            }
+
+            val container = when (pdc) {
+                is CraftPersistentDataContainer? -> pdc
+                else -> null
+            }
+
+            if (item != null) {
+                if (container != null && !container.isEmpty) {
+                    for (key in tag.allKeys.toSet()) {
+                        tag.remove(key)
+                    }
+
+                    tag.merge(container.toTag())
+                } else {
+                    item.tag = null
+                }
+            } else {
+                if (container != null && !container.isEmpty) {
+                    tag.put("PublicBukkitValues", container.toTag())
+                } else {
+                    tag.remove("PublicBukkitValues")
+                }
+            }
+        }
+
+        override fun materialToItem(material: Material): Item =
+            BuiltInRegistries.ITEM.getOptional(material.key.toResourceLocation())
+                .orElseThrow { IllegalArgumentException("Material is not item!") }
+
+        override fun itemToMaterial(item: Item) =
+            Material.getMaterial(BuiltInRegistries.ITEM.getKey(item).path.uppercase())
+                ?: throw IllegalArgumentException("Invalid material!")
+
+        override fun toNMS(player: Player): ServerPlayer {
+            return (player as CraftPlayer).handle
+        }
+    }
+}

eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R2/DummyEntityFactory.kt

@@ -0,0 +1,16 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R2
+
+import com.willfp.eco.internal.entities.EcoDummyEntity
+import com.willfp.eco.internal.spigot.proxy.DummyEntityFactoryProxy
+import org.bukkit.Location
+import org.bukkit.craftbukkit.v1_20_R2.CraftWorld
+import org.bukkit.entity.Entity
+import org.bukkit.entity.EntityType
+
+class DummyEntityFactory : DummyEntityFactoryProxy {
+    override fun createDummyEntity(location: Location): Entity {
+        val world = location.world as CraftWorld
+        @Suppress("UsePropertyAccessSyntax")
+        return EcoDummyEntity(world.createEntity(location, EntityType.ZOMBIE.entityClass).getBukkitEntity())
+    }
+}

eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R2/EntityControllerFactory.kt

@@ -0,0 +1,12 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R2
+
+import com.willfp.eco.core.entities.ai.EntityController
+import com.willfp.eco.internal.spigot.proxy.EntityControllerFactoryProxy
+import com.willfp.eco.internal.spigot.proxy.v1_20_R2.entity.EcoEntityController
+import org.bukkit.entity.Mob
+
+class EntityControllerFactory : EntityControllerFactoryProxy {
+    override fun <T : Mob> createEntityController(entity: T): EntityController<T> {
+        return EcoEntityController(entity)
+    }
+}

eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R2/ExtendedPersistentDataContainerFactory.kt

@@ -0,0 +1,82 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R2
+
+import com.willfp.eco.core.data.ExtendedPersistentDataContainer
+import com.willfp.eco.internal.spigot.proxy.ExtendedPersistentDataContainerFactoryProxy
+import net.minecraft.nbt.Tag
+import org.bukkit.Material
+import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_20_R2.persistence.CraftPersistentDataContainer
+import org.bukkit.craftbukkit.v1_20_R2.persistence.CraftPersistentDataTypeRegistry
+import org.bukkit.inventory.ItemStack
+import org.bukkit.persistence.PersistentDataContainer
+import org.bukkit.persistence.PersistentDataType
+
+class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFactoryProxy {
+    private val registry: CraftPersistentDataTypeRegistry
+
+    init {
+        /*
+         Can't grab actual instance since it's in CraftMetaItem (which is package-private)
+         And getting it would mean more janky reflection
+         */
+        val item = CraftItemStack.asCraftCopy(ItemStack(Material.STONE))
+        val pdc = item.itemMeta!!.persistentDataContainer
+        this.registry = CraftPersistentDataContainer::class.java.getDeclaredField("registry")
+            .apply { isAccessible = true }.get(pdc) as CraftPersistentDataTypeRegistry
+    }
+
+    override fun adapt(pdc: PersistentDataContainer): ExtendedPersistentDataContainer {
+        return when (pdc) {
+            is CraftPersistentDataContainer -> EcoPersistentDataContainer(pdc)
+            else -> throw IllegalArgumentException("Custom PDC instance ims not supported!")
+        }
+    }
+
+    override fun newPdc(): PersistentDataContainer {
+        return CraftPersistentDataContainer(registry)
+    }
+
+    inner class EcoPersistentDataContainer(
+        private val handle: CraftPersistentDataContainer
+    ) : ExtendedPersistentDataContainer {
+        @Suppress("UNCHECKED_CAST")
+        private val customDataTags: MutableMap<String, Tag> =
+            CraftPersistentDataContainer::class.java.getDeclaredField("customDataTags")
+                .apply { isAccessible = true }.get(handle) as MutableMap<String, Tag>
+
+        override fun <T : Any, Z : Any> set(key: String, dataType: PersistentDataType<T, Z>, value: Z) {
+            customDataTags[key] =
+                registry.wrap(dataType.primitiveType, dataType.toPrimitive(value, handle.adapterContext))
+        }
+
+        override fun <T : Any, Z : Any> has(key: String, dataType: PersistentDataType<T, Z>): Boolean {
+            val value = customDataTags[key] ?: return false
+            return registry.isInstanceOf(dataType.primitiveType, value)
+        }
+
+        override fun <T : Any, Z : Any> get(key: String, dataType: PersistentDataType<T, Z>): Z? {
+            val value = customDataTags[key] ?: return null
+            return dataType.fromPrimitive(registry.extract(dataType.primitiveType, value), handle.adapterContext)
+        }
+
+        override fun <T : Any, Z : Any> getOrDefault(
+            key: String,
+            dataType: PersistentDataType<T, Z>,
+            defaultValue: Z
+        ): Z {
+            return get(key, dataType) ?: defaultValue
+        }
+
+        override fun remove(key: String) {
+            customDataTags.remove(key)
+        }
+
+        override fun getAllKeys(): MutableSet<String> {
+            return customDataTags.keys
+        }
+
+        override fun getBase(): PersistentDataContainer {
+            return handle
+        }
+    }
+}

eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R2/FastItemStackFactory.kt

@@ -0,0 +1,12 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R2
+
+import com.willfp.eco.core.fast.FastItemStack
+import com.willfp.eco.internal.spigot.proxy.FastItemStackFactoryProxy
+import com.willfp.eco.internal.spigot.proxy.common.item.EcoFastItemStack
+import org.bukkit.inventory.ItemStack
+
+class FastItemStackFactory : FastItemStackFactoryProxy {
+    override fun create(itemStack: ItemStack): FastItemStack {
+        return EcoFastItemStack(itemStack)
+    }
+}

eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R2/MiniMessageTranslator.kt

@@ -0,0 +1,33 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R2
+
+import com.willfp.eco.core.display.Display
+import com.willfp.eco.internal.spigot.proxy.MiniMessageTranslatorProxy
+import com.willfp.eco.util.toLegacy
+import net.kyori.adventure.text.minimessage.MiniMessage
+
+class MiniMessageTranslator : MiniMessageTranslatorProxy {
+    override fun format(message: String): String {
+        var mut = message
+
+        val startsWithPrefix = mut.startsWith(Display.PREFIX)
+        if (startsWithPrefix) {
+            mut = mut.substring(2)
+        }
+
+        mut = mut.replace('§', '&')
+
+        val miniMessage = runCatching {
+            MiniMessage.miniMessage().deserialize(
+                mut
+            ).toLegacy()
+        }.getOrNull() ?: mut
+
+        mut = if (startsWithPrefix) {
+            Display.PREFIX + miniMessage
+        } else {
+            miniMessage
+        }
+
+        return mut
+    }
+}

eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R2/PacketHandler.kt

@@ -0,0 +1,46 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R2
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.packet.PacketListener
+import com.willfp.eco.internal.spigot.proxy.PacketHandlerProxy
+import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketAutoRecipe
+import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketHeldItemSlot
+import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketOpenWindowMerchant
+import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketSetCreativeSlot
+import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketSetSlot
+import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketWindowItems
+import com.willfp.eco.internal.spigot.proxy.common.packet.display.frame.clearFrames
+import net.minecraft.network.protocol.Packet
+import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer
+import org.bukkit.entity.Player
+
+class PacketHandler : PacketHandlerProxy {
+    override fun sendPacket(player: Player, packet: com.willfp.eco.core.packet.Packet) {
+        if (player !is CraftPlayer) {
+            return
+        }
+
+        val handle = packet.handle
+
+        if (handle !is Packet<*>) {
+            return
+        }
+
+        player.handle.connection.send(handle)
+    }
+
+    override fun clearDisplayFrames() {
+        clearFrames()
+    }
+
+    override fun getPacketListeners(plugin: EcoPlugin): List<PacketListener> {
+        return listOf(
+            PacketAutoRecipe(plugin),
+            PacketHeldItemSlot,
+            PacketOpenWindowMerchant,
+            PacketSetCreativeSlot,
+            PacketSetSlot,
+            PacketWindowItems(plugin)
+        )
+    }
+}

eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R2/SNBTConverter.kt

@@ -0,0 +1,52 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R2
+
+import com.willfp.eco.core.items.TestableItem
+import com.willfp.eco.core.recipe.parts.EmptyTestableItem
+import com.willfp.eco.internal.spigot.proxy.SNBTConverterProxy
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.SnbtPrinterTagVisitor
+import net.minecraft.nbt.TagParser
+import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack
+import org.bukkit.inventory.ItemStack
+
+class SNBTConverter : SNBTConverterProxy {
+    override fun fromSNBT(snbt: String): ItemStack? {
+        val nbt = runCatching { TagParser.parseTag(snbt) }.getOrNull() ?: return null
+        val nms = net.minecraft.world.item.ItemStack.of(nbt)
+        return CraftItemStack.asBukkitCopy(nms)
+    }
+
+    override fun toSNBT(itemStack: ItemStack): String {
+        val nms = CraftItemStack.asNMSCopy(itemStack)
+        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
+    }
+
+    override fun makeSNBTTestable(snbt: String): TestableItem {
+        val nbt = runCatching { TagParser.parseTag(snbt) }.getOrNull() ?: return EmptyTestableItem()
+        val nms = net.minecraft.world.item.ItemStack.of(nbt)
+        if (nms == net.minecraft.world.item.ItemStack.EMPTY) {
+            return EmptyTestableItem()
+        }
+
+        nbt.remove("Count")
+        return SNBTTestableItem(CraftItemStack.asBukkitCopy(nms), nbt)
+    }
+
+    class SNBTTestableItem(
+        private val item: ItemStack,
+        private val tag: CompoundTag
+    ) : TestableItem {
+        override fun matches(itemStack: ItemStack?): Boolean {
+            if (itemStack == null) {
+                return false
+            }
+
+            val nms = CraftItemStack.asNMSCopy(itemStack)
+            val nmsTag = nms.save(CompoundTag())
+            nmsTag.remove("Count")
+            return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type
+        }
+
+        override fun getItem(): ItemStack = item
+    }
+}

eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R2/Skull.kt

@@ -0,0 +1,18 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R2
+
+import com.willfp.eco.internal.spigot.proxy.SkullProxy
+import com.willfp.eco.internal.spigot.proxy.common.texture
+import org.bukkit.inventory.meta.SkullMeta
+
+class Skull : SkullProxy {
+    override fun setSkullTexture(
+        meta: SkullMeta,
+        base64: String
+    ) {
+        meta.texture = base64
+    }
+
+    override fun getSkullTexture(
+        meta: SkullMeta
+    ): String? = meta.texture
+}

eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R2/TPS.kt

@@ -0,0 +1,11 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R2
+
+import com.willfp.eco.internal.spigot.proxy.TPSProxy
+import org.bukkit.Bukkit
+import org.bukkit.craftbukkit.v1_20_R2.CraftServer
+
+class TPS : TPSProxy {
+    override fun getTPS(): Double {
+        return (Bukkit.getServer() as CraftServer).handle.server.recentTps[0]
+    }
+}

eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R2/entity/EcoEntityController.kt

@@ -0,0 +1,95 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R2.entity
+
+import com.willfp.eco.core.entities.ai.CustomGoal
+import com.willfp.eco.core.entities.ai.EntityController
+import com.willfp.eco.core.entities.ai.EntityGoal
+import com.willfp.eco.core.entities.ai.TargetGoal
+import com.willfp.eco.internal.spigot.proxy.common.ai.CustomGoalFactory
+import com.willfp.eco.internal.spigot.proxy.common.ai.getGoalFactory
+import com.willfp.eco.internal.spigot.proxy.common.toPathfinderMob
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.goal.Goal
+import org.bukkit.entity.Mob
+
+class EcoEntityController<T : Mob>(
+    private val handle: T
+) : EntityController<T> {
+    override fun addEntityGoal(priority: Int, goal: EntityGoal<in T>): EntityController<T> {
+        val nms = getNms() ?: return this
+
+        nms.goalSelector.addGoal(
+            priority,
+            goal.getGoalFactory()?.create(goal, nms) ?: return this
+        )
+
+        return this
+    }
+
+    override fun removeEntityGoal(goal: EntityGoal<in T>): EntityController<T> {
+        val nms = getNms() ?: return this
+
+        val predicate: (Goal) -> Boolean = if (goal is CustomGoal<*>) {
+            { CustomGoalFactory.isGoalOfType(it, goal) }
+        } else {
+            { goal.getGoalFactory()?.isGoalOfType(it) == true }
+        }
+
+        for (wrapped in nms.goalSelector.availableGoals.toSet()) {
+            if (predicate(wrapped.goal)) {
+                nms.goalSelector.removeGoal(wrapped.goal)
+            }
+        }
+
+        return this
+    }
+
+    override fun clearEntityGoals(): EntityController<T> {
+        val nms = getNms() ?: return this
+        nms.goalSelector.availableGoals.clear()
+        return this
+    }
+
+    override fun addTargetGoal(priority: Int, goal: TargetGoal<in T>): EntityController<T> {
+        val nms = getNms() ?: return this
+
+        nms.targetSelector.addGoal(
+            priority, goal.getGoalFactory()?.create(goal, nms) ?: return this
+        )
+
+        nms.targetSelector
+
+        return this
+    }
+
+    override fun removeTargetGoal(goal: TargetGoal<in T>): EntityController<T> {
+        val nms = getNms() ?: return this
+
+        val predicate: (Goal) -> Boolean = if (goal is CustomGoal<*>) {
+            { CustomGoalFactory.isGoalOfType(it, goal) }
+        } else {
+            { goal.getGoalFactory()?.isGoalOfType(it) == true }
+        }
+
+        for (wrapped in nms.targetSelector.availableGoals.toSet()) {
+            if (predicate(wrapped.goal)) {
+                nms.targetSelector.removeGoal(wrapped.goal)
+            }
+        }
+
+        return this
+    }
+
+    override fun clearTargetGoals(): EntityController<T> {
+        val nms = getNms() ?: return this
+        nms.targetSelector.availableGoals.clear()
+        return this
+    }
+
+    private fun getNms(): PathfinderMob? {
+        return handle.toPathfinderMob()
+    }
+
+    override fun getEntity(): T {
+        return handle
+    }
+}

eco-core/core-plugin/build.gradle.kts

@@ -51,7 +51,6 @@ dependencies {
     compileOnly("com.github.Gypopo:EconomyShopGUI-API:1.4.6")
     compileOnly("com.github.N0RSKA:ScytherAPI:55a")
     compileOnly("com.ticxo.modelengine:api:R3.0.1")
-    compileOnly("me.TechsCode:UltraEconomyAPI:1.0.0")
     compileOnly("org.black_ixx:playerpoints:3.2.5")
     compileOnly("com.github.Ssomar-Developement:SCore:3.4.7")
     compileOnly("io.lumine:Mythic:5.3.5")

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt

@@ -48,6 +48,7 @@ import com.willfp.eco.internal.items.ArgParserFlag
 import com.willfp.eco.internal.items.ArgParserHead
 import com.willfp.eco.internal.items.ArgParserName
 import com.willfp.eco.internal.items.ArgParserTexture
+import com.willfp.eco.internal.items.ArgParserTrim
 import com.willfp.eco.internal.items.ArgParserUnbreakable
 import com.willfp.eco.internal.lookup.SegmentParserGroup
 import com.willfp.eco.internal.lookup.SegmentParserUseIfPresent
@@ -62,11 +63,7 @@ import com.willfp.eco.internal.spigot.data.PlayerBlockListener
 import com.willfp.eco.internal.spigot.data.ProfileHandler
 import com.willfp.eco.internal.spigot.data.storage.ProfileSaver
 import com.willfp.eco.internal.spigot.drops.CollatedRunnable
-import com.willfp.eco.internal.spigot.eventlisteners.EntityDeathByEntityListeners
+import com.willfp.eco.internal.spigot.eventlisteners.*
-import com.willfp.eco.internal.spigot.eventlisteners.NaturalExpGainListenersPaper
-import com.willfp.eco.internal.spigot.eventlisteners.NaturalExpGainListenersSpigot
-import com.willfp.eco.internal.spigot.eventlisteners.PlayerJumpListenersPaper
-import com.willfp.eco.internal.spigot.eventlisteners.PlayerJumpListenersSpigot
 import com.willfp.eco.internal.spigot.eventlisteners.armor.ArmorChangeEventListeners
 import com.willfp.eco.internal.spigot.eventlisteners.armor.ArmorListener
 import com.willfp.eco.internal.spigot.gui.GUIListener
@@ -152,6 +149,9 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
         Items.registerArgParser(ArgParserUnbreakable)
         Items.registerArgParser(ArgParserName)
         Items.registerArgParser(ArgParserHead)
+        if (Prerequisite.HAS_1_20.isMet) {
+            Items.registerArgParser(ArgParserTrim)
+        }
 
         Entities.registerArgParser(EntityArgParserName)
         Entities.registerArgParser(EntityArgParserNoAI)
@@ -390,7 +390,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
         val listeners = mutableListOf(
             ArmorListener(),
             EntityDeathByEntityListeners(this),
-            CraftingRecipeListener(),
+            CraftingRecipeListener(this),
             StackedRecipeListener(this),
             GUIListener(this),
             ArrowDataListener(this),

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/gui/GUIListener.kt

@@ -15,6 +15,7 @@ import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.inventory.ClickType
+import org.bukkit.event.inventory.InventoryAction
 import org.bukkit.event.inventory.InventoryClickEvent
 import org.bukkit.event.inventory.InventoryCloseEvent
 import org.bukkit.event.inventory.InventoryDragEvent
@@ -136,6 +137,8 @@ class GUIListener(private val plugin: EcoPlugin) : Listener {
     fun handleClose(event: InventoryCloseEvent) {
         val menu = event.inventory.getMenu() as? EcoMenu ?: return
 
+        menu.refresh(event.player as Player)
+
         menu.handleClose(event)
 
         plugin.scheduler.run { MenuHandler.unregisterInventory(event.inventory) }
@@ -216,6 +219,17 @@ class GUIListener(private val plugin: EcoPlugin) : Listener {
         }
     }
 
+    @EventHandler
+    fun temporaryExploitPatch(event: InventoryClickEvent) {
+        if (event.player.renderedInventory == null) {
+            return
+        }
+
+        if (event.action == InventoryAction.COLLECT_TO_CURSOR) {
+            event.isCancelled = true
+        }
+    }
+
     private fun Player.renderActiveMenu() {
         val rendered = this.renderedInventory ?: return
 

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefKingdoms.kt

@@ -6,11 +6,11 @@ import org.bukkit.block.Block
 import org.bukkit.entity.LivingEntity
 import org.bukkit.entity.Player
 import org.kingdoms.constants.group.Kingdom
-import org.kingdoms.constants.group.model.relationships.StandardRelationAttribute
 import org.kingdoms.constants.land.Land
+import org.kingdoms.constants.land.location.SimpleChunkLocation
 import org.kingdoms.constants.player.KingdomPlayer
-import org.kingdoms.constants.player.StandardKingdomPermission
 import org.kingdoms.managers.PvPManager
+import org.kingdoms.managers.land.BuildingProcessor
 
 class AntigriefKingdoms : AntigriefIntegration {
     override fun canBreakBlock(
@@ -21,34 +21,35 @@ class AntigriefKingdoms : AntigriefIntegration {
         if (kp.isAdmin) {
             return true
         }
-        val kingdom: Kingdom = kp.kingdom ?: return false
+        return BuildingProcessor(
-        val land = Land.getLand(block) ?: return true
+            player,
-        val permission = if (land.isNexusLand) {
+            kp,
-            StandardKingdomPermission.NEXUS_BUILD
+            SimpleChunkLocation.of(block),
-        } else StandardKingdomPermission.BUILD
-
-        return if (!kp.hasPermission(permission)) {
             false
-        } else kingdom.hasAttribute(land.kingdom, StandardRelationAttribute.BUILD)
+        ).process().isSuccessful
     }
 
     override fun canCreateExplosion(
         player: Player,
         location: Location
     ): Boolean {
-        val land = Land.getLand(location) ?: return true
+        return canBreakBlock(player, location.block)
-        if (!land.isClaimed) {
-            return true
-        }
-        val kingdom: Kingdom = land.kingdom
-        return kingdom.isMember(player)
     }
 
     override fun canPlaceBlock(
         player: Player,
         block: Block
     ): Boolean {
-        return canBreakBlock(player, block)
+        val kp: KingdomPlayer = KingdomPlayer.getKingdomPlayer(player)
+        if (kp.isAdmin) {
+            return true
+        }
+        return BuildingProcessor(
+            player,
+            kp,
+            SimpleChunkLocation.of(block),
+            true
+        ).process().isSuccessful
     }
 
     override fun canInjure(

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customentities/CustomEntitiesMythicMobs.kt

@@ -17,7 +17,7 @@ class CustomEntitiesMythicMobs : CustomEntitiesIntegration {
             CustomEntity(
                 key,
                 {
-                    val entityId = api.getMythicMobInstance(it)?.type?.entityType?.name ?: return@CustomEntity false
+                    val entityId = api.getMythicMobInstance(it)?.type?.internalName ?: return@CustomEntity false
                     entityId.equals(id, ignoreCase = true)
                 },
                 {

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/price/PriceFactoryUltraEconomy.kt

@@ -32,15 +32,15 @@ class PriceFactoryUltraEconomy(private val currency: Currency) : PriceFactory {
             get() = api.accounts.uuid(this.uniqueId).orElse(null)
 
         override fun canAfford(player: Player, multiplier: Double): Boolean {
-            return (player.account?.getBalance(currency)?.onHand ?: 0f) >= getValue(player, multiplier)
+            return (player.account?.getBalance(currency)?.onHand ?: 0.0) >= getValue(player, multiplier)
         }
 
         override fun pay(player: Player, multiplier: Double) {
-            player.account?.getBalance(currency)?.removeHand(getValue(player, multiplier).toFloat())
+            player.account?.getBalance(currency)?.removeHand(getValue(player, multiplier))
         }
 
         override fun giveTo(player: Player, multiplier: Double) {
-            player.account?.getBalance(currency)?.addHand(getValue(player, multiplier).toFloat())
+            player.account?.getBalance(currency)?.addHand(getValue(player, multiplier))
         }
 
         override fun getValue(player: Player, multiplier: Double): Double {

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/recipes/CraftingRecipeListener.kt

@@ -1,15 +1,17 @@
 package com.willfp.eco.internal.spigot.recipes
 
+import com.willfp.eco.core.Eco
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.recipe.Recipes
 import org.bukkit.Keyed
+import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.inventory.CraftItemEvent
 import org.bukkit.event.inventory.PrepareItemCraftEvent
 import org.bukkit.event.player.PlayerRecipeDiscoverEvent
 
-class CraftingRecipeListener : Listener {
+class CraftingRecipeListener(val plugin: EcoPlugin) : Listener {
     @EventHandler
     fun preventLearningDisplayedRecipes(event: PlayerRecipeDiscoverEvent) {
         if (!EcoPlugin.getPluginNames().contains(event.recipe.namespace)) {
@@ -22,6 +24,16 @@ class CraftingRecipeListener : Listener {
 
     @EventHandler
     fun processListeners(event: PrepareItemCraftEvent) {
+        handlePrepare(event)
+
+        if (plugin.configYml.getBool("enforce-preparing-recipes")) {
+            plugin.scheduler.runLater(1) {
+                handlePrepare(event)
+            }
+        }
+    }
+
+    private fun handlePrepare(event: PrepareItemCraftEvent) {
         var recipe = event.recipe as? Keyed
 
         if (recipe == null) {

eco-core/core-plugin/src/main/resources/config.yml

@@ -97,3 +97,13 @@ math-cache-ttl: 200
 # counts. This is completely anonymous and no personal information is logged. This data
 # is primarily used for optimisation and server insights.
 playerflow: true
+
+# If the packet display system should activate on items that have no meta. This is disabled
+# by default for performance reasons, but if you want to use the packet display system on
+# items that have no meta, then you can enable this option.
+display-without-meta: false
+
+# If eco should enforce its recipes against other plugins. Turn this on if use custom items from
+# non eco-based plugins in recipes and are encountering issues with invisible items or similar.
+# This may cause issues with other plugins, so only enable this if you're having issues.
+enforce-preparing-recipes: false

gradle.properties

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

settings.gradle.kts

@@ -19,6 +19,7 @@ include(":eco-core:core-nms:v1_19_R1")
 include(":eco-core:core-nms:v1_19_R2")
 include(":eco-core:core-nms:v1_19_R3")
 include(":eco-core:core-nms:v1_20_R1")
+include(":eco-core:core-nms:v1_20_R2")
 include(":eco-core:core-proxy")
 include(":eco-core:core-plugin")
 include(":eco-core:core-backend")