geforkt von Mirrors/Paper
43 Zeilen
2.8 KiB
Diff
43 Zeilen
2.8 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:01:54 -0700
|
||
|
|
Subject: [PATCH] Attributes API for item defaults
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/item/Item.java b/src/main/java/net/minecraft/world/item/Item.java
|
||
|
|
index 42085d3f4ae5c6ceecaffde79fb3187712a2af00..3043378c3addf959e0ccf323c1cde8b300b5f237 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/item/Item.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/item/Item.java
|
||
|
|
@@ -274,6 +274,7 @@ public class Item implements ItemLike {
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public Multimap<Attribute, AttributeModifier> getAttributesForSlot(EquipmentSlot enumItemSlot) { return getDefaultAttributeModifiers(enumItemSlot); } // Paper - OBFHELPER
|
||
|
|
public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(EquipmentSlot slot) {
|
||
|
|
return ImmutableMultimap.of();
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||
|
|
index 34eed57c7ed884e0d634ca403e38d25c95b6a038..824111fc74bade75ce06b1f0b57498006d0a66cd 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||
|
|
@@ -493,6 +493,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
||
|
|
return this.getItem(itemToBeRepaired.getType()).canRepair(CraftItemStack.asNMSCopy(itemToBeRepaired), CraftItemStack.asNMSCopy(repairMaterial));
|
||
|
|
}
|
||
|
|
|
||
|
|
+ @Override
|
||
|
|
+ public com.google.common.collect.Multimap<org.bukkit.attribute.Attribute, org.bukkit.attribute.AttributeModifier> getItemAttributes(org.bukkit.Material material, org.bukkit.inventory.EquipmentSlot equipmentSlot) {
|
||
|
|
+ Item item = this.getItem(material);
|
||
|
|
+ if (item == null) {
|
||
|
|
+ throw new IllegalArgumentException(material + " is not an item and therefore does not have attributes");
|
||
|
|
+ }
|
||
|
|
+ com.google.common.collect.ImmutableMultimap.Builder<org.bukkit.attribute.Attribute, org.bukkit.attribute.AttributeModifier> attributeMapBuilder = com.google.common.collect.ImmutableMultimap.builder();
|
||
|
|
+ item.getAttributesForSlot(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(equipmentSlot)).forEach((attributeBase, attributeModifier) -> {
|
||
|
|
+ attributeMapBuilder.put(org.bukkit.Registry.ATTRIBUTE.get(CraftNamespacedKey.fromMinecraft(net.minecraft.core.Registry.ATTRIBUTE.getKey(attributeBase))), org.bukkit.craftbukkit.attribute.CraftAttributeInstance.convert(attributeModifier));
|
||
|
|
+ });
|
||
|
|
+ return attributeMapBuilder.build();
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
@Override
|
||
|
|
public int getProtocolVersion() {
|
||
|
|
return net.minecraft.SharedConstants.getCurrentVersion().getProtocolVersion();
|