1 files changed, 146 insertions, 0 deletions
diff --git a/patch-remap/mache-vineflower/net/minecraft/world/inventory/LecternMenu.java.patch b/patch-remap/mache-vineflower/net/minecraft/world/inventory/LecternMenu.java.patch
new file mode 100644
index 0000000000..101d57b5dd
--- /dev/null
+++ b/patch-remap/mache-vineflower/net/minecraft/world/inventory/LecternMenu.java.patch
@@ -0,0 +1,146 @@
+--- a/net/minecraft/world/inventory/LecternMenu.java
++++ b/net/minecraft/world/inventory/LecternMenu.java
+@@ -2,10 +2,33 @@
+ 
+ import net.minecraft.world.Container;
+ import net.minecraft.world.SimpleContainer;
+-import net.minecraft.world.entity.player.Player;
++import net.minecraft.world.entity.player.Inventory;
+ import net.minecraft.world.item.ItemStack;
++import net.minecraft.world.level.block.entity.LecternBlockEntity.LecternInventory;
++import org.bukkit.Bukkit;
++import org.bukkit.craftbukkit.inventory.CraftInventoryLectern;
++import org.bukkit.craftbukkit.inventory.CraftInventoryView;
++import org.bukkit.entity.Player;
++import org.bukkit.event.player.PlayerTakeLecternBookEvent;
++// CraftBukkit end
+ 
+ public class LecternMenu extends AbstractContainerMenu {
++
++    // CraftBukkit start
++    private CraftInventoryView bukkitEntity = null;
++    private Player player;
++
++    @Override
++    public CraftInventoryView getBukkitView() {
++        if (bukkitEntity != null) {
++            return bukkitEntity;
++        }
++
++        CraftInventoryLectern inventory = new CraftInventoryLectern(this.lectern);
++        bukkitEntity = new CraftInventoryView(this.player, inventory, this);
++        return bukkitEntity;
++    }
++    // CraftBukkit end
+     private static final int DATA_COUNT = 1;
+     private static final int SLOT_COUNT = 1;
+     public static final int BUTTON_PREV_PAGE = 1;
+@@ -15,53 +38,64 @@
+     private final Container lectern;
+     private final ContainerData lecternData;
+ 
+-    public LecternMenu(int containerId) {
+-        this(containerId, new SimpleContainer(1), new SimpleContainerData(1));
++    // CraftBukkit start - add player
++    public LecternMenu(int i, Inventory playerinventory) {
++        this(i, new SimpleContainer(1), new SimpleContainerData(1), playerinventory);
+     }
+ 
+-    public LecternMenu(int containerId, Container lectern, ContainerData lecternData) {
+-        super(MenuType.LECTERN, containerId);
+-        checkContainerSize(lectern, 1);
+-        checkContainerDataCount(lecternData, 1);
+-        this.lectern = lectern;
+-        this.lecternData = lecternData;
+-        this.addSlot(new Slot(lectern, 0, 0, 0) {
++    public LecternMenu(int i, Container iinventory, ContainerData icontainerproperties, Inventory playerinventory) {
++        // CraftBukkit end
++        super(MenuType.LECTERN, i);
++        checkContainerSize(iinventory, 1);
++        checkContainerDataCount(icontainerproperties, 1);
++        this.lectern = iinventory;
++        this.lecternData = icontainerproperties;
++        this.addSlot(new Slot(iinventory, 0, 0, 0) {
+             @Override
+             public void setChanged() {
+                 super.setChanged();
+                 LecternMenu.this.slotsChanged(this.container);
+             }
+         });
+-        this.addDataSlots(lecternData);
++        this.addDataSlots(icontainerproperties);
++        player = (Player) playerinventory.player.getBukkitEntity(); // CraftBukkit
+     }
+ 
+     @Override
+-    public boolean clickMenuButton(Player player, int id) {
++    public boolean clickMenuButton(net.minecraft.world.entity.player.Player player, int id) {
++        int j;
++
+         if (id >= 100) {
+-            int i = id - 100;
+-            this.setData(0, i);
++            j = id - 100;
++            this.setData(0, j);
+             return true;
+         } else {
+             switch (id) {
+-                case 1: {
+-                    int i = this.lecternData.get(0);
+-                    this.setData(0, i - 1);
++                case 1:
++                    j = this.lecternData.get(0);
++                    this.setData(0, j - 1);
+                     return true;
+-                }
+-                case 2: {
+-                    int i = this.lecternData.get(0);
+-                    this.setData(0, i + 1);
++                case 2:
++                    j = this.lecternData.get(0);
++                    this.setData(0, j + 1);
+                     return true;
+-                }
+                 case 3:
+                     if (!player.mayBuild()) {
+                         return false;
+                     }
+ 
+-                    ItemStack itemStack = this.lectern.removeItemNoUpdate(0);
++                    // CraftBukkit start - Event for taking the book
++                    PlayerTakeLecternBookEvent event = new PlayerTakeLecternBookEvent(player, ((CraftInventoryLectern) getBukkitView().getTopInventory()).getHolder());
++                    Bukkit.getServer().getPluginManager().callEvent(event);
++                    if (event.isCancelled()) {
++                        return false;
++                    }
++                    // CraftBukkit end
++                    ItemStack itemstack = this.lectern.removeItemNoUpdate(0);
++
+                     this.lectern.setChanged();
+-                    if (!player.getInventory().add(itemStack)) {
+-                        player.drop(itemStack, false);
++                    if (!player.getInventory().add(itemstack)) {
++                        player.drop(itemstack, false);
+                     }
+ 
+                     return true;
+@@ -72,7 +106,7 @@
+     }
+ 
+     @Override
+-    public ItemStack quickMoveStack(Player player, int index) {
++    public ItemStack quickMoveStack(net.minecraft.world.entity.player.Player player, int index) {
+         return ItemStack.EMPTY;
+     }
+ 
+@@ -83,7 +117,9 @@
+     }
+ 
+     @Override
+-    public boolean stillValid(Player player) {
++    public boolean stillValid(net.minecraft.world.entity.player.Player player) {
++        if (lectern instanceof LecternInventory && !((LecternInventory) lectern).getLectern().hasBook()) return false; // CraftBukkit
++        if (!this.checkReachable) return true; // CraftBukkit
+         return this.lectern.stillValid(player);
+     }
+