mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-23 15:00:30 +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
88 lines
3.7 KiB
Diff
88 lines
3.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: TonytheMacaroni <tonythemacaroni123@gmail.com>
|
|
Date: Thu, 9 Nov 2023 20:35:35 -0500
|
|
Subject: [PATCH] Attribute Modifier API improvements
|
|
|
|
Co-authored-by: Malfrador <malfrador@gmail.com>
|
|
|
|
diff --git a/src/main/java/org/bukkit/attribute/AttributeInstance.java b/src/main/java/org/bukkit/attribute/AttributeInstance.java
|
|
index f08ee26cc4d479e1bfc5264b8cbe721315de91f2..f1fa86ddf1f50a357c9e94cc61261d8c96a2da6f 100644
|
|
--- a/src/main/java/org/bukkit/attribute/AttributeInstance.java
|
|
+++ b/src/main/java/org/bukkit/attribute/AttributeInstance.java
|
|
@@ -39,6 +39,42 @@ public interface AttributeInstance {
|
|
@NotNull
|
|
Collection<AttributeModifier> getModifiers();
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the modifier with the corresponding key.
|
|
+ *
|
|
+ * @param key the jey of the modifier
|
|
+ * @return the modifier, if it exists
|
|
+ */
|
|
+ @org.jetbrains.annotations.Nullable AttributeModifier getModifier(@NotNull net.kyori.adventure.key.Key key);
|
|
+
|
|
+ /**
|
|
+ * Remove a modifier with the corresponding key from this instance.
|
|
+ *
|
|
+ * @param key the key of the modifier
|
|
+ */
|
|
+ void removeModifier(@NotNull net.kyori.adventure.key.Key key);
|
|
+
|
|
+ /**
|
|
+ * Gets the modifier with the corresponding UUID.
|
|
+ *
|
|
+ * @param uuid the UUID of the modifier
|
|
+ * @return the modifier, if it exists
|
|
+ * @deprecated use {@link #getModifier(net.kyori.adventure.key.Key)}, modifiers are no longer stored by UUID
|
|
+ */
|
|
+ @Deprecated(forRemoval = true, since = "1.21")
|
|
+ @org.jetbrains.annotations.Nullable AttributeModifier getModifier(@NotNull java.util.UUID uuid);
|
|
+
|
|
+ /**
|
|
+ * Remove a modifier with the corresponding UUID from this instance.
|
|
+ *
|
|
+ * @param uuid the UUID of the modifier
|
|
+ * @deprecated use {@link #removeModifier(net.kyori.adventure.key.Key)}, modifiers are no longer stored by UUID
|
|
+ */
|
|
+ @Deprecated(forRemoval = true, since = "1.21")
|
|
+ void removeModifier(@NotNull java.util.UUID uuid);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Add a modifier to this instance.
|
|
*
|
|
@@ -46,6 +82,16 @@ public interface AttributeInstance {
|
|
*/
|
|
void addModifier(@NotNull AttributeModifier modifier);
|
|
|
|
+ // Paper start - Transient modifier API
|
|
+ /**
|
|
+ * Add a transient modifier to this instance.
|
|
+ * Transient modifiers are not persisted (saved with the NBT data)
|
|
+ *
|
|
+ * @param modifier to add
|
|
+ */
|
|
+ void addTransientModifier(@NotNull AttributeModifier modifier);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Remove a modifier from this instance.
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
|
|
index 8c53ac6b4381f3cf8b5e989c8b2a3ba77bd4e475..def473b6424da1e81448bd492b7fef46691eaf8c 100644
|
|
--- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
|
|
+++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
|
|
@@ -48,6 +48,12 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed {
|
|
this(NamespacedKey.fromString(uuid.toString()), amount, operation, slot);
|
|
}
|
|
|
|
+ // Paper start - Add constructor without EquipmentSlotGroup
|
|
+ public AttributeModifier(@NotNull NamespacedKey key, double amount, @NotNull Operation operation) {
|
|
+ this(key, amount, operation, EquipmentSlotGroup.ANY);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
public AttributeModifier(@NotNull NamespacedKey key, double amount, @NotNull Operation operation, @NotNull EquipmentSlotGroup slot) {
|
|
Preconditions.checkArgument(key != null, "Key cannot be null");
|
|
Preconditions.checkArgument(operation != null, "Operation cannot be null");
|