Updated to 6.5.2

README.md

@@ -158,8 +158,12 @@ Here's a list of some (not all) of the features of eco:
 
 <h1 align="center">
   <br>
+    <a href="http://gamersupps.gg/discount/Auxilor?afmc=Auxilor" target="_blank">
+      <img src="https://i.imgur.com/uFDpBAC.png" alt="supps banner">
+    </a>
     <a href="https://dedimc.promo/Auxilor" target="_blank">
       <img src="https://i.imgur.com/zdDLhFA.png" alt="dedimc banner">
     </a>
   <br>
 </h1>
+

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

@@ -16,7 +16,6 @@ import org.jetbrains.annotations.NotNull;
  *
  * @see ArmorChangeEvent
  */
-@Deprecated
 public class ArmorEquipEvent extends PlayerEvent {
     /**
      * Bukkit parity.

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

@@ -2,12 +2,16 @@ package com.willfp.eco.core.gui.menu;
 
 import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.gui.slot.Slot;
+import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * GUI version of {@link Inventory}.
@@ -55,6 +59,43 @@ public interface Menu {
      */
     List<ItemStack> getCaptiveItems(@NotNull Player player);
 
+    /**
+     * Write data.
+     *
+     * @param player The player.
+     * @param key    The key.
+     * @param type   The type.
+     * @param value  The value.
+     * @param <T>    The type.
+     * @param <Z>    The type.
+     */
+    <T, Z> void writeData(@NotNull Player player,
+                          @NotNull NamespacedKey key,
+                          @NotNull PersistentDataType<T, Z> type,
+                          @NotNull Z value);
+
+    /**
+     * Read data.
+     *
+     * @param player The player.
+     * @param key    The key.
+     * @param type   The type.
+     * @param <T>    The type.
+     * @param <Z>    The type.
+     * @return The data.
+     */
+    @Nullable <T, Z> T readData(@NotNull Player player,
+                                @NotNull NamespacedKey key,
+                                @NotNull PersistentDataType<T, Z> type);
+
+    /**
+     * Get all data keys for a player.
+     *
+     * @param player The player.
+     * @return The keys.
+     */
+    Set<NamespacedKey> getKeys(@NotNull Player player);
+
     /**
      * Create a builder with a given amount of rows.
      *

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

@@ -56,7 +56,7 @@ public class PlaceholderManager {
                                    @NotNull final String identifier) {
         Optional<PlaceholderEntry> matching = REGISTERED_PLACEHOLDERS.stream().filter(expansion -> expansion.getIdentifier().equalsIgnoreCase(identifier)).findFirst();
         if (matching.isEmpty()) {
-            return null;
+            return "";
         }
         PlaceholderEntry entry = matching.get();
         if (player == null && entry.requiresPlayer()) {

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.items;
 
+import com.willfp.eco.core.items.builder.EnchantedBookBuilder;
 import com.willfp.eco.core.items.builder.ItemBuilder;
 import com.willfp.eco.core.items.builder.ItemStackBuilder;
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
@@ -12,6 +13,7 @@ import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 
@@ -129,9 +131,17 @@ public final class Items {
             return item;
         }
 
-        ItemBuilder builder = new ItemStackBuilder(item.getItem());
+        ItemStack example = item.getItem();
-        requiredEnchantments.forEach(builder::addEnchantment);
+
-        ItemStack example = builder.build();
+        if (example.getItemMeta() instanceof EnchantmentStorageMeta storageMeta) {
+            requiredEnchantments.forEach((enchantment, integer) -> storageMeta.addStoredEnchant(enchantment, integer, true));
+            example.setItemMeta(storageMeta);
+        } else {
+            ItemMeta meta = example.getItemMeta();
+            assert meta != null;
+            requiredEnchantments.forEach((enchantment, integer) -> meta.addEnchant(enchantment, integer, true));
+            example.setItemMeta(meta);
+        }
 
         return new ModifiedTestableItem(
                 item,
@@ -144,12 +154,23 @@ public final class Items {
 
                     assert meta != null;
 
-                    for (Map.Entry<Enchantment, Integer> entry : requiredEnchantments.entrySet()) {
+                    if (meta instanceof EnchantmentStorageMeta storageMeta) {
-                        if (!meta.hasEnchant(entry.getKey())) {
+                        for (Map.Entry<Enchantment, Integer> entry : requiredEnchantments.entrySet()) {
-                            return false;
+                            if (!storageMeta.hasStoredEnchant(entry.getKey())) {
+                                return false;
+                            }
+                            if (storageMeta.getStoredEnchantLevel(entry.getKey()) < entry.getValue()) {
+                                return false;
+                            }
                         }
-                        if (meta.getEnchantLevel(entry.getKey()) < entry.getValue()) {
+                    } else {
-                            return false;
+                        for (Map.Entry<Enchantment, Integer> entry : requiredEnchantments.entrySet()) {
+                            if (!meta.hasEnchant(entry.getKey())) {
+                                return false;
+                            }
+                            if (meta.getEnchantLevel(entry.getKey()) < entry.getValue()) {
+                                return false;
+                            }
                         }
                     }
 

eco-api/src/main/java/com/willfp/eco/core/recipe/parts/ModifiedTestableItem.java

@@ -17,6 +17,7 @@ public class ModifiedTestableItem implements TestableItem {
     /**
      * The item.
      */
+    @Getter
     private final TestableItem handle;
 
     /**

eco-api/src/main/java/com/willfp/eco/core/recipe/parts/TestableStack.java

@@ -19,6 +19,7 @@ public class TestableStack implements TestableItem {
     /**
      * The item.
      */
+    @Getter
     private final TestableItem handle;
 
     /**

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

@@ -27,7 +27,6 @@ class EcoLoadableJSONConfig(
     }
 
     override fun createFile() {
-        val resourcePath = resourcePath
         val inputStream = source.getResourceAsStream(resourcePath)!!
         val outFile = File(this.plugin.dataFolder, resourcePath)
         val lastIndex = resourcePath.lastIndexOf('/')
@@ -37,11 +36,7 @@ class EcoLoadableJSONConfig(
         }
         if (!outFile.exists()) {
             val out: OutputStream = FileOutputStream(outFile)
-            val buf = ByteArray(1024)
+            inputStream.copyTo(out, 1024)
-            var len: Int
-            while (inputStream.read(buf).also { len = it } > 0) {
-                out.write(buf, 0, len)
-            }
             out.close()
             inputStream.close()
         }

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

@@ -31,7 +31,6 @@ open class EcoLoadableYamlConfig(
     }
 
     final override fun createFile() {
-        val resourcePath = resourcePath
         val inputStream = source.getResourceAsStream(resourcePath)!!
         val outFile = File(this.plugin.dataFolder, resourcePath)
         val lastIndex = resourcePath.lastIndexOf('/')
@@ -41,11 +40,7 @@ open class EcoLoadableYamlConfig(
         }
         if (!outFile.exists()) {
             val out: OutputStream = FileOutputStream(outFile)
-            val buf = ByteArray(1024)
+            inputStream.copyTo(out, 1024)
-            var len: Int
-            while (inputStream.read(buf).also { len = it } > 0) {
-                out.write(buf, 0, len)
-            }
             out.close()
             inputStream.close()
         }

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

@@ -6,11 +6,14 @@ import com.willfp.eco.core.gui.slot.Slot
 import com.willfp.eco.internal.gui.slot.EcoSlot
 import com.willfp.eco.util.StringUtils
 import org.bukkit.Bukkit
+import org.bukkit.NamespacedKey
 import org.bukkit.entity.Player
 import org.bukkit.event.inventory.InventoryCloseEvent
 import org.bukkit.inventory.Inventory
 import org.bukkit.inventory.ItemStack
+import org.bukkit.persistence.PersistentDataType
 
+@Suppress("UNCHECKED_CAST")
 class EcoMenu(
     private val rows: Int,
     val slots: List<MutableList<EcoSlot>>,
@@ -75,4 +78,28 @@ class EcoMenu(
         inventory ?: return ArrayList()
         return inventory.captiveItems
     }
+
+    override fun <T : Any, Z : Any> writeData(
+        player: Player,
+        key: NamespacedKey,
+        type: PersistentDataType<T, Z>,
+        value: Z
+    ) {
+        val inventory = MenuHandler.getExtendedInventory(player.openInventory.topInventory)
+        inventory ?: return
+        inventory.data[key] = value
+        inventory.refresh(player)
+    }
+
+    override fun <T : Any, Z : Any> readData(player: Player, key: NamespacedKey, type: PersistentDataType<T, Z>): T? {
+        val inventory = MenuHandler.getExtendedInventory(player.openInventory.topInventory)
+        inventory ?: return null
+        return inventory.data[key] as T?
+    }
+
+    override fun getKeys(player: Player): MutableSet<NamespacedKey> {
+        val inventory = MenuHandler.getExtendedInventory(player.openInventory.topInventory)
+        inventory ?: return HashSet()
+        return inventory.data.keys
+    }
 }

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

@@ -3,6 +3,7 @@ package com.willfp.eco.internal.gui.menu
 import com.willfp.eco.internal.gui.slot.EcoCaptivatorSlot
 import com.willfp.eco.util.MenuUtils
 import com.willfp.eco.util.StringUtils
+import org.bukkit.NamespacedKey
 import org.bukkit.entity.Player
 import org.bukkit.inventory.Inventory
 import org.bukkit.inventory.ItemStack
@@ -12,6 +13,7 @@ class ExtendedInventory(
     private val menu: EcoMenu
 ) {
     val captiveItems: MutableList<ItemStack> = ArrayList()
+    val data: MutableMap<NamespacedKey, Any> = HashMap()
 
     fun refresh(player: Player) {
         captiveItems.clear()

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/recipes/ShapedRecipeListener.java

@@ -6,6 +6,7 @@ import com.willfp.eco.core.items.Items;
 import com.willfp.eco.core.items.TestableItem;
 import com.willfp.eco.core.recipe.Recipes;
 import com.willfp.eco.core.recipe.parts.MaterialTestableItem;
+import com.willfp.eco.core.recipe.parts.ModifiedTestableItem;
 import com.willfp.eco.core.recipe.parts.TestableStack;
 import com.willfp.eco.core.recipe.recipes.CraftingRecipe;
 import com.willfp.eco.core.recipe.recipes.ShapedCraftingRecipe;
@@ -130,6 +131,22 @@ public class ShapedRecipeListener extends PluginDependent<EcoPlugin> implements
                     return;
                 }
             }
+            if (part instanceof ModifiedTestableItem modified) {
+                if (modified.getHandle() instanceof MaterialTestableItem) {
+                    if (Items.isCustomItem(itemStack)) {
+                        event.getInventory().setResult(new ItemStack(Material.AIR));
+                        return;
+                    }
+                }
+            }
+            if (part instanceof TestableStack modified) {
+                if (modified.getHandle() instanceof MaterialTestableItem) {
+                    if (Items.isCustomItem(itemStack)) {
+                        event.getInventory().setResult(new ItemStack(Material.AIR));
+                        return;
+                    }
+                }
+            }
         }
     }
     
@@ -156,6 +173,24 @@ public class ShapedRecipeListener extends PluginDependent<EcoPlugin> implements
                     return;
                 }
             }
+            if (part instanceof ModifiedTestableItem modified) {
+                if (modified.getHandle() instanceof MaterialTestableItem) {
+                    if (Items.isCustomItem(itemStack)) {
+                        event.getInventory().setResult(new ItemStack(Material.AIR));
+                        event.setResult(Event.Result.DENY);
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+            if (part instanceof TestableStack modified) {
+                if (modified.getHandle() instanceof MaterialTestableItem) {
+                    if (Items.isCustomItem(itemStack)) {
+                        event.getInventory().setResult(new ItemStack(Material.AIR));
+                        return;
+                    }
+                }
+            }
         }
     }
     

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

@@ -33,7 +33,13 @@ class GUIListener(plugin: EcoPlugin) : PluginDependent<EcoPlugin>(plugin), Liste
         event.isCancelled = true
         ecoSlot.handleInventoryClick(event, menu)
 
-        plugin.scheduler.run{ MenuHandler.getExtendedInventory(event.clickedInventory!!)!!.refresh(player) }
+        if (event.clickedInventory == null) {
+            return
+        }
+
+        val extendedInventory = MenuHandler.getExtendedInventory(event.clickedInventory!!) ?: return
+
+        plugin.scheduler.run{ extendedInventory.refresh(player) }
     }
 
     @EventHandler

gradle.properties

@@ -1,2 +1,2 @@
-version = 6.4.1
+version = 6.5.2
 plugin-name = eco