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

106 lines
4.3 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>
2024-05-26 01:47:14 +02:00
Co-authored-by: Janet Blackquill <uhhadd@gmail.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
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
+++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
2024-06-14 00:44:26 +02:00
@@ -0,0 +0,0 @@ import java.util.Locale;
import net.minecraft.Util;
import net.minecraft.core.Holder;
import net.minecraft.core.registries.Registries;
+import net.minecraft.network.chat.contents.TranslatableContents;
import net.minecraft.tags.EnchantmentTags;
import org.bukkit.NamespacedKey;
import org.bukkit.Registry;
@@ -0,0 +0,0 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
2021-06-11 14:02:28 +02:00
@Override
2024-06-14 00:44:26 +02:00
public boolean isTreasure() {
- return !this.handle.is(EnchantmentTags.IN_ENCHANTING_TABLE);
+ return this.handle.is(EnchantmentTags.TREASURE); // Paper - use treasure tag
2021-06-11 14:02:28 +02:00
}
@Override
@@ -0,0 +0,0 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
2024-04-27 08:17:58 +02:00
// Paper start
@Override
public net.kyori.adventure.text.Component displayName(int level) {
- return io.papermc.paper.adventure.PaperAdventure.asAdventure(getHandle().getFullname(level));
2024-06-14 00:44:26 +02:00
+ return io.papermc.paper.adventure.PaperAdventure.asAdventure(net.minecraft.world.item.enchantment.Enchantment.getFullname(this.handle, level));
2024-04-27 08:17:58 +02:00
}
2024-08-17 22:58:36 +02:00
// Paper end
2024-04-27 08:17:58 +02:00
2024-08-17 22:58:36 +02:00
@@ -0,0 +0,0 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
throw new UnsupportedOperationException("Description isn't translatable!"); // Paper
}
return translatableContents.getKey();
-
}
// Paper end - add translationKey methods
+ // Paper start - more Enchantment API
2021-06-11 14:02:28 +02:00
+ @Override
+ public boolean isTradeable() {
2024-06-14 00:44:26 +02:00
+ return this.handle.is(EnchantmentTags.TRADEABLE);
2021-06-11 14:02:28 +02:00
+ }
+
+ @Override
+ public boolean isDiscoverable() {
2024-06-14 00:44:26 +02:00
+ return this.handle.is(EnchantmentTags.IN_ENCHANTING_TABLE)
+ || this.handle.is(EnchantmentTags.ON_RANDOM_LOOT)
+ || this.handle.is(EnchantmentTags.ON_MOB_SPAWN_EQUIPMENT)
+ || this.handle.is(EnchantmentTags.TRADEABLE)
+ || this.handle.is(EnchantmentTags.ON_TRADED_EQUIPMENT);
2021-06-11 14:02:28 +02:00
+ }
+
+ @Override
+ public int getMinModifiedCost(int level) {
2024-06-14 00:44:26 +02:00
+ return this.getHandle().definition().minCost().calculate(level);
+ }
+
+ @Override
+ public int getMaxModifiedCost(int level) {
2024-06-14 00:44:26 +02:00
+ return this.getHandle().definition().maxCost().calculate(level);
+ }
+
+ @Override
2024-05-26 01:47:14 +02:00
+ public int getAnvilCost() {
2024-06-14 00:44:26 +02:00
+ return this.getHandle().definition().anvilCost();
2024-05-26 01:47:14 +02:00
+ }
+
+ @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-06-14 00:44:26 +02:00
+ throw new UnsupportedOperationException("Enchantments are based on complex effect maps since 1.21, cannot compute a simple damage increase");
+ }
+
+ @Override
+ public float getDamageIncrease(int level, org.bukkit.entity.EntityType entityType) {
2024-06-14 00:44:26 +02:00
+ throw new UnsupportedOperationException("Enchantments are based on complex effect maps since 1.21, cannot compute a simple damage increase");
2021-06-11 14:02:28 +02:00
+ }
+
+ @Override
2024-06-14 00:44:26 +02:00
+ public java.util.Set<org.bukkit.inventory.EquipmentSlotGroup> getActiveSlotGroups() {
+ return this.getHandle().definition().slots().stream()
+ .map(org.bukkit.craftbukkit.CraftEquipmentSlot::getSlot)
+ .collect(java.util.stream.Collectors.toSet());
2024-08-17 22:58:36 +02:00
+ }
+ // Paper end - more Enchantment API
+
@Override
public String getTranslationKey() {
return Util.makeDescriptionId("enchantment", this.handle.unwrapKey().get().location());