Grindstone API

patches/api/0031-Grindstone-API.patch

@@ -1,84 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Mon, 27 Dec 2021 08:10:50 -0600
-Subject: [PATCH] Grindstone API
-
-
-diff --git a/src/main/java/org/purpurmc/purpur/event/inventory/GrindstoneTakeResultEvent.java b/src/main/java/org/purpurmc/purpur/event/inventory/GrindstoneTakeResultEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..d6db2d355553c9c54b83328d237b9c75e7a8e375
---- /dev/null
-+++ b/src/main/java/org/purpurmc/purpur/event/inventory/GrindstoneTakeResultEvent.java
-@@ -0,0 +1,72 @@
-+package org.purpurmc.purpur.event.inventory;
-+
-+import org.bukkit.entity.HumanEntity;
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.inventory.InventoryEvent;
-+import org.bukkit.inventory.GrindstoneInventory;
-+import org.bukkit.inventory.InventoryView;
-+import org.bukkit.inventory.ItemStack;
-+import org.jetbrains.annotations.ApiStatus;
-+import org.jspecify.annotations.NullMarked;
-+
-+/**
-+ * Called when a player takes the result item out of a Grindstone
-+ */
-+@NullMarked
-+public class GrindstoneTakeResultEvent extends InventoryEvent {
-+    private static final HandlerList handlers = new HandlerList();
-+    private final Player player;
-+    private final ItemStack result;
-+    private int experienceAmount;
-+
-+    @ApiStatus.Internal
-+    public GrindstoneTakeResultEvent(HumanEntity player, InventoryView view, ItemStack result, int experienceAmount) {
-+        super(view);
-+        this.player = (Player) player;
-+        this.result = result;
-+        this.experienceAmount = experienceAmount;
-+    }
-+
-+    public Player getPlayer() {
-+        return player;
-+    }
-+
-+    public ItemStack getResult() {
-+        return result;
-+    }
-+
-+    @Override
-+    public GrindstoneInventory getInventory() {
-+        return (GrindstoneInventory) super.getInventory();
-+    }
-+
-+    /**
-+     * Get the amount of experience this transaction will give
-+     * (takes priority over and uses result from {@link org.bukkit.event.block.BlockExpEvent})
-+     *
-+     * @return Amount of experience to give
-+     */
-+    public int getExperienceAmount() {
-+        return this.experienceAmount;
-+    }
-+
-+    /**
-+     * Set the amount of experience this transaction will give
-+     * (takes priority over {@link org.bukkit.event.block.BlockExpEvent})
-+     *
-+     * @param experienceAmount Amount of experience to give
-+     */
-+    public void setExperienceAmount(int experienceAmount) {
-+        this.experienceAmount = experienceAmount;
-+    }
-+
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}

patches/server/0217-Grindstone-API.patch

