SPIGOT-6026: Pull PotionEffectType and Enchantment from registry

By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
Bukkit/Spigot
2023-12-06 03:40:00 +11:00
parent d569990c3b
commit 9ac8229b9b
5 changed files with 261 additions and 350 deletions

View File

@@ -1,15 +1,14 @@
package org.bukkit.enchantments;
import org.bukkit.NamespacedKey;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
/**
* A simple wrapper for ease of selecting {@link Enchantment}s
* @deprecated only for backwards compatibility, EnchantmentWrapper is no longer used.
*/
public class EnchantmentWrapper extends Enchantment {
public EnchantmentWrapper(@NotNull String name) {
super(NamespacedKey.minecraft(name));
@Deprecated
public abstract class EnchantmentWrapper extends Enchantment {
protected EnchantmentWrapper() {
}
/**
@@ -19,48 +18,6 @@ public class EnchantmentWrapper extends Enchantment {
*/
@NotNull
public Enchantment getEnchantment() {
return Enchantment.getByKey(getKey());
}
@Override
public int getMaxLevel() {
return getEnchantment().getMaxLevel();
}
@Override
public int getStartLevel() {
return getEnchantment().getStartLevel();
}
@NotNull
@Override
public EnchantmentTarget getItemTarget() {
return getEnchantment().getItemTarget();
}
@Override
public boolean canEnchantItem(@NotNull ItemStack item) {
return getEnchantment().canEnchantItem(item);
}
@NotNull
@Override
public String getName() {
return getEnchantment().getName();
}
@Override
public boolean isTreasure() {
return getEnchantment().isTreasure();
}
@Override
public boolean isCursed() {
return getEnchantment().isCursed();
}
@Override
public boolean conflictsWith(@NotNull Enchantment other) {
return getEnchantment().conflictsWith(other);
return this;
}
}