mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-05 00:43:56 +01:00
79e2cb620e
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: 376e37db SPIGOT-7677: Update which entities are marked as spawnable 06c4add3 SPIGOT-7737: Add separate TreeType.MEGA_PINE 19b7caaa SPIGOT-7731: Spawn eggs cannot have damage e585297e PR-1022: Add force option to Player#spawnParticle d26e0094 PR-1018: Add methods to get players seeing specific chunks 8df1ed18 PR-978: Add Material#isCompostable and Material#getCompostChance 4b9b59c7 SPIGOT-7676: Enforce locale parameter in toLowerCase and toUpperCase method calls and always use root locale 8d1e700a PR-1020: Cast instead of using #typed when getting BlockType and ItemType to better work with testing / mocks fa28607a PR-1016: Fix incorrect assumption of Fireball having constant speed 4c6c8586 PR-1015: Add a tool component to ItemMeta 6f6b2123 PR-1014: Add PotionEffectTypeCategory to distinguish between beneficial and harmful effects f511cfe1 PR-1013, SPIGOT-4288, SPIGOT-6202: Add material rerouting in preparation for the switch to ItemType and BlockType def44cbf SPIGOT-7669: Fix typo in ProjectileHitEvent#getHitBlockFace documentation 53fa4f72 PR-1011: Throw an exception if a RecipeChoice is ever supplied air CraftBukkit Changes: ee95e171a SPIGOT-7737: Add separate TreeType.MEGA_PINE 0dae4c62c Fix spawn egg equality check and copy constructor ab59e847c Fix spawn eggs with no entity creating invalid stacks and disconnect creative clients 3b6093b28 SPIGOT-7736: Creative spawn egg use loses components c6b4d5a87 SPIGOT-7731: Spawn eggs cannot have damage 340ccd57f SPIGOT-7735: Fix serialization of player heads with note block sound fd2f41834 SPIGOT-7734: Can't register a custom advancement using unsafe() 02456e2a5 PR-1413: Add force option to Player#spawnParticle 6a61f38b2 SPIGOT-7680: Per-world weather command 58c41cebb PR-1409: Add methods to get players seeing specific chunks 16c976797 PR-1412: Fix shipwreck loot tables not being set for BlockTransformers 7189ba636 PR-1360: Add Material#isCompostable and Material#getCompostChance 900384556 SPIGOT-7676: Enforce locale parameter in toLowerCase and toUpperCase method calls and always use root locale bdb40c5f1 Increase outdated build delay d6607c7dd SPIGOT-7675: Fix FoodComponent config deserialization b148ed332 PR-1406: Fix incorrect assumption of Fireball having constant speed 3ec31ca75 PR-1405: Add a tool component to ItemMeta 5d7d675b9 PR-1404: Add PotionEffectTypeCategory to distinguish between beneficial and harmful effects 960827981 PR-1403, SPIGOT-4288, SPIGOT-6202: Add material rerouting in preparation for the switch to ItemType and BlockType 94e44ec93 PR-1401: Add a config option to accept old keys in registry get calls a43701920 PR-1402: Fix ChunkSnapshot#isSectionEmpty() is always false 87d0a3368 SPIGOT-7668: Move NONE Registry updater to FieldRename to avoid some class loader issues 2ea1e7ac2 PR-1399: Fix regression preventing positive .setDamage value from causing knockback for 0 damage events ba2d49d21 Increase outdated build delay Spigot Changes: fcd94e21 Rebuild patches 342f4939 SPIGOT-7661: Add experimental unload-frozen-chunks option
100 lines
4.6 KiB
Diff
100 lines
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 c96c927367d22e2651a553a5e6685bde9c8f8873..a011123035a96c05921f0a206b92bef15732b443 100644
|
|
--- a/src/main/java/org/bukkit/Material.java
|
|
+++ b/src/main/java/org/bukkit/Material.java
|
|
@@ -4771,6 +4771,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.
|
|
*
|
|
@@ -5478,13 +5495,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 006c5e6449ec21b96c9e5af2fa00ae240451eeca..a0cd105daf93fa02f243ef5b708efe9f3718d7bb 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ItemType.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemType.java
|
|
@@ -2404,6 +2404,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}.
|