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

Update to Minecraft 1.20.5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-04-24 01:15:00 +10:00
parent 4deda9501f
commit 65bc2541a3
524 changed files with 7788 additions and 6181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package org.bukkit.craftbukkit.enchantments;
import net.minecraft.core.Holder;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.world.item.enchantment.EnchantmentBinding;
@@ -20,6 +21,10 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
return CraftRegistry.minecraftToBukkit(minecraft, Registries.ENCHANTMENT, Registry.ENCHANTMENT);
}
public static Enchantment minecraftHolderToBukkit(Holder<net.minecraft.world.item.enchantment.Enchantment> minecraft) {
return minecraftToBukkit(minecraft.value());
}
public static net.minecraft.world.item.enchantment.Enchantment bukkitToMinecraft(Enchantment bukkit) {
return CraftRegistry.bukkitToMinecraft(bukkit);
}
@@ -56,22 +61,7 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
@Override
public EnchantmentTarget getItemTarget() {
return switch (handle.category) {
case ARMOR -> EnchantmentTarget.ARMOR;
case ARMOR_FEET -> EnchantmentTarget.ARMOR_FEET;
case ARMOR_HEAD -> EnchantmentTarget.ARMOR_HEAD;
case ARMOR_LEGS -> EnchantmentTarget.ARMOR_LEGS;
case ARMOR_CHEST -> EnchantmentTarget.ARMOR_TORSO;
case DIGGER -> EnchantmentTarget.TOOL;
case WEAPON -> EnchantmentTarget.WEAPON;
case BOW -> EnchantmentTarget.BOW;
case FISHING_ROD -> EnchantmentTarget.FISHING_ROD;
case BREAKABLE -> EnchantmentTarget.BREAKABLE;
case WEARABLE -> EnchantmentTarget.WEARABLE;
case TRIDENT -> EnchantmentTarget.TRIDENT;
case CROSSBOW -> EnchantmentTarget.CROSSBOW;
case VANISHABLE -> EnchantmentTarget.VANISHABLE;
};
throw new UnsupportedOperationException("Method longer applicable. Use Tags instead.");
}
@Override
@@ -130,8 +120,11 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
case 34 -> "MULTISHOT";
case 35 -> "QUICK_CHARGE";
case 36 -> "PIERCING";
case 37 -> "MENDING";
case 38 -> "VANISHING_CURSE";
case 37 -> "DENSITY";
case 38 -> "BREACH";
case 39 -> "WIND_BURST";
case 40 -> "MENDING";
case 41 -> "VANISHING_CURSE";
default -> getKey().toString();
};
}