Several fixes and new api for experience merging/stacking (#9242)

1 files changed, 37 insertions, 0 deletions

diff --git a/patches/server/0696-Implement-enchantWithLevels-API.patch b/patches/server/0696-Implement-enchantWithLevels-API.patch
new file mode 100644
index 0000000000..7031b197b7
--- /dev/null
+++ b/patches/server/0696-Implement-enchantWithLevels-API.patch
@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jason Penilla <[email protected]>
+Date: Wed, 16 Mar 2022 20:35:21 -0700
+Subject: [PATCH] Implement enchantWithLevels API
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+index 6b2d2b8397bb95ce6ffd87dc1a2f3292f81dd422..c13944058e26895a03f0013b6ca49ac7580ee9bf 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+@@ -596,4 +596,26 @@ public final class CraftItemFactory implements ItemFactory {
+         return eggItem == null ? null : new net.minecraft.world.item.ItemStack(eggItem).asBukkitMirror();
+     }
+     // Paper end - old getSpawnEgg API
++    // Paper start - enchantWithLevels API
++    @Override
++    public ItemStack enchantWithLevels(ItemStack itemStack, int levels, boolean allowTreasure, java.util.Random random) {
++        Preconditions.checkArgument(itemStack != null, "Argument 'itemStack' must not be null");
++        Preconditions.checkArgument(itemStack.getType() != Material.AIR, "Argument 'itemStack' must not be of type AIR");
++        Preconditions.checkArgument(itemStack.getAmount() > 0, "Argument 'itemStack' amount must be greater than 0");
++        Preconditions.checkArgument(levels > 0 && levels <= 30, "Argument 'levels' must be in range [1, 30] (attempted " + levels + ")");
++        Preconditions.checkArgument(random != null, "Argument 'random' must not be null");
++        final net.minecraft.world.item.ItemStack internalStack = CraftItemStack.asNMSCopy(itemStack);
++        if (internalStack.isEnchanted()) {
++            internalStack.set(net.minecraft.core.component.DataComponents.ENCHANTMENTS, null);
++        }
++        final net.minecraft.world.item.ItemStack enchanted = net.minecraft.world.item.enchantment.EnchantmentHelper.enchantItem(
++            MinecraftServer.getServer().getWorldData().enabledFeatures(),
++            new org.bukkit.craftbukkit.util.RandomSourceWrapper(random),
++            internalStack,
++            levels,
++            allowTreasure
++        );
++        return CraftItemStack.asCraftMirror(enchanted);
++    }
++    // Paper end - enchantWithLevels API
+ }