Updated MythicMobs

This reverts commit 9e92ea6062.

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

@@ -2,6 +2,8 @@ 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.core.placeholder.PlaceholderInjectable;
+import com.willfp.eco.core.placeholder.StaticPlaceholder;
 import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.StringUtils;
 import org.bukkit.entity.Player;
@@ -9,6 +11,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -18,7 +21,7 @@ import java.util.Objects;
  * Contains all methods that must exist in yaml and json configurations.
  */
 @SuppressWarnings("unused")
-public interface Config extends Cloneable {
+public interface Config extends Cloneable, PlaceholderInjectable {
     /**
      * Clears cache.
      */
@@ -563,7 +566,7 @@ public interface Config extends Cloneable {
      */
     default double getDoubleFromExpression(@NotNull String path,
                                            @Nullable Player player) {
-        return NumberUtils.evaluateExpression(this.getString(path), player);
+        return NumberUtils.evaluateExpression(this.getString(path), player, this.getInjectedPlaceholders());
     }
 
     /**
@@ -629,4 +632,19 @@ public interface Config extends Cloneable {
      * @return The clone.
      */
     Config clone();
+
+    @Override
+    default void injectPlaceholders(@NotNull Iterable<StaticPlaceholder> placeholders) {
+        // Do nothing.
+    }
+
+    @Override
+    default List<StaticPlaceholder> getInjectedPlaceholders() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    default void clearInjectedPlaceholders() {
+        // Do nothing.
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java

@@ -2,6 +2,7 @@ package com.willfp.eco.core.config.wrapper;
 
 import com.willfp.eco.core.config.ConfigType;
 import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.placeholder.StaticPlaceholder;
 import com.willfp.eco.util.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -134,6 +135,26 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
         return handle.getType();
     }
 
+    @Override
+    public void injectPlaceholders(@NotNull final StaticPlaceholder... placeholders) {
+        handle.injectPlaceholders(placeholders);
+    }
+
+    @Override
+    public void injectPlaceholders(@NotNull final Iterable<StaticPlaceholder> placeholders) {
+        handle.injectPlaceholders(placeholders);
+    }
+
+    @Override
+    public List<StaticPlaceholder> getInjectedPlaceholders() {
+        return handle.getInjectedPlaceholders();
+    }
+
+    @Override
+    public void clearInjectedPlaceholders() {
+        handle.clearInjectedPlaceholders();
+    }
+
     /**
      * Get the handle.
      *

eco-api/src/main/java/com/willfp/eco/core/gui/menu/Menu.java

@@ -96,6 +96,13 @@ public interface Menu {
      */
     Set<NamespacedKey> getKeys(@NotNull Player player);
 
+    /**
+     * Re-render the menu for a player.
+     *
+     * @param player The player.
+     */
+    void refresh(@NotNull Player player);
+
     /**
      * Create a builder with a given amount of rows.
      *

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

@@ -1,6 +1,10 @@
 package com.willfp.eco.core.integrations.placeholder;
 
+import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.placeholder.Placeholder;
+import com.willfp.eco.core.placeholder.PlayerPlaceholder;
+import com.willfp.eco.core.placeholder.PlayerlessPlaceholder;
 import org.apache.commons.lang.Validate;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -10,10 +14,13 @@ import java.util.Objects;
 import java.util.function.Function;
 
 /**
- * A {@link PlaceholderEntry} is a placeholder in and of itself.
+ * A placeholder entry is a placeholder in and of itself.
  * <p>
  * It should be fairly straightforward.
+ *
+ * @deprecated Confusing functionality with inconsistent nullability and poor naming.
  */
+@Deprecated(since = "6.28.0", forRemoval = true)
 public class PlaceholderEntry {
     /**
      * The name of the placeholder, used in lookups.
@@ -140,7 +147,28 @@ public class PlaceholderEntry {
      * Register the placeholder.
      */
     public void register() {
-        PlaceholderManager.registerPlaceholder(this);
+        PlaceholderManager.registerPlaceholder(this.toModernPlaceholder());
+    }
+
+    /**
+     * Convert the placeholder to a modern placeholder.
+     *
+     * @return The placeholder.
+     */
+    Placeholder toModernPlaceholder() {
+        if (this.requiresPlayer) {
+            return new PlayerPlaceholder(
+                    Objects.requireNonNullElse(plugin, Eco.getHandler().getEcoPlugin()),
+                    identifier,
+                    function
+            );
+        } else {
+            return new PlayerlessPlaceholder(
+                    Objects.requireNonNullElse(plugin, Eco.getHandler().getEcoPlugin()),
+                    identifier,
+                    () -> function.apply(null)
+            );
+        }
     }
 
     @Override

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

@@ -4,11 +4,16 @@ import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.placeholder.Placeholder;
+import com.willfp.eco.core.placeholder.PlayerPlaceholder;
+import com.willfp.eco.core.placeholder.PlayerlessPlaceholder;
+import com.willfp.eco.core.placeholder.StaticPlaceholder;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -19,11 +24,12 @@ import java.util.concurrent.TimeUnit;
 /**
  * Class to handle placeholder integrations.
  */
+@SuppressWarnings("removal")
 public final class PlaceholderManager {
     /**
      * All registered placeholders.
      */
-    private static final Map<EcoPlugin, Map<String, PlaceholderEntry>> REGISTERED_PLACEHOLDERS = new HashMap<>();
+    private static final Map<EcoPlugin, Map<String, Placeholder>> REGISTERED_PLACEHOLDERS = new HashMap<>();
 
     /**
      * All registered placeholder integrations.
@@ -35,7 +41,7 @@ public final class PlaceholderManager {
      */
     private static final LoadingCache<EntryWithPlayer, String> PLACEHOLDER_CACHE = Caffeine.newBuilder()
             .expireAfterWrite(50, TimeUnit.MILLISECONDS)
-            .build(key -> key.entry.getResult(key.player));
+            .build(key -> key.entry.getValue(key.player));
 
     /**
      * Register a new placeholder integration.
@@ -50,16 +56,31 @@ public final class PlaceholderManager {
     /**
      * Register a placeholder.
      *
-     * @param expansion The {@link com.willfp.eco.core.integrations.placeholder.PlaceholderEntry} to register.
+     * @param placeholder The placeholder to register.
      */
-    public static void registerPlaceholder(@NotNull final PlaceholderEntry expansion) {
-        EcoPlugin plugin = expansion.getPlugin() == null ? Eco.getHandler().getEcoPlugin() : expansion.getPlugin();
-        Map<String, PlaceholderEntry> pluginPlaceholders = REGISTERED_PLACEHOLDERS
+    public static void registerPlaceholder(@NotNull final Placeholder placeholder) {
+        if (placeholder instanceof StaticPlaceholder) {
+            throw new IllegalArgumentException("Static placeholders cannot be registered!");
+        }
+
+        EcoPlugin plugin = placeholder.getPlugin() == null ? Eco.getHandler().getEcoPlugin() : placeholder.getPlugin();
+        Map<String, Placeholder> pluginPlaceholders = REGISTERED_PLACEHOLDERS
                 .getOrDefault(plugin, new HashMap<>());
-        pluginPlaceholders.put(expansion.getIdentifier(), expansion);
+        pluginPlaceholders.put(placeholder.getIdentifier(), placeholder);
         REGISTERED_PLACEHOLDERS.put(plugin, pluginPlaceholders);
     }
 
+    /**
+     * Register a placeholder.
+     *
+     * @param placeholder The placeholder to register.
+     * @deprecated Uses old placeholder system.
+     */
+    @Deprecated(since = "6.28.0", forRemoval = true)
+    public static void registerPlaceholder(@NotNull final PlaceholderEntry placeholder) {
+        registerPlaceholder(placeholder.toModernPlaceholder());
+    }
+
     /**
      * Get the result of a placeholder with respect to a player.
      *
@@ -82,29 +103,36 @@ public final class PlaceholderManager {
      * @param plugin     The plugin for the placeholder.
      * @return The value of the placeholder.
      */
+    @NotNull
     public static String getResult(@Nullable final Player player,
                                    @NotNull final String identifier,
                                    @Nullable final EcoPlugin plugin) {
         EcoPlugin owner = plugin == null ? Eco.getHandler().getEcoPlugin() : plugin;
-        PlaceholderEntry entry = REGISTERED_PLACEHOLDERS.getOrDefault(owner, new HashMap<>()).get(identifier.toLowerCase());
+        Placeholder placeholder = REGISTERED_PLACEHOLDERS.getOrDefault(owner, new HashMap<>()).get(identifier.toLowerCase());
 
-        if (entry == null && plugin != null) {
-            PlaceholderEntry alternate = REGISTERED_PLACEHOLDERS.getOrDefault(Eco.getHandler().getEcoPlugin(), new HashMap<>())
+        if (placeholder == null && plugin != null) {
+            Placeholder alternate = REGISTERED_PLACEHOLDERS.getOrDefault(Eco.getHandler().getEcoPlugin(), new HashMap<>())
                     .get(identifier.toLowerCase());
             if (alternate != null) {
-                entry = alternate;
+                placeholder = alternate;
             }
         }
 
-        if (entry == null) {
+        if (placeholder == null) {
             return "";
         }
 
-        if (player == null && entry.requiresPlayer()) {
+        if (placeholder instanceof PlayerPlaceholder playerPlaceholder) {
+            if (player == null) {
+                return "";
+            } else {
+                return PLACEHOLDER_CACHE.get(new EntryWithPlayer(playerPlaceholder, player));
+            }
+        } else if (placeholder instanceof PlayerlessPlaceholder playerlessPlaceholder) {
+            return playerlessPlaceholder.getValue();
+        } else {
             return "";
         }
-
-        return PLACEHOLDER_CACHE.get(new EntryWithPlayer(entry, player));
     }
 
     /**
@@ -116,10 +144,28 @@ public final class PlaceholderManager {
      */
     public static String translatePlaceholders(@NotNull final String text,
                                                @Nullable final Player player) {
+        return translatePlaceholders(text, player, Collections.emptyList());
+    }
+
+    /**
+     * Translate all placeholders with respect to a player.
+     *
+     * @param text    The text that may contain placeholders to translate.
+     * @param player  The player to translate the placeholders with respect to.
+     * @param statics Extra static placeholders.
+     * @return The text, translated.
+     */
+    public static String translatePlaceholders(@NotNull final String text,
+                                               @Nullable final Player player,
+                                               @NotNull final List<StaticPlaceholder> statics) {
         String processed = text;
         for (PlaceholderIntegration integration : REGISTERED_INTEGRATIONS) {
             processed = integration.translate(processed, player);
         }
+        for (StaticPlaceholder placeholder : statics) {
+            // Do I know this is a bad way of doing this? Yes.
+            processed = processed.replace("%" + placeholder.getIdentifier() + "%", placeholder.getValue());
+        }
         return processed;
     }
 
@@ -138,8 +184,8 @@ public final class PlaceholderManager {
         return found;
     }
 
-    private static record EntryWithPlayer(@NotNull PlaceholderEntry entry,
-                                          @Nullable Player player) {
+    private record EntryWithPlayer(@NotNull PlayerPlaceholder entry,
+                                   @NotNull Player player) {
 
     }
 

eco-api/src/main/java/com/willfp/eco/core/items/Items.java

@@ -8,6 +8,7 @@ import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
 import com.willfp.eco.core.recipe.parts.MaterialTestableItem;
 import com.willfp.eco.core.recipe.parts.ModifiedTestableItem;
 import com.willfp.eco.core.recipe.parts.TestableStack;
+import com.willfp.eco.core.recipe.parts.UnrestrictedMaterialTestableItem;
 import com.willfp.eco.util.NamespacedKeyUtils;
 import com.willfp.eco.util.NumberUtils;
 import org.bukkit.Material;
@@ -155,11 +156,16 @@ public final class Items {
         String[] split = args[0].toLowerCase().split(":");
 
         if (split.length == 1) {
-            Material material = Material.getMaterial(args[0].toUpperCase());
+            String itemType = args[0];
+            boolean isWildcard = itemType.startsWith("*");
+            if (isWildcard) {
+                itemType = itemType.substring(1);
+            }
+            Material material = Material.getMaterial(itemType.toUpperCase());
             if (material == null || material == Material.AIR) {
                 return new EmptyTestableItem();
             }
-            item = new MaterialTestableItem(material);
+            item = isWildcard ? new UnrestrictedMaterialTestableItem(material) : new MaterialTestableItem(material);
         }
 
         if (split.length == 2) {
@@ -183,11 +189,16 @@ public final class Items {
             This has been superseded by id amount
              */
             if (part == null) {
-                Material material = Material.getMaterial(split[0].toUpperCase());
+                String itemType = split[0];
+                boolean isWildcard = itemType.startsWith("*");
+                if (isWildcard) {
+                    itemType = itemType.substring(1);
+                }
+                Material material = Material.getMaterial(itemType.toUpperCase());
                 if (material == null || material == Material.AIR) {
                     return new EmptyTestableItem();
                 }
-                item = new MaterialTestableItem(material);
+                item = isWildcard ? new UnrestrictedMaterialTestableItem(material) : new MaterialTestableItem(material);
                 stackAmount = Integer.parseInt(split[1]);
             } else {
                 item = part;

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

@@ -0,0 +1,22 @@
+package com.willfp.eco.core.placeholder;
+
+import com.willfp.eco.core.EcoPlugin;
+
+/**
+ * A placeholder represents a string that can hold a value.
+ */
+public sealed interface Placeholder permits PlayerPlaceholder, PlayerlessPlaceholder, StaticPlaceholder {
+    /**
+     * Get the plugin that holds the placeholder.
+     *
+     * @return The plugin.
+     */
+    EcoPlugin getPlugin();
+
+    /**
+     * Get the identifier for the placeholder.
+     *
+     * @return The identifier.
+     */
+    String getIdentifier();
+}

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

@@ -0,0 +1,38 @@
+package com.willfp.eco.core.placeholder;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Represents a class that can have placeholders injected into it.
+ */
+public interface PlaceholderInjectable {
+    /**
+     * Inject placeholder.
+     *
+     * @param placeholders The placeholders.
+     */
+    default void injectPlaceholders(@NotNull StaticPlaceholder... placeholders) {
+        this.injectPlaceholders(List.of(placeholders));
+    }
+
+    /**
+     * Inject placeholder.
+     *
+     * @param placeholders The placeholders.
+     */
+    void injectPlaceholders(@NotNull Iterable<StaticPlaceholder> placeholders);
+
+    /**
+     * Clear injected placeholders.
+     */
+    void clearInjectedPlaceholders();
+
+    /**
+     * Get injected placeholders.
+     *
+     * @return Injected placeholders.
+     */
+    List<StaticPlaceholder> getInjectedPlaceholders();
+}

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

@@ -0,0 +1,92 @@
+package com.willfp.eco.core.placeholder;
+
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.function.Function;
+
+/**
+ * A placeholder that requires a player.
+ */
+public final class PlayerPlaceholder implements Placeholder {
+    /**
+     * The name of the placeholder.
+     */
+    private final String identifier;
+
+    /**
+     * The function to retrieve the output of the placeholder given a player.
+     */
+    private final Function<Player, String> function;
+
+    /**
+     * The plugin for the placeholder.
+     */
+    private final EcoPlugin plugin;
+
+    /**
+     * Create a new player placeholder.
+     *
+     * @param plugin     The plugin.
+     * @param identifier The identifier.
+     * @param function   The function to retrieve the value.
+     */
+    public PlayerPlaceholder(@NotNull final EcoPlugin plugin,
+                             @NotNull final String identifier,
+                             @NotNull final Function<Player, String> function) {
+        this.plugin = plugin;
+        this.identifier = identifier;
+        this.function = function;
+    }
+
+    /**
+     * Get the value of the placeholder for a given player.
+     *
+     * @param player The player.
+     * @return The value.
+     */
+    public String getValue(@NotNull final Player player) {
+        return function.apply(player);
+    }
+
+    /**
+     * Register the placeholder.
+     *
+     * @return The placeholder.
+     */
+    public PlayerPlaceholder register() {
+        PlaceholderManager.registerPlaceholder(this);
+        return this;
+    }
+
+    @Override
+    public EcoPlugin getPlugin() {
+        return this.plugin;
+    }
+
+    @Override
+    public String getIdentifier() {
+        return this.identifier;
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof StaticPlaceholder that)) {
+            return false;
+        }
+        return Objects.equals(this.getIdentifier(), that.getIdentifier())
+                && Objects.equals(this.getPlugin(), that.getPlugin());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.getIdentifier(), this.getPlugin());
+    }
+}

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

@@ -0,0 +1,90 @@
+package com.willfp.eco.core.placeholder;
+
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.function.Supplier;
+
+/**
+ * A placeholder that does not require a player.
+ */
+public final class PlayerlessPlaceholder implements Placeholder {
+    /**
+     * The name of the placeholder.
+     */
+    private final String identifier;
+
+    /**
+     * The function to retrieve the output of the placeholder.
+     */
+    private final Supplier<String> function;
+
+    /**
+     * The plugin for the placeholder.
+     */
+    private final EcoPlugin plugin;
+
+    /**
+     * Create a new player placeholder.
+     *
+     * @param plugin     The plugin.
+     * @param identifier The identifier.
+     * @param function   The function to retrieve the value.
+     */
+    public PlayerlessPlaceholder(@NotNull final EcoPlugin plugin,
+                                 @NotNull final String identifier,
+                                 @NotNull final Supplier<String> function) {
+        this.plugin = plugin;
+        this.identifier = identifier;
+        this.function = function;
+    }
+
+    /**
+     * Get the value of the placeholder.
+     *
+     * @return The value.
+     */
+    public String getValue() {
+        return function.get();
+    }
+
+    /**
+     * Register the placeholder.
+     *
+     * @return The placeholder.
+     */
+    public PlayerlessPlaceholder register() {
+        PlaceholderManager.registerPlaceholder(this);
+        return this;
+    }
+
+    @Override
+    public EcoPlugin getPlugin() {
+        return this.plugin;
+    }
+
+    @Override
+    public String getIdentifier() {
+        return this.identifier;
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof StaticPlaceholder that)) {
+            return false;
+        }
+        return Objects.equals(this.getIdentifier(), that.getIdentifier())
+                && Objects.equals(this.getPlugin(), that.getPlugin());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.getIdentifier(), this.getPlugin());
+    }
+}

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

@@ -0,0 +1,71 @@
+package com.willfp.eco.core.placeholder;
+
+import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.EcoPlugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.function.Supplier;
+
+/**
+ * A placeholder that cannot be registered, and exists purely in injection.
+ */
+public final class StaticPlaceholder implements Placeholder {
+    /**
+     * The name of the placeholder.
+     */
+    private final String identifier;
+
+    /**
+     * The function to retrieve the output of the placeholder.
+     */
+    private final Supplier<String> function;
+
+    /**
+     * Create a new player placeholder.
+     *
+     * @param identifier The identifier.
+     * @param function   The function to retrieve the value.
+     */
+    public StaticPlaceholder(@NotNull final String identifier,
+                             @NotNull final Supplier<String> function) {
+        this.identifier = identifier;
+        this.function = function;
+    }
+
+    /**
+     * Get the value of the placeholder.
+     *
+     * @return The value.
+     */
+    public String getValue() {
+        return function.get();
+    }
+
+    @Override
+    public EcoPlugin getPlugin() {
+        return Eco.getHandler().getEcoPlugin();
+    }
+
+    @Override
+    public String getIdentifier() {
+        return this.identifier;
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof StaticPlaceholder that)) {
+            return false;
+        }
+        return Objects.equals(this.getIdentifier(), that.getIdentifier());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.getIdentifier());
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/recipe/parts/UnrestrictedMaterialTestableItem.java

@@ -0,0 +1,32 @@
+package com.willfp.eco.core.recipe.parts;
+
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Same as material testable items, but doesn't filter out custom items.
+ */
+public class UnrestrictedMaterialTestableItem extends MaterialTestableItem {
+    /**
+     * Create a new simple recipe part.
+     *
+     * @param material The material.
+     */
+    public UnrestrictedMaterialTestableItem(@NotNull final Material material) {
+        super(material);
+    }
+
+    /**
+     * If the item matches the material.
+     *
+     * @param itemStack The item to test.
+     * @return If the item is of the specified material.
+     */
+    @Override
+    public boolean matches(@Nullable final ItemStack itemStack) {
+        return itemStack != null && itemStack.getType() == this.getMaterial();
+    }
+}
+

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

@@ -3,7 +3,6 @@ package com.willfp.eco.core.recipe.recipes;
 import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.PluginDependent;
-import com.willfp.eco.core.Prerequisite;
 import com.willfp.eco.core.items.TestableItem;
 import com.willfp.eco.core.recipe.Recipes;
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
@@ -139,12 +138,6 @@ public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> imple
             displayedRecipe.setIngredient(character, new RecipeChoice.ExactChoice(displayedItems));
         }
 
-        if (Prerequisite.HAS_1_18.isMet() && !Prerequisite.HAS_PAPER.isMet()) {
-            if (Bukkit.getServer().getRecipe(this.getKey()) != null) {
-                return;
-            }
-        }
-
         Bukkit.getServer().addRecipe(shapedRecipe);
         Bukkit.getServer().addRecipe(displayedRecipe);
     }

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

@@ -0,0 +1,343 @@
+package com.willfp.eco.core.recipe.recipes;
+
+import com.google.common.annotations.Beta;
+import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.items.TestableItem;
+import com.willfp.eco.core.recipe.Recipes;
+import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
+import com.willfp.eco.core.recipe.parts.GroupedTestableItems;
+import com.willfp.eco.core.recipe.parts.TestableStack;
+import org.bukkit.Bukkit;
+import org.bukkit.NamespacedKey;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.RecipeChoice;
+import org.bukkit.inventory.ShapelessRecipe;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Shapeless crafting recipe.
+ */
+@Beta
+public final class ShapelessCraftingRecipe extends PluginDependent<EcoPlugin> implements CraftingRecipe {
+    /**
+     * Recipe parts.
+     */
+    private final List<TestableItem> parts;
+
+    /**
+     * The key of the recipe.
+     */
+    private final NamespacedKey key;
+
+    /**
+     * The key of the displayed recipe.
+     */
+    private final NamespacedKey displayedKey;
+
+    /**
+     * The recipe's output.
+     */
+    private final ItemStack output;
+
+    /**
+     * The permission.
+     */
+    private final String permission;
+
+    private ShapelessCraftingRecipe(@NotNull final EcoPlugin plugin,
+                                    @NotNull final String key,
+                                    @NotNull final List<TestableItem> parts,
+                                    @NotNull final ItemStack output,
+                                    @Nullable final String permission) {
+        super(plugin);
+
+        this.parts = parts;
+        this.key = plugin.getNamespacedKeyFactory().create(key);
+        this.displayedKey = plugin.getNamespacedKeyFactory().create(key + "_displayed");
+        this.output = output;
+        this.permission = permission;
+    }
+
+    /**
+     * Make a new test.
+     *
+     * @return The test.
+     */
+    @NotNull
+    public RecipeTest newTest() {
+        return new RecipeTest(this);
+    }
+
+    @Override
+    public boolean test(@NotNull final ItemStack[] matrix) {
+        RecipeTest test = newTest();
+
+        for (ItemStack stack : matrix) {
+            if (test.matchAndRemove(stack) == null) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public void register() {
+        Recipes.register(this);
+
+        Bukkit.getServer().removeRecipe(this.getKey());
+        Bukkit.getServer().removeRecipe(this.getDisplayedKey());
+
+        ShapelessRecipe shapelessRecipe = new ShapelessRecipe(this.getKey(), this.getOutput());
+        for (TestableItem part : parts) {
+            shapelessRecipe.addIngredient(part.getItem().getType());
+        }
+
+        ShapelessRecipe displayedRecipe = new ShapelessRecipe(this.getDisplayedKey(), this.getOutput());
+        for (TestableItem part : parts) {
+            List<TestableItem> items = new ArrayList<>();
+            if (part instanceof GroupedTestableItems group) {
+                items.addAll(group.getChildren());
+            } else {
+                items.add(part);
+            }
+
+            List<ItemStack> displayedItems = new ArrayList<>();
+
+            for (TestableItem testableItem : items) {
+                if (testableItem instanceof TestableStack) {
+                    ItemStack item = testableItem.getItem().clone();
+                    ItemMeta meta = item.getItemMeta();
+                    assert meta != null;
+
+                    List<String> lore = meta.hasLore() ? meta.getLore() : new ArrayList<>();
+                    assert lore != null;
+                    lore.add("");
+                    String add = Eco.getHandler().getEcoPlugin().getLangYml().getFormattedString("multiple-in-craft");
+                    add = add.replace("%amount%", String.valueOf(item.getAmount()));
+                    lore.add(add);
+                    meta.setLore(lore);
+                    item.setItemMeta(meta);
+
+                    displayedItems.add(item);
+                } else {
+                    displayedItems.add(testableItem.getItem());
+                }
+            }
+
+            displayedRecipe.addIngredient(new RecipeChoice.ExactChoice(displayedItems));
+        }
+
+        Bukkit.getServer().addRecipe(shapelessRecipe);
+        Bukkit.getServer().addRecipe(displayedRecipe);
+    }
+
+    /**
+     * Create a new recipe builder.
+     *
+     * @param plugin The plugin that owns the recipe.
+     * @param key    The recipe key.
+     * @return A new builder.
+     */
+    public static Builder builder(@NotNull final EcoPlugin plugin,
+                                  @NotNull final String key) {
+        return new Builder(plugin, key);
+    }
+
+    /**
+     * Get the parts.
+     *
+     * @return The parts.
+     */
+    @NotNull
+    @Override
+    public List<TestableItem> getParts() {
+        return this.parts;
+    }
+
+    /**
+     * Get the key.
+     *
+     * @return The key.
+     */
+    @NotNull
+    @Override
+    public NamespacedKey getKey() {
+        return this.key;
+    }
+
+    /**
+     * Get the displayed key.
+     *
+     * @return The displayed key.
+     */
+    @NotNull
+    @Override
+    public NamespacedKey getDisplayedKey() {
+        return this.displayedKey;
+    }
+
+    /**
+     * Get the output.
+     *
+     * @return The output.
+     */
+    @NotNull
+    @Override
+    public ItemStack getOutput() {
+        return this.output;
+    }
+
+    /**
+     * Get the permission.
+     *
+     * @return The permission.
+     */
+    @Nullable
+    @Override
+    public String getPermission() {
+        return permission;
+    }
+
+    /**
+     * Builder for recipes.
+     */
+    public static final class Builder {
+        /**
+         * The recipe parts.
+         */
+        private final List<TestableItem> recipeParts = new ArrayList<>();
+
+        /**
+         * The output of the recipe.
+         */
+        private ItemStack output = null;
+
+        /**
+         * The permission for the recipe.
+         */
+        private String permission = null;
+
+        /**
+         * The key of the recipe.
+         */
+        private final String key;
+
+        /**
+         * The plugin that created the recipe.
+         */
+        private final EcoPlugin plugin;
+
+        /**
+         * Create a new recipe builder.
+         *
+         * @param plugin The plugin that owns the recipe.
+         * @param key    The recipe key.
+         */
+        private Builder(@NotNull final EcoPlugin plugin,
+                        @NotNull final String key) {
+            this.key = key;
+            this.plugin = plugin;
+        }
+
+        /**
+         * Add a recipe part.
+         *
+         * @param part The part of the recipe.
+         * @return The builder.
+         */
+        public Builder addRecipePart(@NotNull final TestableItem part) {
+            recipeParts.add(part);
+            return this;
+        }
+
+        /**
+         * Set the output of the recipe.
+         *
+         * @param output The output.
+         * @return The builder.
+         */
+        public Builder setOutput(@NotNull final ItemStack output) {
+            this.output = output;
+            return this;
+        }
+
+        /**
+         * Set the permission required to craft the recipe.
+         *
+         * @param permission The permission.
+         * @return The builder.
+         */
+        public Builder setPermission(@Nullable final String permission) {
+            this.permission = permission;
+            return this;
+        }
+
+        /**
+         * Check if recipe parts are all air.
+         *
+         * @return If recipe parts are all air.
+         */
+        public boolean isAir() {
+            for (TestableItem recipePart : this.recipeParts) {
+                if (recipePart != null && !(recipePart instanceof EmptyTestableItem)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        /**
+         * Build the recipe.
+         *
+         * @return The built recipe.
+         */
+        public ShapelessCraftingRecipe build() {
+            return new ShapelessCraftingRecipe(plugin, key.toLowerCase(), recipeParts, output, permission);
+        }
+    }
+
+    /**
+     * Test for shapeless recipes.
+     */
+    public static final class RecipeTest {
+        /**
+         * The remaining items left to be found.
+         */
+        private final List<TestableItem> remaining;
+
+        private RecipeTest(@NotNull final ShapelessCraftingRecipe recipe) {
+            this.remaining = new ArrayList<>(recipe.getParts());
+        }
+
+        /**
+         * If the item is in the recipe, remove it from the remaining items to test and
+         * return the matching item.
+         *
+         * @param itemStack The item.
+         * @return The matching item, or null if no match was found.
+         */
+        @Nullable
+        public TestableItem matchAndRemove(@NotNull final ItemStack itemStack) {
+            if (remaining.isEmpty() && !(new EmptyTestableItem().matches(itemStack))) {
+                return null;
+            }
+
+            Optional<TestableItem> match = remaining.stream()
+                    .filter(item -> item.matches(itemStack))
+                    .findFirst();
+
+            match.ifPresent(remaining::remove);
+
+            return match.orElse(null);
+        }
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.util;
 
+import com.willfp.eco.core.placeholder.StaticPlaceholder;
 import org.apache.commons.lang.Validate;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.ApiStatus;
@@ -7,10 +8,10 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.text.DecimalFormat;
+import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.ThreadLocalRandom;
-import java.util.function.BiFunction;
 
 /**
  * Utilities / API methods for numbers.
@@ -24,7 +25,7 @@ public final class NumberUtils {
     /**
      * Crunch handler.
      */
-    private static BiFunction<String, Player, Double> crunch = null;
+    private static CrunchHandler crunch = null;
 
     /**
      * Set of roman numerals to look up.
@@ -251,7 +252,21 @@ public final class NumberUtils {
      */
     public static double evaluateExpression(@NotNull final String expression,
                                             @Nullable final Player player) {
-        return crunch.apply(expression, player);
+        return evaluateExpression(expression, player, Collections.emptyList());
+    }
+
+    /**
+     * Evaluate an expression with respect to a player (for placeholders).
+     *
+     * @param expression The expression.
+     * @param player     The player.
+     * @param statics    The static placeholders.
+     * @return The value of the expression, or zero if invalid.
+     */
+    public static double evaluateExpression(@NotNull final String expression,
+                                            @Nullable final Player player,
+                                            @NotNull final Iterable<StaticPlaceholder> statics) {
+        return crunch.evaluate(expression, player, statics);
     }
 
     /**
@@ -260,11 +275,29 @@ public final class NumberUtils {
      * @param handler The handler.
      */
     @ApiStatus.Internal
-    public static void initCrunch(@NotNull final BiFunction<String, Player, Double> handler) {
+    public static void initCrunch(@NotNull final CrunchHandler handler) {
         Validate.isTrue(crunch == null, "Already initialized!");
         crunch = handler;
     }
 
+    /**
+     * Bridge component for crunch.
+     */
+    @ApiStatus.Internal
+    public interface CrunchHandler {
+        /**
+         * Evaluate an expression.
+         *
+         * @param expression The expression.
+         * @param player     The player.
+         * @param statics    The statics.
+         * @return The value of the expression, or zero if invalid.
+         */
+        double evaluate(@NotNull String expression,
+                        @Nullable Player player,
+                        @NotNull Iterable<StaticPlaceholder> statics);
+    }
+
     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/EcoJSONConfigSection.kt

@@ -1,8 +1,11 @@
 package com.willfp.eco.internal.config.json
 
+import com.willfp.eco.core.placeholder.StaticPlaceholder
+
 @Suppress("UNCHECKED_CAST")
-class EcoJSONConfigSection(values: Map<String, Any?>) : EcoJSONConfigWrapper() {
+class EcoJSONConfigSection(values: Map<String, Any?>, injections: Collection<StaticPlaceholder> = emptyList()) : EcoJSONConfigWrapper() {
     init {
         init(values)
+        this.injections = injections.toMutableList()
     }
 }

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

@@ -6,6 +6,7 @@ import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.willfp.eco.core.config.ConfigType
 import com.willfp.eco.core.config.interfaces.JSONConfig
+import com.willfp.eco.core.placeholder.StaticPlaceholder
 import com.willfp.eco.util.StringUtils
 import java.util.Objects
 import java.util.concurrent.ConcurrentHashMap
@@ -22,6 +23,7 @@ open class EcoJSONConfigWrapper : JSONConfig {
     val values = ConcurrentHashMap<String, Any?>()
 
     private val cache = ConcurrentHashMap<String, Any>()
+    var injections = mutableListOf<StaticPlaceholder>()
 
     fun init(values: Map<String, Any?>) {
         this.values.clear()
@@ -62,7 +64,7 @@ open class EcoJSONConfigWrapper : JSONConfig {
         }
         return if (values[closestPath] is Map<*, *> && path != closestPath) {
             val section =
-                EcoJSONConfigSection((values[closestPath] as Map<String, Any?>?)!!)
+                EcoJSONConfigSection((values[closestPath] as Map<String, Any?>?)!!, injections)
             section.getOfKnownType(path.substring(closestPath.length + 1), clazz, false)
         } else {
             if (values.containsKey(closestPath)) {
@@ -88,7 +90,7 @@ open class EcoJSONConfigWrapper : JSONConfig {
         for (key in values.keys) {
             list.add(root + key)
             if (values[key] is Map<*, *>) {
-                val section = EcoJSONConfigSection((values[key] as Map<String, Any?>?)!!)
+                val section = EcoJSONConfigSection((values[key] as Map<String, Any?>?)!!, injections)
                 list.addAll(section.getDeepKeys(list, "$root$key."))
             }
         }
@@ -117,7 +119,7 @@ open class EcoJSONConfigWrapper : JSONConfig {
             closestPath = split[0]
         }
         if (values[closestPath] is Map<*, *> && path != closestPath) {
-            val section = EcoJSONConfigSection((values[closestPath] as Map<String, Any?>?)!!)
+            val section = EcoJSONConfigSection((values[closestPath] as Map<String, Any?>?)!!, injections)
             section.setRecursively(path.substring(closestPath.length + 1), obj)
             values[closestPath] = section.values
         } else {
@@ -130,13 +132,13 @@ open class EcoJSONConfigWrapper : JSONConfig {
     }
 
     override fun getSubsection(path: String): JSONConfig {
-        return getSubsectionOrNull(path) ?: EcoJSONConfigSection(mutableMapOf())
+        return getSubsectionOrNull(path) ?: EcoJSONConfigSection(mutableMapOf(), injections)
     }
 
     override fun getSubsectionOrNull(path: String): JSONConfig? {
         return if (values.containsKey(path)) {
             val subsection = values[path] as Map<String, Any>
-            EcoJSONConfigSection(subsection)
+            EcoJSONConfigSection(subsection, injections)
         } else {
             null
         }
@@ -147,7 +149,7 @@ open class EcoJSONConfigWrapper : JSONConfig {
             ?: return null
         val configs = mutableListOf<JSONConfig>()
         for (map in maps) {
-            configs.add(EcoJSONConfigSection(map))
+            configs.add(EcoJSONConfigSection(map, injections))
         }
         return configs.toMutableList()
     }
@@ -206,11 +208,26 @@ open class EcoJSONConfigWrapper : JSONConfig {
         return (getOfKnownType(path, Any::class.java) as Collection<Double>?)?.toMutableList()
     }
 
+    override fun injectPlaceholders(placeholders: Iterable<StaticPlaceholder>) {
+        injections.removeIf { placeholders.any { placeholder -> it.identifier == placeholder.identifier } }
+        injections.addAll(placeholders)
+        this.clearCache()
+    }
+
+    override fun getInjectedPlaceholders(): List<StaticPlaceholder> {
+        return injections.toList()
+    }
+
+    override fun clearInjectedPlaceholders() {
+        injections.clear()
+        this.clearCache()
+    }
+
     override fun getType(): ConfigType {
         return ConfigType.JSON
     }
 
     override fun clone(): JSONConfig {
-        return EcoJSONConfigSection(this.values.toMutableMap())
+        return EcoJSONConfigSection(this.values.toMutableMap(), injections)
     }
 }

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

@@ -1,9 +1,11 @@
 package com.willfp.eco.internal.config.yaml
 
+import com.willfp.eco.core.placeholder.StaticPlaceholder
 import org.bukkit.configuration.ConfigurationSection
 
-class EcoYamlConfigSection(section: ConfigurationSection) : EcoYamlConfigWrapper<ConfigurationSection>() {
+class EcoYamlConfigSection(section: ConfigurationSection, injections: Collection<StaticPlaceholder> = emptyList()) : EcoYamlConfigWrapper<ConfigurationSection>() {
     init {
         init(section)
+        this.injections = injections.toMutableList()
     }
 }

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

@@ -2,6 +2,7 @@ package com.willfp.eco.internal.config.yaml
 
 import com.willfp.eco.core.config.ConfigType
 import com.willfp.eco.core.config.interfaces.Config
+import com.willfp.eco.core.placeholder.StaticPlaceholder
 import com.willfp.eco.util.StringUtils
 import org.bukkit.configuration.ConfigurationSection
 import org.bukkit.configuration.file.YamlConfiguration
@@ -11,6 +12,7 @@ import java.io.StringReader
 open class EcoYamlConfigWrapper<T : ConfigurationSection> : Config {
     lateinit var handle: T
     private val cache = mutableMapOf<String, Any?>()
+    var injections = mutableListOf<StaticPlaceholder>()
 
     protected fun init(config: T): Config {
         handle = config
@@ -57,7 +59,7 @@ open class EcoYamlConfigWrapper<T : ConfigurationSection> : Config {
             if (raw == null) {
                 cache[path] = null
             } else {
-                cache[path] = EcoYamlConfigSection(raw)
+                cache[path] = EcoYamlConfigSection(raw, injections)
             }
             getSubsectionOrNull(path)
         }
@@ -214,7 +216,7 @@ open class EcoYamlConfigWrapper<T : ConfigurationSection> : Config {
                 for (map in mapList) {
                     val temp = YamlConfiguration.loadConfiguration(StringReader(""))
                     temp.createSection("a", map)
-                    configList.add(EcoYamlConfigSection(temp.getConfigurationSection("a")!!))
+                    configList.add(EcoYamlConfigSection(temp.getConfigurationSection("a")!!, injections))
                 }
 
                 cache[path] = if (has(path)) configList else emptyList()
@@ -225,6 +227,21 @@ open class EcoYamlConfigWrapper<T : ConfigurationSection> : Config {
         }
     }
 
+    override fun injectPlaceholders(placeholders: Iterable<StaticPlaceholder>) {
+        injections.removeIf { placeholders.any { placeholder -> it.identifier == placeholder.identifier } }
+        injections.addAll(placeholders)
+        this.clearCache()
+    }
+
+    override fun getInjectedPlaceholders(): List<StaticPlaceholder> {
+        return injections.toList()
+    }
+
+    override fun clearInjectedPlaceholders() {
+        injections.clear()
+        this.clearCache()
+    }
+
     override fun getType(): ConfigType {
         return ConfigType.JSON
     }
@@ -235,7 +252,8 @@ open class EcoYamlConfigWrapper<T : ConfigurationSection> : Config {
                 StringReader(
                     toPlaintext()
                 )
-            )
+            ),
+            injections
         )
     }
 }

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/EcoMenu.kt

@@ -19,7 +19,7 @@ class EcoMenu(
     val slots: List<MutableList<EcoSlot>>,
     private val title: String,
     private val onClose: CloseHandler
-): Menu {
+) : Menu {
     override fun getSlot(row: Int, column: Int): Slot {
         if (row < 1 || row > this.rows) {
             return slots[0][0]
@@ -46,7 +46,7 @@ class EcoMenu(
                 if (meta != null) {
                     val lore = meta.lore
                     if (lore != null) {
-                        lore.replaceAll{ s -> StringUtils.format(s, player) }
+                        lore.replaceAll { s -> StringUtils.format(s, player) }
                         meta.lore = lore
                     }
                     slotItem.itemMeta = meta
@@ -103,4 +103,9 @@ class EcoMenu(
         inventory ?: return HashSet()
         return inventory.data.keys
     }
+
+    override fun refresh(player: Player) {
+        val inventory = MenuHandler.getExtendedInventory(player.openInventory.topInventory) ?: return
+        inventory.refresh(player)
+    }
 }

eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/ChatComponent.kt

@@ -62,7 +62,8 @@ class ChatComponent : ChatComponentProxy {
         }
 
         val newShowItem = showItem.nbt(
-            BinaryTagHolder.binaryTagHolder(
+            @Suppress("UnstableApiUsage", "DEPRECATION")
+            BinaryTagHolder.of(
                 CraftItemStack.asNMSCopy(
                     Display.display(
                         CraftItemStack.asBukkitCopy(

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

@@ -62,7 +62,8 @@ class ChatComponent : ChatComponentProxy {
         }
 
         val newShowItem = showItem.nbt(
-            BinaryTagHolder.binaryTagHolder(
+            @Suppress("UnstableApiUsage", "DEPRECATION")
+            BinaryTagHolder.of(
                 CraftItemStack.asNMSCopy(
                     Display.display(
                         CraftItemStack.asBukkitCopy(

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

@@ -22,8 +22,10 @@ class MiniMessageTranslator : MiniMessageTranslatorProxy {
             ).toLegacy()
         }.getOrNull() ?: mut
 
-        if (startsWithPrefix) {
-            mut = Display.PREFIX + miniMessage
+        mut = if (startsWithPrefix) {
+            Display.PREFIX + miniMessage
+        } else {
+            miniMessage
         }
 
         return mut

eco-core/core-plugin/build.gradle

@@ -2,7 +2,7 @@ group 'com.willfp'
 version rootProject.version
 
 dependencies {
-    implementation 'com.github.Redempt:Crunch:1.0'
+    implementation 'com.github.Redempt:Crunch:1.1.2'
     compileOnly 'net.kyori:adventure-platform-bukkit:4.1.0'
     compileOnly 'org.apache.maven:maven-artifact:3.8.1'
     compileOnly 'com.google.code.gson:gson:2.8.8'
@@ -40,7 +40,8 @@ dependencies {
     compileOnly 'com.github.WhipDevelopment:CrashClaim:f9cd7d92eb'
     compileOnly 'com.wolfyscript.wolfyutilities:wolfyutilities:3.16.0.0'
     compileOnly 'com.github.decentsoftware-eu:decentholograms:2.1.2'
-    compileOnly 'io.lumine.xikage:MythicMobs:4.9.1'
+    compileOnly 'io.lumine:Mythic:5.0.1'
+    compileOnly 'io.lumine:LumineUtils:1.16.1-SNAPSHOT'
 
     // CombatLogX V10 + NewbieHelper Expansion
     compileOnly 'com.SirBlobman.combatlogx:CombatLogX-API:10.0.0.0-SNAPSHOT'

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

@@ -110,10 +110,12 @@ import com.willfp.eco.internal.spigot.math.evaluateExpression
 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.internal.spigot.recipes.CraftingRecipeListener
 import com.willfp.eco.internal.spigot.recipes.StackedRecipeListener
 import com.willfp.eco.internal.spigot.recipes.listeners.ComplexInComplex
 import com.willfp.eco.internal.spigot.recipes.listeners.ComplexInVanilla
+import com.willfp.eco.internal.spigot.recipes.stackhandlers.ShapedCraftingRecipeStackHandler
+import com.willfp.eco.internal.spigot.recipes.stackhandlers.ShapelessCraftingRecipeStackHandler
 import com.willfp.eco.util.NumberUtils
 import com.willfp.eco.util.ServerUtils
 import com.willfp.eco.util.SkullUtils
@@ -156,8 +158,11 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
         Entities.registerArgParser(EntityArgParserSilent())
         Entities.registerArgParser(EntityArgParserEquipment())
 
-        ShapedRecipeListener.registerListener(ComplexInComplex())
-        ShapedRecipeListener.registerListener(ComplexInVanilla())
+        CraftingRecipeListener.registerListener(ComplexInComplex())
+        CraftingRecipeListener.registerListener(ComplexInVanilla())
+
+        StackedRecipeListener.registerHandler(ShapedCraftingRecipeStackHandler())
+        StackedRecipeListener.registerHandler(ShapelessCraftingRecipeStackHandler())
 
         SegmentParserGroup().register()
         SegmentParserUseIfPresent().register()
@@ -171,7 +176,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
         val tpsProxy = getProxy(TPSProxy::class.java)
         ServerUtils.initialize { tpsProxy.getTPS() }
 
-        NumberUtils.initCrunch { exp, player -> evaluateExpression(exp, player) }
+        NumberUtils.initCrunch { expression, player, statics -> evaluateExpression(expression, player, statics) }
 
         postInit()
     }
@@ -263,9 +268,8 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
             IntegrationLoader("HeadDatabase") { CustomItemsManager.register(CustomItemsHeadDatabase(this)) },
             IntegrationLoader("ExecutableItems") { CustomItemsManager.register(CustomItemsExecutableItems()) },
             IntegrationLoader("CustomCrafting") {
-                CustomItemsManager.register(CustomItemsCustomCrafting()); ShapedRecipeListener.registerValidator(
-                CustomRecipeCustomCrafting()
-            )
+                CustomItemsManager.register(CustomItemsCustomCrafting())
+                CraftingRecipeListener.registerValidator(CustomRecipeCustomCrafting())
             },
             IntegrationLoader("MythicMobs") { CustomItemsManager.register(CustomItemsMythicMobs(this)) },
 
@@ -317,7 +321,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
             NaturalExpGainListeners(),
             ArmorListener(),
             EntityDeathByEntityListeners(this),
-            ShapedRecipeListener(),
+            CraftingRecipeListener(),
             StackedRecipeListener(this),
             GUIListener(this),
             ArrowDataListener(this),

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

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

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsMythicMobs.kt

@@ -4,14 +4,14 @@ import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.integrations.customitems.CustomItemsWrapper
 import com.willfp.eco.core.items.Items
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem
-import io.lumine.xikage.mythicmobs.adapters.bukkit.BukkitItemStack
-import io.lumine.xikage.mythicmobs.api.bukkit.events.MythicDropLoadEvent
-import io.lumine.xikage.mythicmobs.drops.Drop
-import io.lumine.xikage.mythicmobs.drops.DropMetadata
-import io.lumine.xikage.mythicmobs.drops.IMultiDrop
-import io.lumine.xikage.mythicmobs.drops.LootBag
-import io.lumine.xikage.mythicmobs.drops.droppables.ItemDrop
-import io.lumine.xikage.mythicmobs.io.MythicLineConfig
+import io.lumine.mythic.api.config.MythicLineConfig
+import io.lumine.mythic.api.drops.DropMetadata
+import io.lumine.mythic.api.drops.IMultiDrop
+import io.lumine.mythic.bukkit.adapters.BukkitItemStack
+import io.lumine.mythic.bukkit.events.MythicDropLoadEvent
+import io.lumine.mythic.core.drops.Drop
+import io.lumine.mythic.core.drops.LootBag
+import io.lumine.mythic.core.drops.droppables.ItemDrop
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 
@@ -42,9 +42,9 @@ class CustomItemsMythicMobs(
 
     private class MythicMobsDrop(
         private val plugin: EcoPlugin,
-        private val config: MythicLineConfig
-    ) : Drop(config.line, config), IMultiDrop {
-        private val id = config.getString(arrayOf("type", "t", "item", "i"), this.dropVar)
+        itemConfig: MythicLineConfig
+    ) : Drop(itemConfig.line, itemConfig), IMultiDrop {
+        private val id = itemConfig.getString(arrayOf("type", "t", "item", "i"), this.dropVar)
 
         override fun get(data: DropMetadata): LootBag {
             val bag = LootBag(data)

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

@@ -1,38 +1,30 @@
 package com.willfp.eco.internal.spigot.math
 
+import com.github.benmanes.caffeine.cache.Cache
+import com.github.benmanes.caffeine.cache.Caffeine
 import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
+import com.willfp.eco.core.placeholder.StaticPlaceholder
 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 cache: Cache<String, CompiledExpression> = Caffeine.newBuilder().build()
 private val goToZero = Crunch.compileExpression("0")
 
-fun evaluateExpression(expression: String, player: Player?): Double {
+fun evaluateExpression(expression: String, player: Player?, statics: Iterable<StaticPlaceholder>): Double {
     val placeholderValues = PlaceholderManager.findPlaceholdersIn(expression)
-        .map { PlaceholderManager.translatePlaceholders(expression, player) }
+        .map { PlaceholderManager.translatePlaceholders(it, player, statics.toList()) }
         .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 compiled = cache.get(expression) {
+        val placeholders = PlaceholderManager.findPlaceholdersIn(it)
+        val env = EvaluationEnvironment()
+        env.setVariableNames(*placeholders.toTypedArray())
+        runCatching { Crunch.compileExpression(expression, env) }.getOrDefault(goToZero)
     }
 
-    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
+    return runCatching { compiled.evaluate(*placeholderValues) }.getOrDefault(0.0)
 }

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

@@ -9,7 +9,7 @@ import org.bukkit.event.inventory.CraftItemEvent
 import org.bukkit.event.inventory.PrepareItemCraftEvent
 import org.bukkit.event.player.PlayerRecipeDiscoverEvent
 
-class ShapedRecipeListener : Listener {
+class CraftingRecipeListener : Listener {
     @EventHandler
     fun preventLearningDisplayedRecipes(event: PlayerRecipeDiscoverEvent) {
         if (!EcoPlugin.getPluginNames().contains(event.recipe.namespace)) {

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

@@ -1,16 +1,19 @@
 package com.willfp.eco.internal.spigot.recipes
 
 import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.items.TestableItem
 import com.willfp.eco.core.recipe.Recipes
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem
 import com.willfp.eco.core.recipe.parts.GroupedTestableItems
 import com.willfp.eco.core.recipe.parts.TestableStack
+import com.willfp.eco.core.recipe.recipes.CraftingRecipe
 import org.bukkit.Material
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.inventory.InventoryClickEvent
 import org.bukkit.inventory.CraftingInventory
+import org.bukkit.inventory.ItemStack
 import kotlin.math.max
 import kotlin.math.min
 
@@ -38,13 +41,18 @@ class StackedRecipeListener(
 
         val recipe = Recipes.getMatch(matrix) ?: return
 
+        // Get the handler for the type of recipe
+        @Suppress("UNCHECKED_CAST")
+        val handler = handlers.firstOrNull { recipe::class.java.isAssignableFrom(it.recipeType) } ?: return
+
         var isStackedRecipe = false
         var maxCraftable = Int.MAX_VALUE
 
         // Start by calculating the maximum number of items to craft
+        val maxToCraftData = handler.makeData(recipe)
         for (i in 0..8) {
             val item = inventory.matrix.getOrNull(i) ?: continue
-            val part = recipe.parts[i].let {
+            val part = handler.getPart(recipe, i, item, maxToCraftData).let {
                 if (it is GroupedTestableItems) {
                     it.getMatchingChild(item)
                 } else it
@@ -68,9 +76,11 @@ class StackedRecipeListener(
         val existingResult = inventory.result
 
         // Deduct the correct number of items from the inventory
+
+        val deductionData = handler.makeData(recipe)
         for (i in 0..8) {
             val item = inventory.matrix.getOrNull(i) ?: continue
-            val part = recipe.parts[i].let {
+            val part = handler.getPart(recipe, i, item, deductionData).let {
                 if (it is GroupedTestableItems) {
                     it.getMatchingChild(item)
                 } else it
@@ -128,4 +138,18 @@ class StackedRecipeListener(
         block()
         plugin.scheduler.run(block)
     }
+
+    companion object {
+        private val handlers = mutableListOf<StackedRecipeHandler>()
+
+        fun registerHandler(handler: StackedRecipeHandler) {
+            handlers.add(handler)
+        }
+    }
+}
+
+interface StackedRecipeHandler {
+    fun makeData(recipe: CraftingRecipe): Any?
+    fun getPart(recipe: CraftingRecipe, position: Int, item: ItemStack, data: Any?): TestableItem?
+    val recipeType: Class<out CraftingRecipe>
 }

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

@@ -2,9 +2,9 @@ package com.willfp.eco.internal.spigot.recipes.listeners
 
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.recipe.Recipes
+import com.willfp.eco.internal.spigot.recipes.CraftingRecipeListener
 import com.willfp.eco.internal.spigot.recipes.GenericCraftEvent
 import com.willfp.eco.internal.spigot.recipes.RecipeListener
-import com.willfp.eco.internal.spigot.recipes.ShapedRecipeListener
 import org.bukkit.entity.Player
 
 class ComplexInComplex : RecipeListener {
@@ -19,7 +19,7 @@ class ComplexInComplex : RecipeListener {
 
         val matrix = event.inventory.matrix
 
-        if (ShapedRecipeListener.validators.any { it.validate(event) }) {
+        if (CraftingRecipeListener.validators.any { it.validate(event) }) {
             return
         }
 
@@ -44,4 +44,4 @@ class ComplexInComplex : RecipeListener {
             event.deny()
         }
     }
-}
+}

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

@@ -2,9 +2,9 @@ package com.willfp.eco.internal.spigot.recipes.listeners
 
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.items.Items
+import com.willfp.eco.internal.spigot.recipes.CraftingRecipeListener
 import com.willfp.eco.internal.spigot.recipes.GenericCraftEvent
 import com.willfp.eco.internal.spigot.recipes.RecipeListener
-import com.willfp.eco.internal.spigot.recipes.ShapedRecipeListener
 
 class ComplexInVanilla : RecipeListener {
     override fun handle(event: GenericCraftEvent) {
@@ -12,7 +12,7 @@ class ComplexInVanilla : RecipeListener {
             return
         }
 
-        if (ShapedRecipeListener.validators.any { it.validate(event) }) {
+        if (CraftingRecipeListener.validators.any { it.validate(event) }) {
             return
         }
 
@@ -22,4 +22,4 @@ class ComplexInVanilla : RecipeListener {
             }
         }
     }
-}
+}

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

@@ -0,0 +1,15 @@
+package com.willfp.eco.internal.spigot.recipes.stackhandlers
+
+import com.willfp.eco.core.items.TestableItem
+import com.willfp.eco.core.recipe.recipes.CraftingRecipe
+import com.willfp.eco.core.recipe.recipes.ShapedCraftingRecipe
+import com.willfp.eco.internal.spigot.recipes.StackedRecipeHandler
+import org.bukkit.inventory.ItemStack
+
+class ShapedCraftingRecipeStackHandler : StackedRecipeHandler {
+    override val recipeType = ShapedCraftingRecipe::class.java
+    override fun makeData(recipe: CraftingRecipe): Any? = null
+
+    override fun getPart(recipe: CraftingRecipe, position: Int, item: ItemStack, data: Any?): TestableItem? =
+        recipe.parts[position]
+}

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

@@ -0,0 +1,28 @@
+package com.willfp.eco.internal.spigot.recipes.stackhandlers
+
+import com.willfp.eco.core.items.TestableItem
+import com.willfp.eco.core.recipe.recipes.CraftingRecipe
+import com.willfp.eco.core.recipe.recipes.ShapelessCraftingRecipe
+import com.willfp.eco.internal.spigot.recipes.StackedRecipeHandler
+import org.bukkit.inventory.ItemStack
+
+class ShapelessCraftingRecipeStackHandler :
+    StackedRecipeHandler {
+    override val recipeType = ShapelessCraftingRecipe::class.java
+    override fun makeData(recipe: CraftingRecipe): Any {
+        recipe as ShapelessCraftingRecipe
+        return recipe.newTest()
+    }
+
+    override fun getPart(
+        recipe: CraftingRecipe,
+        position: Int,
+        item: ItemStack,
+        data: Any?
+    ): TestableItem? {
+        recipe as ShapelessCraftingRecipe
+        data as ShapelessCraftingRecipe.RecipeTest
+
+        return data.matchAndRemove(item)
+    }
+}

gradle.properties

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