56 lines
2.5 KiB
Diff
56 lines
2.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mariell Hoversholm <proximyst@proximyst.com>
|
||
|
|
Date: Thu, 30 Apr 2020 16:56:31 +0200
|
||
|
|
Subject: [PATCH] Add Raw Byte ItemStack Serialization
|
||
|
|
|
||
|
|
Serializes using NBT which is safer for server data migrations than bukkits format.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
|
||
|
|
index 821064264405cde147e944df279b44a20a4868ad..4fa00140cf17e3ea7d602b6337b3fe4f2901202e 100644
|
||
|
|
--- a/src/main/java/org/bukkit/UnsafeValues.java
|
||
|
|
+++ b/src/main/java/org/bukkit/UnsafeValues.java
|
||
|
|
@@ -89,5 +89,9 @@ public interface UnsafeValues {
|
||
|
|
static boolean isLegacyPlugin(org.bukkit.plugin.Plugin plugin) {
|
||
|
|
return !Bukkit.getUnsafe().isSupportedApiVersion(plugin.getDescription().getAPIVersion());
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ byte[] serializeItem(ItemStack item);
|
||
|
|
+
|
||
|
|
+ ItemStack deserializeItem(byte[] data);
|
||
|
|
// Paper end
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||
|
|
index d7d6a3e83dfd88359708749f5c12be02815c3580..ccd81fca25233c2a9c2a8c3f4dda3053d7b2e723 100644
|
||
|
|
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||
|
|
@@ -613,6 +613,29 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||
|
|
return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ /**
|
||
|
|
+ * Deserializes this itemstack from raw NBT bytes. NBT is safer for data migrations as it will
|
||
|
|
+ * use the built in data converter instead of bukkits dangerous serialization system.
|
||
|
|
+ *
|
||
|
|
+ * This expects that the DataVersion was stored on the root of the Compound, as saved from
|
||
|
|
+ * the {@link #serializeAsBytes()} API returned.
|
||
|
|
+ * @return ItemStack migrated to this version of Minecraft if needed.
|
||
|
|
+ */
|
||
|
|
+ @NotNull
|
||
|
|
+ public static ItemStack deserializeBytes(@NotNull byte[] bytes) {
|
||
|
|
+ return org.bukkit.Bukkit.getUnsafe().deserializeItem(bytes);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ /**
|
||
|
|
+ * Serializes this itemstack to raw bytes in NBT. NBT is safer for data migrations as it will
|
||
|
|
+ * use the built in data converter instead of bukkits dangerous serialization system.
|
||
|
|
+ * @return bytes representing this item in NBT.
|
||
|
|
+ */
|
||
|
|
+ @NotNull
|
||
|
|
+ public byte[] serializeAsBytes() {
|
||
|
|
+ return org.bukkit.Bukkit.getUnsafe().serializeItem(this);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
/**
|
||
|
|
* Gets the Display name as seen in the Client.
|
||
|
|
* Currently the server only supports the English language. To override this,
|