aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0364-Add-PlayerRecipeBookClickEvent.patch
blob: 58ea92d25f96a316840050dcc3f1a8727b920ec0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: JRoy <joshroy126@gmail.com>
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 9229caf16997e8bd6da6fae1532372827ec80291..8570b0ecd2a0db9bb02ebcd12bafa1af31bf4b45 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -201,6 +201,7 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.bukkit.NamespacedKey;
 import org.slf4j.Logger;
 
 // CraftBukkit start
@@ -3157,21 +3158,41 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                 ServerGamePacketListenerImpl.LOGGER.debug("Player {} tried to place impossible recipe {}", this.player, recipeholder.id().location());
                                 return;
                             }
+                            // Paper start - Add PlayerRecipeBookClickEvent
+                            NamespacedKey recipeName = org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(recipeholder.id().location());
+                            boolean makeAll = packet.useMaxItems();
+                            com.destroystokyo.paper.event.player.PlayerRecipeBookClickEvent paperEvent = new com.destroystokyo.paper.event.player.PlayerRecipeBookClickEvent(
+                                this.player.getBukkitEntity(), recipeName, makeAll
+                            );
+                            if (!paperEvent.callEvent()) {
+                                return;
+                            }
+                            recipeName = 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 = recipeholder.toBukkitRecipe();
+                            org.bukkit.inventory.Recipe recipe = this.cserver.getRecipe(recipeName); // Paper - Add PlayerRecipeBookClickEvent - forward to legacy event
                             if (recipe == null) {
                                 return;
                             }
-                            org.bukkit.event.player.PlayerRecipeBookClickEvent event = CraftEventFactory.callRecipeBookClickEvent(this.player, recipe, packet.useMaxItems());
+                            // Paper start - Add PlayerRecipeBookClickEvent - forward to legacy event
+                            org.bukkit.event.player.PlayerRecipeBookClickEvent event = CraftEventFactory.callRecipeBookClickEvent(this.player, recipe, makeAll);
+                            recipeName = ((org.bukkit.Keyed) event.getRecipe()).getKey();
+                            makeAll = event.isShiftClick();
+                            }
+                            if (!(this.player.containerMenu instanceof RecipeBookMenu)) {
+                                return;
+                            }
+                            // Paper end - Add PlayerRecipeBookClickEvent - forward to legacy event
 
                             // Cast to keyed should be safe as the recipe will never be a MerchantRecipe.
-                            recipeholder = this.server.getRecipeManager().byKey(CraftRecipe.toMinecraft(((org.bukkit.Keyed) event.getRecipe()).getKey())).orElse(null);
+                            recipeholder = this.server.getRecipeManager().byKey(net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.RECIPE, org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(recipeName))).orElse(null); // Paper - Add PlayerRecipeBookClickEvent - forward to legacy event
                             if (recipeholder == null) {
                                 return;
                             }
-
-                            RecipeBookMenu.PostPlaceAction containerrecipebook_a = containerrecipebook.handlePlacement(event.isShiftClick(), this.player.isCreative(), recipeholder, this.player.serverLevel(), this.player.getInventory());
+                            RecipeBookMenu.PostPlaceAction containerrecipebook_a = containerrecipebook.handlePlacement(makeAll, this.player.isCreative(), recipeholder, this.player.serverLevel(), this.player.getInventory());
                             // CraftBukkit end
 
                             if (containerrecipebook_a == RecipeBookMenu.PostPlaceAction.PLACE_GHOST_RECIPE) {