SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.21

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-06-14 01:05:00 +10:00
parent 7c6204e1a9
commit eed041d629
255 changed files with 3585 additions and 3261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
paper-server/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
View File

@@ -2,11 +2,10 @@ package org.bukkit.craftbukkit.enchantments;
import com.google.common.base.Preconditions;
import java.util.Locale;
import net.minecraft.SystemUtils;
import net.minecraft.core.Holder;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.world.item.enchantment.EnchantmentBinding;
import net.minecraft.world.item.enchantment.EnchantmentVanishing;
import net.minecraft.tags.EnchantmentTags;
import org.bukkit.NamespacedKey;
import org.bukkit.Registry;
import org.bukkit.craftbukkit.CraftRegistry;
@@ -33,6 +32,10 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
return CraftRegistry.bukkitToMinecraft(bukkit);
}
public static Holder<net.minecraft.world.item.enchantment.Enchantment> bukkitToMinecraftHolder(Enchantment bukkit) {
return CraftRegistry.bukkitToMinecraftHolder(bukkit, Registries.ENCHANTMENT);
}
public static String bukkitToString(Enchantment bukkit) {
Preconditions.checkArgument(bukkit != null);
@@ -53,18 +56,18 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
}
private final NamespacedKey key;
private final net.minecraft.world.item.enchantment.Enchantment handle;
private final Holder<net.minecraft.world.item.enchantment.Enchantment> handle;
private final int id;
public CraftEnchantment(NamespacedKey key, net.minecraft.world.item.enchantment.Enchantment handle) {
this.key = key;
this.handle = handle;
this.id = BuiltInRegistries.ENCHANTMENT.getId(handle);
this.handle = CraftRegistry.getMinecraftRegistry(Registries.ENCHANTMENT).wrapAsHolder(handle);
this.id = CraftRegistry.getMinecraftRegistry(Registries.ENCHANTMENT).getId(handle);
}
@Override
public net.minecraft.world.item.enchantment.Enchantment getHandle() {
return handle;
return handle.value();
}
@Override
@@ -74,12 +77,12 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
@Override
public int getMaxLevel() {
return handle.getMaxLevel();
return getHandle().getMaxLevel();
}
@Override
public int getStartLevel() {
return handle.getMinLevel();
return getHandle().getMinLevel();
}
@Override
@@ -89,17 +92,17 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
@Override
public boolean isTreasure() {
return handle.isTreasureOnly();
return !handle.is(EnchantmentTags.IN_ENCHANTING_TABLE);
}
@Override
public boolean isCursed() {
return handle instanceof EnchantmentBinding || handle instanceof EnchantmentVanishing;
return handle.is(EnchantmentTags.CURSE);
}
@Override
public boolean canEnchantItem(ItemStack item) {
return handle.canEnchant(CraftItemStack.asNMSCopy(item));
return getHandle().canEnchant(CraftItemStack.asNMSCopy(item));
}
@Override
@@ -161,12 +164,12 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
return false;
}
CraftEnchantment ench = (CraftEnchantment) other;
return !handle.isCompatibleWith(ench.getHandle());
return !net.minecraft.world.item.enchantment.Enchantment.areCompatible(handle, ench.handle);
}
@Override
public String getTranslationKey() {
return handle.getDescriptionId();
return SystemUtils.makeDescriptionId("enchantment", handle.unwrapKey().get().location());
}
@Override