Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
d1a72eac31
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: 1fc1020a PR-1049: Add MenuType API 8ae2e3be PR-1055: Expand riptiding API cac68bfb SPIGOT-7890: AttributeModifier#getUniqueId() doesn't match the UUID passed to its constructor 7004fcf2 SPIGOT-7886: Fix mistake in AttributeModifier UUID shim 1ac7f950 PR-1054: Add FireworkMeta#hasPower 4cfb565f SPIGOT-7873: Add powered state for skulls CraftBukkit Changes: bbb30e7a8 SPIGOT-7894: NPE when sending tile entity update ba21e9472 SPIGOT-7895: PlayerItemBreakEvent not firing 0fb24bbe0 SPIGOT-7875: Fix PlayerItemConsumeEvent cancellation causing client-side desync 815066449 SPIGOT-7891: Can't remove second ingredient of MerchantRecipe 45c206f2c PR-1458: Add MenuType API 19c8ef9ae SPIGOT-7867: Merchant instanceof AbstractVillager always returns false 4e006d28f PR-1468: Expand riptiding API bd8aded7d Ignore checks in CraftPlayerProfile for ResolvableProfile used in profile components 8679620b5 SPIGOT-7889: Fix tool component deserialisation without speed and/or correct-for-drops 8d5222691 SPIGOT-7882, PR-1467: Fix conversion of name in Profile Component to empty if it is missing 63f91669a SPIGOT-7887: Remove duplicate ProjectileHitEvent for fireballs 7070de8c8 SPIGOT-7878: Server#getLootTable does not return null on invalid loot table 060ee6cae SPIGOT-7876: Can't kick player or disconnect player in PlayerLoginEvent when checking for cookies 7ccb86cc0 PR-1465: Add FireworkMeta#hasPower 804ad6491 SPIGOT-7873: Add powered state for skulls f9610cdcb Improve minecart movement Spigot Changes: a759b629 Rebuild patches Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
100 Zeilen
4.6 KiB
Diff
100 Zeilen
4.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sat, 8 May 2021 15:02:00 -0700
|
|
Subject: [PATCH] Improve item default attribute API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
|
|
index d0aaf145cf34e0c02d5c7b842c203d0630b04b53..5c869feaecd95dbdd658e16f5739bb41540f18bd 100644
|
|
--- a/src/main/java/org/bukkit/Material.java
|
|
+++ b/src/main/java/org/bukkit/Material.java
|
|
@@ -4705,6 +4705,23 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
|
}
|
|
// Paper end - item rarity API
|
|
|
|
+ // Paper start - item default attributes API
|
|
+ /**
|
|
+ * Returns an immutable multimap of attributes for the slot.
|
|
+ * {@link #isItem()} must be true for this material.
|
|
+ *
|
|
+ * @param equipmentSlot the slot to get the attributes for
|
|
+ * @throws IllegalArgumentException if {@link #isItem()} is false
|
|
+ * @return an immutable multimap of attributes
|
|
+ * @deprecated use {@link #getDefaultAttributeModifiers(EquipmentSlot)}
|
|
+ */
|
|
+ @NotNull
|
|
+ @Deprecated(forRemoval = true, since = "1.20.5")
|
|
+ public Multimap<Attribute, AttributeModifier> getItemAttributes(@NotNull EquipmentSlot equipmentSlot) {
|
|
+ return this.getDefaultAttributeModifiers(equipmentSlot);
|
|
+ }
|
|
+ // Paper end - item default attributes API
|
|
+
|
|
/**
|
|
* Do not use for any reason.
|
|
*
|
|
@@ -5412,13 +5429,34 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
|
}
|
|
}
|
|
|
|
+ // Paper start - improve default item attribute API
|
|
+ /**
|
|
+ * Return an immutable copy of all default {@link Attribute}s and their {@link AttributeModifier}s.
|
|
+ * <p>
|
|
+ * Default attributes are those that are always preset on some items, unless
|
|
+ * they are specifically overridden on that {@link ItemStack}. Examples include
|
|
+ * the attack damage on weapons or the armor value on armor.
|
|
+ * <p>
|
|
+ * Only available when {@link #isItem()} is true.
|
|
+ *
|
|
+ * @return the immutable {@link Multimap} with the respective default
|
|
+ * Attributes and modifiers, or an empty map if no attributes are set.
|
|
+ */
|
|
+ public @NotNull @org.jetbrains.annotations.Unmodifiable Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers() {
|
|
+ final ItemType type = this.asItemType();
|
|
+ Preconditions.checkArgument(type != null, "The Material is not an item!");
|
|
+ return type.getDefaultAttributeModifiers();
|
|
+ }
|
|
+ // Paper end - improve default item attribute API
|
|
+
|
|
/**
|
|
* Return an immutable copy of all default {@link Attribute}s and their
|
|
* {@link AttributeModifier}s for a given {@link EquipmentSlot}.
|
|
- *
|
|
- * Default attributes are those that are always preset on some items, such
|
|
- * as the attack damage on weapons or the armor value on armor.
|
|
- *
|
|
+ * <p>
|
|
+ * Default attributes are those that are always preset on some items, unless
|
|
+ * they are specifically overridden on that {@link ItemStack}. Examples include
|
|
+ * the attack damage on weapons or the armor value on armor.
|
|
+ * <p>
|
|
* Only available when {@link #isItem()} is true.
|
|
*
|
|
* @param slot the {@link EquipmentSlot} to check
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java
|
|
index 2b5a18fe7e885fa9b581c0afb299e31f3db2690c..a6d1dde422de98f178c0c9add99e01203a35e5cb 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ItemType.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemType.java
|
|
@@ -2261,6 +2261,21 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
|
|
// @NotNull
|
|
// EquipmentSlot getEquipmentSlot();
|
|
|
|
+ // Paper start - improve default item attribute API
|
|
+ /**
|
|
+ * Return an immutable copy of all default {@link Attribute}s and their
|
|
+ * {@link AttributeModifier}s.
|
|
+ * <p>
|
|
+ * Default attributes are those that are always preset on some items, unless
|
|
+ * they are specifically overridden on that {@link ItemStack}. Examples include
|
|
+ * the attack damage on weapons or the armor value on armor.
|
|
+ *
|
|
+ * @return the immutable {@link Multimap} with the respective default
|
|
+ * Attributes and modifiers, or an empty map if no attributes are set.
|
|
+ */
|
|
+ @NotNull @org.jetbrains.annotations.Unmodifiable Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers();
|
|
+ // Paper end - improve default item attribute API
|
|
+
|
|
/**
|
|
* Return an immutable copy of all default {@link Attribute}s and their
|
|
* {@link AttributeModifier}s for a given {@link EquipmentSlot}.
|