twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-04 06:02:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix more compile issues

Browse Source
This commit is contained in:
Nassim Jahnke
2024-06-14 14:11:52 +02:00
parent 9206b1ea14
commit bcdf841f2d
25 changed files with 206 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
patches/api/Add-UUID-attribute-modifier-API.patch
View File

@@ -14,21 +14,80 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // 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.
*
diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
+++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
@@ -0,0 +0,0 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed {
private final Operation operation;
private final EquipmentSlotGroup slot;
- @Deprecated
+ @Deprecated(forRemoval = true, since = "1.21")
public AttributeModifier(@NotNull String name, double amount, @NotNull Operation operation) {
this(UUID.randomUUID(), name, amount, operation);
}
- @Deprecated
+ @Deprecated(forRemoval = true, since = "1.21")
public AttributeModifier(@NotNull UUID uuid, @NotNull String name, double amount, @NotNull Operation operation) {
this(uuid, name, amount, operation, (EquipmentSlot) null);
}
- @Deprecated
+ @Deprecated(forRemoval = true, since = "1.21")
public AttributeModifier(@NotNull UUID uuid, @NotNull String name, double amount, @NotNull Operation operation, @Nullable EquipmentSlot slot) {
this(uuid, name, amount, operation, (slot) == null ? EquipmentSlotGroup.ANY : slot.getGroup());
}
- @Deprecated
+ @Deprecated(forRemoval = true, since = "1.21")
public AttributeModifier(@NotNull UUID uuid, @NotNull String name, double amount, @NotNull Operation operation, @NotNull EquipmentSlotGroup slot) {
this(NamespacedKey.fromString(uuid.toString()), amount, operation, slot);
}
@@ -0,0 +0,0 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed {
* @deprecated attributes are now identified by keys
*/
@NotNull
- @Deprecated
+ @Deprecated(forRemoval = true, since = "1.21")
public UUID getUniqueId() {
return UUID.fromString(getKey().toString());
}