mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-28 13:36:16 +01:00
52a05907c7
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 97c59261 PR-1073: Make Biome an interface a38581aa Fix further javadoc errors 8271c490 Fix javadoc error 8a9ecf29 PR-1072: Fix bad naming for Vault State methods 6dd58108 PR-1071: Make Fluid an interface and add missing entry ed2cdfc3 PR-1070: Make Attribute an interface and align names with the new minecraft ones 63472efb PR-1069: Add missing winter drop experimental annotation to pale boats CraftBukkit Changes: 7235ad7b0 PR-1501: Make Biome an interface 602904003 PR-1500: Rename implementation for Vault State methods 75f26f79f PR-1499: Make Fluid an interface and add missing entry 4cfd87adc PR-1498: Make Attribute an interface and align names with the new minecraft ones 6bb0db5cb SPIGOT-7928: ExactChoice acts as MaterialChoice 3eaf3a13c SPIGOT-7929: Error when setting EquippableComponent abbf57bac SPIGOT-7930: Fix spawning entities with SummonEntityEffect 92d6ab6cf PR-1497: Move boat field rename entries to below key renaming, so that keys are also renamed abfe292aa PR-1496: Use correct Fluid class on Tags type check c7aab7fa7 SPIGOT-7923: Fix Dispenser logic to avoid firing empty projectiles
87 lines
4.0 KiB
Diff
87 lines
4.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Thu, 20 Jan 2022 18:11:44 -0800
|
|
Subject: [PATCH] Expand PlayerItemMendEvent
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerItemMendEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemMendEvent.java
|
|
index 5b2415c2c92127947a21dfe8d672d2b88ea457df..2be94101e96a4ff011e872437ea24b15cb356ee3 100644
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerItemMendEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerItemMendEvent.java
|
|
@@ -6,6 +6,7 @@ import org.bukkit.event.Cancellable;
|
|
import org.bukkit.event.HandlerList;
|
|
import org.bukkit.inventory.EquipmentSlot;
|
|
import org.bukkit.inventory.ItemStack;
|
|
+import org.jetbrains.annotations.Contract;
|
|
import org.jetbrains.annotations.NotNull;
|
|
|
|
/**
|
|
@@ -23,14 +24,67 @@ public class PlayerItemMendEvent extends PlayerEvent implements Cancellable {
|
|
private final ExperienceOrb experienceOrb;
|
|
private int repairAmount;
|
|
private boolean cancelled;
|
|
+ private final int consumedExperience; // Paper
|
|
|
|
+ @Deprecated // Paper
|
|
public PlayerItemMendEvent(@NotNull Player who, @NotNull ItemStack item, @NotNull EquipmentSlot slot, @NotNull ExperienceOrb experienceOrb, int repairAmount) {
|
|
+ // Paper start
|
|
+ this(who, item, slot, experienceOrb, repairAmount, repairAmount / 2);
|
|
+ }
|
|
+
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal
|
|
+ public PlayerItemMendEvent(@NotNull Player who, @NotNull ItemStack item, @NotNull EquipmentSlot slot, @NotNull ExperienceOrb experienceOrb, int repairAmount, int consumedExperience) {
|
|
+ // Paper end
|
|
super(who);
|
|
this.item = item;
|
|
this.slot = slot;
|
|
this.experienceOrb = experienceOrb;
|
|
this.repairAmount = repairAmount;
|
|
+ // Paper start
|
|
+ this.consumedExperience = consumedExperience;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get the operation used to calculate xp used based on
|
|
+ * the set repair amount. Used to calculate how much of
|
|
+ * an XP orb will be consumed by this mend operation.
|
|
+ *
|
|
+ * @return the durability-to-xp operation
|
|
+ * @deprecated the mending enchantment uses enchantment effects to compute how much durability is granted per xp.
|
|
+ * The enchantment effects operation are too complex to reliably offer the inverse function.
|
|
+ */
|
|
+ @Contract("-> fail")
|
|
+ @Deprecated(forRemoval = true, since = "1.21")
|
|
+ public @NotNull java.util.function.IntUnaryOperator getDurabilityToXpOperation() {
|
|
+ throw new UnsupportedOperationException("Enchantments use effects to compute xp to durability since 1.21.");
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the operation used to calculate xp used based on
|
|
+ * the set repair amount. Used to calculate how much of
|
|
+ * an XP orb will be consumed by this mend operation.
|
|
+ *
|
|
+ * @param durabilityToXpOp the durability-to-xp operation
|
|
+ * @deprecated the mending enchantment uses enchantment effects to compute how much durability is granted per xp.
|
|
+ * The enchantment effects operation are too complex to reliably offer the inverse function.
|
|
+ */
|
|
+ @Contract("_ -> fail")
|
|
+ @Deprecated(forRemoval = true, since = "1.21")
|
|
+ public void setDurabilityToXpOperation(@NotNull java.util.function.IntUnaryOperator durabilityToXpOp) {
|
|
+ throw new UnsupportedOperationException("Enchantments use effects to compute xp to durability since 1.21.");
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Helper method to get the amount of experience that will be consumed.
|
|
+ * This method just returns the result of inputting {@link #getRepairAmount()}
|
|
+ * into the function {@link #getDurabilityToXpOperation()}.
|
|
+ *
|
|
+ * @return the amount of xp that will be consumed
|
|
+ */
|
|
+ public int getConsumedExperience() {
|
|
+ return this.consumedExperience;
|
|
}
|
|
+ // Paper end
|
|
|
|
@Deprecated
|
|
public PlayerItemMendEvent(@NotNull Player who, @NotNull ItemStack item, @NotNull ExperienceOrb experienceOrb, int repairAmount) {
|