Bump com.github.Gypopo:EconomyShopGUI-API from 1.4.6 to 1.7.0

Bumps com.github.Gypopo:EconomyShopGUI-API from 1.4.6 to 1.7.0.

---
updated-dependencies:
- dependency-name: com.github.Gypopo:EconomyShopGUI-API
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/java-ci.yml

@@ -1,6 +1,6 @@
 name: Java CI
 
-on: [ push, pull_request, workflow_dispatch ]
+on: [ push, pull_request ]
 
 jobs:
   build:
@@ -14,11 +14,11 @@ jobs:
         id: vars
         run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
 
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 17
 
       - name: Setup build cache
         uses: actions/cache@v2.1.6

.github/workflows/publish-release.yml

@@ -12,11 +12,11 @@ jobs:
       - name: Checkout latest code
         uses: actions/checkout@v2
 
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 17
 
       - name: Setup build cache
         uses: actions/cache@v2.1.6

.github/workflows/test-publish.yml

@@ -14,11 +14,11 @@ jobs:
         id: vars
         run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
 
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 17
 
       - name: Setup build cache
         uses: actions/cache@v2.1.6

build.gradle.kts

@@ -10,11 +10,10 @@ buildscript {
 
 plugins {
     id("java-library")
-    id("io.github.goooler.shadow") version "8.1.7"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
     id("maven-publish")
     id("java")
     kotlin("jvm") version "1.9.21"
-    kotlin("plugin.serialization") version "1.9.21"
 }
 
 dependencies {
@@ -31,16 +30,14 @@ dependencies {
     implementation(project(path = ":eco-core:core-nms:v1_20_R1", configuration = "reobf"))
     implementation(project(path = ":eco-core:core-nms:v1_20_R2", configuration = "reobf"))
     implementation(project(path = ":eco-core:core-nms:v1_20_R3", configuration = "reobf"))
-    implementation(project(path = ":eco-core:core-nms:v1_20_6", configuration = "reobf"))
 }
 
 allprojects {
     apply(plugin = "java")
     apply(plugin = "java-library")
     apply(plugin = "maven-publish")
-    apply(plugin = "io.github.goooler.shadow")
+    apply(plugin = "com.github.johnrengelman.shadow")
     apply(plugin = "kotlin")
-    apply(plugin = "org.jetbrains.kotlin.plugin.serialization")
 
     repositories {
         mavenCentral()
@@ -92,9 +89,6 @@ allprojects {
 
         // IridiumSkyblock
         maven("https://nexus.iridiumdevelopment.net/repository/maven-releases/")
-
-        // HuskPlugins
-        maven("https://repo.william278.net/releases")
     }
 
     dependencies {
@@ -143,16 +137,48 @@ allprojects {
     }
 
     tasks {
-        withType<Jar> {
-            duplicatesStrategy = DuplicatesStrategy.WARN
-        }
-
         compileKotlin {
             kotlinOptions {
                 jvmTarget = "17"
             }
         }
 
+        shadowJar {
+            relocate("org.bstats", "com.willfp.eco.libs.bstats")
+            relocate("redempt.crunch", "com.willfp.eco.libs.crunch")
+            relocate("org.apache.commons.lang3", "com.willfp.eco.libs.lang3")
+            relocate("org.apache.maven", "com.willfp.eco.libs.maven")
+            relocate("org.checkerframework", "com.willfp.eco.libs.checkerframework")
+            relocate("org.intellij", "com.willfp.eco.libs.intellij")
+            relocate("org.jetbrains.annotations", "com.willfp.eco.libs.jetbrains.annotations")
+            //relocate("org.jetbrains.exposed", "com.willfp.eco.libs.exposed")
+            relocate("org.objenesis", "com.willfp.eco.libs.objenesis")
+            relocate("org.reflections", "com.willfp.eco.libs.reflections")
+            relocate("javassist", "com.willfp.eco.libs.javassist")
+            relocate("javax.annotation", "com.willfp.eco.libs.annotation")
+            relocate("com.google.errorprone", "com.willfp.eco.libs.errorprone")
+            relocate("com.google.j2objc", "com.willfp.eco.libs.j2objc")
+            relocate("com.google.thirdparty", "com.willfp.eco.libs.google.thirdparty")
+            relocate("com.google.protobuf", "com.willfp.eco.libs.google.protobuf") // No I don't know either
+            relocate("google.protobuf", "com.willfp.eco.libs.protobuf") // Still don't know
+            relocate("com.zaxxer.hikari", "com.willfp.eco.libs.hikari")
+            //relocate("com.mysql", "com.willfp.eco.libs.mysql")
+            relocate("de.undercouch.bson4jackson", "com.willfp.eco.libs.bson4jackson")
+            relocate("com.fasterxml.jackson", "com.willfp.eco.libs.jackson")
+            relocate("com.mongodb", "com.willfp.eco.libs.mongodb")
+            relocate("org.bson", "com.willfp.eco.libs.bson")
+            relocate("org.litote", "com.willfp.eco.libs.litote")
+            relocate("org.reactivestreams", "com.willfp.eco.libs.reactivestreams")
+            relocate("reactor.", "com.willfp.eco.libs.reactor.") // Dot in name to be safe
+            relocate("com.moandjiezana.toml", "com.willfp.eco.libs.toml")
+            relocate("com.willfp.modelenginebridge", "com.willfp.eco.libs.modelenginebridge")
+
+            /*
+            Kotlin and caffeine are not shaded so that they can be accessed directly by eco plugins.
+            Also, not relocating adventure, because it's a pain in the ass, and it doesn't *seem* to be causing loader constraint violations.
+             */
+        }
+
         compileJava {
             dependsOn(clean)
             options.encoding = "UTF-8"
@@ -179,48 +205,5 @@ allprojects {
     }
 }
 
-tasks {
-    shadowJar {
-        relocate("org.bstats", "com.willfp.eco.libs.bstats")
-        relocate("redempt.crunch", "com.willfp.eco.libs.crunch")
-        relocate("org.apache.commons.lang3", "com.willfp.eco.libs.lang3")
-        relocate("org.apache.maven", "com.willfp.eco.libs.maven")
-        relocate("org.checkerframework", "com.willfp.eco.libs.checkerframework")
-        relocate("org.intellij", "com.willfp.eco.libs.intellij")
-        relocate("org.jetbrains.annotations", "com.willfp.eco.libs.jetbrains.annotations")
-        //relocate("org.jetbrains.exposed", "com.willfp.eco.libs.exposed")
-        relocate("org.objenesis", "com.willfp.eco.libs.objenesis")
-        relocate("org.reflections", "com.willfp.eco.libs.reflections")
-        relocate("javassist", "com.willfp.eco.libs.javassist")
-        relocate("javax.annotation", "com.willfp.eco.libs.annotation")
-        relocate("com.google.errorprone", "com.willfp.eco.libs.errorprone")
-        relocate("com.google.j2objc", "com.willfp.eco.libs.j2objc")
-        relocate("com.google.thirdparty", "com.willfp.eco.libs.google.thirdparty")
-        relocate("com.google.protobuf", "com.willfp.eco.libs.google.protobuf") // No I don't know either
-        relocate("google.protobuf", "com.willfp.eco.libs.protobuf") // Still don't know
-        relocate("com.zaxxer.hikari", "com.willfp.eco.libs.hikari")
-        //relocate("com.mysql", "com.willfp.eco.libs.mysql")
-        relocate("com.mongodb", "com.willfp.eco.libs.mongodb")
-        relocate("org.bson", "com.willfp.eco.libs.bson")
-        relocate("org.litote", "com.willfp.eco.libs.litote")
-        relocate("org.reactivestreams", "com.willfp.eco.libs.reactivestreams")
-        relocate("reactor.", "com.willfp.eco.libs.reactor.") // Dot in name to be safe
-        relocate("com.moandjiezana.toml", "com.willfp.eco.libs.toml")
-        relocate("com.willfp.modelenginebridge", "com.willfp.eco.libs.modelenginebridge")
-
-        /*
-        Kotlin and caffeine are not shaded so that they can be accessed directly by eco plugins.
-        Also, not relocating adventure, because it's a pain in the ass, and it doesn't *seem* to be causing loader constraint violations.
-         */
-    }
-}
-
-// Root is Java 21 to support 1.20.6+, rest use Java 17
-java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
-    withSourcesJar()
-}
-
 group = "com.willfp"
 version = findProperty("version")!!

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

@@ -167,7 +167,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
     /**
      * The tasks to run on task creation.
      */
-    private final ListMap<LifecyclePosition, Runnable> onCreateTasks = new ListMap<>();
+    private final ListMap<LifecyclePosition, Runnable> createTasks = new ListMap<>();
 
     /**
      * Create a new plugin.
@@ -575,9 +575,8 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
             this.getLogger().severe("");
             this.getLogger().severe("You don't seem to be running paper!");
             this.getLogger().severe("Paper is strongly recommended for all servers,");
-            this.getLogger().severe("and many features may not function properly without it");
-            this.getLogger().severe("Download Paper from https://papermc.io");
-            this.getLogger().severe("It's a drop-in replacement for Spigot, so it's easy to switch.");
+            this.getLogger().severe("and some things may not function properly without it");
+            this.getLogger().severe("Download Paper from &fhttps://papermc.io");
             this.getLogger().severe("");
             this.getLogger().severe("----------------------------");
             this.getLogger().severe("");
@@ -639,7 +638,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
         this.handleLifecycle(this.onReload, this::handleReload);
 
         if (cancelTasks) {
-            this.handleLifecycle(this.onCreateTasks, this::createTasks);
+            this.handleLifecycle(this.createTasks, this::createTasks);
         }
 
         for (Extension extension : this.extensionLoader.getLoadedExtensions()) {
@@ -667,26 +666,6 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
         this.onReload.append(position, task);
     }
 
-    /**
-     * Add new task to run on createTasks.
-     *
-     * @param task The task.
-     */
-    public final void onCreateTasks(@NotNull final Runnable task) {
-        this.onCreateTasks(LifecyclePosition.END, task);
-    }
-
-    /**
-     * Add new task to run on createTasks.
-     *
-     * @param position The position to run the task.
-     * @param task     The task.
-     */
-    public final void onCreateTasks(@NotNull final LifecyclePosition position,
-                                    @NotNull final Runnable task) {
-        this.onCreateTasks.append(position, task);
-    }
-
     /**
      * Reload the plugin and return the time taken to reload.
      *

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

@@ -37,19 +37,11 @@ public class Prerequisite {
             "Requires server to have ProtocolLib"
     );
 
-    /**
-     * Requires the server to be running 1.20.5.
-     */
-    public static final Prerequisite HAS_1_20_5 = new Prerequisite(
-            () -> ProxyConstants.NMS_VERSION.contains("1_20_") && !ProxyConstants.NMS_VERSION.contains("R"),
-            "Requires server to be running 1.20.5+"
-    );
-
     /**
      * Requires the server to be running 1.20.3.
      */
     public static final Prerequisite HAS_1_20_3 = new Prerequisite(
-            () -> ProxyConstants.NMS_VERSION.contains("20_R3") || HAS_1_20_5.isMet(),
+            () -> ProxyConstants.NMS_VERSION.contains("20_R3"),
             "Requires server to be running 1.20.3+"
     );
 
@@ -57,7 +49,7 @@ public class Prerequisite {
      * Requires the server to be running 1.20.
      */
     public static final Prerequisite HAS_1_20 = new Prerequisite(
-            () -> ProxyConstants.NMS_VERSION.contains("20") || HAS_1_20_3.isMet(),
+            () -> ProxyConstants.NMS_VERSION.contains("20"),
             "Requires server to be running 1.20+"
     );
 

eco-api/src/main/java/com/willfp/eco/core/data/ExtendedPersistentDataContainer.java

@@ -87,10 +87,6 @@ public interface ExtendedPersistentDataContainer {
      * @return The extended container.
      */
     static ExtendedPersistentDataContainer extend(@NotNull PersistentDataContainer base) {
-        if (base instanceof ExtendedPersistentDataContainer) {
-            return (ExtendedPersistentDataContainer) base;
-        }
-
         return Eco.get().adaptPdc(base);
     }
 

eco-api/src/main/java/com/willfp/eco/core/events/DropQueuePushEvent.java

@@ -27,7 +27,7 @@ public class DropQueuePushEvent extends PlayerEvent implements Cancellable {
     /**
      * The items.
      */
-    private Collection<? extends ItemStack> items;
+    private final Collection<? extends ItemStack> items;
 
     /**
      * The xp.
@@ -114,15 +114,6 @@ public class DropQueuePushEvent extends PlayerEvent implements Cancellable {
         return items;
     }
 
-    /**
-     * Set the items to be dropped.
-     *
-     * @param items The items.
-     */
-    public void setItems(Collection<? extends ItemStack> items) {
-        this.items = items;
-    }
-
     /**
      * Get the xp to be dropped.
      *

eco-api/src/main/java/com/willfp/eco/core/extensions/ExtensionMetadata.java

@@ -13,8 +13,6 @@ import java.io.File;
  * @param version The extension version.
  * @param name    The extension name.
  * @param author  The extension's author.
- * @param file   The extension's file.
- * @param minimumPluginVersion The minimum plugin version required for this extension.
  */
 public record ExtensionMetadata(@NotNull String version,
                                 @NotNull String name,

eco-api/src/main/java/com/willfp/eco/core/fast/FastItemStack.java

@@ -164,23 +164,15 @@ public interface FastItemStack extends PersistentDataHolder {
      * The returned PersistentDataContainer will not modify the item until the tag is set.
      *
      * @return The base NBT tag.
-     * @deprecated Items are now component-based.
      */
-    @Deprecated(forRemoval = true, since = "6.70.0")
-    default PersistentDataContainer getBaseTag() {
-        throw new UnsupportedOperationException("Not supported in 1.20.5+");
-    }
+    PersistentDataContainer getBaseTag();
 
     /**
      * Set the base NBT tag (Not PublicBukkitValues, the base) from a PersistentDataContainer.
      *
      * @param container The PersistentDataContainer.
-     * @deprecated Items are now component-based.
      */
-    @Deprecated(forRemoval = true, since = "6.70.0")
-    default void setBaseTag(@Nullable PersistentDataContainer container) {
-        throw new UnsupportedOperationException("Not supported in 1.20.5+");
-    }
+    void setBaseTag(@Nullable PersistentDataContainer container);
 
     /**
      * Get the type of the item.

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

@@ -5,8 +5,6 @@ import org.jetbrains.annotations.NotNull;
 
 /**
  * Handles menu events.
- *
- * @param <T> The type of event to handle.x
  */
 public abstract class MenuEventHandler<T extends MenuEvent> {
     /**

eco-api/src/main/java/com/willfp/eco/core/gui/slot/ConfigSlot.java

@@ -86,7 +86,7 @@ public class ConfigSlot extends CustomSlot {
             for (String command : config.getStrings(configKey)) {
                 if (command.startsWith("console:")) {
                     commands.add(new CommandToDispatch(
-                            StringUtils.removePrefix(command, "console:"),
+                            StringUtils.removePrefix("console:", command),
                             true
                     ));
                 } else {

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

@@ -13,7 +13,6 @@ import com.willfp.eco.core.recipe.parts.TestableStack;
 import com.willfp.eco.core.recipe.parts.UnrestrictedMaterialTestableItem;
 import com.willfp.eco.util.NamespacedKeyUtils;
 import com.willfp.eco.util.NumberUtils;
-import kotlin.Suppress;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.enchantments.Enchantment;
@@ -516,11 +515,8 @@ public final class Items {
      *
      * @param itemStack The ItemStack.
      * @return The base NBT.
-     * @deprecated Items are now component-based.
      */
     @NotNull
-    @Deprecated(since = "6.70.0", forRemoval = true)
-    @SuppressWarnings("removal")
     public static PersistentDataContainer getBaseNBT(@NotNull final ItemStack itemStack) {
         return FastItemStack.wrap(itemStack).getBaseTag();
     }
@@ -531,11 +527,8 @@ public final class Items {
      * @param itemStack The ItemStack.
      * @param container The base NBT tag.
      * @return The ItemStack, modified. Not required to use, as this modifies the instance.¬
-     * @deprecated Items are now component-based.
      */
     @NotNull
-    @Deprecated(since = "6.70.0", forRemoval = true)
-    @SuppressWarnings("removal")
     public static ItemStack setBaseNBT(@NotNull final ItemStack itemStack,
                                        @Nullable final PersistentDataContainer container) {
         FastItemStack fis = FastItemStack.wrap(itemStack);

eco-api/src/main/java/com/willfp/eco/core/price/ConfiguredPrice.java

@@ -120,12 +120,8 @@ public final class ConfiguredPrice implements Price {
      */
     public String getDisplay(@NotNull final Player player,
                              final double multiplier) {
-        double value = this.getPrice().getValue(player, multiplier);
-
         return StringUtils.format(
-                formatString
-                        .replace("%value%", NumberUtils.format(value))
-                        .replace("%value_commas%", NumberUtils.formatWithCommas(value)),
+                formatString.replace("%value%", NumberUtils.format(this.getPrice().getValue(player, multiplier))),
                 player,
                 StringUtils.FormatOption.WITH_PLACEHOLDERS
         );

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

@@ -1,6 +1,5 @@
 package com.willfp.eco.core.proxy;
 
-import com.willfp.eco.core.version.Version;
 import org.bukkit.Bukkit;
 
 import java.util.Arrays;
@@ -13,7 +12,7 @@ public final class ProxyConstants {
     /**
      * The NMS version that the server is running on.
      */
-    public static final String NMS_VERSION;
+    public static final String NMS_VERSION = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
 
     /**
      * All supported NMS versions.
@@ -27,24 +26,10 @@ public final class ProxyConstants {
             "v1_19_R3",
             "v1_20_R1",
             "v1_20_R2",
-            "v1_20_R3",
-            "v1_20_6"
+            "v1_20_R3"
     );
 
     private ProxyConstants() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }
-
-    static {
-        String currentMinecraftVersion = Bukkit.getServer().getBukkitVersion().split("-")[0];
-        String nmsVersion;
-
-        if (new Version(currentMinecraftVersion).compareTo(new Version("1.20.5")) < 0) {
-            nmsVersion = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
-        } else {
-            nmsVersion = "v" + currentMinecraftVersion.replace(".", "_");
-        }
-
-        NMS_VERSION = nmsVersion;
-    }
 }

eco-api/src/main/java/com/willfp/eco/core/registry/Registry.java

@@ -62,7 +62,6 @@ public class Registry<T extends Registrable> implements Iterable<T> {
         registry.put(element.getID(), element);
 
         element.onRegister();
-        onRegister(element);
 
         return element;
     }
@@ -79,7 +78,6 @@ public class Registry<T extends Registrable> implements Iterable<T> {
         }
 
         element.onRemove();
-        onRemove(element);
 
         registry.remove(element.getID());
 
@@ -101,10 +99,10 @@ public class Registry<T extends Registrable> implements Iterable<T> {
         T element = registry.get(id);
 
         if (element != null) {
-            return remove(element);
+            element.onRemove();
         }
 
-        return null;
+        return registry.remove(id);
     }
 
     /**
@@ -173,24 +171,6 @@ public class Registry<T extends Registrable> implements Iterable<T> {
         isLocked = false;
     }
 
-    /**
-     * Run when an element is registered.
-     *
-     * @param element The element.
-     */
-    protected void onRegister(@NotNull final T element) {
-        // Override this method to do something when an element is registered.
-    }
-
-    /**
-     * Run when an element is removed.
-     *
-     * @param element The element.
-     */
-    protected void onRemove(@NotNull final T element) {
-        // Override this method to do something when an element is removed.
-    }
-
     /**
      * Get if the registry is empty.
      *

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

@@ -203,20 +203,6 @@ public final class NumberUtils {
         return formatted.endsWith("00") ? String.valueOf((int) toFormat) : formatted;
     }
 
-    /**
-     * Format double to string with commas.
-     *
-     * @param toFormat The number to format.
-     * @return Formatted.
-     */
-    @NotNull
-    public static String formatWithCommas(final double toFormat) {
-        DecimalFormat df = new DecimalFormat("#,##0.00");
-        String formatted = df.format(toFormat);
-
-        return formatted.endsWith(".00") ? formatted.substring(0, formatted.length() - 3) : formatted;
-    }
-
     /**
      * Evaluate an expression.
      *

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

@@ -2,7 +2,6 @@ package com.willfp.eco.util;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
-import com.willfp.eco.core.Eco;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.concurrent.TimeUnit;
@@ -16,7 +15,7 @@ public final class PatternUtils {
      * Cache of compiled literal patterns.
      */
     private static final Cache<String, Pattern> LITERAL_PATTERN_CACHE = Caffeine.newBuilder()
-            .expireAfterAccess(Eco.get().getEcoPlugin().getConfigYml().getInt("literal-cache-ttl"), TimeUnit.MINUTES)
+            .expireAfterAccess(1, TimeUnit.MINUTES)
             .build();
 
     /**

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

@@ -22,8 +22,6 @@ fun ItemMeta.mergeFrom(other: ItemMeta): ItemMeta =
  * @see Items.getBaseNBT
  * @see Items.setBaseNBT
  */
-@Suppress("DEPRECATION")
-@Deprecated("Not supported in 1.20.5+", level = DeprecationLevel.ERROR)
 var ItemStack.baseNBT: PersistentDataContainer
     get() = Items.getBaseNBT(this)
     set(value) {
@@ -31,8 +29,6 @@ var ItemStack.baseNBT: PersistentDataContainer
     }
 
 /** @see Items.setBaseNBT */
-@Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith")
-@Deprecated("Not supported in 1.20.5+", level = DeprecationLevel.ERROR)
 fun ItemStack.clearNBT() =
     Items.setBaseNBT(this, null)
 
@@ -41,14 +37,9 @@ fun ItemStack.toSNBT() =
     Items.toSNBT(this)
 
 /** @see Items.isEmpty */
-@Deprecated("Use ItemStack.isEcoEmpty", ReplaceWith("Items.isEmpty(this)"))
 val ItemStack?.isEmpty: Boolean
     get() = Items.isEmpty(this)
 
-/** @see Items.isEmpty */
-val ItemStack?.isEcoEmpty: Boolean
-    get() = Items.isEmpty(this)
-
 /** @see Items.matchesAny */
 fun Collection<TestableItem>.matches(item: ItemStack): Boolean =
     Items.matchesAny(item, this)

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

@@ -8,10 +8,6 @@ import com.willfp.eco.core.placeholder.context.PlaceholderContext
 fun Number.toNumeral(): String =
     NumberUtils.toNumeral(this.toInt())
 
-/** @see NumberUtils.formatWithCommas */
-fun Number.formatWithCommas(): String =
-    NumberUtils.formatWithCommas(this.toDouble())
-
 /** @see NumberUtils.fromNumeral */
 fun String.parseNumeral(): Int =
     NumberUtils.fromNumeral(this)

eco-api/src/test/java/NumberUtilsTest.java

@@ -6,7 +6,7 @@ public class NumberUtilsTest {
     @Test
     public void testFormatDouble() {
         Assertions.assertEquals("3", NumberUtils.format(3.0D));
-        //Assertions.assertEquals("3.20", NumberUtils.format(3.2D));
+        Assertions.assertEquals("3.20", NumberUtils.format(3.2D));
     }
 
     @Test

eco-core/core-backend/build.gradle.kts

@@ -6,7 +6,7 @@ dependencies {
     implementation("org.reflections:reflections:0.9.12")
     implementation("org.objenesis:objenesis:3.2")
 
-    compileOnly("io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT")
     compileOnly("me.clip:placeholderapi:2.11.4")
     compileOnly("net.kyori:adventure-text-minimessage:4.10.0")
     compileOnly("net.kyori:adventure-platform-bukkit:4.1.0")

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/HandledCommand.kt

@@ -3,6 +3,7 @@ package com.willfp.eco.internal.command
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.CommandBase
 import com.willfp.eco.core.command.NotificationException
+import com.willfp.eco.core.config.base.LangYml
 import org.bukkit.Bukkit
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor

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

@@ -2,6 +2,7 @@ package com.willfp.eco.internal.config
 
 import com.willfp.eco.core.config.ConfigType
 import com.willfp.eco.core.placeholder.InjectablePlaceholder
+import java.util.concurrent.ConcurrentHashMap
 
 class EcoConfigSection(
     type: ConfigType,

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

@@ -15,6 +15,7 @@ import java.nio.channels.AsynchronousFileChannel
 import java.nio.file.Files
 import java.nio.file.StandardOpenOption
 
+@Suppress("UNCHECKED_CAST")
 open class EcoLoadableConfig(
     type: ConfigType,
     configName: String,

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/drops/EcoDropQueue.kt

@@ -1,6 +1,5 @@
 package com.willfp.eco.internal.drops
 
-import com.willfp.eco.core.Prerequisite
 import com.willfp.eco.core.drops.DropQueue
 import com.willfp.eco.core.events.DropQueuePushEvent
 import com.willfp.eco.core.integrations.antigrief.AntigriefManager
@@ -54,16 +53,13 @@ open class EcoDropQueue(val player: Player) : DropQueue() {
             hasTelekinesis = false
         }
 
-        val pushEvent = DropQueuePushEvent(player, items.toMutableList(), location, xp, hasTelekinesis)
+        val pushEvent = DropQueuePushEvent(player, items, location, xp, hasTelekinesis)
         Bukkit.getServer().pluginManager.callEvent(pushEvent)
 
         if (pushEvent.isCancelled) {
             return
         }
 
-        items.clear()
-        items.addAll(pushEvent.items)
-
         val world = location.world!!
         location = location.add(0.5, 0.5, 0.5)
         items.removeIf { itemStack: ItemStack -> itemStack.type == Material.AIR }
@@ -76,17 +72,10 @@ open class EcoDropQueue(val player: Player) : DropQueue() {
                 world.dropItem(location, drop!!).velocity = Vector()
             }
             if (xp > 0) {
-                if (Prerequisite.HAS_PAPER.isMet) {
-                    player.giveExp(xp, true)
-                } else {
-                    val orb =
-                        world.spawnEntity(
-                            player.location.add(0.0, 0.2, 0.0),
-                            EntityType.EXPERIENCE_ORB
-                        ) as ExperienceOrb
-                    orb.velocity = Vector(0, 0, 0)
-                    orb.experience = xp
-                }
+                val orb =
+                    world.spawnEntity(player.location.add(0.0, 0.2, 0.0), EntityType.EXPERIENCE_ORB) as ExperienceOrb
+                orb.velocity = Vector(0, 0, 0)
+                orb.experience = xp
             }
         } else {
             for (drop in items) {

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserName.kt

@@ -19,7 +19,6 @@ object EntityArgParserName : EntityArgParser {
 
         val formatted = StringUtils.format(name)
 
-        @Suppress("DEPRECATION")
         return EntityArgParseResult(
             { it.customName == formatted },
             {

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

@@ -42,7 +42,6 @@ class EcoExtensionLoader(
         }
     }
 
-    @Suppress("DEPRECATION")
     @Throws(MalformedExtensionException::class)
     private fun loadExtension(extensionJar: File) {
         val url = extensionJar.toURI().toURL()
@@ -60,7 +59,6 @@ class EcoExtensionLoader(
         val pluginVersion = Version(extensionYml.getStringOrNull("plugin-version") ?: "0.0.0")
         val pluginName = extensionYml.getStringOrNull("plugin")
 
-        @Suppress("DEPRECATION")
         if (pluginName != null && !pluginName.equals(this.plugin.description.name, ignoreCase = true)) {
             throw ExtensionLoadException("${extensionJar.name} is only compatible with $pluginName!")
         }
@@ -84,7 +82,6 @@ class EcoExtensionLoader(
             author = "Unnamed Author"
         }
 
-        @Suppress("DEPRECATION")
         if (Version(this.plugin.description.version) < pluginVersion) {
             throw ExtensionLoadException("Plugin version is too low for ${extensionJar.name}!")
         }

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/factory/EcoNamespacedKeyFactory.kt

@@ -7,6 +7,6 @@ import org.bukkit.NamespacedKey
 
 class EcoNamespacedKeyFactory(private val plugin: EcoPlugin) : NamespacedKeyFactory {
     override fun create(key: String): NamespacedKey {
-        return NamespacedKeyUtils.create(plugin.id, key)
+        return NamespacedKeyUtils.create(plugin.name, key)
     }
-}
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/fast/InternalNamespacedKeyFactory.kt

@@ -25,6 +25,7 @@ class FastInternalNamespacedKeyFactory : InternalNamespacedKeyFactory {
 
 class SafeInternalNamespacedKeyFactory : InternalNamespacedKeyFactory {
     override fun create(namespace: String, key: String): NamespacedKey {
+        @Suppress("DEPRECATION")
         return NamespacedKey(namespace, key)
     }
 }

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

@@ -43,7 +43,6 @@ class EcoMenu(
         getPossiblyReactiveSlot(row, column, player)
 
     override fun open(player: Player): Inventory {
-        @Suppress("DEPRECATION")
         val inventory = if (columns == 9) {
             Bukkit.createInventory(null, rows * columns, title)
         } else {

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

@@ -1,7 +1,7 @@
 package com.willfp.eco.internal.gui.menu
 
 import com.willfp.eco.core.gui.menu.events.CaptiveItemChangeEvent
-import com.willfp.eco.core.items.isEcoEmpty
+import com.willfp.eco.core.items.isEmpty
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem
 import com.willfp.eco.util.MenuUtils
 import com.willfp.eco.util.openMenu
@@ -55,7 +55,7 @@ class RenderedInventory(
                     val actualItem = inventory.getItem(bukkit) ?: continue
 
                     if (slot.isCaptiveFromEmpty) {
-                        if (!actualItem.isEcoEmpty) {
+                        if (!actualItem.isEmpty) {
                             newCaptive[position] = actualItem
                         }
                     } else {

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

@@ -6,7 +6,6 @@ import com.willfp.eco.core.placeholder.context.placeholderContext
 import me.clip.placeholderapi.expansion.PlaceholderExpansion
 import org.bukkit.entity.Player
 
-@Suppress("DEPRECATION")
 class PAPIExpansion(private val plugin: EcoPlugin) : PlaceholderExpansion() {
     init {
         register()
@@ -21,17 +20,14 @@ class PAPIExpansion(private val plugin: EcoPlugin) : PlaceholderExpansion() {
     }
 
     override fun getAuthor(): String {
-        @Suppress("DEPRECATION")
         return java.lang.String.join(", ", plugin.description.authors)
     }
 
     override fun getIdentifier(): String {
-        @Suppress("DEPRECATION")
         return plugin.description.name.lowercase()
     }
 
     override fun getVersion(): String {
-        @Suppress("DEPRECATION")
         return plugin.description.version
     }
 

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

@@ -1,64 +0,0 @@
-package com.willfp.eco.internal.items
-
-import com.willfp.eco.core.items.args.LookupArgParser
-import org.bukkit.block.CreatureSpawner
-import org.bukkit.entity.EntityType
-import org.bukkit.inventory.ItemStack
-import org.bukkit.inventory.meta.BlockStateMeta
-import org.bukkit.inventory.meta.ItemMeta
-import java.util.function.Predicate
-
-object ArgParserEntity : LookupArgParser {
-    override fun parseArguments(args: Array<out String>, meta: ItemMeta): Predicate<ItemStack>? {
-        if (meta !is BlockStateMeta) {
-            return null
-        }
-
-        if (meta.hasBlockState() || meta.blockState !is CreatureSpawner) {
-            return null
-        }
-
-        val state = meta.blockState as CreatureSpawner
-
-        var type: String? = null
-
-        for (arg in args) {
-            val argSplit = arg.split(":")
-            if (!argSplit[0].equals("entity", ignoreCase = true)) {
-                continue
-            }
-            if (argSplit.size < 2) {
-                continue
-            }
-            type = argSplit[1]
-        }
-
-        type ?: return null
-
-        val entityType = runCatching { EntityType.valueOf(type.uppercase()) }.getOrNull() ?: return null
-
-        state.spawnedType = entityType
-
-        meta.blockState = state
-
-        return Predicate {
-            val testMeta = ((it.itemMeta as? BlockStateMeta) as? CreatureSpawner) ?: return@Predicate false
-
-            testMeta.spawnedType?.name?.equals(type, true) == true
-        }
-    }
-
-    override fun serializeBack(meta: ItemMeta): String? {
-        if (meta !is BlockStateMeta) {
-            return null
-        }
-
-        if (meta.hasBlockState() || meta.blockState !is CreatureSpawner) {
-            return null
-        }
-
-        val state = meta.blockState as CreatureSpawner
-
-        return state.spawnedType?.let { "entity:${state.spawnedType!!.name}" } ?: return null
-    }
-}

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

@@ -28,6 +28,7 @@ object ArgParserHead : LookupArgParser {
 
         playerName ?: return null
 
+        @Suppress("DEPRECATION")
         val player = Bukkit.getOfflinePlayer(playerName)
 
         meta.owningPlayer = player

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

@@ -22,13 +22,12 @@ object ArgParserName : LookupArgParser {
         val formatted = StringUtils.format(name)
 
         // I don't know why it says it's redundant, the compiler yells at me
-        @Suppress("UsePropertyAccessSyntax", "RedundantSuppression", "DEPRECATION")
+        @Suppress("UsePropertyAccessSyntax", "RedundantSuppression")
         meta.setDisplayName(formatted)
 
         return Predicate {
             val testMeta = it.itemMeta ?: return@Predicate false
 
-            @Suppress("DEPRECATION")
             testMeta.displayName == formatted
         }
     }
@@ -38,7 +37,6 @@ object ArgParserName : LookupArgParser {
             return null
         }
 
-        @Suppress("DEPRECATION")
         return "name:\"${meta.displayName}\""
     }
 }

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

@@ -1,11 +1,13 @@
 package com.willfp.eco.internal.items
 
 import com.willfp.eco.core.items.args.LookupArgParser
+import org.bukkit.Color
 import org.bukkit.NamespacedKey
 import org.bukkit.Registry
 import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.ArmorMeta
 import org.bukkit.inventory.meta.ItemMeta
+import org.bukkit.inventory.meta.LeatherArmorMeta
 import org.bukkit.inventory.meta.trim.ArmorTrim
 import org.bukkit.inventory.meta.trim.TrimMaterial
 import org.bukkit.inventory.meta.trim.TrimPattern

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/placeholder/PlaceholderParser.kt

@@ -7,8 +7,6 @@ import com.willfp.eco.core.placeholder.InjectablePlaceholder
 import com.willfp.eco.core.placeholder.Placeholder
 import com.willfp.eco.core.placeholder.context.PlaceholderContext
 import com.willfp.eco.util.StringUtils
-import com.willfp.eco.util.evaluateExpression
-import com.willfp.eco.util.toNiceString
 import java.util.concurrent.TimeUnit
 
 /*
@@ -21,8 +19,6 @@ but it's still best to minimise the memory overhead.
 
 class PlaceholderParser {
     private val placeholderRegex = Regex("%([^% ]+)%")
-    private val prettyMathExpressionRegex = Regex("(\\{\\^\\{)(.)+(}})")
-    private val mathExpressionRegex = Regex("(\\{\\{)(.)+(}})")
 
     private val placeholderLookupCache = Caffeine.newBuilder()
         .expireAfterWrite(1, TimeUnit.SECONDS)
@@ -38,29 +34,6 @@ class PlaceholderParser {
         injections: Collection<InjectablePlaceholder>,
         translateEcoPlaceholders: Boolean = true
     ): String {
-        var processed = text
-
-        // Only evaluate math expressions if there might be any
-        // Checking { as a char is faster than checking a string sequence,
-        // even if it might lead to false positives.
-        if ('{' in processed) {
-            if ('^' in processed) {
-                // Evaluate pretty math expressions
-                processed = prettyMathExpressionRegex.findAll(processed).fold(processed) { acc, matchResult ->
-                    val expression = matchResult.value.substring(3, matchResult.value.length - 2)
-                    val result = evaluateExpression(expression, context)
-                    acc.replace(matchResult.value, result.toNiceString())
-                }
-            }
-
-            // Evaluate math expressions
-            processed = mathExpressionRegex.findAll(processed).fold(processed) { acc, matchResult ->
-                val expression = matchResult.value.substring(2, matchResult.value.length - 2)
-                val result = evaluateExpression(expression, context)
-                acc.replace(matchResult.value, result.toString())
-            }
-        }
-
         /*
 
         Why am I doing injections at the start, and again at the end?
@@ -82,7 +55,7 @@ class PlaceholderParser {
          */
 
         // Apply injections first
-        processed = injections.fold(processed) { acc, injection ->
+        var processed = injections.fold(text) { acc, injection ->
             injection.tryTranslateQuickly(acc, context)
         }
 
@@ -93,7 +66,7 @@ class PlaceholderParser {
                 val prefix = "%${additionalPlayer.identifier}_"
                 processed = found.fold(processed) { acc, placeholder ->
                     if (placeholder.startsWith(prefix)) {
-                        val newPlaceholder = "%${StringUtils.removePrefix(placeholder, prefix)}"
+                        val newPlaceholder = "%${StringUtils.removePrefix(prefix, placeholder)}"
                         val translation = translatePlacholders(
                             newPlaceholder,
                             context.copyWithPlayer(additionalPlayer.player),

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

@@ -1,5 +1,5 @@
 plugins {
-    id("io.papermc.paperweight.userdev") version "1.7.1" apply false
+    id("io.papermc.paperweight.userdev") version "1.5.3" apply false
 }
 
 

eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/NMSCommons.kt

@@ -7,7 +7,6 @@ import com.willfp.eco.internal.spigot.proxy.common.ai.EntityGoalFactory
 import com.willfp.eco.internal.spigot.proxy.common.ai.TargetGoalFactory
 import io.papermc.paper.adventure.PaperAdventure
 import net.kyori.adventure.text.Component
-import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
@@ -75,15 +74,6 @@ fun Player.toNMS(): ServerPlayer =
 fun Component.toNMS(): net.minecraft.network.chat.Component =
     if (Prerequisite.HAS_PAPER.isMet) PaperAdventure.asVanilla(this) else impl.toNMS(this)
 
-fun net.minecraft.network.chat.Component.toAdventure(): Component {
-    if (Prerequisite.HAS_PAPER.isMet) {
-        return PaperAdventure.asAdventure(this)
-    }
-
-    val json = net.minecraft.network.chat.Component.Serializer.toJson(this)
-    return GsonComponentSerializer.gson().deserialize(json)
-}
-
 interface CommonsProvider {
     val nbtTagString: Int
 

eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt

@@ -29,14 +29,10 @@ import kotlin.experimental.and
 import kotlin.experimental.inv
 import kotlin.experimental.or
 
-interface ImplementedFIS : FastItemStack {
-    fun apply()
-}
-
 @Suppress("UsePropertyAccessSyntax")
 class EcoFastItemStack(
     private val bukkit: org.bukkit.inventory.ItemStack
-) : ImplementedFIS {
+) : FastItemStack {
     private val handle = bukkit.asNMSStack()
     private val pdc = (if (handle.hasTag()) handle.getTag()!! else CompoundTag()).makePdc()
 
@@ -188,11 +184,9 @@ class EcoFastItemStack(
         return this.flagBits and bitModifier == bitModifier
     }
 
-    @Deprecated("Not supported in 1.20.5+")
     override fun getBaseTag(): PersistentDataContainer =
         (if (handle.hasTag()) handle.getTag()!! else CompoundTag()).makePdc(base = true)
 
-    @Deprecated("Not supported in 1.20.5+")
     override fun setBaseTag(container: PersistentDataContainer?) {
         (if (handle.hasTag()) handle.getTag()!! else CompoundTag()).setPdc(container, item = handle)
         apply()
@@ -265,7 +259,7 @@ class EcoFastItemStack(
         return handle.getTag()?.hashCode() ?: (0b00010101 * 31 + Item.getId(handle.getItem()))
     }
 
-    override fun apply() {
+    internal fun apply() {
         if (handle.hasTag()) {
             handle.getTag()?.setPdc(this.pdc)
         }
@@ -282,9 +276,9 @@ class EcoFastItemStack(
     }
 }
 
-class ContinuallyAppliedPersistentDataContainer(
+private class ContinuallyAppliedPersistentDataContainer(
     val handle: PersistentDataContainer,
-    private val fis: ImplementedFIS
+    val fis: EcoFastItemStack
 ) : PersistentDataContainer by handle {
     override fun <T : Any, Z : Any> set(key: NamespacedKey, type: PersistentDataType<T, Z>, value: Z) {
         handle.set(key, type, value)

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

@@ -2,7 +2,6 @@ package com.willfp.eco.internal.spigot.proxy.v1_17_R1
 
 import com.willfp.eco.core.data.ExtendedPersistentDataContainer
 import com.willfp.eco.internal.spigot.proxy.ExtendedPersistentDataContainerFactoryProxy
-import com.willfp.eco.internal.spigot.proxy.common.item.ContinuallyAppliedPersistentDataContainer
 import net.minecraft.nbt.Tag
 import org.bukkit.Material
 import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack
@@ -29,7 +28,7 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa
     override fun adapt(pdc: PersistentDataContainer): ExtendedPersistentDataContainer {
         return when (pdc) {
             is CraftPersistentDataContainer -> EcoPersistentDataContainer(pdc)
-            else -> throw IllegalArgumentException("Custom PDC instance ${pdc::class.java.name} is not supported!")
+            else -> throw IllegalArgumentException("Custom PDC instance is not supported!")
         }
     }
 

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

@@ -7,7 +7,6 @@ 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.craftbukkit.v1_17_R1.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -19,9 +18,7 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        val tag = nms.save(CompoundTag())
-        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
-        return SnbtPrinterTagVisitor().visit(tag)
+        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

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

@@ -2,7 +2,6 @@ package com.willfp.eco.internal.spigot.proxy.v1_18_R1
 
 import com.willfp.eco.core.data.ExtendedPersistentDataContainer
 import com.willfp.eco.internal.spigot.proxy.ExtendedPersistentDataContainerFactoryProxy
-import com.willfp.eco.internal.spigot.proxy.common.item.ContinuallyAppliedPersistentDataContainer
 import net.minecraft.nbt.Tag
 import org.bukkit.Material
 import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack
@@ -29,7 +28,7 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa
     override fun adapt(pdc: PersistentDataContainer): ExtendedPersistentDataContainer {
         return when (pdc) {
             is CraftPersistentDataContainer -> EcoPersistentDataContainer(pdc)
-            else -> throw IllegalArgumentException("Custom PDC instance ${pdc::class.java.name} is not supported!")
+            else -> throw IllegalArgumentException("Custom PDC instance is not supported!")
         }
     }
 

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

@@ -7,7 +7,6 @@ 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.craftbukkit.v1_18_R1.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -19,9 +18,7 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        val tag = nms.save(CompoundTag())
-        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
-        return SnbtPrinterTagVisitor().visit(tag)
+        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

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

@@ -2,7 +2,6 @@ package com.willfp.eco.internal.spigot.proxy.v1_18_R2
 
 import com.willfp.eco.core.data.ExtendedPersistentDataContainer
 import com.willfp.eco.internal.spigot.proxy.ExtendedPersistentDataContainerFactoryProxy
-import com.willfp.eco.internal.spigot.proxy.common.item.ContinuallyAppliedPersistentDataContainer
 import net.minecraft.nbt.Tag
 import org.bukkit.Material
 import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack
@@ -29,7 +28,7 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa
     override fun adapt(pdc: PersistentDataContainer): ExtendedPersistentDataContainer {
         return when (pdc) {
             is CraftPersistentDataContainer -> EcoPersistentDataContainer(pdc)
-            else -> throw IllegalArgumentException("Custom PDC instance ${pdc::class.java.name} is not supported!")
+            else -> throw IllegalArgumentException("Custom PDC instance is not supported!")
         }
     }
 

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

@@ -7,7 +7,6 @@ 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.craftbukkit.v1_18_R2.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -19,9 +18,7 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        val tag = nms.save(CompoundTag())
-        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
-        return SnbtPrinterTagVisitor().visit(tag)
+        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

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

@@ -28,7 +28,7 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa
     override fun adapt(pdc: PersistentDataContainer): ExtendedPersistentDataContainer {
         return when (pdc) {
             is CraftPersistentDataContainer -> EcoPersistentDataContainer(pdc)
-            else -> throw IllegalArgumentException("Custom PDC instance ${pdc::class.java.name} is not supported!")
+            else -> throw IllegalArgumentException("Custom PDC instance ims not supported!")
         }
     }
 

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

@@ -8,7 +8,6 @@ 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.craftbukkit.v1_19_R1.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -20,9 +19,7 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        val tag = nms.save(CompoundTag())
-        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
-        return SnbtPrinterTagVisitor().visit(tag)
+        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

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

@@ -2,7 +2,6 @@ package com.willfp.eco.internal.spigot.proxy.v1_19_R2
 
 import com.willfp.eco.core.data.ExtendedPersistentDataContainer
 import com.willfp.eco.internal.spigot.proxy.ExtendedPersistentDataContainerFactoryProxy
-import com.willfp.eco.internal.spigot.proxy.common.item.ContinuallyAppliedPersistentDataContainer
 import net.minecraft.nbt.Tag
 import org.bukkit.Material
 import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack
@@ -29,7 +28,7 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa
     override fun adapt(pdc: PersistentDataContainer): ExtendedPersistentDataContainer {
         return when (pdc) {
             is CraftPersistentDataContainer -> EcoPersistentDataContainer(pdc)
-            else -> throw IllegalArgumentException("Custom PDC instance ${pdc::class.java.name} is not supported!")
+            else -> throw IllegalArgumentException("Custom PDC instance ims not supported!")
         }
     }
 

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

@@ -7,7 +7,6 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
 import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack
-import org.bukkit.craftbukkit.v1_19_R2.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -19,9 +18,7 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        val tag = nms.save(CompoundTag())
-        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
-        return SnbtPrinterTagVisitor().visit(tag)
+        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

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

@@ -28,7 +28,7 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa
     override fun adapt(pdc: PersistentDataContainer): ExtendedPersistentDataContainer {
         return when (pdc) {
             is CraftPersistentDataContainer -> EcoPersistentDataContainer(pdc)
-            else -> throw IllegalArgumentException("Custom PDC instance ${pdc::class.java.name} is not supported!")
+            else -> throw IllegalArgumentException("Custom PDC instance ims not supported!")
         }
     }
 

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

@@ -7,7 +7,6 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
 import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack
-import org.bukkit.craftbukkit.v1_19_R3.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -19,9 +18,7 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        val tag = nms.save(CompoundTag())
-        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
-        return SnbtPrinterTagVisitor().visit(tag)
+        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

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

@@ -1,51 +0,0 @@
-plugins {
-    id("io.papermc.paperweight.userdev")
-}
-
-group = "com.willfp"
-version = rootProject.version
-
-dependencies {
-    implementation(project(":eco-core:core-nms:nms-common"))
-    paperweight.paperDevBundle("1.20.6-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_20_6.common"
-        )
-        relocate(
-            "net.kyori.adventure.text.minimessage",
-            "com.willfp.eco.internal.spigot.proxy.v1_20_6.minimessage"
-        )
-    }
-
-    java {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
-        withSourcesJar()
-    }
-
-    compileKotlin {
-        kotlinOptions {
-            jvmTarget = "21"
-        }
-    }
-}

eco-core/core-nms/v1_20_6/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_6/BukkitCommands.kt

@@ -1,35 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_20_6
-
-import com.willfp.eco.core.command.PluginCommandBase
-import com.willfp.eco.internal.spigot.proxy.BukkitCommandsProxy
-import org.bukkit.Bukkit
-import org.bukkit.command.Command
-import org.bukkit.command.SimpleCommandMap
-import org.bukkit.craftbukkit.CraftServer
-import java.lang.reflect.Field
-
-class BukkitCommands : BukkitCommandsProxy {
-    private val knownCommandsField: Field by lazy {
-        SimpleCommandMap::class.java.getDeclaredField("knownCommands")
-            .apply {
-                isAccessible = true
-            }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    private val knownCommands: MutableMap<String, Command>
-        get() = knownCommandsField.get(getCommandMap()) as MutableMap<String, Command>
-
-    override fun getCommandMap(): SimpleCommandMap {
-        return (Bukkit.getServer() as CraftServer).commandMap
-    }
-
-    override fun syncCommands() {
-        (Bukkit.getServer() as CraftServer).syncCommands()
-    }
-
-    override fun unregisterCommand(command: PluginCommandBase) {
-        knownCommands.remove(command.name)
-        knownCommands.remove("${command.plugin.name.lowercase()}:${command.name}")
-    }
-}

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

@@ -1,171 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_20_6
-
-import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.internal.spigot.proxy.CommonsInitializerProxy
-import com.willfp.eco.internal.spigot.proxy.common.CommonsProvider
-import com.willfp.eco.internal.spigot.proxy.common.packet.PacketInjectorListener
-import com.willfp.eco.internal.spigot.proxy.common.toResourceLocation
-import net.kyori.adventure.text.Component
-import net.kyori.adventure.text.serializer.json.JSONComponentSerializer
-import net.minecraft.core.component.DataComponents
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.nbt.CompoundTag
-import net.minecraft.nbt.Tag
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.entity.PathfinderMob
-import net.minecraft.world.item.Item
-import org.bukkit.Bukkit
-import org.bukkit.Material
-import org.bukkit.NamespacedKey
-import org.bukkit.craftbukkit.CraftServer
-import org.bukkit.craftbukkit.entity.CraftEntity
-import org.bukkit.craftbukkit.entity.CraftMob
-import org.bukkit.craftbukkit.entity.CraftPlayer
-import org.bukkit.craftbukkit.inventory.CraftItemStack
-import org.bukkit.craftbukkit.inventory.CraftMetaArmor
-import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer
-import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry
-import org.bukkit.craftbukkit.util.CraftMagicNumbers
-import org.bukkit.craftbukkit.util.CraftNamespacedKey
-import org.bukkit.entity.LivingEntity
-import org.bukkit.entity.Mob
-import org.bukkit.entity.Player
-import org.bukkit.inventory.ItemStack
-import org.bukkit.persistence.PersistentDataContainer
-import java.lang.reflect.Field
-
-class CommonsInitializer : CommonsInitializerProxy {
-    override fun init(plugin: EcoPlugin) {
-        CommonsProvider.setIfNeeded(CommonsProviderImpl)
-        plugin.onEnable {
-            plugin.eventManager.registerListener(PacketInjectorListener)
-        }
-    }
-
-    object CommonsProviderImpl : CommonsProvider {
-        private val cisHandle: Field = CraftItemStack::class.java.getDeclaredField("handle").apply {
-            isAccessible = true
-        }
-
-        private val pdcRegsitry = CraftMetaArmor::class.java
-            .superclass // Access 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.asCraftMirror(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.remove(DataComponents.CUSTOM_DATA)
-                }
-            } else {
-                if (container != null && !container.isEmpty) {
-                    tag.put("PublicBukkitValues", container.toTag())
-                } else {
-                    tag.remove("PublicBukkitValues")
-                }
-            }
-        }
-
-        override fun materialToItem(material: Material): Item =
-            BuiltInRegistries.ITEM.getOptional(material.key.toResourceLocation())
-                .orElseThrow { IllegalArgumentException("Material is not item!") }
-
-        override fun itemToMaterial(item: Item) =
-            Material.getMaterial(BuiltInRegistries.ITEM.getKey(item).path.uppercase())
-                ?: throw IllegalArgumentException("Invalid material!")
-
-        override fun toNMS(player: Player): ServerPlayer {
-            return (player as CraftPlayer).handle
-        }
-
-        override fun toNMS(component: Component): net.minecraft.network.chat.Component {
-            val json = JSONComponentSerializer.json().serialize(component)
-            val holderLookupProvider = (Bukkit.getServer() as CraftServer).server.registryAccess()
-
-            return net.minecraft.network.chat.Component.Serializer.fromJson(json, holderLookupProvider)!!
-        }
-    }
-}

eco-core/core-nms/v1_20_6/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_6/DisplayName.kt

@@ -1,59 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_20_6
-
-import com.willfp.eco.core.packet.Packet
-import com.willfp.eco.core.packet.sendPacket
-import com.willfp.eco.internal.spigot.proxy.DisplayNameProxy
-import com.willfp.eco.internal.spigot.proxy.common.toNMS
-import net.kyori.adventure.text.Component
-import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket
-import net.minecraft.network.syncher.EntityDataAccessor
-import net.minecraft.network.syncher.SynchedEntityData
-import net.minecraft.world.entity.Entity
-import org.bukkit.craftbukkit.entity.CraftLivingEntity
-import org.bukkit.entity.LivingEntity
-import org.bukkit.entity.Player
-import java.util.Optional
-
-@Suppress("UNCHECKED_CAST")
-class DisplayName : DisplayNameProxy {
-    private val displayNameAccessor = Entity::class.java
-        .declaredFields
-        .filter { it.type == EntityDataAccessor::class.java }
-        .toList()[2]
-        .apply { isAccessible = true }
-        .get(null) as EntityDataAccessor<Optional<net.minecraft.network.chat.Component>>
-
-    private val customNameVisibleAccessor = Entity::class.java
-        .declaredFields
-        .filter { it.type == EntityDataAccessor::class.java }
-        .toList()[3]
-        .apply { isAccessible = true }
-        .get(null) as EntityDataAccessor<Boolean>
-
-    override fun setClientsideDisplayName(
-        entity: LivingEntity,
-        player: Player,
-        displayName: Component,
-        visible: Boolean
-    ) {
-        if (entity !is CraftLivingEntity) {
-            return
-        }
-
-        val nmsComponent = displayName.toNMS()
-
-        val nmsEntity = entity.handle
-        nmsEntity.isCustomNameVisible
-        val entityData = SynchedEntityData.Builder(nmsEntity).build()
-
-        entityData.set(displayNameAccessor, Optional.of(nmsComponent), true)
-        entityData.set(customNameVisibleAccessor, visible, true)
-
-        val packet = ClientboundSetEntityDataPacket(
-            nmsEntity.id,
-            entityData.packDirty() ?: throw IllegalStateException("No packed entity data")
-        )
-
-        player.sendPacket(Packet(packet))
-    }
-}

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

@@ -1,15 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_20_6
-
-import com.willfp.eco.internal.entities.EcoDummyEntity
-import com.willfp.eco.internal.spigot.proxy.DummyEntityFactoryProxy
-import org.bukkit.Location
-import org.bukkit.craftbukkit.CraftWorld
-import org.bukkit.entity.Entity
-import org.bukkit.entity.Zombie
-
-class DummyEntityFactory : DummyEntityFactoryProxy {
-    override fun createDummyEntity(location: Location): Entity {
-        val world = location.world as CraftWorld
-        return EcoDummyEntity(world.createEntity(location, Zombie::class.java))
-    }
-}

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

@@ -1,12 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_20_6
-
-import com.willfp.eco.core.entities.ai.EntityController
-import com.willfp.eco.internal.spigot.proxy.EntityControllerFactoryProxy
-import com.willfp.eco.internal.spigot.proxy.v1_20_6.entity.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_20_6/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_6/ExtendedPersistentDataContainerFactory.kt

@@ -1,82 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_20_6
-
-import com.willfp.eco.core.data.ExtendedPersistentDataContainer
-import com.willfp.eco.internal.spigot.proxy.ExtendedPersistentDataContainerFactoryProxy
-import net.minecraft.nbt.Tag
-import org.bukkit.Material
-import org.bukkit.craftbukkit.inventory.CraftItemStack
-import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer
-import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry
-import org.bukkit.inventory.ItemStack
-import org.bukkit.persistence.PersistentDataContainer
-import org.bukkit.persistence.PersistentDataType
-
-class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFactoryProxy {
-    private val registry: CraftPersistentDataTypeRegistry
-
-    init {
-        /*
-         Can't grab actual instance since it's in CraftMetaItem (which is package-private)
-         And getting it would mean more janky reflection
-         */
-        val item = CraftItemStack.asCraftCopy(ItemStack(Material.STONE))
-        val pdc = item.itemMeta!!.persistentDataContainer
-        this.registry = CraftPersistentDataContainer::class.java.getDeclaredField("registry")
-            .apply { isAccessible = true }.get(pdc) as CraftPersistentDataTypeRegistry
-    }
-
-    override fun adapt(pdc: PersistentDataContainer): ExtendedPersistentDataContainer {
-        return when (pdc) {
-            is CraftPersistentDataContainer -> EcoPersistentDataContainer(pdc)
-            else -> throw IllegalArgumentException("Custom PDC instance ${pdc::class.java.name} is not supported!")
-        }
-    }
-
-    override fun newPdc(): PersistentDataContainer {
-        return CraftPersistentDataContainer(registry)
-    }
-
-    inner class EcoPersistentDataContainer(
-        private 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, 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, 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<T, Tag>(dataType, 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_20_6/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_6/FastItemStackFactory.kt

@@ -1,392 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_20_6
-
-import com.willfp.eco.core.fast.FastItemStack
-import com.willfp.eco.internal.spigot.proxy.FastItemStackFactoryProxy
-import com.willfp.eco.internal.spigot.proxy.common.asNMSStack
-import com.willfp.eco.internal.spigot.proxy.common.item.ContinuallyAppliedPersistentDataContainer
-import com.willfp.eco.internal.spigot.proxy.common.item.ImplementedFIS
-import com.willfp.eco.internal.spigot.proxy.common.makePdc
-import com.willfp.eco.internal.spigot.proxy.common.mergeIfNeeded
-import com.willfp.eco.internal.spigot.proxy.common.setPdc
-import com.willfp.eco.internal.spigot.proxy.common.toAdventure
-import com.willfp.eco.internal.spigot.proxy.common.toItem
-import com.willfp.eco.internal.spigot.proxy.common.toMaterial
-import com.willfp.eco.internal.spigot.proxy.common.toNMS
-import com.willfp.eco.util.StringUtils
-import com.willfp.eco.util.toComponent
-import com.willfp.eco.util.toLegacy
-import net.kyori.adventure.text.Component
-import net.kyori.adventure.text.format.TextDecoration
-import net.minecraft.core.component.DataComponentType
-import net.minecraft.core.component.DataComponents
-import net.minecraft.nbt.CompoundTag
-import net.minecraft.util.Unit
-import net.minecraft.world.item.component.CustomData
-import net.minecraft.world.item.component.CustomModelData
-import net.minecraft.world.item.component.ItemLore
-import org.bukkit.craftbukkit.CraftRegistry
-import org.bukkit.craftbukkit.enchantments.CraftEnchantment
-import org.bukkit.enchantments.Enchantment
-import org.bukkit.inventory.ItemFlag
-import org.bukkit.inventory.ItemStack
-import org.bukkit.persistence.PersistentDataContainer
-import kotlin.math.max
-
-private val unstyledComponent = Component.empty().style {
-    it.color(null).decoration(TextDecoration.ITALIC, false)
-}
-
-class FastItemStackFactory : FastItemStackFactoryProxy {
-    override fun create(itemStack: ItemStack): FastItemStack {
-        return NewEcoFastItemStack(itemStack)
-    }
-
-    @Suppress("UsePropertyAccessSyntax")
-    class NewEcoFastItemStack(
-        private val bukkit: ItemStack
-    ) : ImplementedFIS {
-        // Cast is there because, try as I might, I can't get IntellIJ to recognise half the classes in the dev bundle
-        @Suppress("USELESS_CAST")
-        private val handle = bukkit.asNMSStack() as net.minecraft.world.item.ItemStack
-
-        private val pdc = (handle.get(DataComponents.CUSTOM_DATA)?.copyTag() ?: CompoundTag()).makePdc()
-
-        override fun getEnchants(checkStored: Boolean): Map<Enchantment, Int> {
-            val enchantments = handle.get(DataComponents.ENCHANTMENTS) ?: return emptyMap()
-
-            val map = mutableMapOf<Enchantment, Int>()
-
-            for ((enchantment, level) in enchantments.entrySet()) {
-                val bukkit = CraftEnchantment.minecraftToBukkit(enchantment.value())
-
-                map[bukkit] = level
-            }
-
-            return map
-        }
-
-        override fun getEnchantmentLevel(
-            enchantment: Enchantment,
-            checkStored: Boolean
-        ): Int {
-            val minecraft = CraftRegistry
-                .bukkitToMinecraft<Enchantment, net.minecraft.world.item.enchantment.Enchantment>(enchantment)
-
-            val enchantments = handle.get(DataComponents.ENCHANTMENTS) ?: return 0
-            var level = enchantments.getLevel(minecraft)
-
-            if (checkStored) {
-                val storedEnchantments = handle.get(DataComponents.STORED_ENCHANTMENTS) ?: return 0
-                level = max(level, storedEnchantments.getLevel(minecraft))
-            }
-
-            return level
-        }
-
-        override fun setLore(lore: List<String>?) = setLoreComponents(lore?.map { it.toComponent() })
-
-        override fun setLoreComponents(lore: List<Component>?) {
-            if (lore == null) {
-                handle.set<ItemLore>(DataComponents.LORE, null)
-            } else {
-                val components = lore
-                    .map { unstyledComponent.append(it) }
-                    .map { it.toNMS() }
-
-                handle.set(
-                    DataComponents.LORE, ItemLore(
-                        components,
-                        components
-                    )
-                )
-            }
-
-            apply()
-        }
-
-        override fun getLoreComponents(): List<Component> {
-            return handle.get(DataComponents.LORE)?.lines?.map { it.toAdventure() } ?: emptyList()
-        }
-
-        override fun getLore(): List<String> =
-            getLoreComponents().map { StringUtils.toLegacy(it) }
-
-        override fun setDisplayName(name: Component?) {
-            if (name == null) {
-                handle.set<net.minecraft.network.chat.Component>(DataComponents.CUSTOM_NAME, null)
-            } else {
-                handle.set(DataComponents.CUSTOM_NAME, name.toNMS())
-            }
-
-            apply()
-        }
-
-        override fun setDisplayName(name: String?) = setDisplayName(name?.toComponent())
-
-        override fun getDisplayNameComponent(): Component {
-            return handle.get(DataComponents.CUSTOM_NAME)?.toAdventure()
-                ?: Component.translatable(bukkit.type.toItem().getDescriptionId())
-        }
-
-        override fun getDisplayName(): String = displayNameComponent.toLegacy()
-
-        private fun <T> net.minecraft.world.item.ItemStack.modifyComponent(
-            component: DataComponentType<T>,
-            modifier: (T) -> T
-        ) {
-            val current = handle.get(component) ?: return
-            this.set(component, modifier(current))
-        }
-
-        override fun addItemFlags(vararg hideFlags: ItemFlag) {
-            for (flag in hideFlags) {
-                when (flag) {
-                    ItemFlag.HIDE_ENCHANTS -> {
-                        handle.modifyComponent(DataComponents.ENCHANTMENTS) { enchantments ->
-                            enchantments.withTooltip(false)
-                        }
-                    }
-
-                    ItemFlag.HIDE_ATTRIBUTES -> {
-                        handle.modifyComponent(DataComponents.ATTRIBUTE_MODIFIERS) { attributes ->
-                            attributes.withTooltip(false)
-                        }
-                    }
-
-                    ItemFlag.HIDE_UNBREAKABLE -> {
-                        handle.modifyComponent(DataComponents.UNBREAKABLE) { unbreakable ->
-                            unbreakable.withTooltip(false)
-                        }
-                    }
-
-                    ItemFlag.HIDE_DESTROYS -> {
-                        handle.modifyComponent(DataComponents.CAN_BREAK) { destroys ->
-                            destroys.withTooltip(false)
-                        }
-                    }
-
-                    ItemFlag.HIDE_PLACED_ON -> {
-                        handle.modifyComponent(DataComponents.CAN_PLACE_ON) { placedOn ->
-                            placedOn.withTooltip(false)
-                        }
-                    }
-
-                    ItemFlag.HIDE_ADDITIONAL_TOOLTIP -> {
-                        handle.set(DataComponents.HIDE_ADDITIONAL_TOOLTIP, Unit.INSTANCE)
-                    }
-
-                    ItemFlag.HIDE_DYE -> {
-                        handle.modifyComponent(DataComponents.DYED_COLOR) { dyed ->
-                            dyed.withTooltip(false)
-                        }
-                    }
-
-                    ItemFlag.HIDE_ARMOR_TRIM -> {
-                        handle.modifyComponent(DataComponents.TRIM) { trim ->
-                            trim.withTooltip(false)
-                        }
-                    }
-
-                    ItemFlag.HIDE_STORED_ENCHANTS -> {
-                        handle.modifyComponent(DataComponents.STORED_ENCHANTMENTS) { storedEnchants ->
-                            storedEnchants.withTooltip(false)
-                        }
-                    }
-                }
-            }
-
-            apply()
-        }
-
-        override fun removeItemFlags(vararg hideFlags: ItemFlag) {
-            for (flag in hideFlags) {
-                when (flag) {
-                    ItemFlag.HIDE_ENCHANTS -> {
-                        handle.modifyComponent(DataComponents.ENCHANTMENTS) { enchantments ->
-                            enchantments.withTooltip(true)
-                        }
-                    }
-
-                    ItemFlag.HIDE_ATTRIBUTES -> {
-                        handle.modifyComponent(DataComponents.ATTRIBUTE_MODIFIERS) { attributes ->
-                            attributes.withTooltip(true)
-                        }
-                    }
-
-                    ItemFlag.HIDE_UNBREAKABLE -> {
-                        handle.modifyComponent(DataComponents.UNBREAKABLE) { unbreakable ->
-                            unbreakable.withTooltip(true)
-                        }
-                    }
-
-                    ItemFlag.HIDE_DESTROYS -> {
-                        handle.modifyComponent(DataComponents.CAN_BREAK) { destroys ->
-                            destroys.withTooltip(true)
-                        }
-                    }
-
-                    ItemFlag.HIDE_PLACED_ON -> {
-                        handle.modifyComponent(DataComponents.CAN_PLACE_ON) { placedOn ->
-                            placedOn.withTooltip(true)
-                        }
-                    }
-
-                    ItemFlag.HIDE_ADDITIONAL_TOOLTIP -> {
-                        handle.remove(DataComponents.HIDE_ADDITIONAL_TOOLTIP)
-                    }
-
-                    ItemFlag.HIDE_DYE -> {
-                        handle.modifyComponent(DataComponents.DYED_COLOR) { dyed ->
-                            dyed.withTooltip(true)
-                        }
-                    }
-
-                    ItemFlag.HIDE_ARMOR_TRIM -> {
-                        handle.modifyComponent(DataComponents.TRIM) { trim ->
-                            trim.withTooltip(true)
-                        }
-                    }
-
-                    ItemFlag.HIDE_STORED_ENCHANTS -> {
-                        handle.modifyComponent(DataComponents.STORED_ENCHANTMENTS) { storedEnchants ->
-                            storedEnchants.withTooltip(true)
-                        }
-                    }
-                }
-            }
-
-            apply()
-        }
-
-        override fun getItemFlags(): Set<ItemFlag> {
-            val currentFlags = mutableSetOf<ItemFlag>()
-            for (f in ItemFlag.values()) {
-                if (hasItemFlag(f)) {
-                    currentFlags.add(f)
-                }
-            }
-            return currentFlags
-        }
-
-        override fun hasItemFlag(flag: ItemFlag): Boolean {
-            return when (flag) {
-                ItemFlag.HIDE_ENCHANTS -> {
-                    val enchantments = handle.get(DataComponents.ENCHANTMENTS) ?: return false
-                    !enchantments.showInTooltip
-                }
-
-                ItemFlag.HIDE_ATTRIBUTES -> {
-                    val attributes = handle.get(DataComponents.ATTRIBUTE_MODIFIERS) ?: return false
-                    !attributes.showInTooltip
-                }
-
-                ItemFlag.HIDE_UNBREAKABLE -> {
-                    val unbreakable = handle.get(DataComponents.UNBREAKABLE) ?: return false
-                    !unbreakable.showInTooltip
-                }
-
-                ItemFlag.HIDE_DESTROYS -> {
-                    val destroys = handle.get(DataComponents.CAN_BREAK) ?: return false
-                    !destroys.showInTooltip()
-                }
-
-                ItemFlag.HIDE_PLACED_ON -> {
-                    val placedOn = handle.get(DataComponents.CAN_PLACE_ON) ?: return false
-                    !placedOn.showInTooltip()
-                }
-
-                ItemFlag.HIDE_ADDITIONAL_TOOLTIP -> {
-                    handle.get(DataComponents.HIDE_ADDITIONAL_TOOLTIP) != null
-                }
-
-                ItemFlag.HIDE_DYE -> {
-                    val dyed = handle.get(DataComponents.DYED_COLOR) ?: return false
-                    !dyed.showInTooltip()
-                }
-
-                ItemFlag.HIDE_ARMOR_TRIM -> {
-                    val armorTrim = handle.get(DataComponents.TRIM) ?: return false
-                    !armorTrim.showInTooltip
-                }
-
-                ItemFlag.HIDE_STORED_ENCHANTS -> {
-                    val storedEnchants = handle.get(DataComponents.STORED_ENCHANTMENTS) ?: return false
-                    !storedEnchants.showInTooltip
-                }
-            }
-        }
-
-        override fun getRepairCost(): Int {
-            return handle.get(DataComponents.REPAIR_COST) ?: 0
-        }
-
-        override fun setRepairCost(cost: Int) {
-            handle.set(DataComponents.REPAIR_COST, cost)
-
-            apply()
-        }
-
-        override fun getPersistentDataContainer(): PersistentDataContainer {
-            return ContinuallyAppliedPersistentDataContainer(this.pdc, this)
-        }
-
-        override fun getAmount(): Int = handle.getCount()
-
-        override fun setAmount(amount: Int) {
-            handle.setCount(amount)
-            apply()
-        }
-
-        override fun setType(material: org.bukkit.Material) {
-            @Suppress("DEPRECATION")
-            handle.setItem(material.toItem())
-            apply()
-        }
-
-        override fun getType(): org.bukkit.Material = handle.getItem().toMaterial()
-
-        override fun getCustomModelData(): Int? =
-            handle.get(DataComponents.CUSTOM_MODEL_DATA)?.value
-
-        override fun setCustomModelData(data: Int?) {
-            if (data == null) {
-                handle.remove(DataComponents.CUSTOM_MODEL_DATA)
-            } else {
-                handle.set(DataComponents.CUSTOM_MODEL_DATA, CustomModelData(data))
-            }
-
-            apply()
-        }
-
-        override fun equals(other: Any?): Boolean {
-            if (other !is NewEcoFastItemStack) {
-                return false
-            }
-
-            return other.hashCode() == this.hashCode()
-        }
-
-        override fun hashCode(): Int {
-            return net.minecraft.world.item.ItemStack.hashItemAndComponents(handle)
-        }
-
-        override fun apply() {
-            val customData = handle.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY)
-            val updated = customData.update {
-                it.setPdc(pdc)
-            }
-
-            if (updated.isEmpty) {
-                handle.remove(DataComponents.CUSTOM_DATA)
-            } else {
-                handle.set(DataComponents.CUSTOM_DATA, updated)
-            }
-
-            bukkit.mergeIfNeeded(handle)
-        }
-
-        override fun unwrap(): ItemStack {
-            return bukkit
-        }
-    }
-}

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

@@ -1,33 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_20_6
-
-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_20_6/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_6/PacketHandler.kt

@@ -1,46 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_20_6
-
-import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.packet.PacketListener
-import com.willfp.eco.internal.spigot.proxy.PacketHandlerProxy
-import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketAutoRecipe
-import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketHeldItemSlot
-import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketSetSlot
-import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketWindowItems
-import com.willfp.eco.internal.spigot.proxy.common.packet.display.frame.clearFrames
-import com.willfp.eco.internal.spigot.proxy.v1_20_6.packet.NewItemsPacketOpenWindowMerchant
-import com.willfp.eco.internal.spigot.proxy.v1_20_6.packet.NewItemsPacketSetCreativeSlot
-import net.minecraft.network.protocol.Packet
-import org.bukkit.craftbukkit.entity.CraftPlayer
-import org.bukkit.entity.Player
-
-class PacketHandler : PacketHandlerProxy {
-    override fun sendPacket(player: Player, packet: com.willfp.eco.core.packet.Packet) {
-        if (player !is CraftPlayer) {
-            return
-        }
-
-        val handle = packet.handle
-
-        if (handle !is Packet<*>) {
-            return
-        }
-
-        player.handle.connection.send(handle)
-    }
-
-    override fun clearDisplayFrames() {
-        clearFrames()
-    }
-
-    override fun getPacketListeners(plugin: EcoPlugin): List<PacketListener> {
-        return listOf(
-            PacketAutoRecipe(plugin),
-            PacketHeldItemSlot,
-            NewItemsPacketOpenWindowMerchant,
-            NewItemsPacketSetCreativeSlot,
-            PacketSetSlot,
-            PacketWindowItems(plugin)
-        )
-    }
-}

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

@@ -1,80 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_20_6
-
-import com.mojang.serialization.Dynamic
-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.NbtOps
-import net.minecraft.nbt.SnbtPrinterTagVisitor
-import net.minecraft.nbt.TagParser
-import net.minecraft.server.MinecraftServer
-import net.minecraft.util.datafix.fixes.References
-import org.bukkit.Bukkit
-import org.bukkit.craftbukkit.CraftServer
-import org.bukkit.craftbukkit.inventory.CraftItemStack
-import org.bukkit.craftbukkit.util.CraftMagicNumbers
-import org.bukkit.inventory.ItemStack
-
-private val registryAccess = (Bukkit.getServer() as CraftServer).server.registryAccess()
-
-class SNBTConverter : SNBTConverterProxy {
-    private fun parseItemSNBT(snbt: String): CompoundTag? {
-        val nbt = runCatching { TagParser.parseTag(snbt) }.getOrNull() ?: return null
-        val dataVersion = if (nbt.contains("DataVersion")) {
-            nbt.getInt("DataVersion")
-        } else null
-
-        // If the data version is the same as the server's data version, we don't need to fix it
-        if (dataVersion == CraftMagicNumbers.INSTANCE.dataVersion) {
-            return nbt
-        }
-
-        return MinecraftServer.getServer().fixerUpper.update(
-            References.ITEM_STACK,
-            Dynamic(NbtOps.INSTANCE, nbt),
-            dataVersion ?: 3700, // 3700 is the 1.20.4 data version
-            CraftMagicNumbers.INSTANCE.dataVersion
-        ).value as CompoundTag
-    }
-
-    override fun fromSNBT(snbt: String): ItemStack? {
-        val tag = parseItemSNBT(snbt) ?: return null
-        val nms = net.minecraft.world.item.ItemStack.parse(registryAccess, tag).orElse(null) ?: return null
-        return CraftItemStack.asBukkitCopy(nms)
-    }
-
-    override fun toSNBT(itemStack: ItemStack): String {
-        val nms = CraftItemStack.asNMSCopy(itemStack)
-        val tag = nms.save(registryAccess) as CompoundTag
-        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
-        return SnbtPrinterTagVisitor().visit(tag)
-    }
-
-    override fun makeSNBTTestable(snbt: String): TestableItem {
-        val tag = parseItemSNBT(snbt) ?: return EmptyTestableItem()
-        val nms = net.minecraft.world.item.ItemStack.parse(registryAccess, tag).orElse(null)
-            ?: return EmptyTestableItem()
-
-        tag.remove("Count")
-        return SNBTTestableItem(CraftItemStack.asBukkitCopy(nms), tag)
-    }
-
-    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(registryAccess) as CompoundTag
-            nmsTag.remove("Count")
-            return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type
-        }
-
-        override fun getItem(): ItemStack = item
-    }
-}

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

@@ -1,18 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_20_6
-
-import com.willfp.eco.internal.spigot.proxy.SkullProxy
-import com.willfp.eco.internal.spigot.proxy.common.texture
-import org.bukkit.inventory.meta.SkullMeta
-
-class Skull : SkullProxy {
-    override fun setSkullTexture(
-        meta: SkullMeta,
-        base64: String
-    ) {
-        meta.texture = base64
-    }
-
-    override fun getSkullTexture(
-        meta: SkullMeta
-    ): String? = meta.texture
-}

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

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

eco-core/core-nms/v1_20_6/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_6/entity/EcoEntityController.kt

@@ -1,95 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_20_6.entity
-
-import com.willfp.eco.core.entities.ai.CustomGoal
-import com.willfp.eco.core.entities.ai.EntityController
-import com.willfp.eco.core.entities.ai.EntityGoal
-import com.willfp.eco.core.entities.ai.TargetGoal
-import com.willfp.eco.internal.spigot.proxy.common.ai.CustomGoalFactory
-import com.willfp.eco.internal.spigot.proxy.common.ai.getGoalFactory
-import com.willfp.eco.internal.spigot.proxy.common.toPathfinderMob
-import net.minecraft.world.entity.PathfinderMob
-import net.minecraft.world.entity.ai.goal.Goal
-import org.bukkit.entity.Mob
-
-class EcoEntityController<T : Mob>(
-    private val handle: T
-) : EntityController<T> {
-    override fun addEntityGoal(priority: Int, goal: EntityGoal<in T>): EntityController<T> {
-        val nms = getNms() ?: return this
-
-        nms.goalSelector.addGoal(
-            priority,
-            goal.getGoalFactory()?.create(goal, nms) ?: return this
-        )
-
-        return this
-    }
-
-    override fun removeEntityGoal(goal: EntityGoal<in T>): EntityController<T> {
-        val nms = getNms() ?: return this
-
-        val predicate: (Goal) -> Boolean = if (goal is CustomGoal<*>) {
-            { CustomGoalFactory.isGoalOfType(it, goal) }
-        } else {
-            { goal.getGoalFactory()?.isGoalOfType(it) == true }
-        }
-
-        for (wrapped in nms.goalSelector.availableGoals.toSet()) {
-            if (predicate(wrapped.goal)) {
-                nms.goalSelector.removeGoal(wrapped.goal)
-            }
-        }
-
-        return this
-    }
-
-    override fun clearEntityGoals(): EntityController<T> {
-        val nms = getNms() ?: return this
-        nms.goalSelector.availableGoals.clear()
-        return this
-    }
-
-    override fun addTargetGoal(priority: Int, goal: TargetGoal<in T>): EntityController<T> {
-        val nms = getNms() ?: return this
-
-        nms.targetSelector.addGoal(
-            priority, goal.getGoalFactory()?.create(goal, nms) ?: return this
-        )
-
-        nms.targetSelector
-
-        return this
-    }
-
-    override fun removeTargetGoal(goal: TargetGoal<in T>): EntityController<T> {
-        val nms = getNms() ?: return this
-
-        val predicate: (Goal) -> Boolean = if (goal is CustomGoal<*>) {
-            { CustomGoalFactory.isGoalOfType(it, goal) }
-        } else {
-            { goal.getGoalFactory()?.isGoalOfType(it) == true }
-        }
-
-        for (wrapped in nms.targetSelector.availableGoals.toSet()) {
-            if (predicate(wrapped.goal)) {
-                nms.targetSelector.removeGoal(wrapped.goal)
-            }
-        }
-
-        return this
-    }
-
-    override fun clearTargetGoals(): EntityController<T> {
-        val nms = getNms() ?: return this
-        nms.targetSelector.availableGoals.clear()
-        return this
-    }
-
-    private fun getNms(): PathfinderMob? {
-        return handle.toPathfinderMob()
-    }
-
-    override fun getEntity(): T {
-        return handle
-    }
-}

eco-core/core-nms/v1_20_6/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_6/packet/NewItemsPacketOpenWindowMerchant.kt

@@ -1,35 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_20_6.packet
-
-import com.willfp.eco.core.display.Display
-import com.willfp.eco.core.packet.PacketEvent
-import com.willfp.eco.core.packet.PacketListener
-import com.willfp.eco.internal.spigot.proxy.common.asBukkitStack
-import net.minecraft.network.protocol.game.ClientboundMerchantOffersPacket
-import net.minecraft.world.item.trading.MerchantOffers
-
-object NewItemsPacketOpenWindowMerchant : PacketListener {
-    private val field = ClientboundMerchantOffersPacket::class.java
-        .declaredFields
-        .first { it.type == MerchantOffers::class.java }
-        .apply { isAccessible = true }
-
-    override fun onSend(event: PacketEvent) {
-        val packet = event.packet.handle as? ClientboundMerchantOffersPacket ?: return
-
-        val offers = MerchantOffers()
-
-        for (offer in packet.offers) {
-            val new = offer.copy()
-
-            Display.display(new.baseCostA.itemStack.asBukkitStack(), event.player)
-            if (new.costB.isPresent) {
-                Display.display(new.costB.get().itemStack.asBukkitStack(), event.player)
-            }
-            Display.display(new.result.asBukkitStack(), event.player)
-
-            offers += new
-        }
-
-        field.set(packet, offers)
-    }
-}

eco-core/core-nms/v1_20_6/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_6/packet/NewItemsPacketSetCreativeSlot.kt

@@ -1,19 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_20_6.packet
-
-import com.willfp.eco.core.display.Display
-import com.willfp.eco.core.packet.PacketEvent
-import com.willfp.eco.core.packet.PacketListener
-import com.willfp.eco.internal.spigot.proxy.common.asBukkitStack
-import com.willfp.eco.internal.spigot.proxy.common.packet.display.frame.DisplayFrame
-import com.willfp.eco.internal.spigot.proxy.common.packet.display.frame.lastDisplayFrame
-import net.minecraft.network.protocol.game.ServerboundSetCreativeModeSlotPacket
-
-object NewItemsPacketSetCreativeSlot : PacketListener {
-    override fun onReceive(event: PacketEvent) {
-        val packet = event.packet.handle as? ServerboundSetCreativeModeSlotPacket ?: return
-
-        Display.revert(packet.itemStack.asBukkitStack())
-
-        event.player.lastDisplayFrame = DisplayFrame.EMPTY
-    }
-}

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

@@ -28,7 +28,7 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa
     override fun adapt(pdc: PersistentDataContainer): ExtendedPersistentDataContainer {
         return when (pdc) {
             is CraftPersistentDataContainer -> EcoPersistentDataContainer(pdc)
-            else -> throw IllegalArgumentException("Custom PDC instance ${pdc::class.java.name} is not supported!")
+            else -> throw IllegalArgumentException("Custom PDC instance ims not supported!")
         }
     }
 

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

@@ -7,7 +7,6 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
 import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack
-import org.bukkit.craftbukkit.v1_20_R1.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -19,9 +18,7 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        val tag = nms.save(CompoundTag())
-        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
-        return SnbtPrinterTagVisitor().visit(tag)
+        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

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

@@ -28,7 +28,7 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa
     override fun adapt(pdc: PersistentDataContainer): ExtendedPersistentDataContainer {
         return when (pdc) {
             is CraftPersistentDataContainer -> EcoPersistentDataContainer(pdc)
-            else -> throw IllegalArgumentException("Custom PDC instance ${pdc::class.java.name} is not supported!")
+            else -> throw IllegalArgumentException("Custom PDC instance ims not supported!")
         }
     }
 

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

@@ -7,7 +7,6 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
 import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack
-import org.bukkit.craftbukkit.v1_20_R2.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -19,9 +18,7 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        val tag = nms.save(CompoundTag())
-        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
-        return SnbtPrinterTagVisitor().visit(tag)
+        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

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

@@ -7,7 +7,7 @@ version = rootProject.version
 
 dependencies {
     implementation(project(":eco-core:core-nms:nms-common"))
-    paperweight.paperDevBundle("1.20.4-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.20.3-R0.1-SNAPSHOT")
 
     implementation("net.kyori:adventure-text-minimessage:4.11.0") {
         version {

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

@@ -2,7 +2,6 @@ package com.willfp.eco.internal.spigot.proxy.v1_20_R3
 
 import com.willfp.eco.core.data.ExtendedPersistentDataContainer
 import com.willfp.eco.internal.spigot.proxy.ExtendedPersistentDataContainerFactoryProxy
-import com.willfp.eco.internal.spigot.proxy.common.item.ContinuallyAppliedPersistentDataContainer
 import net.minecraft.nbt.Tag
 import org.bukkit.Material
 import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack
@@ -29,7 +28,7 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa
     override fun adapt(pdc: PersistentDataContainer): ExtendedPersistentDataContainer {
         return when (pdc) {
             is CraftPersistentDataContainer -> EcoPersistentDataContainer(pdc)
-            else -> throw IllegalArgumentException("Custom PDC instance ${pdc::class.java.name} is not supported!")
+            else -> throw IllegalArgumentException("Custom PDC instance ims not supported!")
         }
     }
 
@@ -47,17 +46,17 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa
 
         override fun <T : Any, Z : Any> set(key: String, dataType: PersistentDataType<T, Z>, value: Z) {
             customDataTags[key] =
-                registry.wrap(dataType, dataType.toPrimitive(value, handle.adapterContext))
+                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, value)
+            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<T, Tag>(dataType, value), handle.adapterContext)
+            return dataType.fromPrimitive(registry.extract(dataType.primitiveType, value), handle.adapterContext)
         }
 
         override fun <T : Any, Z : Any> getOrDefault(

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

@@ -7,7 +7,6 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
 import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack
-import org.bukkit.craftbukkit.v1_20_R3.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -19,9 +18,7 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        val tag = nms.save(CompoundTag())
-        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
-        return SnbtPrinterTagVisitor().visit(tag)
+        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

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

@@ -6,6 +6,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer
 
 class TPS : TPSProxy {
     override fun getTPS(): Double {
-        return (Bukkit.getServer() as CraftServer).handle.server.tps1.average
+        return (Bukkit.getServer() as CraftServer).handle.server.recentTps[0]
     }
-}
+}

eco-core/core-plugin/build.gradle.kts

@@ -16,9 +16,8 @@ dependencies {
     implementation("com.zaxxer:HikariCP:5.0.0")
     implementation("net.kyori:adventure-platform-bukkit:4.1.0")
     implementation("org.javassist:javassist:3.29.2-GA")
-    implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.0.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.5.1")
-    implementation("org.mongodb:bson-kotlinx:5.0.0")
+    implementation("org.mongodb:mongodb-driver-sync:4.6.0")
+    implementation("org.litote.kmongo:kmongo-coroutine:4.10.0")
     implementation("com.moandjiezana.toml:toml4j:0.7.2") {
         exclude(group = "com.google.code.gson", module = "gson")
     }
@@ -26,7 +25,7 @@ dependencies {
 
     // Included in spigot jar
     compileOnly("com.google.code.gson:gson:2.8.8")
-    compileOnly("io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT")
 
     // Plugin dependencies
     compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT")
@@ -50,7 +49,7 @@ dependencies {
     compileOnly("com.github.MilkBowl:VaultAPI:1.7")
     compileOnly("com.github.WhipDevelopment:CrashClaim:f9cd7d92eb")
     compileOnly("com.github.decentsoftware-eu:decentholograms:2.8.5")
-    compileOnly("com.github.Gypopo:EconomyShopGUI-API:1.4.6")
+    compileOnly("com.github.Gypopo:EconomyShopGUI-API:1.7.0")
     compileOnly("com.github.N0RSKA:ScytherAPI:55a")
     compileOnly("org.black_ixx:playerpoints:3.2.5")
     compileOnly("com.github.Ssomar-Developement:SCore:3.4.7")
@@ -63,9 +62,6 @@ dependencies {
         exclude(group = "*", module = "*")
     }
     compileOnly("com.iridium:IridiumSkyblock:4.0.8")
-    compileOnly("net.william278.huskclaims:huskclaims-bukkit:1.0.1")
-    compileOnly("net.william278:husktowns:2.6.1")
-    compileOnly("com.github.jojodmo:ItemBridge:b0054538c1")
 
     compileOnly(fileTree("../../lib") {
         include("*.jar")

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

@@ -239,11 +239,6 @@ class EcoImpl : EcoSpigotPlugin(), Eco {
         MergedStateMenu(base, additional)
 
     override fun clean(plugin: EcoPlugin) {
-        // Prevent self-cleaning
-        if (plugin == this) {
-            return
-        }
-
         if (plugin.proxyPackage.isNotEmpty()) {
             val factory = plugin.proxyFactory as EcoProxyFactory
             factory.clean()

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

@@ -22,8 +22,34 @@ import com.willfp.eco.core.particle.Particles
 import com.willfp.eco.core.price.Prices
 import com.willfp.eco.internal.data.MavenVersionToStringAdapter
 import com.willfp.eco.internal.data.VersionToStringAdapter
-import com.willfp.eco.internal.entities.*
-import com.willfp.eco.internal.items.*
+import com.willfp.eco.internal.entities.EntityArgParserAdult
+import com.willfp.eco.internal.entities.EntityArgParserAttackDamage
+import com.willfp.eco.internal.entities.EntityArgParserAttackSpeed
+import com.willfp.eco.internal.entities.EntityArgParserBaby
+import com.willfp.eco.internal.entities.EntityArgParserCharged
+import com.willfp.eco.internal.entities.EntityArgParserEquipment
+import com.willfp.eco.internal.entities.EntityArgParserExplosionRadius
+import com.willfp.eco.internal.entities.EntityArgParserFlySpeed
+import com.willfp.eco.internal.entities.EntityArgParserFollowRange
+import com.willfp.eco.internal.entities.EntityArgParserHealth
+import com.willfp.eco.internal.entities.EntityArgParserJumpStrength
+import com.willfp.eco.internal.entities.EntityArgParserKnockback
+import com.willfp.eco.internal.entities.EntityArgParserKnockbackResistance
+import com.willfp.eco.internal.entities.EntityArgParserName
+import com.willfp.eco.internal.entities.EntityArgParserNoAI
+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.items.ArgParserColor
+import com.willfp.eco.internal.items.ArgParserCustomModelData
+import com.willfp.eco.internal.items.ArgParserEnchantment
+import com.willfp.eco.internal.items.ArgParserFlag
+import com.willfp.eco.internal.items.ArgParserHead
+import com.willfp.eco.internal.items.ArgParserName
+import com.willfp.eco.internal.items.ArgParserTexture
+import com.willfp.eco.internal.items.ArgParserTrim
+import com.willfp.eco.internal.items.ArgParserUnbreakable
 import com.willfp.eco.internal.lookup.SegmentParserGroup
 import com.willfp.eco.internal.lookup.SegmentParserUseIfPresent
 import com.willfp.eco.internal.particle.ParticleFactoryRGB
@@ -43,10 +69,37 @@ import com.willfp.eco.internal.spigot.eventlisteners.armor.ArmorListener
 import com.willfp.eco.internal.spigot.gui.GUIListener
 import com.willfp.eco.internal.spigot.integrations.afk.AFKIntegrationCMI
 import com.willfp.eco.internal.spigot.integrations.afk.AFKIntegrationEssentials
-import com.willfp.eco.internal.spigot.integrations.anticheat.*
-import com.willfp.eco.internal.spigot.integrations.antigrief.*
+import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatAAC
+import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatAlice
+import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatMatrix
+import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatNCP
+import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatSpartan
+import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatVulcan
+import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefBentoBox
+import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCombatLogXV10
+import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCombatLogXV11
+import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCrashClaim
+import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefDeluxeCombat
+import com.willfp.eco.internal.spigot.integrations.antigrief.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
+import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefKingdoms
+import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefLands
+import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefPvPManager
+import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefRPGHorses
+import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefSuperiorSkyblock2
+import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefTowny
+import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefWorldGuard
 import com.willfp.eco.internal.spigot.integrations.customentities.CustomEntitiesMythicMobs
-import com.willfp.eco.internal.spigot.integrations.customitems.*
+import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsCustomCrafting
+import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsDenizen
+import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsExecutableItems
+import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsHeadDatabase
+import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsItemsAdder
+import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsMythicMobs
+import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsOraxen
+import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsScyther
 import com.willfp.eco.internal.spigot.integrations.customrecipes.CustomRecipeCustomCrafting
 import com.willfp.eco.internal.spigot.integrations.economy.EconomyVault
 import com.willfp.eco.internal.spigot.integrations.entitylookup.EntityLookupModelEngine
@@ -96,7 +149,6 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
         Items.registerArgParser(ArgParserUnbreakable)
         Items.registerArgParser(ArgParserName)
         Items.registerArgParser(ArgParserHead)
-        Items.registerArgParser(ArgParserEntity)
         if (Prerequisite.HAS_1_20.isMet) {
             Items.registerArgParser(ArgParserTrim)
         }
@@ -244,8 +296,6 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
             IntegrationLoader("Kingdoms") { AntigriefManager.register(AntigriefKingdoms()) },
             IntegrationLoader("RPGHorses") { AntigriefManager.register(AntigriefRPGHorses()) },
             IntegrationLoader("CrashClaim") { AntigriefManager.register(AntigriefCrashClaim()) },
-            IntegrationLoader("HuskTowns") { AntigriefManager.register(AntigriefHuskTowns()) },
-            IntegrationLoader("HuskClaims") { AntigriefManager.register(AntigriefHuskClaims()) },
             IntegrationLoader("CombatLogX") {
                 val pluginManager = Bukkit.getPluginManager()
                 val combatLogXPlugin = pluginManager.getPlugin("CombatLogX") ?: return@IntegrationLoader
@@ -285,7 +335,6 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
             IntegrationLoader("MythicMobs") { CustomItemsManager.register(CustomItemsMythicMobs(this)) },
             IntegrationLoader("Scyther") { CustomItemsManager.register(CustomItemsScyther()) },
             IntegrationLoader("Denizen") { CustomItemsManager.register(CustomItemsDenizen()) },
-            IntegrationLoader("ItemBridge") { CustomItemsManager.register(CustomItemsItemBridge()) },
 
             // Shop
             IntegrationLoader("ShopGUIPlus") { ShopManager.register(ShopShopGuiPlus()) },

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

@@ -1,7 +1,7 @@
 package com.willfp.eco.internal.spigot.arrows
 
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.items.isEcoEmpty
+import com.willfp.eco.core.items.isEmpty
 import org.bukkit.entity.Arrow
 import org.bukkit.entity.LivingEntity
 import org.bukkit.event.EventHandler
@@ -29,7 +29,7 @@ class ArrowDataListener(
 
         val item = entity.equipment?.itemInMainHand
 
-        if (item.isEcoEmpty || item == null) {
+        if (item.isEmpty || item == null) {
             return
         }
 

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

@@ -1,11 +1,5 @@
 package com.willfp.eco.internal.spigot.data.storage
 
-import com.mongodb.client.model.Filters
-import com.mongodb.client.model.ReplaceOptions
-import com.mongodb.client.model.UpdateOptions
-import com.mongodb.client.model.Updates
-import com.mongodb.kotlin.client.coroutine.MongoClient
-import com.mongodb.kotlin.client.coroutine.MongoCollection
 import com.willfp.eco.core.data.keys.PersistentDataKey
 import com.willfp.eco.internal.spigot.EcoSpigotPlugin
 import com.willfp.eco.internal.spigot.data.ProfileHandler
@@ -14,20 +8,21 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
+import org.litote.kmongo.coroutine.CoroutineClient
+import org.litote.kmongo.coroutine.CoroutineCollection
+import org.litote.kmongo.coroutine.coroutine
+import org.litote.kmongo.eq
+import org.litote.kmongo.reactivestreams.KMongo
+import org.litote.kmongo.setValue
 import java.util.UUID
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.serialization.Contextual
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import org.bukkit.Bukkit
 
 @Suppress("UNCHECKED_CAST")
 class MongoDataHandler(
     plugin: EcoSpigotPlugin,
     private val handler: ProfileHandler
 ) : DataHandler(HandlerType.MONGO) {
-    private val client: MongoClient
-    private val collection: MongoCollection<UUIDProfile>
+    private val client: CoroutineClient
+    private val collection: CoroutineCollection<UUIDProfile>
 
     private val scope = CoroutineScope(Dispatchers.IO)
 
@@ -39,9 +34,8 @@ class MongoDataHandler(
 
         val url = plugin.configYml.getString("mongodb.url")
 
-        client = MongoClient.create(url)
-        collection = client.getDatabase(plugin.configYml.getString("mongodb.database"))
-            .getCollection<UUIDProfile>("uuidprofile") // Compat with jackson mapping
+        client = KMongo.createClient(url).coroutine
+        collection = client.getDatabase("eco").getCollection()
     }
 
     override fun <T : Any> read(uuid: UUID, key: PersistentDataKey<T>): T? {
@@ -72,7 +66,7 @@ class MongoDataHandler(
     private suspend fun <T> doWrite(uuid: UUID, key: PersistentDataKey<T>, value: T) {
         val profile = getOrCreateDocument(uuid)
 
-        profile.data.run {
+        val newData = profile.data.apply {
             if (value == null) {
                 this.remove(key.key.toString())
             } else {
@@ -80,33 +74,25 @@ class MongoDataHandler(
             }
         }
 
-        collection.updateOne(
-            Filters.eq(UUIDProfile::uuid.name, uuid.toString()),
-            Updates.set(UUIDProfile::data.name, profile.data)
-        )
+        collection.updateOne(UUIDProfile::uuid eq uuid.toString(), setValue(UUIDProfile::data, newData))
     }
 
     private suspend fun <T> doRead(uuid: UUID, key: PersistentDataKey<T>): T? {
-        val profile = collection.find<UUIDProfile>(Filters.eq(UUIDProfile::uuid.name, uuid.toString()))
-            .firstOrNull() ?: return key.defaultValue
+        val profile = collection.findOne(UUIDProfile::uuid eq uuid.toString()) ?: return key.defaultValue
         return profile.data[key.key.toString()] as? T?
     }
 
     private suspend fun getOrCreateDocument(uuid: UUID): UUIDProfile {
-        val profile = collection.find<UUIDProfile>(Filters.eq(UUIDProfile::uuid.name, uuid.toString()))
-            .firstOrNull()
+        val profile = collection.findOne(UUIDProfile::uuid eq uuid.toString())
         return if (profile == null) {
-            val toInsert = UUIDProfile(
-                uuid.toString(),
-                mutableMapOf()
+            collection.insertOne(
+                UUIDProfile(
+                    uuid.toString(),
+                    mutableMapOf()
+                )
             )
 
-            collection.replaceOne(
-                Filters.eq(UUIDProfile::uuid.name, uuid.toString()),
-                toInsert,
-                ReplaceOptions().upsert(true)
-            )
-            toInsert
+            getOrCreateDocument(uuid)
         } else {
             profile
         }
@@ -125,10 +111,10 @@ class MongoDataHandler(
     }
 }
 
-@Serializable
-internal data class UUIDProfile(
+private data class UUIDProfile(
     // Storing UUID as strings for serialization
-    @SerialName("_id") val uuid: String,
+    @BsonId
+    val uuid: String,
     // Storing NamespacedKeys as strings for serialization
-    val data: MutableMap<String, @Contextual Any>
+    val data: MutableMap<String, Any>
 )

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

@@ -1,135 +0,0 @@
-package com.willfp.eco.internal.spigot.integrations.antigrief
-
-import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration
-import net.crashcraft.crashclaim.CrashClaim
-import net.crashcraft.crashclaim.permissions.PermissionRoute
-import net.william278.huskclaims.api.HuskClaimsAPI
-import net.william278.huskclaims.libraries.cloplib.operation.Operation
-import net.william278.huskclaims.libraries.cloplib.operation.OperationPosition
-import net.william278.huskclaims.libraries.cloplib.operation.OperationType
-import net.william278.huskclaims.position.Position
-import net.william278.huskclaims.position.World
-import org.bukkit.Location
-import org.bukkit.block.Block
-import org.bukkit.entity.LivingEntity
-import org.bukkit.entity.Monster
-import org.bukkit.entity.Player
-import kotlin.jvm.optionals.getOrElse
-
-class AntigriefHuskClaims : AntigriefIntegration {
-    override fun canBreakBlock(
-        player: Player,
-        block: Block
-    ): Boolean {
-        val api = HuskClaimsAPI.getInstance() ?: return true
-
-        val user = api.getOnlineUser(player.uniqueId) ?: return true
-
-        return api.isOperationAllowed(
-            Operation.of(
-                user,
-                OperationType.BLOCK_BREAK,
-                Position.at(
-                    block.x.toDouble(),
-                    block.y.toDouble(),
-                    block.z.toDouble(),
-                    api.getWorld(block.location.world.name)
-                ),
-                true
-            )
-        )
-    }
-
-    override fun canCreateExplosion(
-        player: Player,
-        location: Location
-    ): Boolean {
-        val api = HuskClaimsAPI.getInstance() ?: return true
-
-        val user = api.getOnlineUser(player.uniqueId) ?: return true
-
-        return api.isOperationAllowed(
-            Operation.of(
-                user,
-                OperationType.EXPLOSION_DAMAGE_ENTITY,
-                Position.at(
-                    location.x,
-                    location.y,
-                    location.z,
-                    api.getWorld(location.world.name)
-                ),
-                true
-            )
-        )
-    }
-
-    override fun canPlaceBlock(
-        player: Player,
-        block: Block
-    ): Boolean {
-        val api = HuskClaimsAPI.getInstance() ?: return true
-
-        val user = api.getOnlineUser(player.uniqueId) ?: return true
-
-        return api.isOperationAllowed(
-            Operation.of(
-                user,
-                OperationType.BLOCK_PLACE,
-                Position.at(
-                    block.x.toDouble(),
-                    block.y.toDouble(),
-                    block.z.toDouble(),
-                    api.getWorld(block.location.world.name)
-                ),
-                true
-            )
-        )
-    }
-
-    override fun canInjure(
-        player: Player,
-        victim: LivingEntity
-    ): Boolean {
-        val api = HuskClaimsAPI.getInstance() ?: return true
-
-        val user = api.getOnlineUser(player.uniqueId) ?: return true
-
-        return api.isOperationAllowed(
-            Operation.of(
-                user,
-                when (victim) {
-                    is Monster -> OperationType.PLAYER_DAMAGE_MONSTER
-                    is Player -> OperationType.PLAYER_DAMAGE_PLAYER
-                    else -> OperationType.PLAYER_DAMAGE_ENTITY
-                },
-                Position.at(
-                    victim.x,
-                    victim.y,
-                    victim.z,
-                    api.getWorld(victim.location.world.name)
-                ),
-                true
-            )
-        )
-    }
-
-    override fun canPickupItem(player: Player, location: Location): Boolean {
-        return true
-    }
-
-    override fun getPluginName(): String {
-        return "HuskClaims"
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (other !is AntigriefIntegration) {
-            return false
-        }
-
-        return other.pluginName == this.pluginName
-    }
-
-    override fun hashCode(): Int {
-        return this.pluginName.hashCode()
-    }
-}

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

@@ -1,129 +0,0 @@
-package com.willfp.eco.internal.spigot.integrations.antigrief
-
-import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration
-import net.william278.husktowns.api.HuskTownsAPI
-import net.william278.husktowns.claim.Position
-import net.william278.husktowns.listener.Operation
-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 AntigriefHuskTowns : AntigriefIntegration {
-    override fun canBreakBlock(
-        player: Player,
-        block: Block
-    ): Boolean {
-        val api = HuskTownsAPI.getInstance() ?: return true
-
-        val user = api.getOnlineUser(player) ?: return true
-
-        return api.isOperationAllowed(
-            Operation.of(
-                user,
-                Operation.Type.BLOCK_BREAK,
-                Position.at(
-                    block.location.x,
-                    block.location.y,
-                    block.location.z,
-                    api.getWorld(block.world)
-                ),
-                true
-            )
-        )
-    }
-
-    override fun canCreateExplosion(
-        player: Player,
-        location: Location
-    ): Boolean {
-        val api = HuskTownsAPI.getInstance() ?: return true
-
-        val user = api.getOnlineUser(player) ?: return true
-
-        return api.isOperationAllowed(
-            Operation.of(
-                user,
-                Operation.Type.EXPLOSION_DAMAGE_ENTITY,
-                Position.at(
-                    location.x,
-                    location.y,
-                    location.z,
-                    api.getWorld(location.world)
-                ),
-                true
-            )
-        )
-    }
-
-    override fun canPlaceBlock(
-        player: Player,
-        block: Block
-    ): Boolean {
-        val api = HuskTownsAPI.getInstance() ?: return true
-
-        val user = api.getOnlineUser(player) ?: return true
-
-        return api.isOperationAllowed(
-            Operation.of(
-                user,
-                Operation.Type.BLOCK_PLACE,
-                Position.at(
-                    block.location.x,
-                    block.location.y,
-                    block.location.z,
-                    api.getWorld(block.world)
-                ),
-                true
-            )
-        )
-    }
-
-    override fun canInjure(
-        player: Player,
-        victim: LivingEntity
-    ): Boolean {
-        val api = HuskTownsAPI.getInstance() ?: return true
-
-        val user = api.getOnlineUser(player) ?: return true
-
-        return api.isOperationAllowed(
-            Operation.of(
-                user,
-                when(victim) {
-                    is Monster -> Operation.Type.PLAYER_DAMAGE_MONSTER
-                    is Player -> Operation.Type.PLAYER_DAMAGE_PLAYER
-                    else -> Operation.Type.PLACE_HANGING_ENTITY
-                },
-                Position.at(
-                    player.location.x,
-                    player.location.y,
-                    player.location.z,
-                    api.getWorld(player.world)
-                ),
-                true
-            )
-        )
-    }
-
-    override fun canPickupItem(player: Player, location: Location): Boolean {
-        return true
-    }
-
-    override fun getPluginName(): String {
-        return "HuskTowns"
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (other !is AntigriefIntegration) {
-            return false
-        }
-
-        return other.pluginName == this.pluginName
-    }
-
-    override fun hashCode(): Int {
-        return this.pluginName.hashCode()
-    }
-}

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

@@ -13,7 +13,7 @@ class AntigriefIridiumSkyblock : AntigriefIntegration {
         player: Player,
         block: Block
     ): Boolean {
-        val api = IridiumSkyblockAPI.getInstance() ?: return false
+        val api = IridiumSkyblockAPI.getInstance()
 
         return api.getIslandPermission(api.getIslandViaLocation(block.location).orElse(null) ?: return true, api.getUser(player), PermissionType.BLOCK_BREAK)
     }
@@ -22,7 +22,7 @@ class AntigriefIridiumSkyblock : AntigriefIntegration {
         player: Player,
         location: Location
     ): Boolean {
-        val api = IridiumSkyblockAPI.getInstance() ?: return false
+        val api = IridiumSkyblockAPI.getInstance()
 
         return api.getIslandPermission(api.getIslandViaLocation(location).orElse(null) ?: return true, api.getUser(player), PermissionType.BLOCK_BREAK)
     }
@@ -31,7 +31,7 @@ class AntigriefIridiumSkyblock : AntigriefIntegration {
         player: Player,
         block: Block
     ): Boolean {
-        val api = IridiumSkyblockAPI.getInstance() ?: return false
+        val api = IridiumSkyblockAPI.getInstance()
 
         return api.getIslandPermission(api.getIslandViaLocation(block.location).orElse(null) ?: return true, api.getUser(player), PermissionType.BLOCK_PLACE)
     }
@@ -40,7 +40,7 @@ class AntigriefIridiumSkyblock : AntigriefIntegration {
         player: Player,
         victim: LivingEntity
     ): Boolean {
-        val api = IridiumSkyblockAPI.getInstance() ?: return false
+        val api = IridiumSkyblockAPI.getInstance()
 
         return when (victim) {
             is Player -> api.getIslandViaLocation(victim.location).orElse(null) != null

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/bstats/Metrics.kt

@@ -8,7 +8,6 @@ import java.io.ByteArrayOutputStream
 import java.io.DataOutputStream
 import java.io.File
 import java.io.InputStreamReader
-import java.net.URI
 import java.net.URL
 import java.nio.charset.StandardCharsets
 import java.util.UUID
@@ -110,7 +109,7 @@ class Metrics(private val plugin: EcoPlugin) {
                 infoLogger.accept("Sent bStats metrics data: $data")
             }
             val url = String.format(REPORT_URL, platform)
-            val connection = URI(url).toURL().openConnection() as HttpsURLConnection
+            val connection = URL(url).openConnection() as HttpsURLConnection
             // Compress the data to save bandwidth
             val compressedData = compress(data.toString())
             connection.requestMethod = "POST"

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

@@ -1,47 +0,0 @@
-package com.willfp.eco.internal.spigot.integrations.customitems
-
-import com.jojodmo.itembridge.ItemBridge
-import com.willfp.eco.core.integrations.customitems.CustomItemsIntegration
-import com.willfp.eco.core.items.CustomItem
-import com.willfp.eco.core.items.Items
-import com.willfp.eco.core.items.TestableItem
-import com.willfp.eco.core.items.provider.ItemProvider
-import com.willfp.eco.util.namespacedKeyOf
-import org.bukkit.inventory.ItemStack
-
-class CustomItemsItemBridge : CustomItemsIntegration {
-    override fun registerProvider() {
-        Items.registerItemProvider(ItemBridgeProvider())
-    }
-
-    override fun getPluginName(): String {
-        return "ItemBridge"
-    }
-
-    private class ItemBridgeProvider : ItemProvider("itembridge") {
-        override fun provideForKey(key: String): TestableItem? {
-
-            val split = key.split(":").toMutableList()
-
-            if (split.size < 2) {
-                return null
-            }
-
-            val itemKey = split[0]
-
-            val item = split[1]
-
-            val stack = ItemBridge.getItemStack(itemKey, item) ?: kotlin.run {
-                return null
-            }
-
-            return CustomItem(
-                namespacedKeyOf("eco:${key.lowercase().replace(":", "__")}"),
-                { test: ItemStack ->
-                    ItemBridge.isItemStack(test, itemKey, item)
-                },
-                stack
-            )
-        }
-    }
-}

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramDecentHolograms.kt

@@ -27,10 +27,7 @@ class HologramDecentHolograms : HologramIntegration {
         }
 
         override fun setContents(contents: List<String>) {
-            val hologram = DHAPI.getHologram(id)
-            if (hologram != null) {
-                DHAPI.setHologramLines(hologram, contents)
-            }
+            DHAPI.setHologramLines(DHAPI.getHologram(id), contents)
         }
     }
 }

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

@@ -5,7 +5,6 @@ import com.github.benmanes.caffeine.cache.Caffeine
 import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
 import com.willfp.eco.core.placeholder.context.PlaceholderContext
 import com.willfp.eco.internal.placeholder.PlaceholderParser
-import com.willfp.eco.util.randDouble
 import redempt.crunch.CompiledExpression
 import redempt.crunch.Crunch
 import redempt.crunch.functional.EvaluationEnvironment
@@ -23,10 +22,6 @@ private val max = Function("max", 2) {
     max(it[0], it[1])
 }
 
-private val rand = Function("random", 2) {
-    randDouble(it[0], it[1])
-}
-
 interface ExpressionHandler {
     fun evaluate(expression: String, context: PlaceholderContext): Double?
 }
@@ -82,7 +77,7 @@ class ImmediatePlaceholderTranslationExpressionHandler(
         .build()
 
     private val env = EvaluationEnvironment().apply {
-        addFunctions(min, max, rand)
+        addFunctions(min, max)
     }
 
     override fun evaluate(expression: String, context: PlaceholderContext): Double? {
@@ -111,7 +106,7 @@ class LazyPlaceholderTranslationExpressionHandler(
         val compiled = cache.getOrPut(expression) {
             val env = EvaluationEnvironment()
             env.setVariableNames(*placeholders.toTypedArray())
-            env.addFunctions(rand, min, max)
+            env.addFunctions(min, max)
             runCatching { Crunch.compileExpression(expression, env) }.getOrNull()
         }
 

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

@@ -2,7 +2,7 @@ package com.willfp.eco.internal.spigot.recipes
 
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.items.TestableItem
-import com.willfp.eco.core.items.isEcoEmpty
+import com.willfp.eco.core.items.isEmpty
 import com.willfp.eco.core.recipe.Recipes
 import com.willfp.eco.core.recipe.parts.GroupedTestableItems
 import com.willfp.eco.core.recipe.parts.TestableStack
@@ -33,7 +33,7 @@ class StackedRecipeListener(
         }
 
         // Just in case
-        if (inventory.getItem(event.slot).isEcoEmpty) {
+        if (inventory.getItem(event.slot).isEmpty) {
             return
         }
 

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

@@ -16,8 +16,6 @@ perform-data-migration: true
 mongodb:
   # The full MongoDB connection URL.
   url: ""
-  # The name of the database to use.
-  database: "eco"
 
 mysql:
   # How many threads to execute statements on. Higher numbers can be faster however
@@ -98,11 +96,6 @@ use-immediate-placeholder-translation-for-math: false
 # less reactive values.
 math-cache-ttl: 200
 
-# The time (in minutes) for literal patterns to be cached for. Higher values will lead to
-# faster evaluation times (less CPU usage) at the expense of slightly more memory usage and
-# less reactive values. (Do not change unless you are told to).
-literal-cache-ttl: 1
-
 # If anonymous usage statistics should be tracked. This is very valuable information as it
 # helps understand how eco and other plugins are being used by logging player and server
 # counts. This is completely anonymous and no personal information is logged. This data

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

@@ -2,7 +2,6 @@ multiple-in-craft: '&l&c! &fThis recipe requires &a%amount%&f of this item.'
 
 # Specify default display names for prices made through ConfiguredPrice#create
 # These will override any custom configured price display names.
-# You can use %value% and %value_commas% as placeholders.
 price-display:
   - type: example_type
     display: "&e%value% Price"

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

@@ -13,14 +13,7 @@ loadbefore:
   - Lands
   - EconomyShopGUI
   - EconomyShopGUI-Premium
-  - CMI
-  - DeluxeCombat
-  - ShopGUIPlus
 softdepend:
-  - ItemBridge
-  - HuskClaims
-  - HuskTowns
-  - Terra
   - ProtocolLib
   - WorldGuard
   - GriefPrevention
@@ -34,6 +27,7 @@ softdepend:
   - PlaceholderAPI
   - mcMMO
   - CombatLogX
+  - ShopGUIPlus
   - ItemsAdder
   - Oraxen
   - HeadDatabase
@@ -41,15 +35,18 @@ softdepend:
   - Alice
   - HolographicDisplays
   - GHolo
+  - CMI
   - Essentials
   - Vault
   - BentoBox
+  - DeluxeCombat
   - IridiumSkyblock
   - SuperiorSkyblock2
   - FabledSkyBlock
   - CrashClaim
   - DecentHolograms
   - MythicMobs
+  - ExecutableItems
   - RPGHorses
   - zShop
   - DeluxeSellwands

gradle.properties

@@ -1,2 +1,2 @@
-version = 6.70.1
+version = 6.68.0
 kotlin.incremental.useClasspathSnapshot=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       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/.
@@ -80,11 +80,13 @@ do
     esac
 done
 
-# This is normally unused
-# shellcheck disable=SC2034
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# 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
@@ -131,29 +133,22 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    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
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,15 +193,11 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
-# 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"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
+# 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" \

gradlew.bat

@@ -26,7 +26,6 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -43,11 +42,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -57,11 +56,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 

settings.gradle.kts

@@ -21,7 +21,6 @@ include(":eco-core:core-nms:v1_19_R3")
 include(":eco-core:core-nms:v1_20_R1")
 include(":eco-core:core-nms:v1_20_R2")
 include(":eco-core:core-nms:v1_20_R3")
-include(":eco-core:core-nms:v1_20_6")
 include(":eco-core:core-proxy")
 include(":eco-core:core-plugin")
 include(":eco-core:core-backend")