2021-06-11 14:02:28 +02:00
|
|
|
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
|
2022-06-07 19:03:07 +02:00
|
|
|
index cbf7df30a7ec8445c8492e3b9f108747dbe1717b..1b5f36b78d81b688ded88ab91e36d9df8c5d64ee 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/UnsafeValues.java
|
|
|
|
+++ b/src/main/java/org/bukkit/UnsafeValues.java
|
2022-03-03 19:21:48 +01:00
|
|
|
@@ -107,5 +107,9 @@ public interface UnsafeValues {
|
2021-06-11 14:02:28 +02:00
|
|
|
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
|
2022-06-07 19:20:30 +02:00
|
|
|
index 515f623b3b6e76dbf24ec1d204f7983adb100858..d3334c62bf39abf17ee7f3e68e106fd637ffdf00 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
2022-06-07 19:20:30 +02:00
|
|
|
@@ -632,6 +632,30 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
|
2021-06-11 14:02:28 +02:00
|
|
|
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.
|
|
|
|
+ * @param bytes bytes representing an item in NBT
|
|
|
|
+ * @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,
|