PaperMC/patches/server/0548-More-Enchantment-API.patch

96 lines
3.8 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Thu, 6 May 2021 19:57:58 -0700
Subject: [PATCH] More Enchantment API
== AT ==
2024-04-25 21:16:00 +02:00
public net.minecraft.world.item.enchantment.Enchantment definition
2021-06-11 14:02:28 +02:00
Co-authored-by: Luis <luisc99@icloud.com>
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
2024-04-27 08:17:58 +02:00
index bb8a3e670924ebcce48669c5dce57e2df03fad77..552f703f6b06895246de72501d01163d9f24dad2 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
+++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
2024-04-24 15:46:45 +02:00
@@ -71,7 +71,7 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
2021-06-11 14:02:28 +02:00
@Override
public boolean isCursed() {
2023-12-06 04:57:46 +01:00
- return this.handle instanceof BindingCurseEnchantment || this.handle instanceof VanishingCurseEnchantment;
+ return this.handle.isCurse(); // Paper - More Enchantment API
2021-06-11 14:02:28 +02:00
}
@Override
2024-04-27 08:17:58 +02:00
@@ -143,13 +143,70 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
// Paper start
@Override
public net.kyori.adventure.text.Component displayName(int level) {
- return io.papermc.paper.adventure.PaperAdventure.asAdventure(getHandle().getFullname(level));
+ return io.papermc.paper.adventure.PaperAdventure.asAdventure(this.handle.getFullname(level));
}
@Override
public String translationKey() {
2023-12-06 19:21:23 +01:00
return this.handle.getDescriptionId();
2021-06-11 14:02:28 +02:00
}
+
+ @Override
+ public boolean isTradeable() {
2024-04-27 08:17:58 +02:00
+ return this.handle.isTradeable();
2021-06-11 14:02:28 +02:00
+ }
+
+ @Override
+ public boolean isDiscoverable() {
2024-04-27 08:17:58 +02:00
+ return this.handle.isDiscoverable();
2021-06-11 14:02:28 +02:00
+ }
+
+ @Override
+ public int getMinModifiedCost(int level) {
2024-04-27 08:17:58 +02:00
+ return this.handle.getMinCost(level);
+ }
+
+ @Override
+ public int getMaxModifiedCost(int level) {
2024-04-27 08:17:58 +02:00
+ return this.handle.getMaxCost(level);
+ }
+
+ @Override
2021-06-11 14:02:28 +02:00
+ public io.papermc.paper.enchantments.EnchantmentRarity getRarity() {
2024-04-25 21:16:00 +02:00
+ throw new UnsupportedOperationException("Enchantments don't have a rarity anymore in 1.20.5+.");
2021-06-11 14:02:28 +02:00
+ }
+
+ @Override
+ public float getDamageIncrease(int level, org.bukkit.entity.EntityCategory entityCategory) {
2024-04-27 08:17:58 +02:00
+ return this.handle.getDamageBonus(level, this.guessEntityTypeFromEnchantmentCategory(entityCategory));
+ }
+
+ @Override
+ public float getDamageIncrease(int level, org.bukkit.entity.EntityType entityType) {
2024-04-27 08:17:58 +02:00
+ return this.handle.getDamageBonus(level, org.bukkit.craftbukkit.util.CraftMagicNumbers.getEntityTypes(entityType));
+ }
+
+ @Deprecated(forRemoval = true)
+ private net.minecraft.world.entity.EntityType<?> guessEntityTypeFromEnchantmentCategory(
+ final org.bukkit.entity.EntityCategory entityCategory
+ ) {
+ final net.minecraft.tags.TagKey<net.minecraft.world.entity.EntityType<?>> tag = switch (entityCategory) {
+ case ARTHROPOD -> net.minecraft.tags.EntityTypeTags.SENSITIVE_TO_BANE_OF_ARTHROPODS;
+ case UNDEAD -> net.minecraft.tags.EntityTypeTags.SENSITIVE_TO_SMITE;
+ case WATER -> net.minecraft.tags.EntityTypeTags.SENSITIVE_TO_IMPALING;
+ default -> null;
+ };
+ if (tag == null) return null;
+
+ return net.minecraft.core.registries.BuiltInRegistries.ENTITY_TYPE.getTag(tag)
+ .map(e -> e.size() > 0 ? e.get(0).value() : null)
+ .orElse(null);
2021-06-11 14:02:28 +02:00
+ }
+
+ @Override
+ public java.util.Set<org.bukkit.inventory.EquipmentSlot> getActiveSlots() {
2024-04-27 08:17:58 +02:00
+ return java.util.stream.Stream.of(this.handle.definition.slots()).map(org.bukkit.craftbukkit.CraftEquipmentSlot::getSlot).collect(java.util.stream.Collectors.toSet());
2021-06-11 14:02:28 +02:00
+ }
// Paper end
2023-12-06 04:57:46 +01:00
@Override