2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
|
|
Date: Fri, 3 Jul 2020 11:58:56 -0500
|
|
|
|
Subject: [PATCH] Add PrepareResultEvent
|
|
|
|
|
|
|
|
Adds a new event for all crafting stations that generate a result slot item
|
|
|
|
|
|
|
|
Anvil, Grindstone and Smithing now extend this event
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
|
2024-08-09 22:05:50 +02:00
|
|
|
index ffda2c984c5683edb38a56f04c53b0ea339e08fc..d685511104ac552dfc9ae2111e1bfb60fa812102 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
|
2024-04-24 08:44:48 +02:00
|
|
|
@@ -327,6 +327,7 @@ public class AnvilMenu extends ItemCombinerMenu {
|
2023-06-08 01:20:26 +02:00
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2023-06-08 01:20:26 +02:00
|
|
|
this.createResult();
|
2024-01-20 23:13:41 +01:00
|
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareResultEvent(this, RESULT_SLOT); // Paper - Add PrepareResultEvent
|
2023-06-08 01:20:26 +02:00
|
|
|
return true;
|
|
|
|
} else {
|
|
|
|
return false;
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java b/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java
|
2024-04-24 08:44:48 +02:00
|
|
|
index 11d7bf4f90083991cfc8c6c5f9a1e8ad6a162843..c52c4c4210bc6ae082443318d9795c48c816aba6 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java
|
2024-04-24 08:44:48 +02:00
|
|
|
@@ -152,6 +152,7 @@ public class CartographyTableMenu extends AbstractContainerMenu {
|
2021-06-11 14:02:28 +02:00
|
|
|
this.setupResultSlot(itemstack, itemstack1, itemstack2);
|
|
|
|
}
|
|
|
|
|
2024-01-20 23:13:41 +01:00
|
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareResultEvent(this, RESULT_SLOT); // Paper - Add PrepareResultEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
private void setupResultSlot(ItemStack map, ItemStack item, ItemStack oldResult) {
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
|
2024-06-13 22:57:13 +02:00
|
|
|
index 637d77d6b07ff9ee5ac1cb0470cbefcba5c7495e..15ec798e149d80aace186f84b9236ddeaba690c3 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
|
2024-06-13 22:57:13 +02:00
|
|
|
@@ -160,6 +160,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
|
2021-06-11 14:02:28 +02:00
|
|
|
super.slotsChanged(inventory);
|
|
|
|
if (inventory == this.repairSlots) {
|
|
|
|
this.createResult();
|
2024-01-20 23:13:41 +01:00
|
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareResultEvent(this, RESULT_SLOT); // Paper - Add PrepareResultEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
|
2024-04-24 08:44:48 +02:00
|
|
|
index 62432c347b86fc79ab529a7dde66bef32d0424dd..be840717e180b6b5abd14db6cc9263349737f9a3 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
|
2023-03-14 20:54:57 +01:00
|
|
|
@@ -110,6 +110,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
|
2021-06-11 14:02:28 +02:00
|
|
|
super.slotsChanged(inventory);
|
|
|
|
if (inventory == this.inputSlots) {
|
|
|
|
this.createResult();
|
2024-01-20 23:13:41 +01:00
|
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareResultEvent(this, this instanceof SmithingMenu ? 3 : 2); // Paper - Add PrepareResultEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/LoomMenu.java b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
|
2024-08-09 22:05:50 +02:00
|
|
|
index 69ed0753c224cb7746762b4b94c4d79d608951b8..2de558dd205a1078fdcac1bce256d059b9bf5d5f 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/inventory/LoomMenu.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
|
2024-04-24 08:44:48 +02:00
|
|
|
@@ -249,7 +249,8 @@ public class LoomMenu extends AbstractContainerMenu {
|
2022-06-08 07:46:52 +02:00
|
|
|
this.resultSlot.set(ItemStack.EMPTY);
|
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2022-06-08 07:46:52 +02:00
|
|
|
- this.broadcastChanges();
|
2024-01-20 23:13:41 +01:00
|
|
|
+ // this.broadcastChanges(); // Paper - Add PrepareResultEvent; done below
|
|
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareResultEvent(this, 3); // Paper - Add PrepareResultEvent
|
2022-06-08 07:46:52 +02:00
|
|
|
} else {
|
|
|
|
this.resultSlot.set(ItemStack.EMPTY);
|
|
|
|
this.selectablePatterns = List.of();
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/SmithingMenu.java b/src/main/java/net/minecraft/world/inventory/SmithingMenu.java
|
2024-06-13 22:57:13 +02:00
|
|
|
index 0735705def4f9505b7f16df2497cc78bbf5a8373..86e51fcce767d265ee0d3beb611be2119085830b 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/inventory/SmithingMenu.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/inventory/SmithingMenu.java
|
2024-06-13 22:57:13 +02:00
|
|
|
@@ -121,6 +121,7 @@ public class SmithingMenu extends ItemCombinerMenu {
|
2022-12-07 21:16:54 +01:00
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2024-01-20 23:13:41 +01:00
|
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareResultEvent(this, RESULT_SLOT); // Paper - Add PrepareResultEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
|
2024-08-09 22:05:50 +02:00
|
|
|
index 30ea1f9e97db86a2ad7baeea4f5a76c821874daa..5b4f03128499b0c1a4b8c5f5ccd17e4bdb391e81 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
|
2024-06-13 22:57:13 +02:00
|
|
|
@@ -182,6 +182,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
|
2021-06-11 14:02:28 +02:00
|
|
|
this.setupRecipeList(inventory, itemstack);
|
|
|
|
}
|
|
|
|
|
2024-01-20 23:13:41 +01:00
|
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareResultEvent(this, RESULT_SLOT); // Paper - Add PrepareResultEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2024-06-13 22:57:13 +02:00
|
|
|
private static SingleRecipeInput createRecipeInput(Container inventory) {
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
2024-08-17 21:39:11 +02:00
|
|
|
index 752aba27c3eb9815bdd2b4683483c70e891711e7..44fd82bf887e5c6d946d7eed18e21f966efda9de 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
2024-08-17 21:39:11 +02:00
|
|
|
@@ -1681,6 +1681,12 @@ public class CraftEventFactory {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2024-08-09 22:05:50 +02:00
|
|
|
public static PrepareAnvilEvent callPrepareAnvilEvent(AnvilView view, ItemStack item) {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ // Paper start - Add PrepareResultEvent
|
|
|
|
+ if (true) {
|
|
|
|
+ view.getTopInventory().setItem(net.minecraft.world.inventory.AnvilMenu.RESULT_SLOT, CraftItemStack.asCraftMirror(item));
|
|
|
|
+ return null; // verify nothing uses return - disable event: handled below in PrepareResult
|
|
|
|
+ }
|
|
|
|
+ // Paper end - Add PrepareResultEvent
|
|
|
|
PrepareAnvilEvent event = new PrepareAnvilEvent(view, CraftItemStack.asCraftMirror(item).clone());
|
|
|
|
event.getView().getPlayer().getServer().getPluginManager().callEvent(event);
|
2021-06-11 14:02:28 +02:00
|
|
|
event.getInventory().setItem(2, event.getResult());
|
2024-08-17 21:39:11 +02:00
|
|
|
@@ -1688,6 +1694,12 @@ public class CraftEventFactory {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2024-02-01 10:15:57 +01:00
|
|
|
public static PrepareGrindstoneEvent callPrepareGrindstoneEvent(InventoryView view, ItemStack item) {
|
|
|
|
+ // Paper start - Add PrepareResultEvent
|
|
|
|
+ if (true) {
|
|
|
|
+ view.getTopInventory().setItem(net.minecraft.world.inventory.GrindstoneMenu.RESULT_SLOT, CraftItemStack.asCraftMirror(item));
|
|
|
|
+ return null; // verify nothing uses return - disable event: handled below in PrepareResult
|
|
|
|
+ }
|
|
|
|
+ // Paper end - Add PrepareResultEvent
|
|
|
|
PrepareGrindstoneEvent event = new PrepareGrindstoneEvent(view, CraftItemStack.asCraftMirror(item).clone());
|
|
|
|
event.getView().getPlayer().getServer().getPluginManager().callEvent(event);
|
2022-12-14 06:03:57 +01:00
|
|
|
event.getInventory().setItem(2, event.getResult());
|
2024-08-17 21:39:11 +02:00
|
|
|
@@ -1695,12 +1707,39 @@ public class CraftEventFactory {
|
2022-12-14 06:03:57 +01:00
|
|
|
}
|
|
|
|
|
2024-02-01 10:15:57 +01:00
|
|
|
public static PrepareSmithingEvent callPrepareSmithingEvent(InventoryView view, ItemStack item) {
|
|
|
|
+ // Paper start - Add PrepareResultEvent
|
|
|
|
+ if (true) {
|
|
|
|
+ view.getTopInventory().setItem(net.minecraft.world.inventory.SmithingMenu.RESULT_SLOT, CraftItemStack.asCraftMirror(item));
|
|
|
|
+ return null; // verify nothing uses return - disable event: handled below in PrepareResult
|
|
|
|
+ }
|
|
|
|
+ // Paper end - Add PrepareResultEvent
|
|
|
|
PrepareSmithingEvent event = new PrepareSmithingEvent(view, CraftItemStack.asCraftMirror(item).clone());
|
|
|
|
event.getView().getPlayer().getServer().getPluginManager().callEvent(event);
|
2023-03-15 10:33:43 +01:00
|
|
|
event.getInventory().setResult(event.getResult());
|
2024-02-01 10:15:57 +01:00
|
|
|
return event;
|
|
|
|
}
|
|
|
|
|
2024-01-21 19:37:09 +01:00
|
|
|
+ // Paper start - Add PrepareResultEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public static void callPrepareResultEvent(AbstractContainerMenu container, int resultSlot) {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ final com.destroystokyo.paper.event.inventory.PrepareResultEvent event;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ InventoryView view = container.getBukkitView();
|
|
|
|
+ org.bukkit.inventory.ItemStack origItem = view.getTopInventory().getItem(resultSlot);
|
|
|
|
+ CraftItemStack result = origItem != null ? CraftItemStack.asCraftCopy(origItem) : null;
|
2024-08-09 22:05:50 +02:00
|
|
|
+ if (view.getTopInventory() instanceof org.bukkit.inventory.AnvilInventory && view instanceof AnvilView anvilView) {
|
|
|
|
+ event = new PrepareAnvilEvent(anvilView, result);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ } else if (view.getTopInventory() instanceof org.bukkit.inventory.GrindstoneInventory) {
|
2022-12-14 06:03:57 +01:00
|
|
|
+ event = new PrepareGrindstoneEvent(view, result);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ } else if (view.getTopInventory() instanceof org.bukkit.inventory.SmithingInventory) {
|
|
|
|
+ event = new PrepareSmithingEvent(view, result);
|
|
|
|
+ } else {
|
|
|
|
+ event = new com.destroystokyo.paper.event.inventory.PrepareResultEvent(view, result);
|
|
|
|
+ }
|
|
|
|
+ event.callEvent();
|
|
|
|
+ event.getInventory().setItem(resultSlot, event.getResult());
|
2021-06-17 21:37:37 +02:00
|
|
|
+ container.broadcastChanges();;
|
2024-02-01 10:15:57 +01:00
|
|
|
+ }
|
2024-01-20 23:13:41 +01:00
|
|
|
+ // Paper end - Add PrepareResultEvent
|
2024-02-01 10:15:57 +01:00
|
|
|
+
|
2021-06-11 14:02:28 +02:00
|
|
|
/**
|
|
|
|
* Mob spawner event.
|
2024-02-01 10:15:57 +01:00
|
|
|
*/
|