mirror of
https://github.com/SparklyPower/SparklyPaper.git
synced 2025-12-19 15:09:27 +00:00
81 lines
5.2 KiB
Diff
81 lines
5.2 KiB
Diff
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 befeaac4786760f6847a5945da2296a3e68dbb17..d918f1fc104795be2a04c1f57265d27e20e9df09 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -3192,6 +3192,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 b2760b9a66c1bcb848d43582c3a913c6fb43102b..beddb6a64e0ba5112d369794a066ca6b9f2ac303 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) {
|