2021-06-11 12:02:28 +00:00
|
|
|
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
|
2023-08-06 00:21:59 +00:00
|
|
|
index a6795b102c9678b122dfd3b36d02783b9e108b48..74cd662d0594f2fbc5aa30ba64d9e4928145dbb9 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
2023-08-06 00:21:59 +00:00
|
|
|
@@ -207,4 +207,18 @@ public interface ItemFactory {
|
2022-01-17 00:53:26 +00:00
|
|
|
@Deprecated
|
2021-06-12 11:18:01 +00:00
|
|
|
String getI18NDisplayName(@Nullable ItemStack item);
|
2023-08-06 00:21:59 +00:00
|
|
|
// Paper end - add getI18NDisplayName
|
2021-06-11 12:02:28 +00:00
|
|
|
+
|
2023-08-06 00:21:59 +00:00
|
|
|
+ // Paper start - ensure server conversions API
|
2021-06-11 12:02:28 +00:00
|
|
|
+ /**
|
2023-08-06 00:21:59 +00:00
|
|
|
+ * Minecraft's updates are converting simple item stacks into more complex NBT oriented Item Stacks.
|
2021-06-11 12:02:28 +00:00
|
|
|
+ *
|
2023-03-31 04:09:13 +00:00
|
|
|
+ * Use this method to ensure any desired data conversions are processed.
|
2021-06-11 12:02:28 +00:00
|
|
|
+ * The input itemstack will not be the same as the returned itemstack.
|
|
|
|
+ *
|
|
|
|
+ * @param item The item to process conversions on
|
2023-08-06 00:21:59 +00:00
|
|
|
+ * @return A potentially Data-Converted-ItemStack
|
2021-06-11 12:02:28 +00:00
|
|
|
+ */
|
|
|
|
+ @NotNull
|
|
|
|
+ ItemStack ensureServerConversions(@NotNull ItemStack item);
|
2023-08-06 00:21:59 +00:00
|
|
|
+ // Paper end - ensure server conversions API
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
2023-06-07 16:24:39 +00:00
|
|
|
index 09a36df6edce2a283df80c67d5ef62da7ff73555..a8faa4c1881bae4d47d901388a78b991d138b518 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
2023-02-15 22:10:14 +00:00
|
|
|
@@ -537,7 +537,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- return result;
|
|
|
|
+ return result.ensureServerConversions(); // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2023-02-15 22:10:14 +00:00
|
|
|
@@ -619,6 +619,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
|
2021-06-11 12:02:28 +00:00
|
|
|
return Bukkit.getServer().getItemFactory().displayName(this);
|
|
|
|
}
|
2021-06-12 11:18:01 +00:00
|
|
|
|
2021-06-11 12:02:28 +00:00
|
|
|
+ /**
|
|
|
|
+ * Minecraft updates are converting simple item stacks into more complex NBT oriented Item Stacks.
|
|
|
|
+ *
|
2023-03-31 04:09:13 +00:00
|
|
|
+ * Use this method to ensure any desired data conversions are processed.
|
2021-06-11 12:02:28 +00:00
|
|
|
+ * 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);
|
|
|
|
+ }
|
2021-06-12 11:18:01 +00:00
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Gets the Display name as seen in the Client.
|
|
|
|
* Currently the server only supports the English language. To override this,
|