Fixed updatechecker formatting

# Conflicts:
#	gradle.properties

build.gradle.kts

@@ -64,6 +64,9 @@ allprojects {
 
         // MythicMobs
         maven("https://mvn.lumine.io/repository/maven-public/")
+
+        // Crunch
+        maven("https://redempt.dev")
     }
 
     dependencies {
@@ -91,12 +94,14 @@ allprojects {
         exclude(group = "org.spongepowered", module = "configurate-hocon")
         exclude(group = "com.darkblade12", module = "particleeffect")
         exclude(group = "com.github.cryptomorin", module = "XSeries")
+        exclude(group = "org.apache.commons", module = "commons-lang3")
     }
 
     tasks {
         shadowJar {
             relocate("org.bstats", "com.willfp.eco.shaded.bstats")
             relocate("net.kyori.adventure.text.minimessage", "com.willfp.eco.shaded.minimessage")
+            relocate("redempt.crunch", "com.willfp.eco.shaded.crunch")
         }
 
         compileJava {

eco-api/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     compileOnly 'org.apache.maven:maven-artifact:3.8.1'
     compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.1-SNAPSHOT'
     compileOnly 'com.google.code.gson:gson:2.8.8'
+    compileOnly 'org.apache.commons:commons-lang3:3.0'
 }
 
 java {

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

@@ -327,7 +327,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
                 DefaultArtifactVersion mostRecentVersion = new DefaultArtifactVersion(version);
                 if (!(currentVersion.compareTo(mostRecentVersion) > 0 || currentVersion.equals(mostRecentVersion))) {
                     this.outdated = true;
-                    this.getLogger().warning("&c " + this.getName() + " is out of date! (Version " + this.getDescription().getVersion() + ")");
+                    this.getLogger().warning("&c" + this.getName() + " is out of date! (Version " + this.getDescription().getVersion() + ")");
                     this.getLogger().warning("&cThe newest version is &f" + version);
                     this.getLogger().warning("&cDownload the new version!");
                 }

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

@@ -2,7 +2,9 @@ package com.willfp.eco.core.config.interfaces;
 
 import com.willfp.eco.core.config.ConfigType;
 import com.willfp.eco.core.config.TransientConfig;
+import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.StringUtils;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -108,6 +110,29 @@ public interface Config extends Cloneable {
         return Objects.requireNonNullElse(getIntOrNull(path), def);
     }
 
+    /**
+     * Get a decimal value via a mathematical expression.
+     *
+     * @param path The key to fetch the value from.
+     * @return The computed value, or 0 if not found or invalid.
+     */
+    default int getIntFromExpression(@NotNull String path) {
+        return getIntFromExpression(path, null);
+    }
+
+    /**
+     * Get a decimal value via a mathematical expression.
+     *
+     * @param path   The key to fetch the value from.
+     * @param player The player to evaluate placeholders with respect to.
+     * @return The computed value, or 0 if not found or invalid.
+     */
+    default int getIntFromExpression(@NotNull String path,
+                                     @Nullable Player player) {
+        return Double.valueOf(getDoubleFromExpression(path, player)).intValue();
+    }
+
+
     /**
      * Get an integer from config.
      *
@@ -519,6 +544,28 @@ public interface Config extends Cloneable {
         return Objects.requireNonNullElse(getDoubleOrNull(path), 0.0);
     }
 
+    /**
+     * Get a decimal value via a mathematical expression.
+     *
+     * @param path The key to fetch the value from.
+     * @return The computed value, or 0 if not found or invalid.
+     */
+    default double getDoubleFromExpression(@NotNull String path) {
+        return getDoubleFromExpression(path, null);
+    }
+
+    /**
+     * Get a decimal value via a mathematical expression.
+     *
+     * @param path   The key to fetch the value from.
+     * @param player The player to evaluate placeholders with respect to.
+     * @return The computed value, or 0 if not found or invalid.
+     */
+    default double getDoubleFromExpression(@NotNull String path,
+                                           @Nullable Player player) {
+        return NumberUtils.evaluateExpression(this.getString(path), player);
+    }
+
     /**
      * Get a decimal from config.
      *

eco-api/src/main/java/com/willfp/eco/core/entities/CustomEntity.java

@@ -1,6 +1,6 @@
 package com.willfp.eco.core.entities;
 
-import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang.Validate;
 import org.bukkit.Location;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Entity;

eco-api/src/main/java/com/willfp/eco/core/entities/impl/EmptyTestableEntity.java

@@ -2,7 +2,7 @@ package com.willfp.eco.core.entities.impl;
 
 import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.entities.TestableEntity;
-import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang.Validate;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.jetbrains.annotations.NotNull;

eco-api/src/main/java/com/willfp/eco/core/entities/impl/ModifiedTestableEntity.java

@@ -1,7 +1,7 @@
 package com.willfp.eco.core.entities.impl;
 
 import com.willfp.eco.core.entities.TestableEntity;
-import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang.Validate;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.jetbrains.annotations.NotNull;

eco-api/src/main/java/com/willfp/eco/core/entities/impl/SimpleTestableEntity.java

@@ -1,7 +1,7 @@
 package com.willfp.eco.core.entities.impl;
 
 import com.willfp.eco.core.entities.TestableEntity;
-import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang.Validate;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;

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

@@ -5,6 +5,9 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Wrapper class for placeholder integrations.
  */
@@ -24,4 +27,14 @@ public interface PlaceholderIntegration extends Integration {
      */
     String translate(@NotNull String text,
                      @Nullable Player player);
+
+    /**
+     * Find all placeholders in a given text.
+     *
+     * @param text The text.
+     * @return The placeholders.
+     */
+    default List<String> findPlaceholdersIn(@NotNull String text) {
+        return new ArrayList<>();
+    }
 }

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

@@ -4,8 +4,10 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -80,6 +82,21 @@ public final class PlaceholderManager {
         return processed;
     }
 
+    /**
+     * Find all placeholders in a given text.
+     *
+     * @param text The text.
+     * @return The placeholders.
+     */
+    public static List<String> findPlaceholdersIn(@NotNull final String text) {
+        List<String> found = new ArrayList<>();
+        for (PlaceholderIntegration integration : REGISTERED_INTEGRATIONS) {
+            found.addAll(integration.findPlaceholdersIn(text));
+        }
+
+        return found;
+    }
+
     private PlaceholderManager() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

eco-api/src/main/java/com/willfp/eco/core/recipe/recipes/ShapedCraftingRecipe.java

@@ -111,7 +111,7 @@ public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> imple
                 List<String> lore = meta.hasLore() ? meta.getLore() : new ArrayList<>();
                 assert lore != null;
                 lore.add("");
-                String add = Eco.getHandler().getEcoPlugin().getLangYml().getString("multiple-in-craft");
+                String add = Eco.getHandler().getEcoPlugin().getLangYml().getFormattedString("multiple-in-craft");
                 add = add.replace("%amount%", String.valueOf(item.getAmount()));
                 lore.add(add);
                 meta.setLore(lore);

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

@@ -1,11 +1,16 @@
 package com.willfp.eco.util;
 
+import org.apache.commons.lang.Validate;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.text.DecimalFormat;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.function.BiFunction;
 
 /**
  * Utilities / API methods for numbers.
@@ -16,6 +21,11 @@ public final class NumberUtils {
      */
     private static final double[] SIN_LOOKUP = new double[65536];
 
+    /**
+     * Crunch handler.
+     */
+    private static BiFunction<String, Player, Double> crunch = null;
+
     /**
      * Set of roman numerals to look up.
      */
@@ -83,7 +93,9 @@ public final class NumberUtils {
      * @param toChange The value to test.
      * @param limit    The maximum.
      * @return The new value.
+     * @deprecated Pointless method.
      */
+    @Deprecated(since = "6.19.0")
     public static int equalIfOver(final int toChange,
                                   final int limit) {
         return Math.min(toChange, limit);
@@ -95,7 +107,9 @@ public final class NumberUtils {
      * @param toChange The value to test.
      * @param limit    The maximum.
      * @return The new value.
+     * @deprecated Pointless method.
      */
+    @Deprecated(since = "6.19.0")
     public static double equalIfOver(final double toChange,
                                      final double limit) {
         return Math.min(toChange, limit);
@@ -218,6 +232,39 @@ public final class NumberUtils {
         return formatted.endsWith("00") ? String.valueOf((int) toFormat) : formatted;
     }
 
+    /**
+     * Evaluate an expression.
+     *
+     * @param expression The expression.
+     * @return The value of the expression, or zero if invalid.
+     */
+    public static double evaluateExpression(@NotNull final String expression) {
+        return evaluateExpression(expression, null);
+    }
+
+    /**
+     * Evaluate an expression with respect to a player (for placeholders).
+     *
+     * @param expression The expression.
+     * @param player     The player.
+     * @return The value of the expression, or zero if invalid.
+     */
+    public static double evaluateExpression(@NotNull final String expression,
+                                            @Nullable final Player player) {
+        return crunch.apply(expression, player);
+    }
+
+    /**
+     * Init crunch handler.
+     *
+     * @param handler The handler.
+     */
+    @ApiStatus.Internal
+    public static void initCrunch(@NotNull final BiFunction<String, Player, Double> handler) {
+        Validate.isTrue(crunch == null, "Already initialized!");
+        crunch = handler;
+    }
+
     private NumberUtils() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

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

@@ -24,11 +24,7 @@ open class EcoLoadableJSONConfig(
     private val name: String = "$configName.json"
 
     fun reloadFromFile() {
-        try {
-            init(configFile)
-        } catch (e: IOException) {
-            e.printStackTrace()
-        }
+        runCatching { init(configFile) }.onFailure { it.printStackTrace() }
     }
 
     final override fun createFile() {
@@ -94,11 +90,7 @@ open class EcoLoadableJSONConfig(
             createFile()
         }
         configFile = File(directory, name)
-        try {
-            init(configFile)
-        } catch (e: IOException) {
-            e.printStackTrace()
-        }
+        init(configFile)
         plugin.configHandler.addConfig(this)
     }
 }

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

@@ -1,10 +1,8 @@
 package com.willfp.eco.internal.config.json
 
 import com.willfp.eco.core.PluginLike
-import org.bukkit.configuration.InvalidConfigurationException
 import org.bukkit.configuration.file.YamlConfiguration
 import java.io.BufferedReader
-import java.io.IOException
 import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets
 
@@ -21,34 +19,28 @@ open class EcoUpdatableJSONConfig(
 
     fun update() {
         super.clearCache()
-        try {
-            this.init(configFile)
-            val newConfig = configInJar
-            if (newConfig.getKeys(true) == this.getKeys(true)) {
-                return
-            }
-            newConfig.getKeys(true).forEach { key: String ->
-                if (!this.getKeys(true).contains(key)) {
-                    if (updateBlacklist.stream().noneMatch { s: String -> key.contains(s) }) {
-                        this.set(key, newConfig[key])
-                    }
-                }
-            }
-            if (removeUnused) {
-                this.getKeys(true).forEach { s ->
-                    if (!newConfig.getKeys(true).contains(s)) {
-                        if (updateBlacklist.stream().noneMatch(s::contains)) {
-                            this.set(s, null)
-                        }
-                    }
-                }
-            }
-            this.save()
-        } catch (e: IOException) {
-            e.printStackTrace()
-        } catch (e: InvalidConfigurationException) {
-            e.printStackTrace()
+        this.init(configFile)
+        val newConfig = configInJar
+        if (newConfig.getKeys(true) == this.getKeys(true)) {
+            return
         }
+        newConfig.getKeys(true).forEach { key: String ->
+            if (!this.getKeys(true).contains(key)) {
+                if (updateBlacklist.stream().noneMatch { s: String -> key.contains(s) }) {
+                    this.set(key, newConfig[key])
+                }
+            }
+        }
+        if (removeUnused) {
+            this.getKeys(true).forEach { s ->
+                if (!newConfig.getKeys(true).contains(s)) {
+                    if (updateBlacklist.stream().noneMatch(s::contains)) {
+                        this.set(s, null)
+                    }
+                }
+            }
+        }
+        this.save()
     }
 
     private val configInJar: YamlConfiguration
@@ -56,13 +48,7 @@ open class EcoUpdatableJSONConfig(
             val newIn = this.source.getResourceAsStream(resourcePath) ?: throw NullPointerException("$name is null?")
             val reader = BufferedReader(InputStreamReader(newIn, StandardCharsets.UTF_8))
             val newConfig = YamlConfiguration()
-            try {
-                newConfig.load(reader)
-            } catch (e: IOException) {
-                e.printStackTrace()
-            } catch (e: InvalidConfigurationException) {
-                e.printStackTrace()
-            }
+            newConfig.load(reader)
             return newConfig
         }
 

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

@@ -24,15 +24,15 @@ class EcoConfigHandler(
 
     override fun callUpdate() {
         for (method in reflections.getMethodsAnnotatedWith(ConfigUpdater::class.java)) {
-            try {
+            kotlin.runCatching {
                 when (method.parameterCount) {
                     0 -> method.invoke(null)
                     1 -> method.invoke(null, this.plugin)
                     else -> throw InvalidUpdateMethodException("Update method must have 0 parameters or a plugin parameter.")
                 }
-            } catch (e: ReflectiveOperationException) {
-                e.printStackTrace()
-                throw InvalidUpdateMethodException("Update method generated an exception")
+            }.onFailure {
+                it.printStackTrace()
+                plugin.logger.severe("Update method ${method.toGenericString()} generated an exception")
             }
         }
     }

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

@@ -5,7 +5,6 @@ package com.willfp.eco.internal.config.yaml
 import com.willfp.eco.core.PluginLike
 import com.willfp.eco.core.config.interfaces.LoadableConfig
 import com.willfp.eco.core.config.interfaces.WrappedYamlConfiguration
-import org.bukkit.configuration.InvalidConfigurationException
 import org.bukkit.configuration.file.YamlConfiguration
 import java.io.File
 import java.io.FileOutputStream
@@ -23,13 +22,7 @@ open class EcoLoadableYamlConfig(
     private val name: String = "$configName.yml"
 
     fun reloadFromFile() {
-        try {
-            handle.load(getConfigFile())
-        } catch (e: IOException) {
-            e.printStackTrace()
-        } catch (e: InvalidConfigurationException) {
-            e.printStackTrace()
-        }
+        handle.load(getConfigFile())
     }
 
     final override fun createFile() {

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

@@ -1,10 +1,8 @@
 package com.willfp.eco.internal.config.yaml
 
 import com.willfp.eco.core.PluginLike
-import org.bukkit.configuration.InvalidConfigurationException
 import org.bukkit.configuration.file.YamlConfiguration
 import java.io.BufferedReader
-import java.io.IOException
 import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets
 
@@ -21,34 +19,28 @@ class EcoUpdatableYamlConfig(
 
     fun update() {
         super.clearCache()
-        try {
-            this.handle.load(configFile)
-            val newConfig = configInJar
-            if (newConfig.getKeys(true) == this.handle.getKeys(true)) {
-                return
-            }
-            newConfig.getKeys(true).forEach { key ->
-                if (!this.handle.getKeys(true).contains(key)) {
-                    if (updateBlacklist.stream().noneMatch { key.contains(it) }) {
-                        this.handle.set(key, newConfig[key])
-                    }
-                }
-            }
-            if (removeUnused) {
-                this.handle.getKeys(true).forEach { s ->
-                    if (!newConfig.getKeys(true).contains(s)) {
-                        if (updateBlacklist.stream().noneMatch(s::contains)) {
-                            this.handle.set(s, null)
-                        }
-                    }
-                }
-            }
-            this.handle.save(configFile)
-        } catch (e: IOException) {
-            e.printStackTrace()
-        } catch (e: InvalidConfigurationException) {
-            e.printStackTrace()
+        this.handle.load(configFile)
+        val newConfig = configInJar
+        if (newConfig.getKeys(true) == this.handle.getKeys(true)) {
+            return
         }
+        newConfig.getKeys(true).forEach { key ->
+            if (!this.handle.getKeys(true).contains(key)) {
+                if (updateBlacklist.stream().noneMatch { key.contains(it) }) {
+                    this.handle.set(key, newConfig[key])
+                }
+            }
+        }
+        if (removeUnused) {
+            this.handle.getKeys(true).forEach { s ->
+                if (!newConfig.getKeys(true).contains(s)) {
+                    if (updateBlacklist.stream().noneMatch(s::contains)) {
+                        this.handle.set(s, null)
+                    }
+                }
+            }
+        }
+        this.handle.save(configFile)
     }
 
     private val configInJar: YamlConfiguration
@@ -56,13 +48,7 @@ class EcoUpdatableYamlConfig(
             val newIn = source.getResourceAsStream(resourcePath) ?: throw NullPointerException("$name is null?")
             val reader = BufferedReader(InputStreamReader(newIn, StandardCharsets.UTF_8))
             val newConfig = YamlConfiguration()
-            try {
-                newConfig.load(reader)
-            } catch (e: IOException) {
-                e.printStackTrace()
-            } catch (e: InvalidConfigurationException) {
-                e.printStackTrace()
-            }
+            newConfig.load(reader)
             return newConfig
         }
 

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/extensions/EcoExtensionLoader.kt

@@ -10,8 +10,6 @@ import com.willfp.eco.core.extensions.MalformedExtensionException
 import org.bukkit.configuration.file.YamlConfiguration
 import java.io.File
 import java.io.InputStreamReader
-import java.net.MalformedURLException
-import java.net.URL
 import java.net.URLClassLoader
 
 class EcoExtensionLoader(
@@ -32,9 +30,7 @@ class EcoExtensionLoader(
                 continue
             }
 
-            try {
-                loadExtension(extensionJar)
-            } catch (e: MalformedExtensionException) {
+            runCatching { loadExtension(extensionJar) }.onFailure {
                 this.plugin.logger.warning(extensionJar.name + " caused an error!")
             }
         }
@@ -42,13 +38,7 @@ class EcoExtensionLoader(
 
     @Throws(MalformedExtensionException::class)
     private fun loadExtension(extensionJar: File) {
-        lateinit var url: URL
-
-        try {
-            url = extensionJar.toURI().toURL()
-        } catch (e: MalformedURLException) {
-            e.printStackTrace()
-        }
+        val url = extensionJar.toURI().toURL()
 
         val classLoader = URLClassLoader(arrayOf(url), this.plugin::class.java.classLoader)
         val ymlIn = classLoader.getResourceAsStream("extension.yml")

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/integrations/PlaceholderIntegrationPAPI.kt

@@ -49,4 +49,14 @@ class PlaceholderIntegrationPAPI(private val plugin: EcoPlugin) : PlaceholderExp
     ): String {
         return PlaceholderAPI.setPlaceholders(player, text)
     }
+
+    override fun findPlaceholdersIn(text: String): MutableList<String> {
+        val placeholders = mutableListOf<String>()
+        val matcher = PlaceholderAPI.getPlaceholderPattern().matcher(text)
+        while (matcher.find()) {
+            placeholders.add(matcher.group())
+        }
+
+        return placeholders
+    }
 }

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

@@ -11,12 +11,7 @@ class ArgParserFlag : LookupArgParser {
         val flags = mutableSetOf<ItemFlag>()
 
         for (arg in args) {
-            val flag = try {
-                ItemFlag.valueOf(arg.uppercase())
-            } catch (e: Exception) {
-                null
-            } ?: continue
-
+            val flag = kotlin.runCatching { ItemFlag.valueOf(arg.uppercase()) }.getOrNull() ?: continue
             flags.add(flag)
         }
 

eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/VillagerTrade.kt

@@ -1,4 +1,5 @@
 package com.willfp.eco.internal.spigot.proxy.v1_16_R3
+
 import com.willfp.eco.core.display.Display
 import com.willfp.eco.internal.spigot.proxy.VillagerTradeProxy
 import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftMerchantRecipe
@@ -30,21 +31,11 @@ class VillagerTrade : VillagerTradeProxy {
     }
 
     private fun getHandle(recipe: CraftMerchantRecipe): net.minecraft.server.v1_16_R3.MerchantRecipe {
-        try {
-            return handle[recipe] as net.minecraft.server.v1_16_R3.MerchantRecipe
-        } catch (e: IllegalAccessException) {
-            e.printStackTrace()
-        }
-        throw IllegalArgumentException("Not CMR")
+        return handle[recipe] as net.minecraft.server.v1_16_R3.MerchantRecipe
     }
 
     init {
-        try {
-            handle = CraftMerchantRecipe::class.java.getDeclaredField("handle")
-            handle.isAccessible = true
-        } catch (e: NoSuchFieldException) {
-            e.printStackTrace()
-            throw RuntimeException("Error!")
-        }
+        handle = CraftMerchantRecipe::class.java.getDeclaredField("handle")
+        handle.isAccessible = true
     }
 }

eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/fast/NMSFastItemStack.kt

@@ -24,9 +24,9 @@ class NMSFastItemStack(itemStack: org.bukkit.inventory.ItemStack) : EcoFastItemS
 
     override fun getEnchantmentsOnItem(checkStored: Boolean): Map<Enchantment, Int> {
         val enchantmentNBT =
-            if (checkStored && handle.item === Items.ENCHANTED_BOOK) EnchantedBookItem.getEnchantments(
+            if (checkStored && handle.getItem() === Items.ENCHANTED_BOOK) EnchantedBookItem.getEnchantments(
                 handle
-            ) else handle.enchantmentTags
+            ) else handle.getEnchantmentTags()
         val foundEnchantments: MutableMap<Enchantment, Int> = HashMap()
         for (base in enchantmentNBT) {
             val compound = base as CompoundTag
@@ -45,9 +45,9 @@ class NMSFastItemStack(itemStack: org.bukkit.inventory.ItemStack) : EcoFastItemS
         checkStored: Boolean
     ): Int {
         val enchantmentNBT =
-            if (checkStored && handle.item === Items.ENCHANTED_BOOK) EnchantedBookItem.getEnchantments(
+            if (checkStored && handle.getItem() === Items.ENCHANTED_BOOK) EnchantedBookItem.getEnchantments(
                 handle
-            ) else handle.enchantmentTags
+            ) else handle.getEnchantmentTags()
         for (base in enchantmentNBT) {
             val compound = base as CompoundTag
             val key = compound.getString("id")
@@ -152,16 +152,16 @@ class NMSFastItemStack(itemStack: org.bukkit.inventory.ItemStack) : EcoFastItemS
 
     private var flagBits: Int
         get() =
-            if (handle.hasTag() && handle.tag!!.contains(
+            if (handle.hasTag() && handle.getTag()!!.contains(
                     "HideFlags",
                     99
                 )
-            ) handle.tag!!.getInt("HideFlags") else 0
+            ) handle.getTag()!!.getInt("HideFlags") else 0
         set(value) =
-            handle.orCreateTag.putInt("HideFlags", value)
+            handle.getOrCreateTag().putInt("HideFlags", value)
 
     override fun getRepairCost(): Int {
-        return handle.baseRepairCost
+        return handle.getBaseRepairCost()
     }
 
     override fun setRepairCost(cost: Int) {
@@ -177,7 +177,7 @@ class NMSFastItemStack(itemStack: org.bukkit.inventory.ItemStack) : EcoFastItemS
     }
 
     override fun hashCode(): Int {
-        return handle.tag?.hashCode() ?: (0b00010101 * 31 + Item.getId(handle.getItem()))
+        return handle.getTag()?.hashCode() ?: (0b00010101 * 31 + Item.getId(handle.getItem()))
     }
 
     private fun apply() {

eco-core/core-plugin/build.gradle

@@ -5,6 +5,7 @@ dependencies {
     implementation('net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT') {
         exclude group: 'net.kyori', module: 'adventure-api'
     }
+    implementation 'com.github.Redempt:Crunch:1.0'
     compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
     compileOnly 'org.apache.maven:maven-artifact:3.8.1'
     compileOnly 'com.google.code.gson:gson:2.8.8'

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

@@ -74,7 +74,6 @@ import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatVulcan
 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefBentoBox
 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCombatLogXV10
 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCombatLogXV11
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCrashClaim
 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefDeluxeCombat
 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefFactionsUUID
 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefGriefPrevention
@@ -95,12 +94,14 @@ import com.willfp.eco.internal.spigot.integrations.hologram.HologramHolographicD
 import com.willfp.eco.internal.spigot.integrations.mcmmo.McmmoIntegrationImpl
 import com.willfp.eco.internal.spigot.integrations.multiverseinventories.MultiverseInventoriesIntegration
 import com.willfp.eco.internal.spigot.integrations.shop.ShopShopGuiPlus
+import com.willfp.eco.internal.spigot.math.evaluateExpression
 import com.willfp.eco.internal.spigot.proxy.BlockBreakProxy
 import com.willfp.eco.internal.spigot.proxy.FastItemStackFactoryProxy
 import com.willfp.eco.internal.spigot.proxy.SkullProxy
 import com.willfp.eco.internal.spigot.proxy.TPSProxy
 import com.willfp.eco.internal.spigot.recipes.ShapedRecipeListener
 import com.willfp.eco.util.BlockUtils
+import com.willfp.eco.util.NumberUtils
 import com.willfp.eco.util.ServerUtils
 import com.willfp.eco.util.SkullUtils
 import net.kyori.adventure.platform.bukkit.BukkitAudiences
@@ -155,6 +156,8 @@ abstract class EcoSpigotPlugin : EcoPlugin(
         val tpsProxy = getProxy(TPSProxy::class.java)
         ServerUtils.initialize { tpsProxy.getTPS() }
 
+        NumberUtils.initCrunch { exp, player -> evaluateExpression(exp, player) }
+
         postInit()
     }
 
@@ -213,7 +216,7 @@ abstract class EcoSpigotPlugin : EcoPlugin(
             IntegrationLoader("Towny") { AntigriefManager.register(AntigriefTowny()) },
             IntegrationLoader("Lands") { AntigriefManager.register(AntigriefLands(this)) },
             IntegrationLoader("Kingdoms") { AntigriefManager.register(AntigriefKingdoms()) },
-            IntegrationLoader("CrashClaim") { AntigriefManager.register(AntigriefCrashClaim()) },
+            //IntegrationLoader("CrashClaim") { AntigriefManager.register(AntigriefCrashClaim()) },
             IntegrationLoader("CombatLogX") {
                 val pluginManager = Bukkit.getPluginManager()
                 val combatLogXPlugin = pluginManager.getPlugin("CombatLogX") ?: return@IntegrationLoader
@@ -235,7 +238,7 @@ abstract class EcoSpigotPlugin : EcoPlugin(
             IntegrationLoader("Alice") { AnticheatManager.register(this, AnticheatAlice()) },
 
             // Custom Entities
-            IntegrationLoader("MythicMobs") { CustomEntitiesManager.register(CustomEntitiesMythicMobs())},
+            IntegrationLoader("MythicMobs") { CustomEntitiesManager.register(CustomEntitiesMythicMobs()) },
 
             // Custom Items
             IntegrationLoader("Oraxen") { CustomItemsManager.register(CustomItemsOraxen()) },

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MySQLDataHandler.kt

@@ -55,7 +55,7 @@ class MySQLDataHandler(
         }
 
         // Get Exposed to shut the hell up
-        try {
+        runCatching {
             exposedLogger::class.java.getDeclaredField("logger").apply { isAccessible = true }
                 .apply {
                     get(exposedLogger).apply {
@@ -63,8 +63,6 @@ class MySQLDataHandler(
                             .invoke(this, Level.OFF)
                     }
                 }
-        } catch (e: Exception) {
-            Eco.getHandler().ecoPlugin.logger.warning("Failed to silence Exposed logger! You might get some console spam")
         }
     }
 

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

@@ -8,7 +8,6 @@ import com.willfp.eco.core.AbstractPacketAdapter
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.internal.spigot.proxy.AutoCraftProxy
 import org.bukkit.entity.Player
-import java.lang.reflect.InvocationTargetException
 
 class PacketAutoRecipe(plugin: EcoPlugin) : AbstractPacketAdapter(plugin, PacketType.Play.Server.AUTO_RECIPE, false) {
     override fun onSend(
@@ -27,10 +26,6 @@ class PacketAutoRecipe(plugin: EcoPlugin) : AbstractPacketAdapter(plugin, Packet
         getPlugin().getProxy(AutoCraftProxy::class.java).modifyPacket(packet.handle)
         val newAutoRecipe = PacketContainer(PacketType.Play.Server.AUTO_RECIPE)
         newAutoRecipe.minecraftKeys.write(0, packet.minecraftKeys.read(0))
-        try {
-            ProtocolLibrary.getProtocolManager().sendServerPacket(player, newAutoRecipe)
-        } catch (e: InvocationTargetException) {
-            e.printStackTrace()
-        }
+        ProtocolLibrary.getProtocolManager().sendServerPacket(player, newAutoRecipe)
     }
 }

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

@@ -47,34 +47,42 @@ class PacketWindowItems(plugin: EcoPlugin) : AbstractPacketAdapter(plugin, Packe
         handleRateLimit(player)
 
         if (usingAsync(player)) {
-            val newPacket = packet.shallowClone()
-
-            fun modifyAndSend(itemStacks: MutableList<ItemStack>, windowId: Int, player: Player) {
-                modifyWindowItems(itemStacks, windowId, player)
-
-                newPacket.itemListModifier.write(0, itemStacks)
-
-                ignorePacketList.add(player.name)
-
-                ProtocolLibrary.getProtocolManager().sendServerPacket(player, newPacket)
-            }
-
             executor.execute {
-                try {
-                    modifyAndSend(itemStacks, windowId, player)
-                } catch (e: Exception) {
+                runCatching {
+                    modifyAndSend(packet.shallowClone(), itemStacks, windowId, player)
+                }.onFailure {
                     if (this.getPlugin().configYml.getBool("async-display.log-errors")) {
-                        this.getPlugin().logger.warning("Error happened in async processing! Disable async display (/plugins/eco/config.yml)" +
-                                "if this is a frequent issue. (Remember to disable ratelimit and emergency too)")
-                    }
-
-                    this.getPlugin().scheduler.run {
-                        modifyAndSend(itemStacks, windowId, player)
+                        this.getPlugin().logger.warning(
+                            "Error happened in async processing! Disable async display (/plugins/eco/config.yml)" +
+                                    "if this is a frequent issue. (Remember to disable ratelimit and emergency too)"
+                        )
                     }
                 }
             }
         } else {
-            packet.itemListModifier.write(0, modifyWindowItems(itemStacks, windowId, player))
+            modifyPacket(packet, itemStacks, windowId, player)
+        }
+    }
+
+    private fun modifyPacket(
+        packet: PacketContainer,
+        itemStacks: MutableList<ItemStack>,
+        windowId: Int,
+        player: Player
+    ) {
+        packet.itemListModifier.write(0, modifyWindowItems(itemStacks, windowId, player))
+    }
+
+    private fun modifyAndSend(
+        packet: PacketContainer,
+        itemStacks: MutableList<ItemStack>,
+        windowId: Int,
+        player: Player
+    ) {
+        modifyPacket(packet, itemStacks, windowId, player)
+        ignorePacketList.add(player.name)
+        this.getPlugin().scheduler.run {
+            ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet)
         }
     }
 

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

@@ -2,8 +2,8 @@ package com.willfp.eco.internal.spigot.integrations.customentities
 
 import com.willfp.eco.core.entities.CustomEntity
 import com.willfp.eco.core.integrations.customentities.CustomEntitiesWrapper
-import com.willfp.eco.util.NamespacedKeyUtils
 import io.lumine.xikage.mythicmobs.MythicMobs
+import org.bukkit.NamespacedKey
 
 class CustomEntitiesMythicMobs : CustomEntitiesWrapper {
     override fun registerAllEntities() {
@@ -11,7 +11,8 @@ class CustomEntitiesMythicMobs : CustomEntitiesWrapper {
         val api = MythicMobs.inst().apiHelper
 
         for (id in mobManager.mobNames) {
-            val key = NamespacedKeyUtils.create("mythicmobs", id.lowercase())
+            val key = NamespacedKey.fromString("mythicmobs:${id.lowercase()}")
+            key ?: continue
             CustomEntity(
                 key,
                 {

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

@@ -0,0 +1,38 @@
+package com.willfp.eco.internal.spigot.math
+
+import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
+import org.bukkit.entity.Player
+import redempt.crunch.CompiledExpression
+import redempt.crunch.Crunch
+import redempt.crunch.data.FastNumberParsing
+import redempt.crunch.functional.EvaluationEnvironment
+
+private val cache = mutableMapOf<String, CompiledExpression>()
+private val goToZero = Crunch.compileExpression("0")
+
+fun evaluateExpression(expression: String, player: Player?): Double {
+    val placeholderValues = PlaceholderManager.findPlaceholdersIn(expression)
+        .map { PlaceholderManager.getResult(player, expression) }
+        .map { runCatching { FastNumberParsing.parseDouble(it) }.getOrDefault(0.0) }
+        .toDoubleArray()
+
+    val compiled = generateExpression(expression)
+    return runCatching { compiled.evaluate(*placeholderValues) }.getOrDefault(0.0)
+}
+
+private fun generateExpression(expression: String): CompiledExpression {
+    val cached = cache[expression]
+
+    if (cached != null) {
+        return cached
+    }
+
+    val placeholders = PlaceholderManager.findPlaceholdersIn(expression)
+
+    val env = EvaluationEnvironment()
+    env.setVariableNames(*placeholders.toTypedArray())
+
+    val compiled = runCatching { Crunch.compileExpression(expression, env) }.getOrDefault(goToZero)
+    cache[expression] = compiled
+    return compiled
+}

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

@@ -53,4 +53,5 @@ libraries:
   - 'org.jetbrains.exposed:exposed-jdbc:0.36.2'
   - 'mysql:mysql-connector-java:8.0.25'
   - 'com.google.guava:guava:31.0.1-jre'
-  - 'com.zaxxer:HikariCP:5.0.0'
+  - 'com.zaxxer:HikariCP:5.0.0'
+  - 'org.apache.commons:commons-lang3:3.0'

gradle.properties

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