Suppression

This reverts commit 5cfb87e0

build.gradle.kts

@@ -81,9 +81,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()) {
-            return itemStack;
+        if (!Eco.get().getEcoPlugin().getConfigYml().getBool("display-without-meta")) {
+            if (!itemStack.hasItemMeta()) {
+                return itemStack;
+            }
         }
 
         ItemStack original = itemStack.clone();

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.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-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-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.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.*
 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
@@ -216,6 +217,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
-        val land = Land.getLand(block) ?: return true
-        val permission = if (land.isNexusLand) {
-            StandardKingdomPermission.NEXUS_BUILD
-        } else StandardKingdomPermission.BUILD
-
-        return if (!kp.hasPermission(permission)) {
+        return BuildingProcessor(
+            player,
+            kp,
+            SimpleChunkLocation.of(block),
             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
-        if (!land.isClaimed) {
-            return true
-        }
-        val kingdom: Kingdom = land.kingdom
-        return kingdom.isMember(player)
+        return canBreakBlock(player, location.block)
     }
 
     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.4
 plugin-name = eco
 kotlin.code.style = official