Updated to 6.18.5

# Conflicts:
#	gradle.properties

eco-api/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     compileOnly 'org.apache.maven:maven-artifact:3.8.1'
     compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.1-SNAPSHOT'
     compileOnly 'com.google.code.gson:gson:2.8.8'
+    compileOnly 'org.apache.commons:commons-lang3:3.0'
 }
 
 java {

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

@@ -111,7 +111,7 @@ public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> imple
                 List<String> lore = meta.hasLore() ? meta.getLore() : new ArrayList<>();
                 assert lore != null;
                 lore.add("");
-                String add = Eco.getHandler().getEcoPlugin().getLangYml().getString("multiple-in-craft");
+                String add = Eco.getHandler().getEcoPlugin().getLangYml().getFormattedString("multiple-in-craft");
                 add = add.replace("%amount%", String.valueOf(item.getAmount()));
                 lore.add(add);
                 meta.setLore(lore);

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

@@ -24,9 +24,9 @@ class NMSFastItemStack(itemStack: org.bukkit.inventory.ItemStack) : EcoFastItemS
 
     override fun getEnchantmentsOnItem(checkStored: Boolean): Map<Enchantment, Int> {
         val enchantmentNBT =
-            if (checkStored && handle.item === Items.ENCHANTED_BOOK) EnchantedBookItem.getEnchantments(
+            if (checkStored && handle.getItem() === Items.ENCHANTED_BOOK) EnchantedBookItem.getEnchantments(
                 handle
-            ) else handle.enchantmentTags
+            ) else handle.getEnchantmentTags()
         val foundEnchantments: MutableMap<Enchantment, Int> = HashMap()
         for (base in enchantmentNBT) {
             val compound = base as CompoundTag
@@ -45,9 +45,9 @@ class NMSFastItemStack(itemStack: org.bukkit.inventory.ItemStack) : EcoFastItemS
         checkStored: Boolean
     ): Int {
         val enchantmentNBT =
-            if (checkStored && handle.item === Items.ENCHANTED_BOOK) EnchantedBookItem.getEnchantments(
+            if (checkStored && handle.getItem() === Items.ENCHANTED_BOOK) EnchantedBookItem.getEnchantments(
                 handle
-            ) else handle.enchantmentTags
+            ) else handle.getEnchantmentTags()
         for (base in enchantmentNBT) {
             val compound = base as CompoundTag
             val key = compound.getString("id")
@@ -152,16 +152,16 @@ class NMSFastItemStack(itemStack: org.bukkit.inventory.ItemStack) : EcoFastItemS
 
     private var flagBits: Int
         get() =
-            if (handle.hasTag() && handle.tag!!.contains(
+            if (handle.hasTag() && handle.getTag()!!.contains(
                     "HideFlags",
                     99
                 )
-            ) handle.tag!!.getInt("HideFlags") else 0
+            ) handle.getTag()!!.getInt("HideFlags") else 0
         set(value) =
-            handle.orCreateTag.putInt("HideFlags", value)
+            handle.getOrCreateTag().putInt("HideFlags", value)
 
     override fun getRepairCost(): Int {
-        return handle.baseRepairCost
+        return handle.getBaseRepairCost()
     }
 
     override fun setRepairCost(cost: Int) {
@@ -177,7 +177,7 @@ class NMSFastItemStack(itemStack: org.bukkit.inventory.ItemStack) : EcoFastItemS
     }
 
     override fun hashCode(): Int {
-        return handle.tag?.hashCode() ?: (0b00010101 * 31 + Item.getId(handle.getItem()))
+        return handle.getTag()?.hashCode() ?: (0b00010101 * 31 + Item.getId(handle.getItem()))
     }
 
     private fun apply() {

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

@@ -74,7 +74,6 @@ import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatVulcan
 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefBentoBox
 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCombatLogXV10
 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCombatLogXV11
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCrashClaim
 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefDeluxeCombat
 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefFactionsUUID
 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefGriefPrevention
@@ -213,7 +212,7 @@ abstract class EcoSpigotPlugin : EcoPlugin(
             IntegrationLoader("Towny") { AntigriefManager.register(AntigriefTowny()) },
             IntegrationLoader("Lands") { AntigriefManager.register(AntigriefLands(this)) },
             IntegrationLoader("Kingdoms") { AntigriefManager.register(AntigriefKingdoms()) },
-            IntegrationLoader("CrashClaim") { AntigriefManager.register(AntigriefCrashClaim()) },
+            //IntegrationLoader("CrashClaim") { AntigriefManager.register(AntigriefCrashClaim()) },
             IntegrationLoader("CombatLogX") {
                 val pluginManager = Bukkit.getPluginManager()
                 val combatLogXPlugin = pluginManager.getPlugin("CombatLogX") ?: return@IntegrationLoader

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

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

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

@@ -53,4 +53,5 @@ libraries:
   - 'org.jetbrains.exposed:exposed-jdbc:0.36.2'
   - 'mysql:mysql-connector-java:8.0.25'
   - 'com.google.guava:guava:31.0.1-jre'
-  - 'com.zaxxer:HikariCP:5.0.0'
+  - 'com.zaxxer:HikariCP:5.0.0'
+  - 'org.apache.commons:commons-lang3:3.0'

gradle.properties

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