Updated crunch

Added FabledSkyBlock integration in AntigriefManager

README.md

@@ -39,7 +39,7 @@ and many more.
 # For developers
 
 ## Javadoc
-The 6.27.2 Javadoc can be found [here](https://javadoc.jitpack.io/com/willfp/eco/6.27.2/javadoc/)
+The 6.38.2 Javadoc can be found [here](https://javadoc.jitpack.io/com/willfp/eco/6.38.2/javadoc/)
 
 ## Plugin Information
 

build.gradle.kts

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
     }
 }
 
@@ -13,7 +13,7 @@ plugins {
     id("com.github.johnrengelman.shadow") version "7.1.2"
     id("maven-publish")
     id("java")
-    kotlin("jvm") version "1.6.21"
+    kotlin("jvm") version "1.7.10"
 }
 
 dependencies {
@@ -24,6 +24,7 @@ dependencies {
     implementation(project(path = ":eco-core:core-nms:v1_17_R1", configuration = "reobf"))
     implementation(project(path = ":eco-core:core-nms:v1_18_R1", configuration = "reobf"))
     implementation(project(path = ":eco-core:core-nms:v1_18_R2", configuration = "reobf"))
+    implementation(project(path = ":eco-core:core-nms:v1_19_R1", configuration = "reobf"))
 }
 
 allprojects {
@@ -60,7 +61,7 @@ allprojects {
         maven("https://maven.enginehub.org/repo/")
 
         // FactionsUUID
-        maven("https://ci.ender.zone/plugin/repository/everything/")
+        //maven("https://ci.ender.zone/plugin/repository/everything/")
 
         // NoCheatPlus
         maven("https://repo.md-5.net/content/repositories/snapshots/")
@@ -76,12 +77,15 @@ allprojects {
 
         // LibsDisguises
         maven("https://repo.md-5.net/content/groups/public/")
+
+        // FabledSkyblock
+        maven("https://repo.songoda.com/repository/public/")
     }
 
     dependencies {
         // Kotlin
-        implementation(kotlin("stdlib", version = "1.6.21"))
+        implementation(kotlin("stdlib", version = "1.7.10"))
-        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1")
+        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2")
 
         // Included in spigot jar, no need to move to implementation
         compileOnly("org.jetbrains:annotations:23.0.0")
@@ -128,8 +132,6 @@ allprojects {
             kotlinOptions {
                 jvmTarget = "17"
             }
-            targetCompatibility = "17"
-            sourceCompatibility = "17"
         }
 
         shadowJar {

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

@@ -304,6 +304,11 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         this.color = props.getColor();
         this.supportingExtensions = props.isSupportingExtensions();
 
+        this.proxyFactory = this.proxyPackage.equalsIgnoreCase("") ? null : Eco.getHandler().createProxyFactory(this);
+        this.logger = Eco.getHandler().createLogger(this);
+
+        this.getLogger().info("Initializing " + this.getColor() + this.getName());
+
         this.scheduler = Eco.getHandler().createScheduler(this);
         this.eventManager = Eco.getHandler().createEventManager(this);
         this.namespacedKeyFactory = Eco.getHandler().createNamespacedKeyFactory(this);
@@ -311,16 +316,12 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         this.runnableFactory = Eco.getHandler().createRunnableFactory(this);
         this.extensionLoader = Eco.getHandler().createExtensionLoader(this);
         this.configHandler = Eco.getHandler().createConfigHandler(this);
-        this.logger = Eco.getHandler().createLogger(this);
-        this.proxyFactory = this.proxyPackage.equalsIgnoreCase("") ? null : Eco.getHandler().createProxyFactory(this);
 
         this.langYml = this.createLangYml();
         this.configYml = this.createConfigYml();
 
         Eco.getHandler().addNewPlugin(this);
 
-        this.getLogger().info("Initializing " + this.getColor() + this.getName());
-
         /*
         The minimum eco version check was moved here because it's very common
         to add a lot of code in the constructor of plugins; meaning that the plugin

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

@@ -15,6 +15,7 @@ import com.willfp.eco.core.factory.RunnableFactory;
 import com.willfp.eco.core.fast.FastItemStack;
 import com.willfp.eco.core.gui.GUIFactory;
 import com.willfp.eco.core.integrations.placeholder.PlaceholderIntegration;
+import com.willfp.eco.core.items.SNBTHandler;
 import com.willfp.eco.core.proxy.Cleaner;
 import com.willfp.eco.core.proxy.ProxyFactory;
 import com.willfp.eco.core.scheduling.Scheduler;
@@ -282,8 +283,7 @@ public interface Handler {
      * @param <T> The mob type.
      * @return The controlled entity.
      */
-    @NotNull
+    @NotNull <T extends Mob> EntityController<T> createEntityController(@NotNull T mob);
-    <T extends Mob> EntityController<T> createEntityController(@NotNull T mob);
 
     /**
      * Adapt base PDC to extended PDC.
@@ -301,4 +301,12 @@ public interface Handler {
      */
     @NotNull
     PersistentDataContainer newPdc();
+
+    /**
+     * Get SNBT handler.
+     *
+     * @return The SNBT handler.
+     */
+    @NotNull
+    SNBTHandler getSNBTHandler();
 }

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

@@ -41,11 +41,19 @@ public class Prerequisite {
             "Requires server to have vault"
     );
 
+    /**
+     * Requires the server to be running 1.19.
+     */
+    public static final Prerequisite HAS_1_19 = new Prerequisite(
+            () -> ProxyConstants.NMS_VERSION.contains("19"),
+            "Requires server to be running 1.19+"
+    );
+
     /**
      * Requires the server to be running 1.18.
      */
     public static final Prerequisite HAS_1_18 = new Prerequisite(
-            () -> ProxyConstants.NMS_VERSION.contains("18"),
+            () -> ProxyConstants.NMS_VERSION.contains("18") || HAS_1_19.isMet(),
             "Requires server to be running 1.18+"
     );
 

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

@@ -3,6 +3,7 @@ package com.willfp.eco.core.config.interfaces;
 import com.willfp.eco.core.config.BuildableConfig;
 import com.willfp.eco.core.config.ConfigType;
 import com.willfp.eco.core.config.TransientConfig;
+import com.willfp.eco.core.placeholder.AdditionalPlayer;
 import com.willfp.eco.core.placeholder.InjectablePlaceholder;
 import com.willfp.eco.core.placeholder.PlaceholderInjectable;
 import com.willfp.eco.util.NumberUtils;
@@ -14,6 +15,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -159,6 +161,20 @@ public interface Config extends Cloneable, PlaceholderInjectable {
         return Double.valueOf(getDoubleFromExpression(path, player)).intValue();
     }
 
+    /**
+     * 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.
+     * @param additionalPlayers The additional players 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,
+                                     @NotNull Collection<AdditionalPlayer> additionalPlayers) {
+        return Double.valueOf(getDoubleFromExpression(path, player, additionalPlayers)).intValue();
+    }
+
 
     /**
      * Get an integer from config.
@@ -474,6 +490,20 @@ public interface Config extends Cloneable, PlaceholderInjectable {
         return NumberUtils.evaluateExpression(this.getString(path), player, this);
     }
 
+    /**
+     * 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.
+     * @param additionalPlayers The additional players 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,
+                                           @NotNull Collection<AdditionalPlayer> additionalPlayers) {
+        return NumberUtils.evaluateExpression(this.getString(path), player, this, additionalPlayers);
+    }
+
     /**
      * Get a decimal from config.
      *

eco-api/src/main/java/com/willfp/eco/core/display/DisplayModule.java

@@ -64,6 +64,21 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
         // Technically optional.
     }
 
+    /**
+     * Display an item.
+     *
+     * @param itemStack  The item.
+     * @param player     The player.
+     * @param properties The properties.
+     * @param args       Optional args for display.
+     */
+    public void display(@NotNull final ItemStack itemStack,
+                        @Nullable final Player player,
+                        @NotNull final DisplayProperties properties,
+                        @NotNull final Object... args) {
+        // Technically optional.
+    }
+
     /**
      * Revert an item.
      *

eco-api/src/main/java/com/willfp/eco/core/display/DisplayProperties.java

@@ -0,0 +1,18 @@
+package com.willfp.eco.core.display;
+
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Extra properties passed into {@link DisplayModule}.
+ *
+ * @param inInventory  If the item was in an inventory.
+ * @param inGui        If the item is assumed to be in a gui. (Not perfectly accurate).
+ * @param originalItem The original item, not to be modified.
+ */
+public record DisplayProperties(
+        boolean inInventory,
+        boolean inGui,
+        @NotNull ItemStack originalItem
+) {
+}

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

@@ -68,6 +68,14 @@ public interface MenuBuilder {
      */
     MenuBuilder onClose(@NotNull CloseHandler action);
 
+    /**
+     * Set the menu open handler.
+     *
+     * @param action The handler.
+     * @return The builder.
+     */
+    MenuBuilder onOpen(@NotNull OpenHandler action);
+
     /**
      * Set the action to run on render.
      *

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

@@ -0,0 +1,19 @@
+package com.willfp.eco.core.gui.menu;
+
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Interface to run on menu open.
+ */
+@FunctionalInterface
+public interface OpenHandler {
+    /**
+     * Performs this operation on the given arguments.
+     *
+     * @param player The player.
+     * @param menu   The menu.
+     */
+    void handle(@NotNull Player player,
+                @NotNull Menu menu);
+}

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

@@ -4,6 +4,7 @@ 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.AdditionalPlayer;
 import com.willfp.eco.core.placeholder.InjectablePlaceholder;
 import com.willfp.eco.core.placeholder.Placeholder;
 import com.willfp.eco.core.placeholder.PlaceholderInjectable;
@@ -11,11 +12,13 @@ import com.willfp.eco.core.placeholder.PlayerPlaceholder;
 import com.willfp.eco.core.placeholder.PlayerStaticPlaceholder;
 import com.willfp.eco.core.placeholder.PlayerlessPlaceholder;
 import com.willfp.eco.core.placeholder.StaticPlaceholder;
+import com.willfp.eco.util.StringUtils;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -23,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Class to handle placeholder integrations.
@@ -56,11 +61,17 @@ public final class PlaceholderManager {
         }
 
         @Override
-        public @NotNull List<InjectablePlaceholder> getPlaceholderInjections() {
+        public @NotNull
+        List<InjectablePlaceholder> getPlaceholderInjections() {
             return Collections.emptyList();
         }
     };
 
+    /**
+     * The default PlaceholderAPI pattern; brought in for compatibility.
+     */
+    private static final Pattern PATTERN = Pattern.compile("[%]([^%]+)[%]");
+
     /**
      * Register a new placeholder integration.
      *
@@ -192,7 +203,45 @@ public final class PlaceholderManager {
     public static String translatePlaceholders(@NotNull final String text,
                                                @Nullable final Player player,
                                                @NotNull final PlaceholderInjectable context) {
+        return translatePlaceholders(text, player, context, new ArrayList<>());
+    }
+
+    /**
+     * 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 context           The injectable context.
+     * @param additionalPlayers Additional players to translate placeholders for.
+     * @return The text, translated.
+     */
+    public static String translatePlaceholders(@NotNull final String text,
+                                               @Nullable final Player player,
+                                               @NotNull final PlaceholderInjectable context,
+                                               @NotNull final Collection<AdditionalPlayer> additionalPlayers) {
         String processed = text;
+
+        // Prevent running 2 scans if there are no additional players.
+        if (!additionalPlayers.isEmpty()) {
+            List<String> found = findPlaceholdersIn(text);
+
+            for (AdditionalPlayer additionalPlayer : additionalPlayers) {
+                for (String placeholder : found) {
+                    String prefix = "%" + additionalPlayer.getIdentifier() + "_";
+
+                    if (placeholder.startsWith(prefix)) {
+                        processed = processed.replace(
+                                placeholder,
+                                translatePlaceholders(
+                                        "%" + StringUtils.removePrefix(prefix, placeholder),
+                                        additionalPlayer.getPlayer()
+                                )
+                        );
+                    }
+                }
+            }
+        }
+
         for (PlaceholderIntegration integration : REGISTERED_INTEGRATIONS) {
             processed = integration.translate(processed, player);
         }
@@ -214,12 +263,21 @@ public final class PlaceholderManager {
      * @return The placeholders.
      */
     public static List<String> findPlaceholdersIn(@NotNull final String text) {
-        List<String> found = new ArrayList<>();
+        Set<String> found = new HashSet<>();
+
+        // Mock PAPI for those without it installed
+        if (REGISTERED_INTEGRATIONS.isEmpty()) {
+            Matcher matcher = PATTERN.matcher(text);
+            while (matcher.find()) {
+                found.add(matcher.group());
+            }
+        }
+
         for (PlaceholderIntegration integration : REGISTERED_INTEGRATIONS) {
             found.addAll(integration.findPlaceholdersIn(text));
         }
 
-        return found;
+        return new ArrayList<>(found);
     }
 
     private record EntryWithPlayer(@NotNull PlayerPlaceholder entry,

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

@@ -2,6 +2,7 @@ package com.willfp.eco.core.items;
 
 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.fast.FastItemStack;
 import com.willfp.eco.core.items.args.LookupArgParser;
 import com.willfp.eco.core.items.provider.ItemProvider;
@@ -185,6 +186,10 @@ public final class Items {
      */
     @NotNull
     public static TestableItem lookup(@NotNull final String key) {
+        if (key.startsWith("{")) {
+            return Eco.getHandler().getSNBTHandler().createTestable(key);
+        }
+
         return ITEMS_LOOKUP_HANDLER.parseKey(key);
     }
 
@@ -520,6 +525,28 @@ public final class Items {
         return fis.unwrap();
     }
 
+    /**
+     * Convert item to SNBT.
+     *
+     * @param itemStack The item.
+     * @return The NBT string.
+     */
+    @NotNull
+    public static String toSNBT(@NotNull final ItemStack itemStack) {
+        return Eco.getHandler().getSNBTHandler().toSNBT(itemStack);
+    }
+
+    /**
+     * Get item from SNBT.
+     *
+     * @param snbt The NBT string.
+     * @return The ItemStack, or null if invalid.
+     */
+    @Nullable
+    public static ItemStack fromSNBT(@NotNull final String snbt) {
+        return Eco.getHandler().getSNBTHandler().fromSNBT(snbt);
+    }
+
     private Items() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

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

@@ -0,0 +1,41 @@
+package com.willfp.eco.core.items;
+
+import com.willfp.eco.core.Eco;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * API to handle SNBT conversion.
+ */
+@ApiStatus.Internal
+@Eco.HandlerComponent
+public interface SNBTHandler {
+    /**
+     * Get item from SNBT.
+     *
+     * @param snbt The NBT string.
+     * @return The ItemStack, or null if invalid.
+     */
+    @Nullable
+    ItemStack fromSNBT(@NotNull String snbt);
+
+    /**
+     * Convert item to SNBT.
+     *
+     * @param itemStack The item.
+     * @return The NBT string.
+     */
+    @NotNull
+    String toSNBT(@NotNull ItemStack itemStack);
+
+    /**
+     * Make TestableItem from SNBT.
+     *
+     * @param snbt The NBT string.
+     * @return The TestableItem.
+     */
+    @NotNull
+    TestableItem createTestable(@NotNull String snbt);
+}

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

@@ -0,0 +1,49 @@
+package com.willfp.eco.core.placeholder;
+
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * An additional player with an identifier to parse placeholders for the player.
+ */
+public class AdditionalPlayer {
+    /**
+     * The player.
+     */
+    private final Player player;
+
+    /**
+     * The identifier.
+     */
+    private final String identifier;
+
+    /**
+     * Create a new additional player.
+     *
+     * @param player     The player.
+     * @param identifier The identifier.
+     */
+    public AdditionalPlayer(@NotNull final Player player,
+                            @NotNull final String identifier) {
+        this.player = player;
+        this.identifier = identifier;
+    }
+
+    /**
+     * Get the player.
+     *
+     * @return The player.
+     */
+    public Player getPlayer() {
+        return player;
+    }
+
+    /**
+     * Get the identifier.
+     *
+     * @return The identifier.
+     */
+    public String getIdentifier() {
+        return identifier;
+    }
+}

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

@@ -20,7 +20,8 @@ public final class ProxyConstants {
     public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
             "v1_17_R1",
             "v1_18_R1",
-            "v1_18_R2"
+            "v1_18_R2",
+            "v1_19_R1"
     );
 
     private ProxyConstants() {

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

@@ -1,12 +1,24 @@
 package com.willfp.eco.util;
 
+import com.willfp.eco.core.gui.menu.Menu;
 import com.willfp.eco.core.tuples.Pair;
+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.util.function.Function;
 
 /**
  * Utilities / API methods for menus.
  */
 public final class MenuUtils {
+    /**
+     * The menu supplier.
+     */
+    private static Function<Player, Menu> menuGetter = null;
+
     /**
      * Convert 0-53 slot to row and column pair.
      *
@@ -31,6 +43,29 @@ public final class MenuUtils {
         return (column - 1) + ((row - 1) * 9);
     }
 
+    /**
+     * Get a player's open menu.
+     *
+     * @param player The player.
+     * @return The menu, or null if none open.
+     */
+    @Nullable
+    public static Menu getOpenMenu(@NotNull final Player player) {
+        return menuGetter.apply(player);
+    }
+
+    /**
+     * Initialize the tps supplier function.
+     *
+     * @param function The function.
+     */
+    @ApiStatus.Internal
+    public static void initialize(@NotNull final Function<Player, Menu> function) {
+        Validate.isTrue(menuGetter == null, "Already initialized!");
+
+        menuGetter = function;
+    }
+
     private MenuUtils() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

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.AdditionalPlayer;
 import com.willfp.eco.core.placeholder.InjectablePlaceholder;
 import com.willfp.eco.core.placeholder.PlaceholderInjectable;
 import com.willfp.eco.core.placeholder.StaticPlaceholder;
@@ -11,6 +12,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -263,7 +265,8 @@ public final class NumberUtils {
             }
 
             @Override
-            public @NotNull List<InjectablePlaceholder> getPlaceholderInjections() {
+            public @NotNull
+            List<InjectablePlaceholder> getPlaceholderInjections() {
                 return Collections.emptyList();
             }
         });
@@ -282,7 +285,7 @@ public final class NumberUtils {
     public static double evaluateExpression(@NotNull final String expression,
                                             @Nullable final Player player,
                                             @NotNull final Iterable<StaticPlaceholder> statics) {
-        return crunch.evaluate(expression, player, new PlaceholderInjectable() {
+        return evaluateExpression(expression, player, new PlaceholderInjectable() {
             @Override
             public void clearInjectedPlaceholders() {
                 // Do nothing.
@@ -304,13 +307,29 @@ public final class NumberUtils {
      *
      * @param expression The expression.
      * @param player     The player.
-     * @param context The injectable placeholders.
+     * @param context    The injectable 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 PlaceholderInjectable context) {
-        return crunch.evaluate(expression, player, context);
+        return evaluateExpression(expression, player, context, new ArrayList<>());
+    }
+
+    /**
+     * Evaluate an expression with respect to a player (for placeholders).
+     *
+     * @param expression        The expression.
+     * @param player            The player.
+     * @param context           The injectable placeholders.
+     * @param additionalPlayers Additional players to parse placeholders for.
+     * @return The value of the expression, or zero if invalid.
+     */
+    public static double evaluateExpression(@NotNull final String expression,
+                                            @Nullable final Player player,
+                                            @NotNull final PlaceholderInjectable context,
+                                            @NotNull final Collection<AdditionalPlayer> additionalPlayers) {
+        return crunch.evaluate(expression, player, context, additionalPlayers);
     }
 
     /**
@@ -332,14 +351,16 @@ public final class NumberUtils {
         /**
          * Evaluate an expression.
          *
-         * @param expression The expression.
+         * @param expression        The expression.
-         * @param player     The player.
+         * @param player            The player.
-         * @param injectable The injectable placeholders.
+         * @param injectable        The injectable placeholders.
+         * @param additionalPlayers The additional players.
          * @return The value of the expression, or zero if invalid.
          */
         double evaluate(@NotNull String expression,
                         @Nullable Player player,
-                        @NotNull PlaceholderInjectable injectable);
+                        @NotNull PlaceholderInjectable injectable,
+                        @NotNull Collection<AdditionalPlayer> additionalPlayers);
     }
 
     private NumberUtils() {

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

@@ -152,6 +152,20 @@ public final class VectorUtils {
         return vectors.toArray(new Vector[0]);
     }
 
+    /**
+     * Get if a vector is a safe velocity.
+     *
+     * @param vec The vector to check.
+     * @return If safe.
+     */
+    public static boolean isSafeVelocity(@NotNull final Vector vec) {
+        double x = Math.abs(vec.getX());
+        double y = Math.abs(vec.getY());
+        double z = Math.abs(vec.getZ());
+
+        return x < 4 && y < 4 && z < 4;
+    }
+
     private VectorUtils() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

eco-api/src/main/kotlin/com/willfp/eco/core/gui/GUIHelpers.kt

@@ -109,6 +109,10 @@ fun slot(
 fun MenuBuilder.onClose(action: (InventoryCloseEvent, Menu) -> Unit): MenuBuilder =
     this.onClose { a, b -> action(a, b) }
 
+/** @see MenuBuilder.onOpen */
+fun MenuBuilder.onOpen(action: (Player, Menu) -> Unit): MenuBuilder =
+    this.onOpen { a, b -> action(a, b) }
+
 /** @see MenuBuilder.modify */
 fun MenuBuilder.modify(modifier: (MenuBuilder) -> Unit): MenuBuilder =
     this.modfiy { modifier(it) }

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

@@ -0,0 +1,10 @@
+@file:JvmName("MenuUtilsExtensions")
+
+package com.willfp.eco.util
+
+import com.willfp.eco.core.gui.menu.Menu
+import org.bukkit.entity.Player
+
+/** @see MenuUtils.getOpenMenu */
+val Player.openMenu: Menu?
+    get() = MenuUtils.getOpenMenu(this)

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

@@ -11,3 +11,7 @@ val Vector.isFinite: Boolean
 /** @see VectorUtils.simplifyVector */
 fun Vector.simplify(): Vector =
     VectorUtils.simplifyVector(this)
+
+/** @see VectorUtils.isSafeVelocity */
+val Vector.isSafeVelocity: Boolean
+    get() = VectorUtils.isSafeVelocity(this)

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/display/EcoDisplayHandler.kt

@@ -4,6 +4,7 @@ import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.display.Display
 import com.willfp.eco.core.display.DisplayHandler
 import com.willfp.eco.core.display.DisplayModule
+import com.willfp.eco.core.display.DisplayProperties
 import com.willfp.eco.core.fast.fast
 import org.bukkit.NamespacedKey
 import org.bukkit.entity.Player
@@ -32,13 +33,21 @@ class EcoDisplayHandler(plugin: EcoPlugin) : DisplayHandler {
             }
         }
 
-
         Display.revert(itemStack)
 
         if (!itemStack.hasItemMeta()) {
             return itemStack
         }
 
+        val original = itemStack.clone()
+        val inventory = player?.openInventory?.topInventory
+        val inInventory = inventory?.contains(original) ?: false
+
+        val props = DisplayProperties(
+            inInventory,
+            inInventory && inventory?.holder == null,
+            original
+        )
 
         for ((_, modules) in registeredModules) {
             for (module in modules) {
@@ -48,6 +57,7 @@ class EcoDisplayHandler(plugin: EcoPlugin) : DisplayHandler {
 
                 if (player != null) {
                     module.display(itemStack, player as Player?, *varargs)
+                    module.display(itemStack, player as Player?, props, *varargs)
                 }
             }
         }

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

@@ -2,6 +2,7 @@ package com.willfp.eco.internal.gui.menu
 
 import com.willfp.eco.core.gui.menu.CloseHandler
 import com.willfp.eco.core.gui.menu.Menu
+import com.willfp.eco.core.gui.menu.OpenHandler
 import com.willfp.eco.core.gui.slot.Slot
 import com.willfp.eco.internal.gui.slot.EcoSlot
 import com.willfp.eco.util.NamespacedKeyUtils
@@ -19,7 +20,8 @@ class EcoMenu(
     val slots: List<MutableList<EcoSlot>>,
     private val title: String,
     private val onClose: CloseHandler,
-    private val onRender: (Player, Menu) -> Unit
+    private val onRender: (Player, Menu) -> Unit,
+    private val onOpen: OpenHandler
 ) : Menu {
     override fun getSlot(row: Int, column: Int): Slot {
         if (row < 1 || row > this.rows) {
@@ -49,6 +51,7 @@ class EcoMenu(
 
         player.openInventory(inventory)
         MenuHandler.registerInventory(inventory, this, player)
+        onOpen.handle(player, this)
         inventory.asRenderedInventory()?.generateCaptive()
         return inventory
     }

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

@@ -3,6 +3,7 @@ package com.willfp.eco.internal.gui.menu
 import com.willfp.eco.core.gui.menu.CloseHandler
 import com.willfp.eco.core.gui.menu.Menu
 import com.willfp.eco.core.gui.menu.MenuBuilder
+import com.willfp.eco.core.gui.menu.OpenHandler
 import com.willfp.eco.core.gui.slot.FillerMask
 import com.willfp.eco.core.gui.slot.FillerSlot
 import com.willfp.eco.core.gui.slot.Slot
@@ -21,6 +22,7 @@ class EcoMenuBuilder(private val rows: Int ) : MenuBuilder {
     private var maskSlots: List<MutableList<Slot?>>
     private val slots: List<MutableList<Slot?>> = ListUtils.create2DList(rows, 9)
     private var onClose = CloseHandler { _, _ -> }
+    private var onOpen = OpenHandler { _, _ -> }
     private var onRender: (Player, Menu) -> Unit = { _, _ -> }
 
     override fun setTitle(title: String): MenuBuilder {
@@ -54,6 +56,11 @@ class EcoMenuBuilder(private val rows: Int ) : MenuBuilder {
         return this
     }
 
+    override fun onOpen(action: OpenHandler): MenuBuilder {
+        onOpen = action
+        return this
+    }
+
     override fun onRender(action: BiConsumer<Player, Menu>): MenuBuilder {
         onRender = { a, b -> action.accept(a, b) }
         return this
@@ -83,7 +90,7 @@ class EcoMenuBuilder(private val rows: Int ) : MenuBuilder {
             finalSlots.add(tempRow)
         }
 
-        return EcoMenu(rows, finalSlots, title, onClose, onRender)
+        return EcoMenu(rows, finalSlots, title, onClose, onRender, onOpen)
     }
 
     init {

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/slot/EcoSlot.kt

@@ -38,7 +38,7 @@ open class EcoSlot(
     }
 
     override fun getItemStack(player: Player): ItemStack {
-        val menu = player.openInventory.topInventory.getMenu()!!
+        val menu = player.openInventory.topInventory.getMenu() ?: return ItemStack(Material.AIR)
         val prev = provider.provide(player, menu)
         return updater.update(player, menu, prev) ?: ItemStack(Material.AIR)
     }

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

@@ -0,0 +1,53 @@
+package com.willfp.eco.internal.spigot.proxy.v1_17_R1
+
+import com.willfp.eco.core.items.TestableItem
+import com.willfp.eco.core.recipe.parts.EmptyTestableItem
+import com.willfp.eco.internal.spigot.proxy.SNBTConverterProxy
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.SnbtPrinterTagVisitor
+import net.minecraft.nbt.TagParser
+import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack
+import org.bukkit.inventory.ItemStack
+
+class SNBTConverter : SNBTConverterProxy {
+    override fun fromSNBT(snbt: String): ItemStack? {
+        val nbt = runCatching { TagParser.parseTag(snbt) }.getOrNull() ?: return null
+        val nms = net.minecraft.world.item.ItemStack.of(nbt)
+        return CraftItemStack.asBukkitCopy(nms)
+    }
+
+    override fun toSNBT(itemStack: ItemStack): String {
+        val nms = CraftItemStack.asNMSCopy(itemStack)
+        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
+    }
+
+    override fun makeSNBTTestable(snbt: String): TestableItem {
+        val nbt = runCatching { TagParser.parseTag(snbt) }.getOrNull() ?: return EmptyTestableItem()
+        val nms = net.minecraft.world.item.ItemStack.of(nbt)
+        if (nms == net.minecraft.world.item.ItemStack.EMPTY) {
+            return EmptyTestableItem()
+        }
+
+        nbt.remove("Count")
+
+        return SNBTTestableItem(CraftItemStack.asBukkitCopy(nms), nbt)
+    }
+
+    class SNBTTestableItem(
+        private val item: ItemStack,
+        private val tag: CompoundTag
+    ) : TestableItem {
+        override fun matches(itemStack: ItemStack?): Boolean {
+            if (itemStack == null) {
+                return false
+            }
+
+            val nms = CraftItemStack.asNMSCopy(itemStack)
+            val nmsTag = nms.save(CompoundTag())
+            nmsTag.remove("Count")
+            return tag.copy().merge(nmsTag) == nmsTag
+        }
+
+        override fun getItem(): ItemStack = item
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.willfp.eco.internal.spigot.proxy.v1_18_R1
+
+import com.willfp.eco.core.items.TestableItem
+import com.willfp.eco.core.recipe.parts.EmptyTestableItem
+import com.willfp.eco.internal.spigot.proxy.SNBTConverterProxy
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.SnbtPrinterTagVisitor
+import net.minecraft.nbt.TagParser
+import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack
+import org.bukkit.inventory.ItemStack
+
+class SNBTConverter : SNBTConverterProxy {
+    override fun fromSNBT(snbt: String): ItemStack? {
+        val nbt = runCatching { TagParser.parseTag(snbt) }.getOrNull() ?: return null
+        val nms = net.minecraft.world.item.ItemStack.of(nbt)
+        return CraftItemStack.asBukkitCopy(nms)
+    }
+
+    override fun toSNBT(itemStack: ItemStack): String {
+        val nms = CraftItemStack.asNMSCopy(itemStack)
+        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
+    }
+
+    override fun makeSNBTTestable(snbt: String): TestableItem {
+        val nbt = runCatching { TagParser.parseTag(snbt) }.getOrNull() ?: return EmptyTestableItem()
+        val nms = net.minecraft.world.item.ItemStack.of(nbt)
+        if (nms == net.minecraft.world.item.ItemStack.EMPTY) {
+            return EmptyTestableItem()
+        }
+
+        nbt.remove("Count")
+
+        return SNBTTestableItem(CraftItemStack.asBukkitCopy(nms), nbt)
+    }
+
+    class SNBTTestableItem(
+        private val item: ItemStack,
+        private val tag: CompoundTag
+    ) : TestableItem {
+        override fun matches(itemStack: ItemStack?): Boolean {
+            if (itemStack == null) {
+                return false
+            }
+
+            val nms = CraftItemStack.asNMSCopy(itemStack)
+            val nmsTag = nms.save(CompoundTag())
+            nmsTag.remove("Count")
+            return tag.copy().merge(nmsTag) == nmsTag
+        }
+
+        override fun getItem(): ItemStack = item
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.willfp.eco.internal.spigot.proxy.v1_18_R2
+
+import com.willfp.eco.core.items.TestableItem
+import com.willfp.eco.core.recipe.parts.EmptyTestableItem
+import com.willfp.eco.internal.spigot.proxy.SNBTConverterProxy
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.SnbtPrinterTagVisitor
+import net.minecraft.nbt.TagParser
+import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack
+import org.bukkit.inventory.ItemStack
+
+class SNBTConverter : SNBTConverterProxy {
+    override fun fromSNBT(snbt: String): ItemStack? {
+        val nbt = runCatching { TagParser.parseTag(snbt) }.getOrNull() ?: return null
+        val nms = net.minecraft.world.item.ItemStack.of(nbt)
+        return CraftItemStack.asBukkitCopy(nms)
+    }
+
+    override fun toSNBT(itemStack: ItemStack): String {
+        val nms = CraftItemStack.asNMSCopy(itemStack)
+        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
+    }
+
+    override fun makeSNBTTestable(snbt: String): TestableItem {
+        val nbt = runCatching { TagParser.parseTag(snbt) }.getOrNull() ?: return EmptyTestableItem()
+        val nms = net.minecraft.world.item.ItemStack.of(nbt)
+        if (nms == net.minecraft.world.item.ItemStack.EMPTY) {
+            return EmptyTestableItem()
+        }
+
+        nbt.remove("Count")
+
+        return SNBTTestableItem(CraftItemStack.asBukkitCopy(nms), nbt)
+    }
+
+    class SNBTTestableItem(
+        private val item: ItemStack,
+        private val tag: CompoundTag
+    ) : TestableItem {
+        override fun matches(itemStack: ItemStack?): Boolean {
+            if (itemStack == null) {
+                return false
+            }
+
+            val nms = CraftItemStack.asNMSCopy(itemStack)
+            val nmsTag = nms.save(CompoundTag())
+            nmsTag.remove("Count")
+            return tag.copy().merge(nmsTag) == nmsTag
+        }
+
+        override fun getItem(): ItemStack = item
+    }
+}

eco-core/core-nms/v1_19_R1/build.gradle.kts

@@ -0,0 +1,39 @@
+plugins {
+    id("io.papermc.paperweight.userdev") version "1.3.6"
+}
+
+group = "com.willfp"
+version = rootProject.version
+
+dependencies {
+    implementation(project(":eco-core:core-nms:nms-common"))
+    paperDevBundle("1.19-R0.1-SNAPSHOT")
+
+    implementation("net.kyori:adventure-text-minimessage:4.11.0") {
+        version {
+            strictly("4.11.0")
+        }
+        exclude(group = "net.kyori", module = "adventure-api")
+    }
+}
+
+tasks {
+    build {
+        dependsOn(reobfJar)
+    }
+
+    reobfJar {
+        mustRunAfter(shadowJar)
+    }
+
+    shadowJar {
+        relocate(
+            "com.willfp.eco.internal.spigot.proxy.common",
+            "com.willfp.eco.internal.spigot.proxy.v1_19_R1.common"
+        )
+        relocate(
+            "net.kyori.adventure.text.minimessage",
+            "com.willfp.eco.internal.spigot.proxy.v1_19_R1.minimessage"
+        )
+    }
+}

eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/AutoCraft.kt

@@ -0,0 +1,15 @@
+package com.willfp.eco.internal.spigot.proxy.v1_19_R1
+
+import com.willfp.eco.internal.spigot.proxy.AutoCraftProxy
+import net.minecraft.network.protocol.game.ClientboundPlaceGhostRecipePacket
+import net.minecraft.resources.ResourceLocation
+
+class AutoCraft : AutoCraftProxy {
+    override fun modifyPacket(packet: Any) {
+        val recipePacket = packet as ClientboundPlaceGhostRecipePacket
+        val fKey = recipePacket.javaClass.getDeclaredField("b")
+        fKey.isAccessible = true
+        val key = fKey[recipePacket] as ResourceLocation
+        fKey[recipePacket] = ResourceLocation(key.namespace, key.path + "_displayed")
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.willfp.eco.internal.spigot.proxy.v1_19_R1
+
+import com.willfp.eco.core.display.Display
+import com.willfp.eco.internal.spigot.proxy.ChatComponentProxy
+import net.kyori.adventure.nbt.api.BinaryTagHolder
+import net.kyori.adventure.text.BuildableComponent
+import net.kyori.adventure.text.Component
+import net.kyori.adventure.text.TranslatableComponent
+import net.kyori.adventure.text.event.HoverEvent
+import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer
+import net.minecraft.nbt.TagParser
+import org.bukkit.Material
+import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack
+import org.bukkit.entity.Player
+import org.bukkit.inventory.ItemStack
+
+@Suppress("UNCHECKED_CAST")
+class ChatComponent : ChatComponentProxy {
+    private val gsonComponentSerializer = GsonComponentSerializer.gson()
+
+    override fun modifyComponent(obj: Any, player: Player): Any {
+        if (obj !is net.minecraft.network.chat.Component) {
+            return obj
+        }
+
+        val component = gsonComponentSerializer.deserialize(
+            net.minecraft.network.chat.Component.Serializer.toJson(
+                obj
+            )
+        ).asComponent() as BuildableComponent<*, *>
+
+        val newComponent = modifyBaseComponent(component, player)
+
+        return net.minecraft.network.chat.Component.Serializer.fromJson(
+            gsonComponentSerializer.serialize(newComponent.asComponent())
+        ) ?: obj
+    }
+
+    private fun modifyBaseComponent(baseComponent: Component, player: Player): Component {
+        var component = baseComponent
+
+        if (component is TranslatableComponent) {
+            val args = mutableListOf<Component>()
+            for (arg in component.args()) {
+                args.add(modifyBaseComponent(arg, player))
+            }
+            component = component.args(args)
+        }
+
+        val children = mutableListOf<Component>()
+        for (child in component.children()) {
+            children.add(modifyBaseComponent(child, player))
+        }
+        component = component.children(children)
+
+        val hoverEvent: HoverEvent<Any> = component.style().hoverEvent() as HoverEvent<Any>? ?: return component
+
+        val showItem = hoverEvent.value()
+
+        if (showItem !is HoverEvent.ShowItem) {
+            return component
+        }
+
+        val newShowItem = showItem.nbt(
+            BinaryTagHolder.binaryTagHolder(
+                CraftItemStack.asNMSCopy(
+                    Display.display(
+                        CraftItemStack.asBukkitCopy(
+                            CraftItemStack.asNMSCopy(
+                                ItemStack(
+                                    Material.matchMaterial(
+                                        showItem.item()
+                                            .toString()
+                                    ) ?: return component,
+                                    showItem.count()
+                                )
+                            ).apply {
+                                this.tag = TagParser.parseTag(
+                                    showItem.nbt()?.string() ?: return component
+                                ) ?: return component
+                            }
+                        ),
+                        player
+                    )
+                ).orCreateTag.toString()
+            )
+        )
+
+        val newHover = hoverEvent.value(newShowItem)
+        val style = component.style().hoverEvent(newHover)
+        return component.style(style)
+    }
+}

eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/CommonsInitializer.kt

@@ -0,0 +1,135 @@
+package com.willfp.eco.internal.spigot.proxy.v1_19_R1
+
+import com.willfp.eco.internal.spigot.proxy.CommonsInitializerProxy
+import com.willfp.eco.internal.spigot.proxy.common.CommonsProvider
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.Tag
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.entity.PathfinderMob
+import org.bukkit.Bukkit
+import org.bukkit.NamespacedKey
+import org.bukkit.craftbukkit.v1_19_R1.CraftServer
+import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity
+import org.bukkit.craftbukkit.v1_19_R1.entity.CraftMob
+import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_19_R1.persistence.CraftPersistentDataContainer
+import org.bukkit.craftbukkit.v1_19_R1.persistence.CraftPersistentDataTypeRegistry
+import org.bukkit.craftbukkit.v1_19_R1.util.CraftMagicNumbers
+import org.bukkit.craftbukkit.v1_19_R1.util.CraftNamespacedKey
+import org.bukkit.entity.LivingEntity
+import org.bukkit.entity.Mob
+import org.bukkit.inventory.ItemStack
+import org.bukkit.persistence.PersistentDataContainer
+import java.lang.reflect.Field
+
+class CommonsInitializer : CommonsInitializerProxy {
+    override fun init() {
+        CommonsProvider.setIfNeeded(CommonsProviderImpl)
+    }
+
+    object CommonsProviderImpl : CommonsProvider {
+        private val cisHandle: Field = CraftItemStack::class.java.getDeclaredField("handle").apply {
+            isAccessible = true
+        }
+
+        private val pdcRegsitry = Class.forName("org.bukkit.craftbukkit.v1_19_R1.inventory.CraftMetaItem")
+            .getDeclaredField("DATA_TYPE_REGISTRY")
+            .apply { isAccessible = true }
+            .get(null) as CraftPersistentDataTypeRegistry
+
+        override val nbtTagString = CraftMagicNumbers.NBT.TAG_STRING
+
+        override fun toPathfinderMob(mob: Mob): PathfinderMob? {
+            val craft = mob as? CraftMob ?: return null
+            return craft.handle as? PathfinderMob
+        }
+
+        override fun toResourceLocation(namespacedKey: NamespacedKey): ResourceLocation =
+            CraftNamespacedKey.toMinecraft(namespacedKey)
+
+        override fun asNMSStack(itemStack: ItemStack): net.minecraft.world.item.ItemStack {
+            return if (itemStack !is CraftItemStack) {
+                CraftItemStack.asNMSCopy(itemStack)
+            } else {
+                cisHandle[itemStack] as net.minecraft.world.item.ItemStack? ?: CraftItemStack.asNMSCopy(itemStack)
+            }
+        }
+
+        override fun asBukkitStack(itemStack: net.minecraft.world.item.ItemStack): ItemStack {
+            return CraftItemStack.asBukkitCopy(itemStack)
+        }
+
+        override fun mergeIfNeeded(itemStack: ItemStack, nmsStack: net.minecraft.world.item.ItemStack) {
+            if (itemStack !is CraftItemStack) {
+                itemStack.itemMeta = CraftItemStack.asCraftMirror(nmsStack).itemMeta
+            }
+        }
+
+        override fun toBukkitEntity(entity: net.minecraft.world.entity.LivingEntity): LivingEntity? =
+            CraftEntity.getEntity(Bukkit.getServer() as CraftServer, entity) as? LivingEntity
+
+        override fun makePdc(tag: CompoundTag, base: Boolean): PersistentDataContainer {
+            fun emptyPdc(): CraftPersistentDataContainer = CraftPersistentDataContainer(pdcRegsitry)
+
+            fun CompoundTag?.toPdc(): PersistentDataContainer {
+                val pdc = emptyPdc()
+                this ?: return pdc
+                val keys = this.allKeys
+                for (key in keys) {
+                    pdc.put(key, this[key])
+                }
+
+                return pdc
+            }
+
+            return if (base) {
+                tag.toPdc()
+            } else {
+                if (tag.contains("PublicBukkitValues")) {
+                    tag.getCompound("PublicBukkitValues").toPdc()
+                } else {
+                    emptyPdc()
+                }
+            }
+        }
+
+        override fun setPdc(
+            tag: CompoundTag,
+            pdc: PersistentDataContainer?,
+            item: net.minecraft.world.item.ItemStack?
+        ) {
+            fun CraftPersistentDataContainer.toTag(): CompoundTag {
+                val compound = CompoundTag()
+                val rawPublicMap: Map<String, Tag> = this.raw
+                for ((key, value) in rawPublicMap) {
+                    compound.put(key, value)
+                }
+
+                return compound
+            }
+
+            val container = when (pdc) {
+                is CraftPersistentDataContainer? -> pdc
+                else -> null
+            }
+
+            if (item != null) {
+                if (container != null && !container.isEmpty) {
+                    for (key in tag.allKeys.toSet()) {
+                        tag.remove(key)
+                    }
+
+                    tag.merge(container.toTag())
+                } else {
+                    item.setTag(null)
+                }
+            } else {
+                if (container != null && !container.isEmpty) {
+                    tag.put("PublicBukkitValues", container.toTag())
+                } else {
+                    tag.remove("PublicBukkitValues")
+                }
+            }
+        }
+    }
+}

eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/DummyEntityFactory.kt

@@ -0,0 +1,16 @@
+package com.willfp.eco.internal.spigot.proxy.v1_19_R1
+
+import com.willfp.eco.internal.entities.EcoDummyEntity
+import com.willfp.eco.internal.spigot.proxy.DummyEntityFactoryProxy
+import org.bukkit.Location
+import org.bukkit.craftbukkit.v1_19_R1.CraftWorld
+import org.bukkit.entity.Entity
+import org.bukkit.entity.EntityType
+
+class DummyEntityFactory : DummyEntityFactoryProxy {
+    override fun createDummyEntity(location: Location): Entity {
+        val world = location.world as CraftWorld
+        @Suppress("UsePropertyAccessSyntax")
+        return EcoDummyEntity(world.createEntity(location, EntityType.ZOMBIE.entityClass).getBukkitEntity())
+    }
+}

eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/EntityControllerFactory.kt

@@ -0,0 +1,12 @@
+package com.willfp.eco.internal.spigot.proxy.v1_19_R1
+
+import com.willfp.eco.core.entities.ai.EntityController
+import com.willfp.eco.internal.spigot.proxy.EntityControllerFactoryProxy
+import com.willfp.eco.internal.spigot.proxy.common.ai.EcoEntityController
+import org.bukkit.entity.Mob
+
+class EntityControllerFactory : EntityControllerFactoryProxy {
+    override fun <T : Mob> createEntityController(entity: T): EntityController<T> {
+        return EcoEntityController(entity)
+    }
+}

eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/ExtendedPersistentDataContainerFactory.kt

@@ -0,0 +1,70 @@
+package com.willfp.eco.internal.spigot.proxy.v1_19_R1
+
+import com.willfp.eco.core.data.ExtendedPersistentDataContainer
+import com.willfp.eco.internal.spigot.proxy.ExtendedPersistentDataContainerFactoryProxy
+import net.minecraft.nbt.Tag
+import org.bukkit.craftbukkit.v1_19_R1.persistence.CraftPersistentDataContainer
+import org.bukkit.craftbukkit.v1_19_R1.persistence.CraftPersistentDataTypeRegistry
+import org.bukkit.persistence.PersistentDataContainer
+import org.bukkit.persistence.PersistentDataType
+
+class ExtendedPersistentDataContainerFactory: ExtendedPersistentDataContainerFactoryProxy {
+    @Suppress("UNCHECKED_CAST")
+    private val registry: CraftPersistentDataTypeRegistry =
+        CraftPersistentDataContainer::class.java.getDeclaredField("registry")
+            .apply { isAccessible = true }.get(null) as CraftPersistentDataTypeRegistry
+
+    override fun adapt(pdc: PersistentDataContainer): ExtendedPersistentDataContainer {
+        return when (pdc) {
+            is CraftPersistentDataContainer -> EcoPersistentDataContainer(pdc)
+            else -> throw IllegalArgumentException("Custom PDC instance is not supported!")
+        }
+    }
+
+    override fun newPdc(): PersistentDataContainer {
+        return CraftPersistentDataContainer(registry)
+    }
+
+    inner class EcoPersistentDataContainer(
+        val handle: CraftPersistentDataContainer
+    ) : ExtendedPersistentDataContainer {
+        @Suppress("UNCHECKED_CAST")
+        private val customDataTags: MutableMap<String, Tag> =
+            CraftPersistentDataContainer::class.java.getDeclaredField("customDataTags")
+                .apply { isAccessible = true }.get(handle) as MutableMap<String, Tag>
+
+        override fun <T : Any, Z : Any> set(key: String, dataType: PersistentDataType<T, Z>, value: Z) {
+            customDataTags[key] = registry.wrap(dataType.primitiveType, dataType.toPrimitive(value, handle.adapterContext))
+        }
+
+        override fun <T : Any, Z : Any> has(key: String, dataType: PersistentDataType<T, Z>): Boolean {
+            val value = customDataTags[key] ?: return false
+            return registry.isInstanceOf(dataType.primitiveType, value)
+        }
+
+        override fun <T : Any, Z : Any> get(key: String, dataType: PersistentDataType<T, Z>): Z? {
+            val value = customDataTags[key] ?: return null
+            return dataType.fromPrimitive(registry.extract(dataType.primitiveType, value), handle.adapterContext)
+        }
+
+        override fun <T : Any, Z : Any> getOrDefault(
+            key: String,
+            dataType: PersistentDataType<T, Z>,
+            defaultValue: Z
+        ): Z {
+            return get(key, dataType) ?: defaultValue
+        }
+
+        override fun remove(key: String) {
+            customDataTags.remove(key)
+        }
+
+        override fun getAllKeys(): MutableSet<String> {
+            return customDataTags.keys
+        }
+
+        override fun getBase(): PersistentDataContainer {
+            return handle
+        }
+    }
+}

eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/FastItemStackFactory.kt

@@ -0,0 +1,12 @@
+package com.willfp.eco.internal.spigot.proxy.v1_19_R1
+
+import com.willfp.eco.core.fast.FastItemStack
+import com.willfp.eco.internal.spigot.proxy.FastItemStackFactoryProxy
+import com.willfp.eco.internal.spigot.proxy.common.item.EcoFastItemStack
+import org.bukkit.inventory.ItemStack
+
+class FastItemStackFactory : FastItemStackFactoryProxy {
+    override fun create(itemStack: ItemStack): FastItemStack {
+        return EcoFastItemStack(itemStack)
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.willfp.eco.internal.spigot.proxy.v1_19_R1
+
+import com.willfp.eco.core.display.Display
+import com.willfp.eco.internal.spigot.proxy.MiniMessageTranslatorProxy
+import com.willfp.eco.util.toLegacy
+import net.kyori.adventure.text.minimessage.MiniMessage
+
+class MiniMessageTranslator : MiniMessageTranslatorProxy {
+    override fun format(message: String): String {
+        var mut = message
+
+        val startsWithPrefix = mut.startsWith(Display.PREFIX)
+        if (startsWithPrefix) {
+            mut = mut.substring(2)
+        }
+
+        mut = mut.replace('§', '&')
+
+        val miniMessage = runCatching {
+            MiniMessage.miniMessage().deserialize(
+                mut
+            ).toLegacy()
+        }.getOrNull() ?: mut
+
+        mut = if (startsWithPrefix) {
+            Display.PREFIX + miniMessage
+        } else {
+            miniMessage
+        }
+
+        return mut
+    }
+}

eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/SNBTConverter.kt

@@ -0,0 +1,52 @@
+package com.willfp.eco.internal.spigot.proxy.v1_19_R1
+
+import com.willfp.eco.core.items.TestableItem
+import com.willfp.eco.core.recipe.parts.EmptyTestableItem
+import com.willfp.eco.internal.spigot.proxy.SNBTConverterProxy
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.SnbtPrinterTagVisitor
+import net.minecraft.nbt.TagParser
+import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack
+import org.bukkit.inventory.ItemStack
+
+class SNBTConverter : SNBTConverterProxy {
+    override fun fromSNBT(snbt: String): ItemStack? {
+        val nbt = runCatching { TagParser.parseTag(snbt) }.getOrNull() ?: return null
+        val nms = net.minecraft.world.item.ItemStack.of(nbt)
+        return CraftItemStack.asBukkitCopy(nms)
+    }
+
+    override fun toSNBT(itemStack: ItemStack): String {
+        val nms = CraftItemStack.asNMSCopy(itemStack)
+        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
+    }
+
+    override fun makeSNBTTestable(snbt: String): TestableItem {
+        val nbt = runCatching { TagParser.parseTag(snbt) }.getOrNull() ?: return EmptyTestableItem()
+        val nms = net.minecraft.world.item.ItemStack.of(nbt)
+        if (nms == net.minecraft.world.item.ItemStack.EMPTY) {
+            return EmptyTestableItem()
+        }
+
+        nbt.remove("Count")
+        return SNBTTestableItem(CraftItemStack.asBukkitCopy(nms), nbt)
+    }
+
+    class SNBTTestableItem(
+        private val item: ItemStack,
+        private val tag: CompoundTag
+    ) : TestableItem {
+        override fun matches(itemStack: ItemStack?): Boolean {
+            if (itemStack == null) {
+                return false
+            }
+
+            val nms = CraftItemStack.asNMSCopy(itemStack)
+            val nmsTag = nms.save(CompoundTag())
+            nmsTag.remove("Count")
+            return tag.copy().merge(nmsTag) == nmsTag
+        }
+
+        override fun getItem(): ItemStack = item
+    }
+}

eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/Skull.kt

@@ -0,0 +1,48 @@
+package com.willfp.eco.internal.spigot.proxy.v1_19_R1
+
+import com.mojang.authlib.GameProfile
+import com.mojang.authlib.properties.Property
+import com.willfp.eco.internal.spigot.proxy.SkullProxy
+import org.bukkit.inventory.meta.SkullMeta
+import java.lang.reflect.Field
+import java.lang.reflect.Method
+import java.util.UUID
+
+class Skull : SkullProxy {
+    private lateinit var setProfile: Method
+    private lateinit var profile: Field
+
+    override fun setSkullTexture(
+        meta: SkullMeta,
+        base64: String
+    ) {
+        if (!this::setProfile.isInitialized) {
+            setProfile = meta.javaClass.getDeclaredMethod("setProfile", GameProfile::class.java)
+            setProfile.isAccessible = true
+        }
+        if (base64.length < 20) {
+            return
+        }
+
+        val uuid = UUID(
+            base64.substring(base64.length - 20).hashCode().toLong(),
+            base64.substring(base64.length - 10).hashCode().toLong()
+        )
+        val profile = GameProfile(uuid, "eco")
+        profile.properties.put("textures", Property("textures", base64))
+        setProfile.invoke(meta, profile)
+    }
+
+    override fun getSkullTexture(
+        meta: SkullMeta
+    ): String? {
+        if (!this::profile.isInitialized) {
+            profile = meta.javaClass.getDeclaredField("profile")
+            profile.isAccessible = true
+        }
+        val profile = profile[meta] as GameProfile? ?: return null
+        val properties = profile.properties ?: return null
+        val prop = properties["textures"] ?: return null
+        return prop.toMutableList().firstOrNull()?.name
+    }
+}

eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/TPS.kt

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

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

@@ -0,0 +1,41 @@
+package com.willfp.eco.internal.spigot.proxy.v1_19_R1
+
+import com.willfp.eco.core.display.Display
+import com.willfp.eco.internal.spigot.proxy.VillagerTradeProxy
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.item.trading.MerchantOffer
+import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftMerchantRecipe
+import org.bukkit.entity.Player
+import org.bukkit.inventory.MerchantRecipe
+import java.lang.reflect.Field
+
+class VillagerTrade : VillagerTradeProxy {
+    private val handle: Field = CraftMerchantRecipe::class.java.getDeclaredField("handle")
+
+    override fun displayTrade(
+        recipe: MerchantRecipe,
+        player: Player
+    ): MerchantRecipe {
+        recipe as CraftMerchantRecipe
+
+        val nbt = getHandle(recipe).createTag()
+        for (tag in arrayOf("buy", "buyB", "sell")) {
+            val nms = ItemStack.of(nbt.getCompound(tag))
+            val displayed = Display.display(CraftItemStack.asBukkitCopy(nms), player)
+            val itemNBT = CraftItemStack.asNMSCopy(displayed).save(CompoundTag())
+            nbt.put(tag, itemNBT)
+        }
+
+        return CraftMerchantRecipe(MerchantOffer(nbt))
+    }
+
+    private fun getHandle(recipe: CraftMerchantRecipe): MerchantOffer {
+        return handle[recipe] as MerchantOffer
+    }
+
+    init {
+        handle.isAccessible = true
+    }
+}

eco-core/core-plugin/build.gradle

@@ -6,7 +6,7 @@ dependencies {
     compileOnly project(":eco-core:core-backend")
 
     // Libraries
-    implementation 'com.github.Redempt:Crunch:1.1.2'
+    implementation 'com.github.Redempt:Crunch:master-SNAPSHOT'
     implementation 'mysql:mysql-connector-java:8.0.25'
     implementation 'org.jetbrains.exposed:exposed-core:0.37.3'
     implementation 'org.jetbrains.exposed:exposed-dao:0.37.3'
@@ -22,10 +22,9 @@ dependencies {
     compileOnly 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT'
 
     // Plugin dependencies
-    compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.1-SNAPSHOT'
+    compileOnly 'com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT'
     compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.7-SNAPSHOT'
     compileOnly 'com.github.TechFortress:GriefPrevention:16.17.1'
-    compileOnly 'com.massivecraft:Factions:1.6.9.5-U0.5.10'
     compileOnly 'com.github.cryptomorin:kingdoms:1.12.3'
     compileOnly('com.github.TownyAdvanced:Towny:0.97.2.6') {
         exclude group: 'com.zaxxer', module: 'HikariCP'
@@ -36,12 +35,13 @@ dependencies {
     compileOnly 'com.gmail.nossr50.mcMMO:mcMMO:2.1.202'
     compileOnly 'me.clip:placeholderapi:2.10.10'
     compileOnly 'com.github.oraxen:oraxen:bd81ace154'
-    compileOnly 'com.github.brcdev-minecraft:shopgui-api:2.2.0'
+    compileOnly 'com.github.brcdev-minecraft:shopgui-api:3.0.0'
     compileOnly 'com.github.LoneDev6:API-ItemsAdder:2.4.7'
     compileOnly 'com.arcaniax:HeadDatabase-API:1.3.0'
     compileOnly 'com.gmail.filoghost.holographicdisplays:holographicdisplays-api:2.4.0'
     compileOnly 'com.github.EssentialsX:Essentials:2.18.2'
     compileOnly 'com.bgsoftware:SuperiorSkyblockAPI:1.8.3'
+    compileOnly 'com.songoda:skyblock:2.3.30'
     compileOnly 'com.github.MilkBowl:VaultAPI:1.7'
     compileOnly 'com.github.WhipDevelopment:CrashClaim:f9cd7d92eb'
     compileOnly 'com.wolfyscript.wolfyutilities:wolfyutilities:3.16.0.0'

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

@@ -16,7 +16,11 @@ object ConflictFinder {
                 continue
             }
 
-            val conflict = plugin.getConflict()
+            val conflict = try {
+                plugin.getConflict()
+            } catch (e: Exception) {
+                continue
+            } // Really can't be fucked to do this properly.
 
             if (conflict != null) {
                 conflicts.add(conflict)

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

@@ -7,6 +7,7 @@ import com.willfp.eco.core.data.ExtendedPersistentDataContainer
 import com.willfp.eco.core.entities.ai.EntityController
 import com.willfp.eco.core.fast.FastItemStack
 import com.willfp.eco.core.integrations.placeholder.PlaceholderIntegration
+import com.willfp.eco.core.items.SNBTHandler
 import com.willfp.eco.internal.EcoCleaner
 import com.willfp.eco.internal.EcoPropsParser
 import com.willfp.eco.internal.Plugins
@@ -31,6 +32,7 @@ import com.willfp.eco.internal.spigot.data.EcoKeyRegistry
 import com.willfp.eco.internal.spigot.data.EcoProfileHandler
 import com.willfp.eco.internal.spigot.data.storage.HandlerType
 import com.willfp.eco.internal.spigot.integrations.bstats.MetricHandler
+import com.willfp.eco.internal.spigot.items.EcoSNBTHandler
 import com.willfp.eco.internal.spigot.proxy.CommonsInitializerProxy
 import com.willfp.eco.internal.spigot.proxy.DummyEntityFactoryProxy
 import com.willfp.eco.internal.spigot.proxy.EntityControllerFactoryProxy
@@ -70,6 +72,8 @@ class EcoHandler : EcoSpigotPlugin(), Handler {
         }, this
     )
 
+    private val snbtHandler = EcoSNBTHandler(this)
+
     @Suppress("RedundantNullableReturnType")
     private val keyFactory: InternalNamespacedKeyFactory? =
         if (this.configYml.getBool("use-safer-namespacedkey-creation"))
@@ -170,4 +174,7 @@ class EcoHandler : EcoSpigotPlugin(), Handler {
 
     override fun newPdc(): PersistentDataContainer =
         getProxy(ExtendedPersistentDataContainerFactoryProxy::class.java).newPdc()
+
+    override fun getSNBTHandler(): SNBTHandler =
+        snbtHandler
 }

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

@@ -38,6 +38,7 @@ import com.willfp.eco.internal.entities.EntityArgParserSilent
 import com.willfp.eco.internal.entities.EntityArgParserSize
 import com.willfp.eco.internal.entities.EntityArgParserSpawnReinforcements
 import com.willfp.eco.internal.entities.EntityArgParserSpeed
+import com.willfp.eco.internal.gui.menu.getMenu
 import com.willfp.eco.internal.items.ArgParserColor
 import com.willfp.eco.internal.items.ArgParserCustomModelData
 import com.willfp.eco.internal.items.ArgParserEnchantment
@@ -83,6 +84,7 @@ import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCombatLogX
 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.AntigriefFabledSkyBlock
 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefFactionsUUID
 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefGriefPrevention
 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefIridiumSkyblock
@@ -111,6 +113,7 @@ import com.willfp.eco.internal.spigot.integrations.shop.ShopEconomyShopGUI
 import com.willfp.eco.internal.spigot.integrations.shop.ShopShopGuiPlus
 import com.willfp.eco.internal.spigot.integrations.shop.ShopZShop
 import com.willfp.eco.internal.spigot.math.evaluateExpression
+import com.willfp.eco.internal.spigot.player.PlayerHealthFixer
 import com.willfp.eco.internal.spigot.proxy.FastItemStackFactoryProxy
 import com.willfp.eco.internal.spigot.proxy.SkullProxy
 import com.willfp.eco.internal.spigot.proxy.TPSProxy
@@ -120,6 +123,7 @@ 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.MenuUtils
 import com.willfp.eco.util.NumberUtils
 import com.willfp.eco.util.ServerUtils
 import com.willfp.eco.util.SkullUtils
@@ -180,7 +184,9 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
         val tpsProxy = getProxy(TPSProxy::class.java)
         ServerUtils.initialize { tpsProxy.getTPS() }
 
-        NumberUtils.initCrunch { expression, player, context -> evaluateExpression(expression, player, context) }
+        NumberUtils.initCrunch(::evaluateExpression)
+
+        MenuUtils.initialize { it.openInventory.topInventory.getMenu() }
 
         CustomItemsManager.registerProviders()
 
@@ -259,6 +265,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
             IntegrationLoader("IridiumSkyblock") { AntigriefManager.register(AntigriefIridiumSkyblock()) },
             IntegrationLoader("DeluxeCombat") { AntigriefManager.register(AntigriefDeluxeCombat()) },
             IntegrationLoader("SuperiorSkyblock2") { AntigriefManager.register(AntigriefSuperiorSkyblock2()) },
+            IntegrationLoader("FabledSkyBlock") { AntigriefManager.register(AntigriefFabledSkyBlock()) },
             IntegrationLoader("BentoBox") { AntigriefManager.register(AntigriefBentoBox()) },
             IntegrationLoader("WorldGuard") { AntigriefManager.register(AntigriefWorldGuard()) },
             IntegrationLoader("GriefPrevention") { AntigriefManager.register(AntigriefGriefPrevention()) },
@@ -358,7 +365,8 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
             ArrowDataListener(this),
             ArmorChangeEventListeners(this),
             DataListener(this),
-            PlayerBlockListener(this)
+            PlayerBlockListener(this),
+            PlayerHealthFixer(this)
         )
 
         if (Prerequisite.HAS_PAPER.isMet) {

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

@@ -17,11 +17,13 @@ class PacketSetSlot(plugin: EcoPlugin) : AbstractPacketAdapter(plugin, PacketTyp
         player: Player,
         event: PacketEvent
     ) {
-        packet.itemModifier.modify(0) { item: ItemStack? ->
+        packet.itemModifier.modify(0, object : VersionCompatiblePLibFunction<ItemStack> {
-            Display.display(
+            override fun apply(item: ItemStack) =
-                item!!, player
+                Display.display(
-            )
+                    item,
-        }
+                    player
+                )
+        })
 
         player.lastDisplayFrame = DisplayFrame.EMPTY
     }

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

@@ -0,0 +1,8 @@
+package com.willfp.eco.internal.spigot.display
+
+import com.google.common.base.Function
+import java.util.function.UnaryOperator
+
+interface VersionCompatiblePLibFunction<T> : Function<T, T>, UnaryOperator<T> {
+
+}

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

@@ -13,6 +13,7 @@ import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.inventory.InventoryClickEvent
 import org.bukkit.event.inventory.InventoryCloseEvent
+import org.bukkit.event.player.PlayerItemHeldEvent
 
 class GUIListener(private val plugin: EcoPlugin) : Listener {
     @EventHandler(priority = EventPriority.HIGH)
@@ -45,7 +46,6 @@ class GUIListener(private val plugin: EcoPlugin) : Listener {
         }
 
         val menu = inv.getMenu() ?: return
-        val rendered = inv.asRenderedInventory() ?: return
 
         val (row, column) = MenuUtils.convertSlotToRowColumn(inv.firstEmpty())
 
@@ -54,8 +54,6 @@ class GUIListener(private val plugin: EcoPlugin) : Listener {
         if (!slot.isCaptive) {
             event.isCancelled = true
         }
-
-        plugin.scheduler.run { rendered.render() }
     }
 
     @EventHandler(priority = EventPriority.HIGH)
@@ -66,4 +64,25 @@ class GUIListener(private val plugin: EcoPlugin) : Listener {
 
         plugin.scheduler.run { MenuHandler.unregisterInventory(event.inventory) }
     }
+
+    @EventHandler
+    fun forceRender(event: InventoryClickEvent) {
+        val player = event.whoClicked as? Player ?: return
+        player.renderActiveMenu()
+    }
+
+    @EventHandler
+    fun forceRender(event: PlayerItemHeldEvent) {
+        val player = event.player
+        player.renderActiveMenu()
+    }
+
+    private fun Player.renderActiveMenu() {
+        val inv = this.openInventory.topInventory
+
+        val rendered = inv.asRenderedInventory() ?: return
+
+        rendered.render()
+        plugin.scheduler.run { rendered.render() }
+    }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFabledSkyBlock.kt

@@ -0,0 +1,99 @@
+package com.willfp.eco.internal.spigot.integrations.antigrief
+
+import com.songoda.skyblock.SkyBlock
+import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration
+import org.bukkit.Location
+import org.bukkit.block.Block
+import org.bukkit.entity.LivingEntity
+import org.bukkit.entity.Monster
+import org.bukkit.entity.Player
+
+class AntigriefFabledSkyBlock : AntigriefIntegration {
+
+    override fun getPluginName(): String {
+        return "FabledSkyBlock"
+    }
+
+    override fun canBreakBlock(player: Player, block: Block): Boolean {
+
+        val skyblock = SkyBlock.getInstance()
+        val island = skyblock.islandManager.getIslandAtLocation(block.location) ?: return true
+
+        if (!player.hasPermission("fabledskyblock.bypass.destroy")) {
+            return false
+        }
+
+        if (!skyblock.permissionManager.hasPermission(island, "Destroy", island.getRole(player))) {
+            return false
+        }
+
+        return true
+    }
+
+    override fun canCreateExplosion(player: Player, location: Location): Boolean {
+
+        val skyblock = SkyBlock.getInstance()
+        val island = skyblock.islandManager.getIslandAtLocation(location) ?: return true
+
+        if (!player.hasPermission("fabledskyblock.bypass.explosions")) {
+            return false
+        }
+
+        if (!skyblock.permissionManager.hasPermission(island, "Explosions", island.getRole(player))) {
+            return false
+        }
+
+        return true
+    }
+
+    override fun canPlaceBlock(player: Player, block: Block): Boolean {
+
+        val skyblock = SkyBlock.getInstance()
+        val island = skyblock.islandManager.getIslandAtLocation(block.location) ?: return true
+
+        if (!player.hasPermission("fabledskyblock.bypass.place")) {
+            return false
+        }
+
+        if (!skyblock.permissionManager.hasPermission(island, "Place", island.getRole(player))) {
+            return false
+        }
+
+        return true
+    }
+
+    override fun canInjure(player: Player, victim: LivingEntity): Boolean {
+
+        val skyblock = SkyBlock.getInstance()
+        val island = SkyBlock.getInstance().islandManager.getIslandAtLocation(victim.location) ?: return true
+
+        if (victim is Player) return skyblock.permissionManager.hasPermission(island, "PvP", island.getRole(player))
+
+        val islandPermission = when (victim) {
+            is Monster -> "MonsterHurting"
+            else -> "MobHurting"
+        }
+
+        if (!skyblock.permissionManager.hasPermission(island, islandPermission, island.getRole(player))) {
+            return false
+        }
+
+        return true
+    }
+
+    override fun canPickupItem(player: Player, location: Location): Boolean {
+
+        val skyblock = SkyBlock.getInstance()
+        val island = SkyBlock.getInstance().islandManager.getIslandAtLocation(location) ?: return true
+
+        if (!player.hasPermission("fabledskyblock.bypass.itempickup")) {
+            return false
+        }
+
+        if (!skyblock.permissionManager.hasPermission(island, "ItemPickup", island.getRole(player))) {
+            return false
+        }
+
+        return true
+    }
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFactionsUUID.kt

@@ -5,7 +5,7 @@ import com.massivecraft.factions.FLocation
 import com.massivecraft.factions.FPlayer
 import com.massivecraft.factions.FPlayers
 import com.massivecraft.factions.Faction
-import com.massivecraft.factions.perms.PermissibleAction
+import com.massivecraft.factions.perms.PermissibleActions
 import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration
 import org.bukkit.Location
 import org.bukkit.block.Block
@@ -20,7 +20,7 @@ class AntigriefFactionsUUID : AntigriefIntegration {
         val fplayer: FPlayer = FPlayers.getInstance().getByPlayer(player)
         val flocation = FLocation(block.location)
         val faction: Faction = Board.getInstance().getFactionAt(flocation)
-        return if (!faction.hasAccess(fplayer, PermissibleAction.DESTROY)) {
+        return if (!faction.hasAccess(fplayer, PermissibleActions.DESTROY, flocation)) {
             fplayer.isAdminBypassing
         } else true
     }
@@ -41,7 +41,7 @@ class AntigriefFactionsUUID : AntigriefIntegration {
         val fplayer: FPlayer = FPlayers.getInstance().getByPlayer(player)
         val flocation = FLocation(block.location)
         val faction: Faction = Board.getInstance().getFactionAt(flocation)
-        return if (!faction.hasAccess(fplayer, PermissibleAction.BUILD)) {
+        return if (!faction.hasAccess(fplayer, PermissibleActions.BUILD, flocation)) {
             fplayer.isAdminBypassing
         } else true
     }
@@ -58,7 +58,7 @@ class AntigriefFactionsUUID : AntigriefIntegration {
                 return fplayer.isAdminBypassing
             }
         } else {
-            if (faction.hasAccess(fplayer, PermissibleAction.DESTROY)) {
+            if (faction.hasAccess(fplayer, PermissibleActions.DESTROY, flocation)) {
                 return fplayer.isAdminBypassing
             }
         }

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

@@ -4,16 +4,16 @@ import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.integrations.customitems.CustomItemsIntegration
 import com.willfp.eco.core.items.Items
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem
+import io.lumine.mythic.api.adapters.AbstractItemStack
 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.api.drops.IItemDrop
 import io.lumine.mythic.bukkit.adapters.BukkitItemStack
 import io.lumine.mythic.bukkit.events.MythicDropLoadEvent
-import io.lumine.mythic.core.drops.Drop
+import org.bukkit.Material
-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
+import org.bukkit.inventory.ItemStack
 
 class CustomItemsMythicMobs(
     private val plugin: EcoPlugin
@@ -39,19 +39,16 @@ class CustomItemsMythicMobs(
     private class MythicMobsDrop(
         private val plugin: EcoPlugin,
         itemConfig: MythicLineConfig
-    ) : Drop(itemConfig.line, itemConfig), IMultiDrop {
+    ) : IItemDrop {
-        private val id = itemConfig.getString(arrayOf("type", "t", "item", "i"), this.dropVar)
+        private val id = itemConfig.getString(arrayOf("type", "t", "item", "i"), "eco")
-
-        override fun get(data: DropMetadata): LootBag {
-            val bag = LootBag(data)
 
+        override fun getDrop(data: DropMetadata, v: Double): AbstractItemStack {
             val item = Items.lookup(id)
             if (item is EmptyTestableItem) {
                 plugin.logger.warning("Item with ID $id is invalid, check your configs!")
-                return bag
+                return BukkitItemStack(ItemStack(Material.AIR))
             }
-            bag.add(data, ItemDrop(this.line, this.config, BukkitItemStack(item.item)))
+            return BukkitItemStack(item.item.apply { amount = v.toInt() })
-            return bag
         }
     }
 }

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

@@ -0,0 +1,20 @@
+package com.willfp.eco.internal.spigot.items
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.items.SNBTHandler
+import com.willfp.eco.core.items.TestableItem
+import com.willfp.eco.internal.spigot.proxy.SNBTConverterProxy
+import org.bukkit.inventory.ItemStack
+
+class EcoSNBTHandler(
+    private val plugin: EcoPlugin
+) : SNBTHandler {
+    override fun fromSNBT(snbt: String): ItemStack? =
+        plugin.getProxy(SNBTConverterProxy::class.java).fromSNBT(snbt)
+
+    override fun toSNBT(itemStack: ItemStack): String =
+        plugin.getProxy(SNBTConverterProxy::class.java).toSNBT(itemStack)
+
+    override fun createTestable(snbt: String): TestableItem =
+        plugin.getProxy(SNBTConverterProxy::class.java).makeSNBTTestable(snbt)
+}

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

@@ -3,19 +3,31 @@ 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.AdditionalPlayer
 import com.willfp.eco.core.placeholder.PlaceholderInjectable
 import org.bukkit.entity.Player
 import redempt.crunch.CompiledExpression
 import redempt.crunch.Crunch
 import redempt.crunch.data.FastNumberParsing
 import redempt.crunch.functional.EvaluationEnvironment
+import redempt.crunch.functional.Function
+import kotlin.math.max
+import kotlin.math.min
 
 private val cache: Cache<String, CompiledExpression> = Caffeine.newBuilder().build()
 private val goToZero = Crunch.compileExpression("0")
 
-fun evaluateExpression(expression: String, player: Player?, context: PlaceholderInjectable): Double {
+private val min = Function("min", 2) {
+    min(it[0], it[1])
+}
+
+private val max = Function("max", 2) {
+    max(it[0], it[1])
+}
+
+fun evaluateExpression(expression: String, player: Player?, context: PlaceholderInjectable, additional: Collection<AdditionalPlayer>): Double {
     val placeholderValues = PlaceholderManager.findPlaceholdersIn(expression)
-        .map { PlaceholderManager.translatePlaceholders(it, player, context) }
+        .map { PlaceholderManager.translatePlaceholders(it, player, context, additional) }
         .map { runCatching { FastNumberParsing.parseDouble(it) }.getOrDefault(0.0) }
         .toDoubleArray()
 
@@ -23,6 +35,7 @@ fun evaluateExpression(expression: String, player: Player?, context: Placeholder
         val placeholders = PlaceholderManager.findPlaceholdersIn(it)
         val env = EvaluationEnvironment()
         env.setVariableNames(*placeholders.toTypedArray())
+        env.addFunctions(min, max)
         runCatching { Crunch.compileExpression(expression, env) }.getOrDefault(goToZero)
     }
 

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

@@ -0,0 +1,42 @@
+package com.willfp.eco.internal.spigot.player
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.data.keys.PersistentDataKey
+import com.willfp.eco.core.data.keys.PersistentDataKeyType
+import com.willfp.eco.core.data.profile
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+import org.bukkit.event.player.PlayerJoinEvent
+import org.bukkit.event.player.PlayerQuitEvent
+
+class PlayerHealthFixer(
+    private val plugin: EcoPlugin
+): Listener {
+    private val lastHealthKey = PersistentDataKey(
+        plugin.namespacedKeyFactory.create("last_health"),
+        PersistentDataKeyType.DOUBLE,
+        0.0
+    )
+
+    @EventHandler
+    fun onLeave(event: PlayerQuitEvent) {
+        if (!plugin.configYml.getBool("health-fixer")) {
+            return
+        }
+
+        val player = event.player
+        player.profile.write(lastHealthKey, player.health)
+    }
+
+    @EventHandler
+    fun onJoin(event: PlayerJoinEvent) {
+        if (!plugin.configYml.getBool("health-fixer")) {
+            return
+        }
+
+        val player = event.player
+        plugin.scheduler.runLater(2) {
+            player.health = player.profile.read(lastHealthKey)
+        }
+    }
+}

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

@@ -76,4 +76,7 @@ log-full-extension-errors: false
 # disable this option. Bear in mind that this means the auto-craft preview will fail to
 # render items nicely, which may degrade the user experience on your server. If you use
 # a custom crafting table, though, this won't affect anything, and you should disable the option.
-displayed-recipes: true
+displayed-recipes: true
+
+# Save health on leave and set it back on join - works around attribute modifiers.
+health-fixer: false

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

@@ -37,6 +37,7 @@ softdepend:
   - DeluxeCombat
   - IridiumSkyblock
   - SuperiorSkyblock2
+  - FabledSkyBlock
   - CrashClaim
   - DecentHolograms
   - MythicMobs

eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/SNBTConverterProxy.kt

@@ -0,0 +1,10 @@
+package com.willfp.eco.internal.spigot.proxy
+
+import com.willfp.eco.core.items.TestableItem
+import org.bukkit.inventory.ItemStack
+
+interface SNBTConverterProxy {
+    fun toSNBT(itemStack: ItemStack): String
+    fun fromSNBT(snbt: String): ItemStack?
+    fun makeSNBTTestable(snbt: String): TestableItem
+}

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

settings.gradle.kts

@@ -15,6 +15,7 @@ include(":eco-core:core-nms:nms-common")
 include(":eco-core:core-nms:v1_17_R1")
 include(":eco-core:core-nms:v1_18_R1")
 include(":eco-core:core-nms:v1_18_R2")
+include(":eco-core:core-nms:v1_19_R1")
 include(":eco-core:core-proxy")
 include(":eco-core:core-plugin")
 include(":eco-core:core-backend")