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 {
@@ -22,7 +21,6 @@ dependencies {
     implementation(project(path = ":eco-core:core-plugin", configuration = "shadow"))
     implementation(project(":eco-core:core-proxy"))
     implementation(project(":eco-core:core-backend"))
-    implementation(project(":eco-core:core-backend-modern"))
     implementation(project(path = ":eco-core:core-nms:v1_17_R1", configuration = "reobf"))
     implementation(project(path = ":eco-core:core-nms:v1_18_R1", configuration = "reobf"))
     implementation(project(path = ":eco-core:core-nms:v1_18_R2", configuration = "reobf"))
@@ -32,23 +30,20 @@ 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_21", 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()
+        mavenLocal()
         maven("https://repo.auxilor.io/repository/maven-public/")
-        maven("https://jitpack.io") {
-            content { includeGroupByRegex("com\\.github\\..*") }
-        }
+        maven("https://jitpack.io")
 
         // SuperiorSkyblock2
         maven("https://repo.bg-software.com/repository/api/")
@@ -94,12 +89,6 @@ allprojects {
 
         // IridiumSkyblock
         maven("https://nexus.iridiumdevelopment.net/repository/maven-releases/")
-
-        // HuskPlugins
-        maven("https://repo.william278.net/releases")
-
-        // FancyHolograms
-        maven("https://repo.fancyplugins.de/releases")
     }
 
     dependencies {
@@ -148,21 +137,59 @@ 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"
         }
 
+        java {
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
+            withSourcesJar()
+        }
+
         test {
             useJUnitPlatform()
 
@@ -175,53 +202,6 @@ allprojects {
         build {
             dependsOn(shadowJar)
         }
-
-        withType<JavaCompile>().configureEach {
-            options.release = 17
-        }
-    }
-
-    java {
-        withSourcesJar()
-        toolchain {
-            languageVersion = JavaLanguageVersion.of(21)
-        }
-    }
-}
-
-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.
-         */
     }
 }
 

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

@@ -1,6 +1,5 @@
 package com.willfp.eco.core;
 
-import com.google.common.collect.ImmutableList;
 import com.willfp.eco.core.command.impl.PluginCommand;
 import com.willfp.eco.core.config.base.ConfigYml;
 import com.willfp.eco.core.config.base.LangYml;
@@ -37,8 +36,6 @@ import org.jetbrains.annotations.Nullable;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
@@ -123,17 +120,9 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
 
     /**
      * The display module for the plugin.
-     *
-     * @deprecated Plugins can now have multiple display modules.
      */
-    @Deprecated(since = "6.72.0")
     private DisplayModule displayModule;
 
-    /**
-     * The display modules for the plugin.
-     */
-    private List<DisplayModule> displayModules = new ArrayList<>();
-
     /**
      * The logger for the plugin.
      */
