Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt
#	eco-core/core-plugin/src/main/resources/config.yml

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

@@ -597,7 +597,10 @@ default double getDoubleFromExpression(@NotNull String path,
      */
     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 static ItemStack display(@NotNull final ItemStack itemStack,
 
         Display.revert(itemStack);
 
-        if (!itemStack.hasItemMeta()) {
-            return itemStack;
+        if (!Eco.get().getEcoPlugin().getConfigYml().getBool("display-without-meta")) {
+            if (!itemStack.hasItemMeta()) {
+                return itemStack;
+            }
         }
 
         ItemStack original = itemStack.clone();

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.injections = ConcurrentHashMap(injections)
+        this.init(values, 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-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt

@@ -389,7 +389,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
     override fun loadListeners(): List<Listener> {
         val listeners = mutableListOf(
             ArmorListener(),
-            EntityDeathByEntityListeners(this),
+            EntityDeathByEntityListeners,
             CraftingRecipeListener(this),
             StackedRecipeListener(this),
             GUIListener(this),

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

@@ -0,0 +1,27 @@
+package com.willfp.eco.internal.spigot.eventlisteners
+
+import com.willfp.eco.core.events.EntityDeathByEntityEvent
+import org.bukkit.Bukkit
+import org.bukkit.event.EventHandler
+import org.bukkit.event.EventPriority
+import org.bukkit.event.Listener
+import org.bukkit.event.entity.EntityDamageByEntityEvent
+import org.bukkit.event.entity.EntityDeathEvent
+
+object EntityDeathByEntityListener: Listener {
+    @EventHandler(priority = EventPriority.HIGH)
+    fun onEntityDeath(event: EntityDeathEvent) {
+        val damageEvent = event.entity.lastDamageCause as? EntityDamageByEntityEvent ?: return
+        val killer = damageEvent.damager
+
+        Bukkit.getPluginManager().callEvent(
+            EntityDeathByEntityEvent(
+                event.entity,
+                killer,
+                event.drops,
+                event.droppedExp,
+                event
+            )
+        )
+    }
+}

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

@@ -98,7 +98,12 @@ math-cache-ttl: 200
 # 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 make sure its recipes are not affected by other plugins on PrepareCraftItemEvent
 # Turn this on if you use ItemsAdder/Oraxen/Other 3d party plugins custom items in eco recipes
 # And having issues with the item being invisible when you are trying to craft ir.
-enforce-preparing-recipes: false
+enforce-preparing-recipes: false

gradle.properties

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