2022-03-17 09:51:43 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
|
|
|
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
|
2024-10-25 13:52:04 +02:00
|
|
|
index ad86ee4372e55c82968fd4fc6a65debab0092028..d9eec6cff3c7c6515f4d61bf1063e7d609d4bcb3 100644
|
2022-03-17 09:51:43 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
2024-10-23 22:52:43 +02:00
|
|
|
@@ -305,4 +305,47 @@ public final class CraftItemFactory implements ItemFactory {
|
2023-11-11 21:25:45 +01:00
|
|
|
return eggItem == null ? null : new net.minecraft.world.item.ItemStack(eggItem).asBukkitMirror();
|
|
|
|
}
|
2024-01-19 12:30:04 +01:00
|
|
|
// Paper end - old getSpawnEgg API
|
2023-11-11 21:25:45 +01:00
|
|
|
+ // Paper start - enchantWithLevels API
|
2022-03-17 09:51:43 +01:00
|
|
|
+ @Override
|
|
|
|
+ public ItemStack enchantWithLevels(ItemStack itemStack, int levels, boolean allowTreasure, java.util.Random random) {
|
2024-09-27 20:04:57 +02:00
|
|
|
+ return enchantWithLevels(
|
|
|
|
+ itemStack,
|
|
|
|
+ levels,
|
|
|
|
+ allowTreasure
|
|
|
|
+ ? Optional.empty()
|
|
|
|
+ // While IN_ENCHANTING_TABLE is not logically the same as all but TREASURE, the tag is defined as
|
|
|
|
+ // NON_TREASURE, which does contain all enchantments not in the treasure tag.
|
|
|
|
+ // Additionally, the allowTreasure boolean is more intended to configure this method to behave like
|
|
|
|
+ // an enchanting table.
|
2024-10-25 13:52:04 +02:00
|
|
|
+ : net.minecraft.server.MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.ENCHANTMENT).get(EnchantmentTags.IN_ENCHANTING_TABLE),
|
2024-09-27 20:04:57 +02:00
|
|
|
+ random
|
|
|
|
+ );
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
|
|
|
|
+ private ItemStack enchantWithLevels(
|
|
|
|
+ ItemStack itemStack,
|
|
|
|
+ int levels,
|
|
|
|
+ Optional<? extends net.minecraft.core.HolderSet<net.minecraft.world.item.enchantment.Enchantment>> possibleEnchantments,
|
|
|
|
+ java.util.Random random
|
|
|
|
+ ) {
|
2023-06-13 01:51:45 +02:00
|
|
|
+ Preconditions.checkArgument(itemStack != null, "Argument 'itemStack' must not be null");
|
2024-09-27 20:04:57 +02:00
|
|
|
+ Preconditions.checkArgument(!itemStack.isEmpty(), "Argument 'itemStack' cannot be empty");
|
2023-06-13 01:51:45 +02:00
|
|
|
+ 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");
|
2022-03-17 09:51:43 +01:00
|
|
|
+ final net.minecraft.world.item.ItemStack internalStack = CraftItemStack.asNMSCopy(itemStack);
|
2024-04-25 05:40:32 +02:00
|
|
|
+ if (internalStack.isEnchanted()) {
|
2024-09-27 20:04:57 +02:00
|
|
|
+ internalStack.set(net.minecraft.core.component.DataComponents.ENCHANTMENTS, net.minecraft.world.item.enchantment.ItemEnchantments.EMPTY);
|
2022-03-17 09:51:43 +01:00
|
|
|
+ }
|
2024-06-14 15:16:29 +02:00
|
|
|
+ final net.minecraft.core.RegistryAccess registryAccess = net.minecraft.server.MinecraftServer.getServer().registryAccess();
|
2024-04-25 05:40:32 +02:00
|
|
|
+ final net.minecraft.world.item.ItemStack enchanted = net.minecraft.world.item.enchantment.EnchantmentHelper.enchantItem(
|
|
|
|
+ new org.bukkit.craftbukkit.util.RandomSourceWrapper(random),
|
|
|
|
+ internalStack,
|
|
|
|
+ levels,
|
2024-06-15 19:08:11 +02:00
|
|
|
+ registryAccess,
|
2024-09-27 20:04:57 +02:00
|
|
|
+ possibleEnchantments
|
2024-04-25 05:40:32 +02:00
|
|
|
+ );
|
2022-03-17 09:51:43 +01:00
|
|
|
+ return CraftItemStack.asCraftMirror(enchanted);
|
|
|
|
+ }
|
2023-11-11 21:25:45 +01:00
|
|
|
+ // Paper end - enchantWithLevels API
|
|
|
|
}
|