From 937e0261403208816b70f1e54420d3d0c09c187a Mon Sep 17 00:00:00 2001 From: Melncat Date: Mon, 26 Sep 2022 11:42:38 -0700 Subject: [PATCH] Add item packet serialization API (#1130) --- ...0053-Add-item-packet-serialize-event.patch | 60 +++++++++++++++++++ ...0301-Add-item-packet-serialize-event.patch | 45 ++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 patches/api/0053-Add-item-packet-serialize-event.patch create mode 100644 patches/server/0301-Add-item-packet-serialize-event.patch diff --git a/patches/api/0053-Add-item-packet-serialize-event.patch b/patches/api/0053-Add-item-packet-serialize-event.patch new file mode 100644 index 000000000..633be5005 --- /dev/null +++ b/patches/api/0053-Add-item-packet-serialize-event.patch @@ -0,0 +1,60 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MelnCat +Date: Sat, 24 Sep 2022 10:50:33 -0700 +Subject: [PATCH] Add item packet serialize event + + +diff --git a/src/main/java/org/purpurmc/purpur/event/packet/NetworkItemSerializeEvent.java b/src/main/java/org/purpurmc/purpur/event/packet/NetworkItemSerializeEvent.java +new file mode 100644 +index 0000000000000000000000000000000000000000..c0da73d2ea83a6055e34894ba1c7506fc8667712 +--- /dev/null ++++ b/src/main/java/org/purpurmc/purpur/event/packet/NetworkItemSerializeEvent.java +@@ -0,0 +1,48 @@ ++package org.purpurmc.purpur.event.packet; ++ ++import org.bukkit.event.Event; ++import org.bukkit.event.HandlerList; ++import org.bukkit.inventory.ItemStack; ++import org.jetbrains.annotations.NotNull; ++import org.jetbrains.annotations.Nullable; ++ ++/** ++ * Called when an item is about to be written to a packet. ++ */ ++public class NetworkItemSerializeEvent extends Event { ++ private ItemStack itemStack; ++ ++ public NetworkItemSerializeEvent(@NotNull ItemStack itemStack) { ++ super(!org.bukkit.Bukkit.isPrimaryThread()); ++ this.itemStack = itemStack; ++ } ++ ++ /** ++ * @return The item that is about to be serialized. Not mutable ++ */ ++ @NotNull ++ public ItemStack getItemStack() { ++ return itemStack; ++ } ++ ++ /** ++ * Sets the item that will be serialized. ++ * ++ * @param itemStack The item ++ */ ++ public void setItemStack(@Nullable ItemStack itemStack) { ++ this.itemStack = itemStack; ++ } ++ ++ private static final HandlerList handlers = new HandlerList(); ++ ++ @NotNull ++ public HandlerList getHandlers() { ++ return handlers; ++ } ++ ++ @NotNull ++ public static HandlerList getHandlerList() { ++ return handlers; ++ } ++} diff --git a/patches/server/0301-Add-item-packet-serialize-event.patch b/patches/server/0301-Add-item-packet-serialize-event.patch new file mode 100644 index 000000000..5389319bc --- /dev/null +++ b/patches/server/0301-Add-item-packet-serialize-event.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MelnCat +Date: Sat, 24 Sep 2022 09:56:28 -0700 +Subject: [PATCH] Add item packet serialize event + + +diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java +index 35377576ed182814051c11f902e02e8e921e84e3..a7b6e22daf64abca311bc5771192a3c09368537f 100644 +--- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java ++++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java +@@ -83,6 +83,8 @@ public class FriendlyByteBuf extends ByteBuf { + private static final int MAX_PUBLIC_KEY_HEADER_SIZE = 256; + private static final int MAX_PUBLIC_KEY_LENGTH = 512; + ++ public static boolean hasItemSerializeEvent = false; // Purpur ++ + public FriendlyByteBuf(ByteBuf parent) { + this.source = parent; + } +@@ -570,6 +572,13 @@ public class FriendlyByteBuf extends ByteBuf { + this.writeBoolean(false); + } else { + this.writeBoolean(true); ++ // Purpur start ++ if (hasItemSerializeEvent) { ++ var event = new org.purpurmc.purpur.event.packet.NetworkItemSerializeEvent(stack.asBukkitCopy()); ++ event.callEvent(); ++ stack = ItemStack.fromBukkitCopy(event.getItemStack()); ++ } ++ // Purpur end + Item item = stack.getItem(); + + this.writeId(Registry.ITEM, item); +diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java +index 60bed3f87016b29508ea1a94db65a1f60d960de1..13c9cddf7ac0af16676050e3bcdf22b7475a0387 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -1537,6 +1537,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Purpur + Iterator iterator = this.getAllLevels().iterator(); // Paper - move down + while (iterator.hasNext()) { + ServerLevel worldserver = (ServerLevel) iterator.next();