Merge branch 'refs/heads/develop'

Update config.yml

build.gradle.kts

@@ -63,7 +63,7 @@ allprojects {
         maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
 
         // ProtocolLib
-        //maven("https://repo.dmulloy2.net/nexus/repository/public/")
+        maven("https://repo.dmulloy2.net/nexus/repository/public/")
 
         // WorldGuard
         maven("https://maven.enginehub.org/repo/")

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

@@ -2,6 +2,7 @@ package com.willfp.eco.core.proxy;
 
 import com.willfp.eco.core.version.Version;
 import org.bukkit.Bukkit;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
 import java.util.List;
@@ -35,6 +36,13 @@ public final class ProxyConstants {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }
 
+    private static String convertVersion(@NotNull final String version) {
+        return switch (version) {
+            case "v1_21_1" -> "v1_21";
+            default -> version;
+        };
+    }
+
     static {
         String currentMinecraftVersion = Bukkit.getServer().getBukkitVersion().split("-")[0];
         String nmsVersion;
@@ -45,6 +53,6 @@ public final class ProxyConstants {
             nmsVersion = "v" + currentMinecraftVersion.replace(".", "_");
         }
 
-        NMS_VERSION = nmsVersion;
+        NMS_VERSION = convertVersion(nmsVersion);
     }
 }

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

@@ -14,12 +14,16 @@ object ArgParserEnchantment : LookupArgParser {
         val enchants = mutableMapOf<Enchantment, Int>()
 
         for (arg in args) {
+            try {
                 val argSplit = arg.split(":")
 
                 val enchant = Enchantment.getByKey(NamespacedKey.minecraft(argSplit[0].lowercase())) ?: continue
                 val level = argSplit.getOrNull(1)?.toIntOrNull() ?: enchant.maxLevel
 
                 enchants[enchant] = level
+            } catch (e: IllegalArgumentException) {
+                continue
+            }
         }
 
         if (enchants.isEmpty()) {

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

@@ -12,7 +12,7 @@ object ParticleFactoryRGB : ParticleFactory {
         if (Prerequisite.HAS_1_20_5.isMet) {
             Particle.valueOf("DUST")
         } else {
-            Particle.valueOf("REDSTONE_DUST")
+            Particle.valueOf("REDSTONE")
         }
     }.getOrNull()
 

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

@@ -29,7 +29,7 @@ dependencies {
     compileOnly("io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT")
 
     // Plugin dependencies
-    compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT")
+    compileOnly("com.comphenix.protocol:ProtocolLib:5.1.0")
     compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.7-SNAPSHOT")
     compileOnly("com.github.TechFortress:GriefPrevention:16.17.1")
     compileOnly("com.github.TownyAdvanced:Towny:0.99.5.21") {

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

@@ -101,7 +101,7 @@ math-cache-ttl: 200
 # The time (in minutes) for literal patterns to be cached for. Higher values will lead to
 # faster evaluation times (less CPU usage) at the expense of slightly more memory usage and
 # less reactive values. (Do not change unless you are told to).
-literal-cache-ttl: 1
+literal-cache-ttl: 10
 
 # If anonymous usage statistics should be tracked. This is very valuable information as it
 # helps understand how eco and other plugins are being used by logging player and server

gradle.properties

@@ -1,2 +1,2 @@
-version = 6.73.2
+version = 6.73.5
 kotlin.incremental.useClasspathSnapshot=false