twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-07-31 20:22:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove ItemFactory#enchantWithLevels range check for vanilla parity (#12209)

Browse Source
This commit is contained in:
Esophose
2025-03-08 13:38:14 -07:00
committed by GitHub
parent 20df25d3a5
commit 43f37b1b5e
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-api/src/main/java/org/bukkit/inventory/ItemFactory.java
View File

@@ -327,7 +327,7 @@ public interface ItemFactory {
* *
* <p>If the provided ItemStack is already enchanted, the existing enchants will be removed before enchanting.</p> * <p>If the provided ItemStack is already enchanted, the existing enchants will be removed before enchanting.</p>
* *
* <p>Levels must be in range {@code [1, 30]}.</p> * <p>Enchantment tables use levels in the range {@code [1, 30]}.</p>
* *
* @param itemStack ItemStack to enchant * @param itemStack ItemStack to enchant
* @param levels levels to use for enchanting * @param levels levels to use for enchanting
@@ -336,7 +336,7 @@ public interface ItemFactory {
* @return enchanted copy of the provided ItemStack * @return enchanted copy of the provided ItemStack
* @throws IllegalArgumentException on bad arguments * @throws IllegalArgumentException on bad arguments
*/ */
@NotNull ItemStack enchantWithLevels(@NotNull ItemStack itemStack, @org.jetbrains.annotations.Range(from = 1, to = 30) int levels, boolean allowTreasure, @NotNull java.util.Random random); @NotNull ItemStack enchantWithLevels(@NotNull ItemStack itemStack, int levels, boolean allowTreasure, @NotNull java.util.Random random);
// Paper end - enchantWithLevels API // Paper end - enchantWithLevels API
// Paper start - enchantWithLevels with tag specification // Paper start - enchantWithLevels with tag specification
/** /**
@@ -344,7 +344,7 @@ public interface ItemFactory {
* *
* <p>If the provided ItemStack is already enchanted, the existing enchants will be removed before enchanting.</p> * <p>If the provided ItemStack is already enchanted, the existing enchants will be removed before enchanting.</p>
* *
* <p>Levels must be in range {@code [1, 30]}.</p> * <p>Enchantment tables use levels in the range {@code [1, 30]}.</p>
* *
* @param itemStack ItemStack to enchant * @param itemStack ItemStack to enchant
* @param levels levels to use for enchanting * @param levels levels to use for enchanting
@@ -353,6 +353,6 @@ public interface ItemFactory {
* @return enchanted copy of the provided ItemStack * @return enchanted copy of the provided ItemStack
* @throws IllegalArgumentException on bad arguments * @throws IllegalArgumentException on bad arguments
*/ */
@NotNull ItemStack enchantWithLevels(@NotNull ItemStack itemStack, @org.jetbrains.annotations.Range(from = 1, to = 30) int levels, @NotNull io.papermc.paper.registry.set.RegistryKeySet<@NotNull Enchantment> keySet, @NotNull java.util.Random random); @NotNull ItemStack enchantWithLevels(@NotNull ItemStack itemStack, int levels, @NotNull io.papermc.paper.registry.set.RegistryKeySet<@NotNull Enchantment> keySet, @NotNull java.util.Random random);
// Paper end - enchantWithLevels with tag specification // Paper end - enchantWithLevels with tag specification
} }

8
paper-api/src/main/java/org/bukkit/inventory/ItemStack.java
View File

@@ -683,7 +683,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
* *
* <p>If this ItemStack is already enchanted, the existing enchants will be removed before enchanting.</p> * <p>If this ItemStack is already enchanted, the existing enchants will be removed before enchanting.</p>
* *
* <p>Levels must be in range {@code [1, 30]}.</p> * <p>Enchantment tables use levels in the range {@code [1, 30]}.</p>
* *
* @param levels levels to use for enchanting * @param levels levels to use for enchanting
* @param allowTreasure whether to allow enchantments where {@link org.bukkit.enchantments.Enchantment#isTreasure()} returns true * @param allowTreasure whether to allow enchantments where {@link org.bukkit.enchantments.Enchantment#isTreasure()} returns true
@@ -692,7 +692,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
* @throws IllegalArgumentException on bad arguments * @throws IllegalArgumentException on bad arguments
*/ */
@NotNull @NotNull
public ItemStack enchantWithLevels(final @org.jetbrains.annotations.Range(from = 1, to = 30) int levels, final boolean allowTreasure, final @NotNull java.util.Random random) { public ItemStack enchantWithLevels(final int levels, final boolean allowTreasure, final @NotNull java.util.Random random) {
return Bukkit.getServer().getItemFactory().enchantWithLevels(this, levels, allowTreasure, random); return Bukkit.getServer().getItemFactory().enchantWithLevels(this, levels, allowTreasure, random);
} }
@@ -701,7 +701,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
* *
* <p>If the provided ItemStack is already enchanted, the existing enchants will be removed before enchanting.</p> * <p>If the provided ItemStack is already enchanted, the existing enchants will be removed before enchanting.</p>
* *
* <p>Levels must be in range {@code [1, 30]}.</p> * <p>Enchantment tables use levels in the range {@code [1, 30]}.</p>
* *
* @param levels levels to use for enchanting * @param levels levels to use for enchanting
* @param keySet registry key set defining the set of possible enchantments, e.g. {@link io.papermc.paper.registry.keys.tags.EnchantmentTagKeys#IN_ENCHANTING_TABLE}. * @param keySet registry key set defining the set of possible enchantments, e.g. {@link io.papermc.paper.registry.keys.tags.EnchantmentTagKeys#IN_ENCHANTING_TABLE}.
@@ -709,7 +709,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
* @return enchanted copy of the provided ItemStack * @return enchanted copy of the provided ItemStack
* @throws IllegalArgumentException on bad arguments * @throws IllegalArgumentException on bad arguments
*/ */
public @NotNull ItemStack enchantWithLevels(final @org.jetbrains.annotations.Range(from = 1, to = 30) int levels, final @NotNull io.papermc.paper.registry.set.RegistryKeySet<@NotNull Enchantment> keySet, final @NotNull java.util.Random random) { public @NotNull ItemStack enchantWithLevels(final int levels, final @NotNull io.papermc.paper.registry.set.RegistryKeySet<@NotNull Enchantment> keySet, final @NotNull java.util.Random random) {
return Bukkit.getItemFactory().enchantWithLevels(this, levels, keySet, random); return Bukkit.getItemFactory().enchantWithLevels(this, levels, keySet, random);
} }

1
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
View File

@@ -349,7 +349,6 @@ public final class CraftItemFactory implements ItemFactory {
) { ) {
Preconditions.checkArgument(itemStack != null, "Argument 'itemStack' must not be null"); Preconditions.checkArgument(itemStack != null, "Argument 'itemStack' must not be null");
Preconditions.checkArgument(!itemStack.isEmpty(), "Argument 'itemStack' cannot be empty"); Preconditions.checkArgument(!itemStack.isEmpty(), "Argument 'itemStack' cannot be empty");
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"); Preconditions.checkArgument(random != null, "Argument 'random' must not be null");
final net.minecraft.world.item.ItemStack internalStack = CraftItemStack.asNMSCopy(itemStack); final net.minecraft.world.item.ItemStack internalStack = CraftItemStack.asNMSCopy(itemStack);
if (internalStack.isEnchanted()) { if (internalStack.isEnchanted()) {