aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0376-Add-PlayerRecipeBookClickEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0376-Add-PlayerRecipeBookClickEvent.patch')
-rw-r--r--patches/server/0376-Add-PlayerRecipeBookClickEvent.patch55
1 files changed, 55 insertions, 0 deletions
diff --git a/patches/server/0376-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0376-Add-PlayerRecipeBookClickEvent.patch
new file mode 100644
index 0000000000..2f223b4810
--- /dev/null
+++ b/patches/server/0376-Add-PlayerRecipeBookClickEvent.patch
@@ -0,0 +1,55 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: JRoy <[email protected]>
+Date: Fri, 5 Jun 2020 18:24:06 -0400
+Subject: [PATCH] Add PlayerRecipeBookClickEvent
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 7fab3281116aa917c96223c1a1caf6280293df65..591f4f43dd023facf0a8990682069190c388d64b 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -3041,16 +3041,40 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+ if (!this.player.containerMenu.stillValid(this.player)) {
+ ServerGamePacketListenerImpl.LOGGER.debug("Player {} interacted with invalid menu {}", this.player, this.player.containerMenu);
+ } else {
++ // Paper start - Add PlayerRecipeBookClickEvent
++ ResourceLocation recipeName = packet.getRecipe();
++ boolean makeAll = packet.isShiftDown();
++ com.destroystokyo.paper.event.player.PlayerRecipeBookClickEvent paperEvent = new com.destroystokyo.paper.event.player.PlayerRecipeBookClickEvent(
++ this.player.getBukkitEntity(), org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(recipeName), makeAll
++ );
++ if (!paperEvent.callEvent()) {
++ return;
++ }
++ recipeName = CraftNamespacedKey.toMinecraft(paperEvent.getRecipe());
++ makeAll = paperEvent.isMakeAll();
++ if (org.bukkit.event.player.PlayerRecipeBookClickEvent.getHandlerList().getRegisteredListeners().length > 0) {
++ // Paper end - Add PlayerRecipeBookClickEvent
+ // CraftBukkit start - implement PlayerRecipeBookClickEvent
+- org.bukkit.inventory.Recipe recipe = this.cserver.getRecipe(CraftNamespacedKey.fromMinecraft(packet.getRecipe()));
++ org.bukkit.inventory.Recipe recipe = this.cserver.getRecipe(CraftNamespacedKey.fromMinecraft(recipeName)); // Paper
+ if (recipe == null) {
+ return;
+ }
+- org.bukkit.event.player.PlayerRecipeBookClickEvent event = CraftEventFactory.callRecipeBookClickEvent(this.player, recipe, packet.isShiftDown());
++ // Paper start - Add PlayerRecipeBookClickEvent
++ org.bukkit.event.player.PlayerRecipeBookClickEvent event = CraftEventFactory.callRecipeBookClickEvent(this.player, recipe, makeAll);
++ recipeName = CraftNamespacedKey.toMinecraft(((org.bukkit.Keyed) event.getRecipe()).getKey());
++ makeAll = event.isShiftClick();
++ }
++ if (!(this.player.containerMenu instanceof RecipeBookMenu<?> recipeBookMenu)) {
++ return;
++ }
++ // Paper end - Add PlayerRecipeBookClickEvent
+
+ // Cast to keyed should be safe as the recipe will never be a MerchantRecipe.
+- this.server.getRecipeManager().byKey(CraftNamespacedKey.toMinecraft(((org.bukkit.Keyed) event.getRecipe()).getKey())).ifPresent((recipeholder) -> {
+- ((RecipeBookMenu) this.player.containerMenu).handlePlacement(event.isShiftClick(), recipeholder, this.player);
++ // Paper start - Add PlayerRecipeBookClickEvent
++ final boolean finalMakeAll = makeAll;
++ this.server.getRecipeManager().byKey(recipeName).ifPresent((recipeholder) -> {
++ recipeBookMenu.handlePlacement(finalMakeAll, recipeholder, this.player);
++ // Paper end - Add PlayerRecipeBookClickEvent
+ });
+ // CraftBukkit end
+ }