Merge remote-tracking branch 'origin/master'

# Conflicts:
#	gradle.properties

build.gradle.kts

@@ -27,6 +27,7 @@ dependencies {
     implementation(project(path = ":eco-core:core-nms:v1_19_R1", configuration = "reobf"))
     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"))
 }
 
 allprojects {

eco-api/src/main/java/com/willfp/eco/core/Eco.java

@@ -527,9 +527,10 @@ public interface Eco {
      *
      * @param expression The expression.
      * @param context    The context.
-     * @return The value of the expression, or zero if invalid.
+     * @return The value of the expression, or null if invalid.
      */
-    double evaluate(@NotNull String expression,
+    @Nullable
+    Double evaluate(@NotNull String expression,
                     @NotNull PlaceholderContext context);
 
     /**

eco-api/src/main/java/com/willfp/eco/core/Prerequisite.java

@@ -37,11 +37,19 @@ public class Prerequisite {
             "Requires server to have ProtocolLib"
     );
 
+    /**
+     * Requires the server to be running 1.20.
+     */
+    public static final Prerequisite HAS_1_20 = new Prerequisite(
+            () -> ProxyConstants.NMS_VERSION.contains("20"),
+            "Requires server to be running 1.20+"
+    );
+
     /**
      * Requires the server to be running 1.19.4.
      */
     public static final Prerequisite HAS_1_19_4 = new Prerequisite(
-            () -> ProxyConstants.NMS_VERSION.contains("19_R3"),
+            () -> ProxyConstants.NMS_VERSION.contains("19_R3") || HAS_1_20.isMet(),
             "Requires server to be running 1.19.4+"
     );
 
@@ -49,7 +57,7 @@ public class Prerequisite {
      * Requires the server to be running 1.19.
      */
     public static final Prerequisite HAS_1_19 = new Prerequisite(
-            () -> ProxyConstants.NMS_VERSION.contains("19"),
+            () -> ProxyConstants.NMS_VERSION.contains("19") || HAS_1_20.isMet(),
             "Requires server to be running 1.19+"
     );
 

eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java

@@ -98,6 +98,7 @@ public final class PlaceholderManager {
         // Storing as immutable set leads to slower times to register placeholders, but much
         // faster times to access registrations.
         Set<Placeholder> pluginPlaceholders = new HashSet<>(REGISTERED_PLACEHOLDERS.get(placeholder.getPlugin()));
+        pluginPlaceholders.removeIf(p -> p.getPattern().equals(placeholder.getPattern()));
         pluginPlaceholders.add(placeholder);
         REGISTERED_PLACEHOLDERS.put(placeholder.getPlugin(), ImmutableSet.copyOf(pluginPlaceholders));
     }

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

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

eco-api/src/main/java/com/willfp/eco/util/NumberUtils.java

@@ -12,6 +12,7 @@ import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TreeMap;
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -251,12 +252,15 @@ public final class NumberUtils {
                                             @Nullable final Player player,
                                             @Nullable final PlaceholderInjectable context,
                                             @NotNull final Collection<AdditionalPlayer> additionalPlayers) {
-        return Eco.get().evaluate(expression, new PlaceholderContext(
-                player,
-                null,
-                context,
-                additionalPlayers
-        ));
+        return evaluateExpression(
+                expression,
+                new PlaceholderContext(
+                        player,
+                        null,
+                        context,
+                        additionalPlayers
+                )
+        );
     }
 
     /**
@@ -283,6 +287,22 @@ public final class NumberUtils {
      */
     public static double evaluateExpression(@NotNull final String expression,
                                             @NotNull final PlaceholderContext context) {
+        return Objects.requireNonNullElse(
+                evaluateExpressionOrNull(expression, context),
+                0.0
+        );
+    }
+
+    /**
+     * Evaluate an expression in a context.
+     *
+     * @param expression The expression.
+     * @param context    The context.
+     * @return The value of the expression, or zero if invalid.
+     */
+    @Nullable
+    public static Double evaluateExpressionOrNull(@NotNull final String expression,
+                                                  @NotNull final PlaceholderContext context) {
         return Eco.get().evaluate(expression, context);
     }
 

eco-api/src/main/kotlin/com/willfp/eco/core/placeholder/Placeholder.kt

@@ -0,0 +1,14 @@
+@file:JvmName("PlaceholderExtensions")
+
+package com.willfp.eco.core.placeholder
+
+import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
+import com.willfp.eco.core.placeholder.context.PlaceholderContext
+
+/** @see PlaceholderManager.translatePlaceholders */
+fun String.translatePlaceholders(context: PlaceholderContext) =
+    PlaceholderManager.translatePlaceholders(this, context)
+
+/** @see PlaceholderManager.findPlaceholdersIn */
+fun String.findPlaceholders(): List<String> =
+    PlaceholderManager.findPlaceholdersIn(this)

eco-api/src/main/kotlin/com/willfp/eco/util/NumberUtils.kt

@@ -31,3 +31,7 @@ fun evaluateExpression(expression: String) =
 /** @see NumberUtils.evaluateExpression */
 fun evaluateExpression(expression: String, context: PlaceholderContext) =
     NumberUtils.evaluateExpression(expression, context)
+
+/** @see NumberUtils.evaluateExpressionOrNull */
+fun evaluateExpressionOrNull(expression: String, context: PlaceholderContext) =
+    NumberUtils.evaluateExpressionOrNull(expression, context)

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

@@ -30,6 +30,8 @@ internal fun Any?.constrainConfigTypes(type: ConfigType): Any? = when (this) {
             this.toMutableList()
         }
     }
+
+    is Float -> this.toDouble() // Should prevent !!float from being written
     else -> this
 }
 

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

@@ -1,12 +1,12 @@
 package com.willfp.eco.internal.config
 
 import com.willfp.eco.core.config.interfaces.Config
+import org.yaml.snakeyaml.DumperOptions
 import org.yaml.snakeyaml.nodes.Node
 import org.yaml.snakeyaml.representer.Represent
 import org.yaml.snakeyaml.representer.Representer
 
-@Suppress("DEPRECATION")
-class EcoRepresenter : Representer() {
+class EcoRepresenter : Representer(DumperOptions()) {
     init {
         multiRepresenters[Config::class.java] = RepresentConfig(multiRepresenters[Map::class.java]!!)
     }

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/events/EcoEventManager.kt

@@ -24,8 +24,8 @@ fun PacketEvent.handleSend() {
                 listener.listener.onSend(this)
             } catch (e: Exception) {
                 listener.plugin.logger.warning(
-                    "Exception in packet listener ${listener.listener.javaClass.simpleName}" +
-                            " for packet ${packet.javaClass.simpleName}!"
+                    "Exception in packet listener ${listener.listener.javaClass.name}" +
+                            " for packet ${packet.handle.javaClass.name}!"
                 )
                 e.printStackTrace()
             }
@@ -40,8 +40,8 @@ fun PacketEvent.handleReceive() {
                 listener.listener.onReceive(this)
             } catch (e: Exception) {
                 listener.plugin.logger.warning(
-                    "Exception in packet listener ${listener.listener.javaClass.simpleName}" +
-                            " for packet ${packet.javaClass.simpleName}!"
+                    "Exception in packet listener ${listener.listener.javaClass.name}" +
+                            " for packet ${packet.handle.javaClass.name}!"
                 )
                 e.printStackTrace()
             }

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

@@ -0,0 +1,53 @@
+package com.willfp.eco.internal.items
+
+import com.willfp.eco.core.items.args.LookupArgParser
+import org.bukkit.Bukkit
+import org.bukkit.inventory.ItemStack
+import org.bukkit.inventory.meta.ItemMeta
+import org.bukkit.inventory.meta.SkullMeta
+import java.util.function.Predicate
+
+object ArgParserHead : LookupArgParser {
+    override fun parseArguments(args: Array<out String>, meta: ItemMeta): Predicate<ItemStack>? {
+        if (meta !is SkullMeta) {
+            return null
+        }
+
+        var playerName: String? = null
+
+        for (arg in args) {
+            val argSplit = arg.split(":")
+            if (!argSplit[0].equals("head", ignoreCase = true)) {
+                continue
+            }
+            if (argSplit.size < 2) {
+                continue
+            }
+            playerName = argSplit[1]
+        }
+
+        playerName ?: return null
+
+        @Suppress("DEPRECATION")
+        val player = Bukkit.getOfflinePlayer(playerName)
+
+        meta.owningPlayer = player
+
+        return Predicate {
+            val testMeta = it.itemMeta as? SkullMeta ?: return@Predicate false
+            testMeta.owningPlayer?.uniqueId == player.uniqueId
+        }
+    }
+
+    override fun serializeBack(meta: ItemMeta): String? {
+        if (meta !is SkullMeta) {
+            return null
+        }
+
+        if (meta.owningPlayer == null) {
+            return null
+        }
+
+        return "head:${meta.owningPlayer?.name}"
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/placeholder/PlaceholderLookup.kt

@@ -4,8 +4,23 @@ import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
 import com.willfp.eco.core.placeholder.InjectablePlaceholder
 import com.willfp.eco.core.placeholder.Placeholder
+import com.willfp.eco.core.placeholder.context.PlaceholderContext
+import com.willfp.eco.core.placeholder.templates.SimpleInjectablePlaceholder
 import java.util.regex.Pattern
 
+/*
+
+A set of global placeholders that are always available.
+
+ */
+private val globalPlaceholders = setOf<Placeholder>(
+    object : SimpleInjectablePlaceholder("player") {
+        override fun getValue(args: String, context: PlaceholderContext): String? {
+            return context.player?.name
+        }
+    },
+)
+
 class PlaceholderLookup(
     val args: String,
     val plugin: EcoPlugin?,
@@ -29,6 +44,12 @@ class PlaceholderLookup(
             }
         }
 
+        for (placeholder in globalPlaceholders) {
+            if (placeholder.matches(this)) {
+                return placeholder
+            }
+        }
+
         return null
     }
 

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/placeholder/PlaceholderParser.kt

@@ -7,7 +7,6 @@ import com.willfp.eco.core.placeholder.InjectablePlaceholder
 import com.willfp.eco.core.placeholder.Placeholder
 import com.willfp.eco.core.placeholder.context.PlaceholderContext
 import com.willfp.eco.util.StringUtils
-import java.util.Optional
 import java.util.concurrent.TimeUnit
 
 /*
@@ -23,7 +22,7 @@ class PlaceholderParser {
 
     private val placeholderLookupCache = Caffeine.newBuilder()
         .expireAfterWrite(1, TimeUnit.SECONDS)
-        .build<PlaceholderLookup, Optional<Placeholder>>()
+        .build<PlaceholderLookup, Placeholder?>()
 
     fun translatePlacholders(text: String, context: PlaceholderContext): String {
         return translatePlacholders(text, context, context.injectableContext.placeholderInjections)
@@ -122,10 +121,10 @@ class PlaceholderParser {
         val lookup = PlaceholderLookup(args, plugin, injections)
 
         val placeholder = placeholderLookupCache.get(lookup) {
-            Optional.ofNullable(it.findMatchingPlaceholder())
-        }.orElse(null) ?: return null
+            it.findMatchingPlaceholder()
+        }
 
-        return placeholder.getValue(args, context)
+        return placeholder?.getValue(args, context)
     }
 
     private fun translateEcoPlaceholdersIn(

eco-core/core-nms/v1_20_R1/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-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_R1.common"
+        )
+        relocate(
+            "net.kyori.adventure.text.minimessage",
+            "com.willfp.eco.internal.spigot.proxy.v1_20_R1.minimessage"
+        )
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R1
+
+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_R1.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_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R1/CommonsInitializer.kt

@@ -0,0 +1,159 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R1
+
+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_R1.CraftServer
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftEntity
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftMob
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer
+import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_20_R1.persistence.CraftPersistentDataContainer
+import org.bukkit.craftbukkit.v1_20_R1.persistence.CraftPersistentDataTypeRegistry
+import org.bukkit.craftbukkit.v1_20_R1.util.CraftMagicNumbers
+import org.bukkit.craftbukkit.v1_20_R1.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_R1.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_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R1/DummyEntityFactory.kt

@@ -0,0 +1,16 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R1
+
+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_R1.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_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R1/EntityControllerFactory.kt

@@ -0,0 +1,12 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R1
+
+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_R1.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_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R1/ExtendedPersistentDataContainerFactory.kt

@@ -0,0 +1,82 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R1
+
+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_R1.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_20_R1.persistence.CraftPersistentDataContainer
+import org.bukkit.craftbukkit.v1_20_R1.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_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R1/FastItemStackFactory.kt

@@ -0,0 +1,12 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R1
+
+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_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R1/MiniMessageTranslator.kt

@@ -0,0 +1,33 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R1
+
+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_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R1/PacketHandler.kt

@@ -0,0 +1,46 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R1
+
+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_R1.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_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R1/SNBTConverter.kt

@@ -0,0 +1,52 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R1
+
+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_R1.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_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R1/Skull.kt

@@ -0,0 +1,18 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R1
+
+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_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R1/TPS.kt

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

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

@@ -0,0 +1,95 @@
+package com.willfp.eco.internal.spigot.proxy.v1_20_R1.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/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt

@@ -45,6 +45,7 @@ import com.willfp.eco.internal.items.ArgParserColor
 import com.willfp.eco.internal.items.ArgParserCustomModelData
 import com.willfp.eco.internal.items.ArgParserEnchantment
 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.ArgParserUnbreakable
@@ -150,6 +151,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
         Items.registerArgParser(ArgParserFlag)
         Items.registerArgParser(ArgParserUnbreakable)
         Items.registerArgParser(ArgParserName)
+        Items.registerArgParser(ArgParserHead)
 
         Entities.registerArgParser(EntityArgParserName)
         Entities.registerArgParser(EntityArgParserNoAI)

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

@@ -10,11 +10,11 @@ class DelegatedExpressionHandler(
     plugin: EcoPlugin,
     private val handler: ExpressionHandler
 ) : ExpressionHandler {
-    private val evaluationCache: Cache<Int, Double> = Caffeine.newBuilder()
+    private val evaluationCache: Cache<Int, Double?> = Caffeine.newBuilder()
         .expireAfterWrite(plugin.configYml.getInt("math-cache-ttl").toLong(), TimeUnit.MILLISECONDS)
         .build()
 
-    override fun evaluate(expression: String, context: PlaceholderContext): Double {
+    override fun evaluate(expression: String, context: PlaceholderContext): Double? {
         // Peak performance (totally not having fun with bitwise operators)
         val hash = (((expression.hashCode() shl 5) - expression.hashCode()) xor
                 (context.player?.uniqueId?.hashCode() ?: 0)
@@ -22,7 +22,7 @@ class DelegatedExpressionHandler(
 
         return evaluationCache.get(hash) {
             handler.evaluate(expression, context)
-                .let { if (!it.isFinite()) 0.0 else it } // Fixes NaN bug.
+                .let { if (it?.isFinite() != true) null else it } // Fixes NaN bug.
         }
     }
 }

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

@@ -14,8 +14,6 @@ import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.pow
 
-private val goToZero = Crunch.compileExpression("0")
-
 private val min = Function("min", 2) {
     min(it[0], it[1])
 }
@@ -25,8 +23,9 @@ private val max = Function("max", 2) {
 }
 
 interface ExpressionHandler {
-    fun evaluate(expression: String, context: PlaceholderContext): Double
+    fun evaluate(expression: String, context: PlaceholderContext): Double?
 }
+
 private fun String.fastToDoubleOrNull(): Double? {
     if (isEmpty()) {
         return null
@@ -47,6 +46,7 @@ private fun String.fastToDoubleOrNull(): Double? {
                 if (decimalIdx != -1) return null
                 decimalIdx = idx
             }
+
             in '0'..'9' -> {
                 val number = (char.code - '0'.code).toDouble()
                 if (decimalIdx != -1) {
@@ -55,6 +55,7 @@ private fun String.fastToDoubleOrNull(): Double? {
                     integerPart = integerPart * 10 + number
                 }
             }
+
             else -> return null
         }
 
@@ -70,7 +71,7 @@ private fun String.fastToDoubleOrNull(): Double? {
 class ImmediatePlaceholderTranslationExpressionHandler(
     private val placeholderParser: PlaceholderParser
 ) : ExpressionHandler {
-    private val cache: Cache<String, CompiledExpression> = Caffeine.newBuilder()
+    private val cache: Cache<String, CompiledExpression?> = Caffeine.newBuilder()
         .expireAfterAccess(500, TimeUnit.MILLISECONDS)
         .build()
 
@@ -78,25 +79,24 @@ class ImmediatePlaceholderTranslationExpressionHandler(
         addFunctions(min, max)
     }
 
-    override fun evaluate(expression: String, context: PlaceholderContext): Double {
+    override fun evaluate(expression: String, context: PlaceholderContext): Double? {
         val translatedExpression = placeholderParser.translatePlacholders(expression, context)
 
         val compiled = cache.get(translatedExpression) {
-            runCatching { Crunch.compileExpression(translatedExpression, env) }
-                .getOrDefault(goToZero)
+            runCatching { Crunch.compileExpression(translatedExpression, env) }.getOrNull()
         }
 
-        return runCatching { compiled.evaluate() }.getOrDefault(0.0)
+        return runCatching { compiled?.evaluate() }.getOrNull()
     }
 }
 
 class LazyPlaceholderTranslationExpressionHandler(
     private val placeholderParser: PlaceholderParser
 ) : ExpressionHandler {
-    private val cache: Cache<String, CompiledExpression> = Caffeine.newBuilder()
+    private val cache: Cache<String, CompiledExpression?> = Caffeine.newBuilder()
         .build()
 
-    override fun evaluate(expression: String, context: PlaceholderContext): Double {
+    override fun evaluate(expression: String, context: PlaceholderContext): Double? {
         val placeholders = PlaceholderManager.findPlaceholdersIn(expression)
 
         val placeholderValues = placeholderParser.parseIndividualPlaceholders(placeholders, context)
@@ -107,9 +107,9 @@ class LazyPlaceholderTranslationExpressionHandler(
             val env = EvaluationEnvironment()
             env.setVariableNames(*placeholders.toTypedArray())
             env.addFunctions(min, max)
-            runCatching { Crunch.compileExpression(expression, env) }.getOrDefault(goToZero)
+            runCatching { Crunch.compileExpression(expression, env) }.getOrNull()
         }
 
-        return runCatching { compiled.evaluate(*placeholderValues) }.getOrDefault(0.0)
+        return runCatching { compiled?.evaluate(*placeholderValues) }.getOrNull()
     }
 }

gradle.properties

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

settings.gradle.kts

@@ -18,6 +18,7 @@ include(":eco-core:core-nms:v1_18_R2")
 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-proxy")
 include(":eco-core:core-plugin")
 include(":eco-core:core-backend")