@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Mon, 27 Dec 2021 08:11:00 -0600
-Subject: [PATCH] Grindstone API
-
-
-diff --git a/net/minecraft/world/inventory/GrindstoneMenu.java b/net/minecraft/world/inventory/GrindstoneMenu.java
-index cc229f3e1e9527cbedf929e326731943bb513dae..111da7435f0abb5a57bd2c5fecead2380ac4347a 100644
---- a/net/minecraft/world/inventory/GrindstoneMenu.java
-+++ b/net/minecraft/world/inventory/GrindstoneMenu.java
-@@ -96,12 +96,14 @@ public class GrindstoneMenu extends AbstractContainerMenu {
- 
-             @Override
-             public void onTake(net.minecraft.world.entity.player.Player player, ItemStack stack) {
-+                ItemStack itemstack = activeQuickItem == null ? stack : activeQuickItem; // Purpur
-                 context.execute((world, blockposition) -> {
-                     if (world instanceof ServerLevel) {
-                         // Paper start - Fire BlockExpEvent on grindstone use
-                         org.bukkit.event.block.BlockExpEvent event = new org.bukkit.event.block.BlockExpEvent(org.bukkit.craftbukkit.block.CraftBlock.at(world, blockposition), this.getExperienceAmount(world));
-                         event.callEvent();
--                        ExperienceOrb.award((ServerLevel) world, Vec3.atCenterOf(blockposition), event.getExpToDrop(), org.bukkit.entity.ExperienceOrb.SpawnReason.GRINDSTONE, player);
-+                        org.purpurmc.purpur.event.inventory.GrindstoneTakeResultEvent grindstoneTakeResultEvent = new org.purpurmc.purpur.event.inventory.GrindstoneTakeResultEvent(player.getBukkitEntity(), getBukkitView(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), event.getExpToDrop()); grindstoneTakeResultEvent.callEvent(); // Purpur
-+                        ExperienceOrb.award((ServerLevel) world, Vec3.atCenterOf(blockposition), grindstoneTakeResultEvent.getExperienceAmount(), org.bukkit.entity.ExperienceOrb.SpawnReason.GRINDSTONE, player); // Purpur
-                         // Paper end - Fire BlockExpEvent on grindstone use
-                     }
- 
-@@ -386,7 +388,9 @@ public class GrindstoneMenu extends AbstractContainerMenu {
-                 return ItemStack.EMPTY;
-             }
- 
-+            this.activeQuickItem = itemstack; // Purpur
-             slot1.onTake(player, itemstack1);
-+            this.activeQuickItem = null; // Purpur
-         }
- 
-         return itemstack;

purpur-api/src/main/java/org/purpurmc/purpur/event/inventory/GrindstoneTakeResultEvent.java

@@ -0,0 +1,72 @@
+package org.purpurmc.purpur.event.inventory;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.inventory.InventoryEvent;
+import org.bukkit.inventory.GrindstoneInventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Called when a player takes the result item out of a Grindstone
+ */
+@NullMarked
+public class GrindstoneTakeResultEvent extends InventoryEvent {
+    private static final HandlerList handlers = new HandlerList();
+    private final Player player;
+    private final ItemStack result;
+    private int experienceAmount;
+
+    @ApiStatus.Internal
+    public GrindstoneTakeResultEvent(HumanEntity player, InventoryView view, ItemStack result, int experienceAmount) {
+        super(view);
+        this.player = (Player) player;
+        this.result = result;
+        this.experienceAmount = experienceAmount;
+    }
+
+    public Player getPlayer() {
+        return player;
+    }
+
+    public ItemStack getResult() {
+        return result;
+    }
+
+    @Override
+    public GrindstoneInventory getInventory() {
+        return (GrindstoneInventory) super.getInventory();
+    }
+
+    /**
+     * Get the amount of experience this transaction will give
+     * (takes priority over and uses result from {@link org.bukkit.event.block.BlockExpEvent})
+     *
+     * @return Amount of experience to give
+     */
+    public int getExperienceAmount() {
+        return this.experienceAmount;
+    }
+
+    /**
+     * Set the amount of experience this transaction will give
+     * (takes priority over {@link org.bukkit.event.block.BlockExpEvent})
+     *
+     * @param experienceAmount Amount of experience to give
+     */
+    public void setExperienceAmount(int experienceAmount) {
+        this.experienceAmount = experienceAmount;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+}

purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/GrindstoneMenu.java.patch

@@ -1,5 +1,20 @@
 --- a/net/minecraft/world/inventory/GrindstoneMenu.java
 +++ b/net/minecraft/world/inventory/GrindstoneMenu.java
+@@ -91,11 +_,13 @@
+             @Override
+             public void onTake(Player player, ItemStack stack) {
+                 access.execute((level, blockPos) -> {
++                    ItemStack itemstack = activeQuickItem == null ? stack : activeQuickItem; // Purpur - Grindstone API
+                     if (level instanceof ServerLevel) {
+                         // Paper start - Fire BlockExpEvent on grindstone use
+                         org.bukkit.event.block.BlockExpEvent event = new org.bukkit.event.block.BlockExpEvent(org.bukkit.craftbukkit.block.CraftBlock.at(level, blockPos), this.getExperienceAmount(level));
+                         event.callEvent();
+-                        ExperienceOrb.award((ServerLevel) level, Vec3.atCenterOf(blockPos), event.getExpToDrop(), org.bukkit.entity.ExperienceOrb.SpawnReason.GRINDSTONE, player);
++                        org.purpurmc.purpur.event.inventory.GrindstoneTakeResultEvent grindstoneTakeResultEvent = new org.purpurmc.purpur.event.inventory.GrindstoneTakeResultEvent(player.getBukkitEntity(), getBukkitView(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), event.getExpToDrop()); grindstoneTakeResultEvent.callEvent(); // Purpur - Grindstone API
++                        ExperienceOrb.award((ServerLevel) level, Vec3.atCenterOf(blockPos), grindstoneTakeResultEvent.getExperienceAmount(), org.bukkit.entity.ExperienceOrb.SpawnReason.GRINDSTONE, player); // Purpur - Grindstone API
+                         // Paper end - Fire BlockExpEvent on grindstone use
+                     }
+ 
 @@ -124,7 +_,7 @@
                  for (Entry<Holder<Enchantment>> entry : enchantmentsForCrafting.entrySet()) {
                      Holder<Enchantment> holder = entry.getKey();
@@ -111,3 +126,13 @@
          return item;
      }
  
+@@ -278,7 +_,9 @@
+                 return ItemStack.EMPTY;
+             }
+ 
++            this.activeQuickItem = itemStack; // Purpur - Grindstone API
+             slot.onTake(player, item);
++            this.activeQuickItem = null; // Purpur - Grindstone API
+         }
+ 
+         return itemStack;