Update to 1.21.1

2026-01-04 15:41:34 +00:00 · 2024-08-19 15:57:05 -03:00
parent 6df23d180d
commit e371a3ef2a
31 changed files with 470 additions and 708 deletions
--- a/patches/server/0020-Add-CraftItemRecipeEvent.patch
+++ b/patches/server/0020-Add-CraftItemRecipeEvent.patch
@@ -0,0 +1,80 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrPowerGamerBR <git@mrpowergamerbr.com>
+Date: Tue, 25 Jun 2024 02:52:32 -0300
+Subject: [PATCH] Add CraftItemRecipeEvent
+
+Used when a player OR a crafter block crafts an item, as an alternative to PrepareItemCraftEvent and CraftItemEvent, because both events are not triggered when a item is crafted from a crafter
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index b13057c0792067cc6b0abdf0d64a9be2cc9389a4..56911919c531d2a4d5e89fbc628160617295b0bb 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -3180,6 +3180,21 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+                                 } else {
+                                     event = new CraftItemEvent(recipe, inventory, type, packet.getSlotNum(), click, action);
+                                 }
+                                // SparklyPaper start - add CraftItemRecipeEvent
+                                // We will pigback a bit on the current implementation
+                                net.sparklypower.sparklypaper.event.inventory.CraftItemRecipeEvent craftItemRecipeEvent = new net.sparklypower.sparklypaper.event.inventory.CraftItemRecipeEvent(
+                                    ((CraftingInventory) top).getMatrix(), // We cannot use the top inventory directly because (it seems) that the first slot is the "result" slot
+                                    recipe,
+                                    event.getCurrentItem()
+                                );
+                                if (craftItemRecipeEvent.callEvent()) {
+                                    event.setCurrentItem(craftItemRecipeEvent.getResult());
+                                } else {
+                                    event.setCancelled(true);
+                                    cancelled = true;
+                                    event.setCurrentItem(craftItemRecipeEvent.getResult());
+                                }
+                                // SparklyPaper end
+                             }
+                         }
+ 
+diff --git a/src/main/java/net/minecraft/world/level/block/CrafterBlock.java b/src/main/java/net/minecraft/world/level/block/CrafterBlock.java
+index deb5b4fab94618c08a51e432c33e49b1627bd717..703fbeafc78889cbfea292847678207d9d8c5cab 100644
+--- a/src/main/java/net/minecraft/world/level/block/CrafterBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/CrafterBlock.java
+@@ -202,6 +202,13 @@ public class CrafterBlock extends BaseEntityBlock {
+                 }
+                 itemstack = CraftItemStack.asNMSCopy(event.getResult());
+                 // CraftBukkit end
+                // SparklyPaper - add CraftItemRecipeEvent
+                net.sparklypower.sparklypaper.event.inventory.CraftItemRecipeEvent sparklyEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callCraftItemRecipeEvent(crafterblockentity, recipeholder.toBukkitRecipe(), itemstack);
+                if (sparklyEvent.isCancelled()) {
+                    return;
+                }
+                itemstack = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(sparklyEvent.getResult());
+                // SparklyPaper end
+                 if (itemstack.isEmpty()) {
+                     world.levelEvent(1050, pos, 0);
+                 } else {
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index 44bec90466967933b5322a8ca8b5e86e0c96d443..6d166a6662ed2badfdc9cb42ca4374dc8d640404 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -1467,6 +1467,24 @@ public class CraftEventFactory {
+         Bukkit.getPluginManager().callEvent(crafterCraftEvent);
+         return crafterCraftEvent;
+     }
+
+    // SparklyPaper start - add CraftItemRecipeEvent
+    public static net.sparklypower.sparklypaper.event.inventory.CraftItemRecipeEvent callCraftItemRecipeEvent(net.minecraft.world.inventory.CraftingContainer container, Recipe recipe, ItemStack result) {
+        org.bukkit.inventory.ItemStack[] matrix = new org.bukkit.inventory.ItemStack[container.getItems().size()];
+        int i = 0;
+        for (ItemStack item : container.getItems()) {
+            matrix[i] = CraftItemStack.asCraftMirror(item);
+            i++;
+        }
+        org.bukkit.inventory.ItemStack bukkitResult = CraftItemStack.asCraftMirror(result);
+
+        net.sparklypower.sparklypaper.event.inventory.CraftItemRecipeEvent event = new net.sparklypower.sparklypaper.event.inventory.CraftItemRecipeEvent(matrix, recipe, bukkitResult);
+        Bukkit.getPluginManager().callEvent(event);
+
+        return event;
+    }
+    // SparklyPaper end
+
+     // Paper start
+     @Deprecated
+     public static com.destroystokyo.paper.event.entity.ProjectileCollideEvent callProjectileCollideEvent(Entity entity, EntityHitResult position) {