63 lines
2.6 KiB
Diff
63 lines
2.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Wed, 4 May 2016 23:55:48 -0400
|
||
|
|
Subject: [PATCH] ensureServerConversions API
|
||
|
|
|
||
|
|
This will take a Bukkit ItemStack and run it through any conversions a server process would perform on it,
|
||
|
|
to ensure it meets latest minecraft expectations.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||
|
|
index 6cc4bad2ecd19f44a680ff03cbfb99d48ea5c337..42551f8aa6666a6144815b619327c6d8f3c3776b 100644
|
||
|
|
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||
|
|
@@ -160,5 +160,17 @@ public interface ItemFactory {
|
||
|
|
*/
|
||
|
|
@NotNull
|
||
|
|
net.kyori.adventure.text.Component displayName(@NotNull ItemStack itemStack);
|
||
|
|
+
|
||
|
|
+ /**
|
||
|
|
+ * Minecraft updates are converting simple item stacks into more complex NBT oriented Item Stacks.
|
||
|
|
+ *
|
||
|
|
+ * Use this method to to ensure any desired data conversions are processed.
|
||
|
|
+ * The input itemstack will not be the same as the returned itemstack.
|
||
|
|
+ *
|
||
|
|
+ * @param item The item to process conversions on
|
||
|
|
+ * @return A potentially Data Converted ItemStack
|
||
|
|
+ */
|
||
|
|
+ @NotNull
|
||
|
|
+ ItemStack ensureServerConversions(@NotNull ItemStack item);
|
||
|
|
// Paper end
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||
|
|
index a15abec467bac70116a6fc21a300d4930b909f15..f9d226962f16821d07ac80f1bf69cb01a5de2654 100644
|
||
|
|
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||
|
|
@@ -536,7 +536,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- return result;
|
||
|
|
+ return result.ensureServerConversions(); // Paper
|
||
|
|
}
|
||
|
|
|
||
|
|
/**
|
||
|
|
@@ -611,5 +611,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
|
||
|
|
public @NotNull net.kyori.adventure.text.Component displayName() {
|
||
|
|
return Bukkit.getServer().getItemFactory().displayName(this);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ /**
|
||
|
|
+ * Minecraft updates are converting simple item stacks into more complex NBT oriented Item Stacks.
|
||
|
|
+ *
|
||
|
|
+ * Use this method to to ensure any desired data conversions are processed.
|
||
|
|
+ * The input itemstack will not be the same as the returned itemstack.
|
||
|
|
+ *
|
||
|
|
+ * @return A potentially Data Converted ItemStack
|
||
|
|
+ */
|
||
|
|
+ @NotNull
|
||
|
|
+ public ItemStack ensureServerConversions() {
|
||
|
|
+ return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
|
||
|
|
+ }
|
||
|
|
// Paper end
|
||
|
|
}
|