@@ -178,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.
@@ -566,15 +555,10 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
      * Default code to be executed after the server is up.
      */
     public final void afterLoad() {
-        DisplayModule module = createDisplayModule();
-        if (module != null) {
-            Display.registerDisplayModule(module);
-            this.displayModules.add(module);
-        }
+        this.displayModule = createDisplayModule();
 
-        for (DisplayModule displayModule : this.loadDisplayModules()) {
-            Display.registerDisplayModule(displayModule);
-            this.displayModules.add(displayModule);
+        if (this.getDisplayModule() != null) {
+            Display.registerDisplayModule(this.getDisplayModule());
         }
 
         if (Prerequisite.HAS_PROTOCOLLIB.isMet()) {
@@ -591,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("");
@@ -655,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()) {
@@ -683,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.
      *
@@ -915,25 +878,14 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
      * Create the display module for the plugin.
      *
      * @return The display module, or null.
-     * @deprecated Use {@link #loadDisplayModules()} instead.
      */
     @Nullable
-    @Deprecated(since = "6.72.0")
     protected DisplayModule createDisplayModule() {
         Validate.isTrue(this.getDisplayModule() == null, "Display module exists!");
 
         return null;
     }
 
-    /**
-     * Load display modules.
-     *
-     * @return The display modules.
-     */
-    protected List<DisplayModule> loadDisplayModules() {
-        return new ArrayList<>();
-    }
-
     /**
      * Get the minimum version of eco to use the plugin.
      *
@@ -1183,23 +1135,12 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
      * Get the plugin's display module.
      *
      * @return The display module.
-     * @deprecated Use {@link #getDisplayModules()} instead.
      */
     @Nullable
-    @Deprecated(since = "6.72.0", forRemoval = true)
     public DisplayModule getDisplayModule() {
         return this.displayModule;
     }
 
-    /**
-     * Get the plugin's display modules.
-     *
-     * @return The display modules.
-     */
-    public List<DisplayModule> getDisplayModules() {
-        return ImmutableList.copyOf(this.displayModules);
-    }
-
     /**
      * Get if the plugin is outdated.
      *

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

@@ -37,28 +37,11 @@ public class Prerequisite {
             "Requires server to have ProtocolLib"
     );
 
-    /**
-     * Requires the server to be running 1.21.
-     */
-    public static final Prerequisite HAS_1_21 = new Prerequisite(
-            () -> ProxyConstants.NMS_VERSION.contains("1_21"),
-            "Requires server to be running 1.21+"
-    );
-
-    /**
-     * 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"))
-                    || HAS_1_21.isMet(),
-            "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+"
     );
 
@@ -66,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/blocks/Blocks.java

@@ -1,149 +0,0 @@
-package com.willfp.eco.core.blocks;
-
-import com.willfp.eco.core.blocks.impl.EmptyTestableBlock;
-import com.willfp.eco.core.blocks.impl.MaterialTestableBlock;
-import com.willfp.eco.core.blocks.impl.UnrestrictedMaterialTestableBlock;
-import com.willfp.eco.core.blocks.provider.BlockProvider;
-import com.willfp.eco.util.NamespacedKeyUtils;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
-import org.bukkit.block.Block;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Class to manage all custom and vanilla blocks.
- */
-public final class Blocks {
-    /**
-     * All entities.
-     */
-    private static final Map<NamespacedKey, TestableBlock> REGISTRY = new ConcurrentHashMap<>();
-
-    /**
-     * All block providers.
-     */
-    private static final Map<String, BlockProvider> PROVIDERS = new ConcurrentHashMap<>();
-
-    /**
-     * The lookup handler.
-     */
-    private static final BlocksLookupHandler BLOCKS_LOOKUP_HANDLER = new BlocksLookupHandler(Blocks::doParse);
-
-    /**
-     * Register a new custom block.
-     *
-     * @param key   The key of the block.
-     * @param block The block.
-     */
-    public static void registerCustomBlock(@NotNull final NamespacedKey key,
-                                           @NotNull final TestableBlock block) {
-        REGISTRY.put(key, block);
-    }
-
-    /**
-     * Register a new block provider.
-     *
-     * @param provider The provider.
-     */
-    public static void registerBlockProvider(@NotNull final BlockProvider provider) {
-        PROVIDERS.put(provider.getNamespace(), provider);
-    }
-
-    /**
-     * Remove a block.
-     *
-     * @param key The key of the block.
-     */
-    public static void removeCustomBlock(@NotNull final NamespacedKey key) {
-        REGISTRY.remove(key);
-    }
-
-    /**
-     * This is the backbone of the eco block system.
-     * <p>
-     * You can look up a TestableBlock for any material or custom block,
-     * and it will return it.
-     * <p>
-     * If you want to get a Block instance from this, then just call
-     * {@link TestableBlock#place(Location)}.
-     *
-     * @param key The lookup string.
-     * @return The testable block, or an empty testable block if not found.
-     */
-    @NotNull
-    public static TestableBlock lookup(@NotNull final String key) {
-        return BLOCKS_LOOKUP_HANDLER.parseKey(key);
-    }
-
-    @NotNull
-    private static TestableBlock doParse(@NotNull final String[] args) {
-        if (args.length == 0) {
-            return new EmptyTestableBlock();
-        }
-
-        String[] split = args[0].toLowerCase().split(":");
-        if (split.length == 1) {
-            if (args[0].startsWith("*")) {
-                Material type = Material.getMaterial(args[0].substring(1));
-                return (type == null) ? new EmptyTestableBlock() : new UnrestrictedMaterialTestableBlock(type);
-            } else {
-                Material type = Material.getMaterial(args[0].toUpperCase());
-                return (type == null) ? new EmptyTestableBlock() : new MaterialTestableBlock(type);
-            }
-        }
-
-        NamespacedKey namespacedKey = NamespacedKeyUtils.create(split[0], split[1]);
-        TestableBlock block = REGISTRY.get(namespacedKey);
-
-        if (block != null) {
-            return block;
-        }
-
-        BlockProvider provider = PROVIDERS.get(split[0]);
-        if (provider == null) {
-            return new EmptyTestableBlock();
-        }
-
-        block = provider.provideForKey(split[1]);
-        if (block == null) {
-            return new EmptyTestableBlock();
-        }
-
-        registerCustomBlock(namespacedKey, block);
-        return block;
-    }
-
-    /**
-     * Get if block is a custom block.
-     *
-     * @param block The block to check.
-     * @return If is custom.
-     */
-    public static boolean isCustomBlock(@NotNull final Block block) {
-        for (TestableBlock testable : REGISTRY.values()) {
-            if (testable.matches(block)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Get all registered custom blocks.
-     *
-     * @return A set of all blocks.
-     */
-    public static Set<TestableBlock> getCustomBlocks() {
-        return new HashSet<>(REGISTRY.values());
-    }
-
-    private Blocks() {
-        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
-    }
-}

eco-api/src/main/java/com/willfp/eco/core/blocks/BlocksLookupHandler.java

@@ -1,48 +0,0 @@
-package com.willfp.eco.core.blocks;
-
-import com.willfp.eco.core.blocks.impl.EmptyTestableBlock;
-import com.willfp.eco.core.blocks.impl.GroupedTestableBlocks;
-import com.willfp.eco.core.lookup.LookupHandler;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.function.Function;
-
-/**
- * Handle block lookup strings.
- */
-public class BlocksLookupHandler implements LookupHandler<TestableBlock> {
-    /**
-     * The parser.
-     */
-    private final Function<String[], @NotNull TestableBlock> parser;
-
-    /**
-     * Create new lookup handler.
-     *
-     * @param parser The parser.
-     */
-    public BlocksLookupHandler(@NotNull final Function<String[], @NotNull TestableBlock> parser) {
-        this.parser = parser;
-    }
-
-    @Override
-    public @NotNull TestableBlock parse(@NotNull final String[] args) {
-        return parser.apply(args);
-    }
-
-    @Override
-    public boolean validate(@NotNull final TestableBlock object) {
-        return !(object instanceof EmptyTestableBlock);
-    }
-
-    @Override
-    public @NotNull TestableBlock getFailsafe() {
-        return new EmptyTestableBlock();
-    }
-
-    @Override
-    public @NotNull TestableBlock join(@NotNull final Collection<TestableBlock> options) {
-        return new GroupedTestableBlocks(options);
-    }
-}

eco-api/src/main/java/com/willfp/eco/core/blocks/CustomBlock.java

@@ -1,84 +0,0 @@
-package com.willfp.eco.core.blocks;
-
-import org.apache.commons.lang.Validate;
-import org.bukkit.Location;
-import org.bukkit.NamespacedKey;
-import org.bukkit.block.Block;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.function.Function;
-import java.util.function.Predicate;
-
-/**
- * A custom block has 3 components.
- *
- * <ul>
- *     <li>The key to identify it</li>
- *     <li>The test to check if any block is this custom block</li>
- *     <li>The supplier to spawn the custom {@link Block}</li>
- * </ul>
- */
-public class CustomBlock implements TestableBlock {
-    /**
-     * The key.
-     */
-    private final NamespacedKey key;
-
-    /**
-     * The test for block to pass.
-     */
-    private final Predicate<@NotNull Block> test;
-
-    /**
-     * The provider to spawn the block.
-     */
-    private final Function<Location, Block> provider;
-
-    /**
-     * Create a new custom block.
-     *
-     * @param key      The block key.
-     * @param test     The test.
-     * @param provider The provider to spawn the block.
-     */
-    public CustomBlock(@NotNull final NamespacedKey key,
-                       @NotNull final Predicate<@NotNull Block> test,
-                       @NotNull final Function<Location, Block> provider) {
-        this.key = key;
-        this.test = test;
-        this.provider = provider;
-    }
-
-    @Override
-    public boolean matches(@Nullable final Block other) {
-        if (other == null) {
-            return false;
-        }
-
-        return test.test(other);
-    }
-
-    @Override
-    public @NotNull Block place(@NotNull final Location location) {
-        Validate.notNull(location.getWorld());
-
-        return provider.apply(location);
-    }
-
-    /**
-     * Register the block.
-     */
-    public void register() {
-        Blocks.registerCustomBlock(this.getKey(), this);
-    }
-
-    /**
-     * Get the key.
-     *
-     * @return The key.
-     */
-    public NamespacedKey getKey() {
-        return this.key;
-    }
-}

eco-api/src/main/java/com/willfp/eco/core/blocks/TestableBlock.java

@@ -1,31 +0,0 @@
-package com.willfp.eco.core.blocks;
-
-import com.willfp.eco.core.lookup.Testable;
-import org.bukkit.Location;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Entity;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * A block with a test.
- */
-public interface TestableBlock extends Testable<Block> {
-    /**
-     * If a Block matches the test.
-     *
-     * @param other The other block.
-     * @return If the block matches.
-     */
-    @Override
-    boolean matches(@Nullable Block other);
-
-    /**
-     * Place the block.
-     *
-     * @param location The location.
-     * @return The block.
-     */
-    @NotNull
-    Block place(@NotNull Location location);
-}

eco-api/src/main/java/com/willfp/eco/core/blocks/impl/EmptyTestableBlock.java

@@ -1,29 +0,0 @@
-package com.willfp.eco.core.blocks.impl;
-
-import com.willfp.eco.core.blocks.TestableBlock;
-import org.bukkit.Location;
-import org.bukkit.block.Block;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Empty block.
- */
-public class EmptyTestableBlock implements TestableBlock {
-    /**
-     * Create a new empty testable block.
-     */
-    public EmptyTestableBlock() {
-
-    }
-
-    @Override
-    public boolean matches(@Nullable final Block other) {
-        return false;
-    }
-
-    @Override
-    public @NotNull Block place(@NotNull final Location location) {
-        return location.getBlock();
-    }
-}

eco-api/src/main/java/com/willfp/eco/core/blocks/impl/GroupedTestableBlocks.java

@@ -1,60 +0,0 @@
-package com.willfp.eco.core.blocks.impl;
-
-import com.willfp.eco.core.blocks.TestableBlock;
-import com.willfp.eco.util.NumberUtils;
-import org.apache.commons.lang.Validate;
-import org.bukkit.Location;
-import org.bukkit.block.Block;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * A group of testable blocks.
- */
-public class GroupedTestableBlocks implements TestableBlock {
-    /**
-     * The children.
-     */
-    private final Collection<TestableBlock> children;
-
-    /**
-     * Create a new group of testable blocks.
-     *
-     * @param children The children.
-     */
-    public GroupedTestableBlocks(@NotNull final Collection<TestableBlock> children) {
-        Validate.isTrue(!children.isEmpty(), "Group must have at least one child!");
-
-        this.children = children;
-    }
-
-    @Override
-    public boolean matches(@Nullable final Block other) {
-        for (TestableBlock child : children) {
-            if (child.matches(other)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public @NotNull Block place(@NotNull final Location location) {
-        return new ArrayList<>(children)
-                .get(NumberUtils.randInt(0, children.size() - 1))
-                .place(location);
-    }
-
-    /**
-     * Get the children.
-     *
-     * @return The children.
-     */
-    public Collection<TestableBlock> getChildren() {
-        return new ArrayList<>(children);
-    }
-}

eco-api/src/main/java/com/willfp/eco/core/blocks/impl/MaterialTestableBlock.java

@@ -1,59 +0,0 @@
-package com.willfp.eco.core.blocks.impl;
-
-import com.willfp.eco.core.blocks.Blocks;
-import com.willfp.eco.core.blocks.TestableBlock;
-import org.apache.commons.lang.Validate;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * A testable block for vanilla materials.
- */
-public class MaterialTestableBlock implements TestableBlock {
-    /**
-     * The block type.
-     */
-    private final Material material;
-
-    /**
-     * Create a new unrestricted material testable block.
-     *
-     * @param material The material.
-     */
-    public MaterialTestableBlock(@NotNull final Material material) {
-        this.material = material;
-    }
-
-    @Override
-    public boolean matches(@Nullable final Block block) {
-        boolean simpleMatches = block != null && block.getType() == material;
-
-        if (!simpleMatches) {
-            return false;
-        }
-
-        return !Blocks.isCustomBlock(block);
-    }
-
-    @Override
-    public @NotNull Block place(@NotNull Location location) {
-        Validate.notNull(location.getWorld());
-
-        Block block = location.getWorld().getBlockAt(location);
-        block.setType(material);
-
-        return block;
-    }
-
-    /**
-     * Get the material.
-     *
-     * @return The material.
-     */
-    public Material getMaterial() {
-        return this.material;
-    }
-}

eco-api/src/main/java/com/willfp/eco/core/blocks/impl/UnrestrictedMaterialTestableBlock.java

@@ -1,52 +0,0 @@
-package com.willfp.eco.core.blocks.impl;
-
-import com.willfp.eco.core.blocks.TestableBlock;
-import org.apache.commons.lang.Validate;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * A testable block for materials regardless of data.
- */
-public class UnrestrictedMaterialTestableBlock implements TestableBlock {
-    /**
-     * The block type.
-     */
-    private final Material material;
-
-    /**
-     * Create a new unrestricted material testable block.
-     *
-     * @param material The material.
-     */
-    public UnrestrictedMaterialTestableBlock(@NotNull final Material material) {
-        this.material = material;
-    }
-
-    @Override
-    public boolean matches(@Nullable final Block other) {
-        return other != null && other.getType() == material;
-    }
-
-    @Override
-    public @NotNull Block place(@NotNull Location location) {
-        Validate.notNull(location.getWorld());
-
-        Block block = location.getWorld().getBlockAt(location);
-        block.setType(material);
-
-        return block;
-    }
-
-    /**
-     * Get the material.
-     *
-     * @return The material.
-     */
-    public Material getMaterial() {
-        return this.material;
-    }
-}

eco-api/src/main/java/com/willfp/eco/core/blocks/provider/BlockProvider.java

@@ -1,49 +0,0 @@
-package com.willfp.eco.core.blocks.provider;
-
-import com.willfp.eco.core.blocks.TestableBlock;
-import com.willfp.eco.core.registry.Registry;
-import org.apache.commons.lang.Validate;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Block providers are call-site registrations for blocks. In other words,
- * they only register their blocks when a request is made. This is marginally
- * slower, however it is required for certain plugins, and fixes bugs related to
- * loading orders.
- *
- * @see TestableBlock
- */
-public abstract class BlockProvider {
-    /**
-     * The namespace.
-     */
-    private final String namespace;
-
-    /**
-     * Create a new BlockProvider for a specific namespace.
-     *
-     * @param namespace The namespace.
-     */
-    protected BlockProvider(@NotNull final String namespace) {
-        this.namespace = namespace;
-    }
-
-    /**
-     * Provide a TestableBlock for a given key.
-     *
-     * @param key The block ID.
-     * @return The TestableBlock, or null if not found.
-     */
-    @Nullable
-    public abstract TestableBlock provideForKey(@NotNull String key);
-
-    /**
-     * Get the namespace.
-     *
-     * @return The namespace.
-     */
-    public String getNamespace() {
-        return this.namespace;
-    }
-}

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/display/Display.java

@@ -211,22 +211,12 @@ public final class Display {
                 new ArrayList<>()
         );
 
+        modules.removeIf(it -> it.getPluginName().equalsIgnoreCase(module.getPluginName()));
         modules.add(module);
 
         REGISTERED_MODULES.put(module.getWeight(), modules);
     }
 
-    /**
-     * Unregister a display module.
-     *
-     * @param module The module.
-     */
-    public static void unregisterDisplayModule(@NotNull final DisplayModule module) {
-        for (List<DisplayModule> modules : REGISTERED_MODULES.values()) {
-            modules.remove(module);
-        }
-    }
-
     private Display() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

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/integrations/customblocks/CustomBlocksIntegration.java

@@ -1,24 +0,0 @@
-package com.willfp.eco.core.integrations.customblocks;
-
-import com.willfp.eco.core.integrations.Integration;
-
-/**
- * Wrapper class for custom block integrations.
- */
-public interface CustomBlocksIntegration extends Integration {
-    /**
-     * Register all the custom block for a specific plugin into eco.
-     *
-     * @see com.willfp.eco.core.blocks.Blocks
-     */
-    default void registerAllBlocks() {
-        // Override when needed.
-    }
-
-    /**
-     * Register {@link com.willfp.eco.core.blocks.provider.BlockProvider}s.
-     */
-    default void registerProvider() {
-        // Override when needed.
-    }
-}

eco-api/src/main/java/com/willfp/eco/core/integrations/customblocks/CustomBlocksManager.java

@@ -1,45 +0,0 @@
-package com.willfp.eco.core.integrations.customblocks;
-
-import com.willfp.eco.core.integrations.IntegrationRegistry;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Class to handle custom block integrations.
- */
-public final class CustomBlocksManager {
-    /**
-     * A set of all registered integrations.
-     */
-    private static final IntegrationRegistry<CustomBlocksIntegration> REGISTRY = new IntegrationRegistry<>();
-
-    /**
-     * Register a new integration.
-     *
-     * @param integration The integration to register.
-     */
-    public static void register(@NotNull final CustomBlocksIntegration integration) {
-        REGISTRY.register(integration);
-    }
-
-    /**
-     * Register all the custom block for a specific plugin into eco.
-     *
-     * @see com.willfp.eco.core.blocks.Blocks
-     */
-    public static void registerAllBlocks() {
-        REGISTRY.forEachSafely(CustomBlocksIntegration::registerAllBlocks);
-    }
-
-    /**
-     * Register all the custom blocks for a specific plugin into eco.
-     *
-     * @see com.willfp.eco.core.blocks.Blocks
-     */
-    public static void registerProviders() {
-        REGISTRY.forEachSafely(CustomBlocksIntegration::registerProvider);
-    }
-
-    private CustomBlocksManager() {
-        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
-    }
-}

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

@@ -6,7 +6,6 @@ import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.fast.FastItemStack;
 import com.willfp.eco.core.items.args.LookupArgParser;
 import com.willfp.eco.core.items.provider.ItemProvider;
-import com.willfp.eco.core.items.tag.ItemTag;
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
 import com.willfp.eco.core.recipe.parts.MaterialTestableItem;
 import com.willfp.eco.core.recipe.parts.ModifiedTestableItem;
@@ -93,11 +92,6 @@ public final class Items {
      */
     private static final Map<String, Material> FRIENDLY_MATERIAL_NAMES = new HashMap<>();
 
-    /**
-     * All tags.
-     */
-    private static final Map<String, ItemTag> TAGS = new HashMap<>();
-
     /**
      * Register a new custom item.
      *
@@ -222,20 +216,7 @@ public final class Items {
 
         String[] split = args[0].toLowerCase().split(":");
 
-        String base = split[0];
-        boolean isTag = base.startsWith("#");
-
-        if (isTag) {
-            String tag = base.substring(1);
-            ItemTag itemTag = TAGS.get(tag);
-
-            if (itemTag == null) {
-                return new EmptyTestableItem();
-            }
-            item = itemTag.toTestableItem();
-        }
-
-        if (split.length == 1 && !isTag) {
+        if (split.length == 1) {
             String itemType = args[0];
             boolean isWildcard = itemType.startsWith("*");
             if (isWildcard) {
@@ -248,7 +229,7 @@ public final class Items {
             item = isWildcard ? new UnrestrictedMaterialTestableItem(material) : new MaterialTestableItem(material);
         }
 
-        if (split.length == 2 && !isTag) {
+        if (split.length == 2) {
             String namespace = split[0];
             String keyID = split[1];
             NamespacedKey namespacedKey = NamespacedKeyUtils.create(namespace, keyID);
@@ -292,7 +273,7 @@ public final class Items {
         Legacy namespace:id:amount format
         This has been superseded by namespace:id amount
          */
-        if (split.length == 3 && !isTag) {
+        if (split.length == 3) {
             TestableItem part = REGISTRY.get(NamespacedKeyUtils.create(split[0], split[1]));
             if (part == null) {
                 return new EmptyTestableItem();
@@ -324,8 +305,7 @@ public final class Items {
 
         List<Predicate<ItemStack>> predicates = new ArrayList<>();
 
-        for (
-                LookupArgParser argParser : ARG_PARSERS) {
+        for (LookupArgParser argParser : ARG_PARSERS) {
             Predicate<ItemStack> predicate = argParser.parseArguments(modifierArgs, meta);
             if (predicate != null) {
                 predicates.add(argParser.parseArguments(modifierArgs, meta));
@@ -535,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();
     }
@@ -550,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);
@@ -630,24 +604,6 @@ public final class Items {
         return false;
     }
 
-    /**
-     * Register a new item tag.
-     *
-     * @param tag The tag.
-     */
-    public static void registerTag(@NotNull final ItemTag tag) {
-        TAGS.put(tag.getIdentifier(), tag);
-    }
-
-    /**
-     * Get all tags.
-     *
-     * @return All tags.
-     */
-    public static Collection<ItemTag> getTags() {
-        return TAGS.values();
-    }
-
     private Items() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

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

@@ -1,29 +0,0 @@
-package com.willfp.eco.core.items.tag;
-
-import org.bukkit.NamespacedKey;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A custom item tag.
- */
-public abstract class CustomItemTag implements ItemTag {
-    /**
-     * The key.
-     */
-    private final NamespacedKey key;
-
-    /**
-     * Create a new custom item tag.
-     *
-     * @param key         The key.
-     */
-    public CustomItemTag(@NotNull final NamespacedKey key) {
-        this.key = key;
-    }
-
-    @Override
-    @NotNull
-    public String getIdentifier() {
-        return key.toString();
-    }
-}

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

@@ -1,66 +0,0 @@
-package com.willfp.eco.core.items.tag;
-
-import com.willfp.eco.core.items.TestableItem;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * A group of items that share a common trait.
- */
-public interface ItemTag {
-    /**
-     * Get the identifier of the tag.
-     *
-     * @return The identifier.
-     */
-    @NotNull
-    String getIdentifier();
-
-    /**
-     * Check if an item matches the tag.
-     *
-     * @param itemStack The item to check.
-     * @return If the item matches the tag.
-     */
-    boolean matches(@NotNull ItemStack itemStack);
-
-    /**
-     * Get an example item.
-     *
-     * @return The example item.
-     */
-    @Nullable
-    default ItemStack getExampleItem() {
-        return null;
-    }
-
-    /**
-     * Convert this tag to a testable item.
-     *
-     * @return The testable item.
-     */
-    @NotNull
-    default TestableItem toTestableItem() {
-        return new TestableItem() {
-            @Override
-            public boolean matches(@Nullable final ItemStack itemStack) {
-                return itemStack != null && ItemTag.this.matches(itemStack);
-            }
-
-            @Override
-            public @NotNull ItemStack getItem() {
-                ItemStack example = ItemTag.this.getExampleItem();
-                return example == null ? new ItemStack(Material.STONE) : example;
-            }
-
-            @Override
-            public String toString() {
-                return "ItemTagTestableItem{" +
-                        "tag=" + ItemTag.this.getIdentifier() +
-                        '}';
-            }
-        };
-    }
-}

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

@@ -1,58 +0,0 @@
-package com.willfp.eco.core.items.tag;
-
-import org.bukkit.Material;
-import org.bukkit.Tag;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A vanilla item tag.
- */
-public final class VanillaItemTag implements ItemTag {
-    /**
-     * The identifier.
-     */
-    private final String identifier;
-
-    /**
-     * The tag.
-     */
-    private final Tag<Material> tag;
-
-    /**
-     * Create a new vanilla item tag.
-     *
-     * @param identifier The identifier.
-     * @param tag        The tag.
-     */
-    public VanillaItemTag(@NotNull final String identifier,
-                          @NotNull final Tag<Material> tag) {
-        this.identifier = identifier;
-        this.tag = tag;
-    }
-
-    /**
-     * Get the tag.
-     *
-     * @return The tag.
-     */
-    public Tag<Material> getTag() {
-        return tag;
-    }
-
-    @Override
-    @NotNull
-    public String getIdentifier() {
-        return identifier;
-    }
-
-    @Override
-    public boolean matches(@NotNull final ItemStack itemStack) {
-        return tag.isTagged(itemStack.getType());
-    }
-
-    @Override
-    public @NotNull ItemStack getExampleItem() {
-        return new ItemStack(tag.getValues().stream().findFirst().orElse(Material.STONE));
-    }
-}

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_21"
+            "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/DurabilityUtils.java

@@ -158,8 +158,11 @@ public final class DurabilityUtils {
         }
 
         if (item.getItemMeta() instanceof Damageable meta) {
-            meta.setDamage(Math.max(0, meta.getDamage() - repair));
+            meta.setDamage(meta.getDamage() - repair);
 
+            if (meta.getDamage() < 0) {
+                meta.setDamage(0);
+            }
             item.setItemMeta((ItemMeta) meta);
         }
     }

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-modern/build.gradle.kts

@@ -1,19 +0,0 @@
-group = "com.willfp"
-version = rootProject.version
-
-dependencies {
-    compileOnly(project(":eco-core:core-backend"))
-    compileOnly("io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT")
-}
-
-tasks {
-    compileJava {
-        options.release = 21
-    }
-
-    compileKotlin {
-        kotlinOptions {
-            jvmTarget = "21"
-        }
-    }
-}

eco-core/core-backend-modern/src/main/kotlin/com/willfp/eco/internal/compat/modern/entities/ModernEntityArgParsersImpl.kt

@@ -1,13 +0,0 @@
-package com.willfp.eco.internal.compat.modern.entities
-
-import com.willfp.eco.core.entities.Entities
-import com.willfp.eco.internal.compat.modern.entities.parsers.EntityArgParserJumpStrength
-import com.willfp.eco.internal.compat.modern.entities.parsers.EntityArgParserScale
-import com.willfp.eco.internal.entities.ModernEntityArgParsers
-
-class ModernEntityArgParsersImpl: ModernEntityArgParsers {
-    override fun registerAll() {
-        Entities.registerArgParser(EntityArgParserScale)
-        Entities.registerArgParser(EntityArgParserJumpStrength)
-    }
-}

eco-core/core-backend-modern/src/main/kotlin/com/willfp/eco/internal/compat/modern/entities/parsers/EntityArgParserScale.kt

@@ -1,45 +0,0 @@
-package com.willfp.eco.internal.compat.modern.entities.parsers
-
-import com.willfp.eco.core.entities.args.EntityArgParseResult
-import com.willfp.eco.core.entities.args.EntityArgParser
-import org.bukkit.attribute.Attribute
-import org.bukkit.entity.LivingEntity
-import org.bukkit.entity.Phantom
-import org.bukkit.entity.Slime
-
-object EntityArgParserScale : EntityArgParser {
-    override fun parseArguments(args: Array<out String>): EntityArgParseResult? {
-        var attributeValue: Double? = null
-
-        for (arg in args) {
-            val argSplit = arg.split(":")
-            if (!argSplit[0].equals("scale", ignoreCase = true)) {
-                continue
-            }
-            if (argSplit.size < 2) {
-                continue
-            }
-            attributeValue = argSplit[1].toDoubleOrNull()
-        }
-
-        attributeValue ?: return null
-
-        return EntityArgParseResult(
-            {
-                if (it !is LivingEntity) {
-                    return@EntityArgParseResult false
-                }
-
-                val inst = it.getAttribute(Attribute.GENERIC_SCALE) ?: return@EntityArgParseResult false
-                inst.value >= attributeValue
-            },
-            {
-                if (it !is LivingEntity) {
-                    return@EntityArgParseResult
-                }
-
-                it.getAttribute(Attribute.GENERIC_SCALE)?.baseValue = attributeValue
-            }
-        )
-    }
-}

eco-core/core-backend-modern/src/main/kotlin/com/willfp/eco/internal/compat/modern/items/ModernItemArgParsersImpl.kt

@@ -1,21 +0,0 @@
-package com.willfp.eco.internal.compat.modern.items
-
-import com.willfp.eco.core.items.Items
-import com.willfp.eco.internal.compat.modern.items.parsers.ArgParserFireResistant
-import com.willfp.eco.internal.compat.modern.items.parsers.ArgParserGlint
-import com.willfp.eco.internal.compat.modern.items.parsers.ArgParserItemName
-import com.willfp.eco.internal.compat.modern.items.parsers.ArgParserMaxDamage
-import com.willfp.eco.internal.compat.modern.items.parsers.ArgParserMaxStackSize
-import com.willfp.eco.internal.compat.modern.items.parsers.ArgParserTrim
-import com.willfp.eco.internal.items.ModernItemArgParsers
-
-class ModernItemArgParsersImpl : ModernItemArgParsers {
-    override fun registerAll() {
-        Items.registerArgParser(ArgParserTrim)
-        Items.registerArgParser(ArgParserFireResistant)
-        Items.registerArgParser(ArgParserGlint)
-        Items.registerArgParser(ArgParserItemName)
-        Items.registerArgParser(ArgParserMaxDamage)
-        Items.registerArgParser(ArgParserMaxStackSize)
-    }
-}

eco-core/core-backend-modern/src/main/kotlin/com/willfp/eco/internal/compat/modern/items/parsers/ArgParserFireResistant.kt

@@ -1,14 +0,0 @@
-package com.willfp.eco.internal.compat.modern.items.parsers
-
-import com.willfp.eco.internal.items.templates.FlagArgParser
-import org.bukkit.inventory.meta.ItemMeta
-
-object ArgParserFireResistant : FlagArgParser("fire_resistant") {
-    override fun apply(meta: ItemMeta) {
-        meta.isFireResistant = true
-    }
-
-    override fun test(meta: ItemMeta): Boolean {
-        return meta.isFireResistant
-    }
-}

eco-core/core-backend-modern/src/main/kotlin/com/willfp/eco/internal/compat/modern/items/parsers/ArgParserGlint.kt

@@ -1,14 +0,0 @@
-package com.willfp.eco.internal.compat.modern.items.parsers
-
-import com.willfp.eco.internal.items.templates.FlagArgParser
-import org.bukkit.inventory.meta.ItemMeta
-
-object ArgParserGlint : FlagArgParser("glint") {
-    override fun apply(meta: ItemMeta) {
-        meta.setEnchantmentGlintOverride(true)
-    }
-
-    override fun test(meta: ItemMeta): Boolean {
-        return meta.hasEnchantmentGlintOverride()
-    }
-}

eco-core/core-backend-modern/src/main/kotlin/com/willfp/eco/internal/compat/modern/items/parsers/ArgParserItemName.kt

@@ -1,27 +0,0 @@
-package com.willfp.eco.internal.compat.modern.items.parsers
-
-import com.willfp.eco.internal.items.templates.ValueArgParser
-import com.willfp.eco.util.StringUtils
-import net.kyori.adventure.text.Component
-import net.kyori.adventure.text.minimessage.MiniMessage
-import org.bukkit.inventory.meta.ItemMeta
-
-object ArgParserItemName : ValueArgParser<Component>("item_name") {
-    override fun parse(arg: String): Component {
-        return StringUtils.formatToComponent(arg)
-    }
-
-    override fun apply(meta: ItemMeta, value: Component) {
-        meta.itemName(value)
-    }
-
-    override fun test(meta: ItemMeta): String? {
-        if (!meta.hasItemName()) {
-            return null
-        }
-
-        val name = MiniMessage.miniMessage().serialize(meta.itemName())
-
-        return name
-    }
-}

eco-core/core-backend-modern/src/main/kotlin/com/willfp/eco/internal/compat/modern/items/parsers/ArgParserMaxDamage.kt

@@ -1,31 +0,0 @@
-package com.willfp.eco.internal.compat.modern.items.parsers
-
-import com.willfp.eco.internal.items.templates.ValueArgParser
-import org.bukkit.inventory.meta.Damageable
-import org.bukkit.inventory.meta.ItemMeta
-
-object ArgParserMaxDamage : ValueArgParser<Int>("max_damage") {
-    override fun parse(arg: String): Int? {
-        return arg.toIntOrNull()
-    }
-
-    override fun apply(meta: ItemMeta, value: Int) {
-        if (meta !is Damageable) {
-            return
-        }
-
-        meta.setMaxDamage(value)
-    }
-
-    override fun test(meta: ItemMeta): String? {
-        if (meta !is Damageable) {
-            return null
-        }
-
-        if (!meta.hasMaxDamage()) {
-            return null
-        }
-
-        return meta.maxDamage.toString()
-    }
-}

eco-core/core-backend-modern/src/main/kotlin/com/willfp/eco/internal/compat/modern/items/parsers/ArgParserMaxStackSize.kt

@@ -1,22 +0,0 @@
-package com.willfp.eco.internal.compat.modern.items.parsers
-
-import com.willfp.eco.internal.items.templates.ValueArgParser
-import org.bukkit.inventory.meta.ItemMeta
-
-object ArgParserMaxStackSize : ValueArgParser<Int>("max_stack_size") {
-    override fun parse(arg: String): Int? {
-        return arg.toIntOrNull()
-    }
-
-    override fun apply(meta: ItemMeta, value: Int) {
-        meta.setMaxStackSize(value)
-    }
-
-    override fun test(meta: ItemMeta): String? {
-        if (!meta.hasMaxStackSize()) {
-            return null
-        }
-
-        return meta.maxStackSize.toString()
-    }
-}

eco-core/core-backend-modern/src/main/kotlin/com/willfp/eco/internal/compat/modern/recipes/AutocrafterPatchImpl.kt

@@ -1,19 +0,0 @@
-@file:Suppress("UnstableApiUsage")
-
-package com.willfp.eco.internal.compat.modern.recipes
-
-import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.internal.recipes.AutocrafterPatch
-import org.bukkit.event.EventHandler
-import org.bukkit.event.block.CrafterCraftEvent
-
-class AutocrafterPatchImpl: AutocrafterPatch {
-    @EventHandler
-    fun preventEcoRecipes(event: CrafterCraftEvent) {
-        if (!EcoPlugin.getPluginNames().contains(event.recipe.key.namespace)) {
-            return
-        }
-
-        event.isCancelled = true
-    }
-}

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

@@ -6,22 +6,10 @@ 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")
     compileOnly("org.yaml:snakeyaml:1.33")
     compileOnly("com.moandjiezana.toml:toml4j:0.7.2")
 }
-
-tasks {
-    compileJava {
-        options.release = 17
-    }
-
-    compileKotlin {
-        kotlinOptions {
-            jvmTarget = "17"
-        }
-    }
-}

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
@@ -126,19 +127,14 @@ abstract class HandledCommand(
      * @return The tab completion results.
      */
     private fun CommandBase.handleTabComplete(sender: CommandSender, args: List<String>): List<String> {
-        if (!sender.hasPermission(permission)) {
-            return emptyList()
-        }
+        if (!sender.hasPermission(permission)) return emptyList()
 
         if (args.size == 1) {
-            val completions = mutableListOf<String>()
+            val completions = subcommands.filter { sender.hasPermission(it.permission) }.map { it.name }
 
-            StringUtil.copyPartialMatches(
-                args[0],
-                subcommands.filter { sender.hasPermission(it.permission) }.map { it.name },
-                completions
-            )
+            val list = mutableListOf<String>()
 
+            StringUtil.copyPartialMatches(args[0], completions, list)
             if (completions.isNotEmpty()) {
                 return completions
             }
@@ -161,11 +157,9 @@ abstract class HandledCommand(
         }
 
         val completions = tabComplete(sender, args).toMutableList()
-
         if (sender is Player) {
             completions.addAll(tabComplete(sender, args))
         }
-
         return completions.sorted()
     }
 }

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/compat/ModernCompatibility.kt

@@ -1,68 +0,0 @@
-package com.willfp.eco.internal.compat
-
-import com.willfp.eco.core.Prerequisite
-import com.willfp.eco.core.proxy.exceptions.ProxyError
-
-private const val BASE_PACKAGE = "com.willfp.eco.internal.compat.modern"
-private val isModern = Prerequisite.HAS_PAPER.isMet && Prerequisite.HAS_1_21.isMet
-
-internal annotation class ModernCompatibilityProxy(
-    val location: String
-)
-
-private val cache = mutableMapOf<Class<*>, Any>()
-
-object ModernCompatibilityScope {
-    inline fun <reified T> loadProxy(): T {
-        return loadCompatibilityProxy(T::class.java)
-    }
-
-    inline fun <reified T> useProxy(block: T.() -> Any?) {
-        val proxy = loadProxy<T>()
-
-        with(proxy) {
-            block()
-        }
-    }
-}
-
-fun <R> ifModern(block: ModernCompatibilityScope.() -> R) {
-    if (!isModern) {
-        return
-    }
-
-    block(ModernCompatibilityScope)
-}
-
-fun <T> loadCompatibilityProxy(clazz: Class<T>): T {
-    @Suppress("UNCHECKED_CAST")
-    return cache.getOrPut(clazz) {
-        loadProxyUncached(clazz)
-    } as T
-}
-
-private fun loadProxyUncached(clazz: Class<*>): Any {
-    val proxy = clazz.getAnnotation(ModernCompatibilityProxy::class.java)
-    val location = proxy?.location ?: throw IllegalArgumentException("Class ${clazz.name} is not a proxy")
-    val className = "$BASE_PACKAGE.$location"
-
-    try {
-        val found = Class.forName(className)
-
-        val constructor = found.getConstructor()
-        val instance = constructor.newInstance()
-
-        if (!clazz.isInstance(instance)) {
-            throw ProxyError(
-                "Modern compatibility proxy class $className does not implement ${clazz.name}",
-                ClassCastException()
-            )
-        }
-
-        return instance
-    } catch (e: ClassNotFoundException) {
-        throw ProxyError("Could not find modern compatibility proxy class $className", e)
-    } catch (e: NoSuchMethodException) {
-        throw ProxyError("Could not find no-args constructor for modern compatibility proxy class $className", e)
-    }
-}

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/EntityArgParserJumpStrength.kt

@@ -1,4 +1,4 @@
-package com.willfp.eco.internal.compat.modern.entities.parsers
+package com.willfp.eco.internal.entities
 
 import com.willfp.eco.core.entities.args.EntityArgParseResult
 import com.willfp.eco.core.entities.args.EntityArgParser
@@ -28,7 +28,7 @@ object EntityArgParserJumpStrength : EntityArgParser {
                     return@EntityArgParseResult false
                 }
 
-                val inst = it.getAttribute(Attribute.GENERIC_JUMP_STRENGTH) ?: return@EntityArgParseResult false
+                val inst = it.getAttribute(Attribute.HORSE_JUMP_STRENGTH) ?: return@EntityArgParseResult false
                 inst.value >= attributeValue
             },
             {
@@ -36,7 +36,7 @@ object EntityArgParserJumpStrength : EntityArgParser {
                     return@EntityArgParseResult
                 }
 
-                it.getAttribute(Attribute.GENERIC_JUMP_STRENGTH)?.baseValue = attributeValue
+                it.getAttribute(Attribute.HORSE_JUMP_STRENGTH)?.baseValue = attributeValue
             }
         )
     }

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/entities/ModernEntityArgParsers.kt

@@ -1,8 +0,0 @@
-package com.willfp.eco.internal.entities
-
-import com.willfp.eco.internal.compat.ModernCompatibilityProxy
-
-@ModernCompatibilityProxy("entities.ModernEntityArgParsersImpl")
-interface ModernEntityArgParsers {
-    fun registerAll()
-}

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,9 +1,7 @@
 package com.willfp.eco.internal.gui.menu
 
-import com.willfp.eco.core.Eco
-import com.willfp.eco.core.Prerequisite
 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
@@ -22,23 +20,9 @@ fun Player.forceRenderedInventory(menu: RenderedInventory) {
     trackedForceRendered[this.uniqueId] = menu
 }
 
-// Workaround because 1.21 has OpenInventory as an interface instead of an abstract class like in previous versions
-interface TopInventoryProxy {
-    fun getTopInventory(player: Player): Inventory
-}
-
-private val Player.topInventory: Inventory
-    get() {
-        return if (!Prerequisite.HAS_1_21.isMet) {
-            Eco.get().ecoPlugin.getProxy(TopInventoryProxy::class.java).getTopInventory(this)
-        } else {
-            this.openInventory.topInventory
-        }
-    }
-
 val Player.renderedInventory: RenderedInventory?
     get() = trackedForceRendered[this.uniqueId]
-        ?: this.topInventory.asRenderedInventory()
+        ?: this.openInventory.topInventory.asRenderedInventory()
 
 class RenderedInventory(
     val menu: EcoMenu,
@@ -71,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/ArgParserCustomModelData.kt

@@ -7,12 +7,20 @@ import java.util.function.Predicate
 
 object ArgParserCustomModelData : LookupArgParser {
     override fun parseArguments(args: Array<out String>, meta: ItemMeta): Predicate<ItemStack>? {
-        val arg = args.firstOrNull {
-            it.startsWith("custom-model-data:", ignoreCase = true)
-                    || it.startsWith("custom_model_data:", ignoreCase = true)
-        } ?: return null
+        var modelData: Int? = null
 
-        val modelData = arg.split(":")[1].toIntOrNull() ?: return null
+        for (arg in args) {
+            val argSplit = arg.split(":")
+            if (!argSplit[0].equals("custom-model-data", ignoreCase = true)) {
+                continue
+            }
+            if (argSplit.size < 2) {
+                continue
+            }
+            modelData = argSplit[1].toIntOrNull()
+        }
+
+        modelData ?: return null
 
         meta.setCustomModelData(modelData)
 
@@ -32,6 +40,6 @@ object ArgParserCustomModelData : LookupArgParser {
             return null
         }
 
-        return "custom_model_data:${meta.customModelData}"
+        return "custom-model-data:${meta.customModelData}"
     }
 }

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

@@ -2,7 +2,7 @@ package com.willfp.eco.internal.items
 
 import com.willfp.eco.core.fast.fast
 import com.willfp.eco.core.items.args.LookupArgParser
-import org.bukkit.NamespacedKey
+import com.willfp.eco.util.NamespacedKeyUtils
 import org.bukkit.enchantments.Enchantment
 import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.EnchantmentStorageMeta
@@ -16,10 +16,16 @@ object ArgParserEnchantment : LookupArgParser {
         for (arg in args) {
             val argSplit = arg.split(":")
 
-            val enchant = Enchantment.getByKey(NamespacedKey.minecraft(argSplit[0].lowercase())) ?: continue
-            val level = argSplit.getOrNull(1)?.toIntOrNull() ?: enchant.maxLevel
+            if (argSplit.size < 2) {
+                continue
+            }
 
-            enchants[enchant] = level
+            val enchant = Enchantment.getByKey(NamespacedKeyUtils.create("minecraft", argSplit[0]))
+            val level = argSplit[1].toIntOrNull()
+
+            if (enchant != null && level != null) {
+                enchants[enchant] = level
+            }
         }
 
         if (enchants.isEmpty()) {

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

@@ -1,30 +1,42 @@
 package com.willfp.eco.internal.items
 
-import com.willfp.eco.internal.items.templates.ValueArgParser
+import com.willfp.eco.core.items.args.LookupArgParser
 import com.willfp.eco.util.StringUtils
 import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.ItemMeta
 import java.util.function.Predicate
 
-object ArgParserName : ValueArgParser<String>("name") {
-    override fun parse(arg: String): String {
-        return arg
-    }
+object ArgParserName : LookupArgParser {
+    override fun parseArguments(args: Array<out String>, meta: ItemMeta): Predicate<ItemStack>? {
+        var name: String? = null
 
-    override fun apply(meta: ItemMeta, value: String) {
-        val formatted = StringUtils.format(value)
+        for (arg in args) {
+            if (!arg.lowercase().startsWith("name:")) {
+                continue
+            }
+            name = arg.substring(5, arg.length)
+        }
+
+        name ?: return null
+
+        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
+
+            testMeta.displayName == formatted
+        }
     }
 
-    override fun test(meta: ItemMeta): String? {
+    override fun serializeBack(meta: ItemMeta): String? {
         if (!meta.hasDisplayName()) {
             return null
         }
 
-        @Suppress("DEPRECATION")
-        return meta.displayName
+        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.compat.modern.items.parsers
+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
@@ -23,11 +25,7 @@ object ArgParserTrim : LookupArgParser {
             if (!argSplit[0].equals("trim", ignoreCase = true)) {
                 continue
             }
-
-            @Suppress("DEPRECATION")
             material = Registry.TRIM_MATERIAL.get(NamespacedKey.minecraft(argSplit.getOrElse(1) {""}))
-
-            @Suppress("DEPRECATION")
             pattern = Registry.TRIM_PATTERN.get(NamespacedKey.minecraft(argSplit.getOrElse(2) {""}))
         }
 
@@ -47,11 +45,6 @@ object ArgParserTrim : LookupArgParser {
     override fun serializeBack(meta: ItemMeta): String? {
         val trim = (meta as? ArmorMeta)?.trim ?: return null
 
-        @Suppress("DEPRECATION")
-        val materialKey = Registry.TRIM_MATERIAL.getKey(trim.material) ?: return null
-        @Suppress("DEPRECATION")
-        val patternKey = Registry.TRIM_PATTERN.getKey(trim.pattern) ?: return null
-
-        return "trim:${materialKey.key.lowercase()}:${patternKey.key.lowercase()}"
+        return "trim:${trim.material.key.key.lowercase()}:${trim.pattern.key.key.lowercase()}"
     }
 }

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

@@ -1,14 +1,38 @@
 package com.willfp.eco.internal.items
 
-import com.willfp.eco.internal.items.templates.FlagArgParser
+import com.willfp.eco.core.items.args.LookupArgParser
+import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.ItemMeta
+import java.util.function.Predicate
+
+object ArgParserUnbreakable : LookupArgParser {
+    override fun parseArguments(args: Array<out String>, meta: ItemMeta): Predicate<ItemStack>? {
+        var unbreakable = false
+
+        for (arg in args) {
+            if (arg.equals("unbreakable", true)) {
+                unbreakable = true
+            }
+        }
+
+        if (!unbreakable) {
+            return null
+        }
 
-object ArgParserUnbreakable : FlagArgParser("unbreakable") {
-    override fun apply(meta: ItemMeta) {
         meta.isUnbreakable = true
+
+        return Predicate {
+            val testMeta = it.itemMeta ?: return@Predicate false
+
+            testMeta.isUnbreakable
+        }
     }
 
-    override fun test(meta: ItemMeta): Boolean {
-        return meta.isUnbreakable
+    override fun serializeBack(meta: ItemMeta): String? {
+        if (!meta.isUnbreakable) {
+            return null
+        }
+
+        return "unbreakable"
     }
 }

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

@@ -1,8 +0,0 @@
-package com.willfp.eco.internal.items
-
-import com.willfp.eco.internal.compat.ModernCompatibilityProxy
-
-@ModernCompatibilityProxy("items.ModernItemArgParsersImpl")
-interface ModernItemArgParsers {
-    fun registerAll()
-}

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

@@ -1,39 +0,0 @@
-package com.willfp.eco.internal.items.tags
-
-import com.willfp.eco.core.items.Items
-import com.willfp.eco.core.items.tag.VanillaItemTag
-import org.bukkit.Keyed
-import org.bukkit.Material
-import org.bukkit.Tag
-
-object VanillaItemTags {
-    fun register() {
-        // Get all tags
-        val allTags = Tag::class.java.declaredFields
-            .filter { it.type == Tag::class.java }
-            .mapNotNull {
-                val tag = it.get(null) as? Tag<*>
-                if (tag == null) {
-                    null
-                } else {
-                    NamedTag(it.name.lowercase(), tag)
-                }
-            }
-
-        // Register all tags
-        for (tag in allTags) {
-            if (tag.isMaterial) {
-                Items.registerTag(
-                    @Suppress("UNCHECKED_CAST")
-                    VanillaItemTag(tag.name, tag.tag as Tag<Material>)
-                )
-            }
-        }
-    }
-
-    private data class NamedTag<T : Keyed>(val name: String, val tag: Tag<T>) {
-        // Check if tag is material
-        val isMaterial: Boolean
-            get() = tag.values.firstOrNull() is Material
-    }
-}

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

@@ -1,44 +0,0 @@
-package com.willfp.eco.internal.items.templates
-
-import com.willfp.eco.core.items.args.LookupArgParser
-import org.bukkit.inventory.ItemStack
-import org.bukkit.inventory.meta.ItemMeta
-import java.util.function.Predicate
-
-abstract class FlagArgParser(
-    protected val flag: String
-) : LookupArgParser {
-    abstract fun apply(meta: ItemMeta)
-
-    abstract fun test(meta: ItemMeta): Boolean
-
-    override fun parseArguments(args: Array<out String>, meta: ItemMeta): Predicate<ItemStack>? {
-        var has = false
-
-        for (arg in args) {
-            if (arg.equals(flag, true)) {
-                has = true
-            }
-        }
-
-        if (!has) {
-            return null
-        }
-
-        apply(meta)
-
-        return Predicate {
-            val testMeta = it.itemMeta ?: return@Predicate false
-
-            test(testMeta)
-        }
-    }
-
-    override fun serializeBack(meta: ItemMeta): String? {
-        if (!test(meta)) {
-            return null
-        }
-
-        return flag
-    }
-}

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

@@ -1,50 +0,0 @@
-package com.willfp.eco.internal.items.templates
-
-import com.willfp.eco.core.items.args.LookupArgParser
-import com.willfp.eco.util.StringUtils
-import org.bukkit.inventory.ItemStack
-import org.bukkit.inventory.meta.ItemMeta
-import java.util.function.Predicate
-
-abstract class ValueArgParser<T: Any>(
-    protected val flag: String
-) : LookupArgParser {
-    abstract fun parse(arg: String): T?
-
-    abstract fun apply(meta: ItemMeta, value: T)
-
-    abstract fun test(meta: ItemMeta): String?
-
-    override fun parseArguments(args: Array<out String>, meta: ItemMeta): Predicate<ItemStack>? {
-        var argument: String? = null
-
-        for (arg in args) {
-            if (!arg.lowercase().startsWith("${flag}:")) {
-                continue
-            }
-            argument = arg.substring(flag.length + 1, arg.length)
-        }
-
-        argument ?: return null
-
-        val parsed = parse(argument) ?: return null
-
-        apply(meta, parsed)
-
-        return Predicate {
-            val testMeta = it.itemMeta ?: return@Predicate false
-
-            test(testMeta) == parsed
-        }
-    }
-
-    override fun serializeBack(meta: ItemMeta): String? {
-        val test = test(meta)
-
-        if (test.isNullOrBlank()) {
-            return null
-        }
-
-        return "${flag}:\"$test\""
-    }
-}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/particle/ParticleFactoryRGB.kt

@@ -1,6 +1,5 @@
 package com.willfp.eco.internal.particle
 
-import com.willfp.eco.core.Prerequisite
 import com.willfp.eco.core.particle.ParticleFactory
 import com.willfp.eco.core.particle.SpawnableParticle
 import org.bukkit.Color
@@ -8,14 +7,6 @@ import org.bukkit.Location
 import org.bukkit.Particle
 
 object ParticleFactoryRGB : ParticleFactory {
-    private val dustParticle = runCatching {
-        if (Prerequisite.HAS_1_20_5.isMet) {
-            Particle.valueOf("DUST")
-        } else {
-            Particle.valueOf("REDSTONE_DUST")
-        }
-    }.getOrNull()
-
     override fun getNames() = listOf(
         "color",
         "rgb",
@@ -39,9 +30,7 @@ object ParticleFactoryRGB : ParticleFactory {
         override fun spawn(location: Location, amount: Int) {
             val world = location.world ?: return
 
-            val particle = dustParticle ?: return
-
-            world.spawnParticle(particle, location, amount, 0.0, 0.0, 0.0, 0.0, options)
+            world.spawnParticle(Particle.REDSTONE, location, amount, 0.0, 0.0, 0.0, 0.0, options)
         }
     }
 }

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-backend/src/main/kotlin/com/willfp/eco/internal/price/PriceFactoryXP.kt

@@ -8,11 +8,6 @@ import org.bukkit.entity.Player
 import java.util.UUID
 import kotlin.math.roundToInt
 
-private fun getXPNeededForLevel(level: Int): Int {
-    // XP Formula from NMS Player
-    return if (level >= 30) 112 + (level - 30) * 9 else (if (level >= 15) 37 + (level - 15) * 5 else 7 + level * 2)
-}
-
 object PriceFactoryXP : PriceFactory {
     override fun getNames() = listOf(
         "xp",
@@ -30,37 +25,15 @@ object PriceFactoryXP : PriceFactory {
     ) : Price {
         private val multipliers = mutableMapOf<UUID, Double>()
 
-        override fun canAfford(player: Player, multiplier: Double): Boolean {
-            var totalExperience = 0
-            for (level in 0 until player.level) {
-                totalExperience += getXPNeededForLevel(level)
-            }
-
-            totalExperience += (player.exp * getXPNeededForLevel(player.level)).toInt()
-
-            return totalExperience >= getValue(player, multiplier).roundToInt()
-        }
+        override fun canAfford(player: Player, multiplier: Double): Boolean =
+            player.totalExperience >= getValue(player, multiplier)
 
         override fun pay(player: Player, multiplier: Double) {
-            takeXP(player, getValue(player, multiplier).roundToInt())
-        }
-
-        private fun takeXP(player: Player, amount: Int) {
-            val currentLevel = player.level
-            val currentExp = player.exp * getXPNeededForLevel(currentLevel)
-
-            if (currentExp >= amount) {
-                player.exp = (currentExp - amount) / getXPNeededForLevel(currentLevel)
-            } else {
-                // Handle recursive level down
-                player.exp = 1f
-                player.level = (currentLevel - 1).coerceAtLeast(0)
-                takeXP(player, (amount - currentExp).toInt())
-            }
+            player.totalExperience -= getValue(player, multiplier).roundToInt()
         }
 
         override fun giveTo(player: Player, multiplier: Double) {
-            player.giveExp(getValue(player, multiplier).roundToInt())
+            player.totalExperience += getValue(player, multiplier).roundToInt()
         }
 
         override fun getValue(player: Player, multiplier: Double): Double {

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/recipes/AutocrafterPatch.kt

@@ -1,7 +0,0 @@
-package com.willfp.eco.internal.recipes
-
-import com.willfp.eco.internal.compat.ModernCompatibilityProxy
-import org.bukkit.event.Listener
-
-@ModernCompatibilityProxy("recipes.AutocrafterPatchImpl")
-interface AutocrafterPatch: Listener

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/modern/build.gradle.kts

@@ -1,23 +0,0 @@
-plugins {
-    id("io.papermc.paperweight.userdev")
-}
-
-group = "com.willfp"
-version = rootProject.version
-
-dependencies {
-    compileOnly(project(":eco-core:core-nms:common"))
-    paperweight.paperDevBundle("1.21-R0.1-SNAPSHOT")
-}
-
-tasks {
-    compileJava {
-        options.release = 21
-    }
-
-    compileKotlin {
-        kotlinOptions {
-            jvmTarget = "21"
-        }
-    }
-}

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

@@ -1,414 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.common.modern
-
-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.Style
-import net.kyori.adventure.text.format.TextColor
-import net.kyori.adventure.text.format.TextDecoration
-import net.minecraft.core.component.DataComponentType
-import net.minecraft.core.component.DataComponents
-import net.minecraft.core.registries.Registries
-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.Bukkit
-import org.bukkit.craftbukkit.CraftRegistry
-import org.bukkit.craftbukkit.CraftServer
-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)
-}
-
-private fun Component.unstyled(): Component {
-    return unstyledComponent.append(this)
-}
-
-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
-        }
-
-        if (checkStored) {
-            val stored = handle.get(DataComponents.STORED_ENCHANTMENTS) ?: return map
-
-            for ((enchantment, level) in stored.entrySet()) {
-                val bukkit = CraftEnchantment.minecraftToBukkit(enchantment.value())
-
-                map[bukkit] = max(map.getOrDefault(bukkit, 0), level)
-            }
-        }
-
-        return map
-    }
-
-    override fun getEnchantmentLevel(
-        enchantment: Enchantment,
-        checkStored: Boolean
-    ): Int {
-        val minecraft =
-            CraftRegistry.bukkitToMinecraft<Enchantment, net.minecraft.world.item.enchantment.Enchantment>(
-                enchantment
-            )
-
-        val server = Bukkit.getServer() as CraftServer
-        val access = server.server.registryAccess()
-
-        val holder = access.registryOrThrow(Registries.ENCHANTMENT).wrapAsHolder(minecraft)
-
-        val enchantments = handle.get(DataComponents.ENCHANTMENTS) ?: return 0
-        var level = enchantments.getLevel(holder)
-
-        if (checkStored) {
-            val storedEnchantments = handle.get(DataComponents.STORED_ENCHANTMENTS) ?: return 0
-            level = max(level, storedEnchantments.getLevel(holder))
-        }
-
-        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 { it.unstyled() }
-                .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.ITEM_NAME, null)
-            handle.set<net.minecraft.network.chat.Component>(DataComponents.CUSTOM_NAME, null)
-        } else {
-            handle.set(
-                DataComponents.CUSTOM_NAME,
-                name.unstyled().toNMS()
-            )
-        }
-
-        apply()
-    }
-
-    override fun setDisplayName(name: String?) = setDisplayName(name?.toComponent())
-
-    override fun getDisplayNameComponent(): Component {
-        return handle.get(DataComponents.CUSTOM_NAME)?.toAdventure()
-            ?: handle.get(DataComponents.ITEM_NAME)?.toAdventure()
-            ?: Component.translatable(bukkit.type.toItem().descriptionId)
-    }
-
-    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.entries) {
-            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/nms-common/build.gradle.kts

@@ -7,11 +7,4 @@ version = rootProject.version
 
 dependencies {
     paperweight.paperDevBundle("1.17.1-R0.1-SNAPSHOT")
-    pluginRemapper("net.fabricmc:tiny-remapper:0.10.3:fat")
-}
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
 }

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