aboutsummaryrefslogtreecommitdiffhomepage
path: root/patch-remap/mache-spigotflower/net/minecraft/world/inventory/HopperMenu.java.patch
diff options
context:
space:
mode:
authorMiniDigger | Martin <[email protected]>2024-01-14 11:04:49 +0100
committerMiniDigger | Martin <[email protected]>2024-01-14 11:04:49 +0100
commitbee74680e607c2e29b038329f62181238911cd83 (patch)
tree708fd1a4a0227d9071243adf2a42d5e9e96cde4a /patch-remap/mache-spigotflower/net/minecraft/world/inventory/HopperMenu.java.patch
parent0a44692ef6ff6e255d48eb3ba1bb114166eafda9 (diff)
downloadPaper-softspoon.tar.gz
Paper-softspoon.zip
add remapped patches as a testsoftspoon
Diffstat (limited to 'patch-remap/mache-spigotflower/net/minecraft/world/inventory/HopperMenu.java.patch')
-rw-r--r--patch-remap/mache-spigotflower/net/minecraft/world/inventory/HopperMenu.java.patch98
1 files changed, 98 insertions, 0 deletions
diff --git a/patch-remap/mache-spigotflower/net/minecraft/world/inventory/HopperMenu.java.patch b/patch-remap/mache-spigotflower/net/minecraft/world/inventory/HopperMenu.java.patch
new file mode 100644
index 0000000000..4ef856587f
--- /dev/null
+++ b/patch-remap/mache-spigotflower/net/minecraft/world/inventory/HopperMenu.java.patch
@@ -0,0 +1,98 @@
+--- a/net/minecraft/world/inventory/HopperMenu.java
++++ b/net/minecraft/world/inventory/HopperMenu.java
+@@ -6,20 +6,42 @@
+ import net.minecraft.world.entity.player.Player;
+ import net.minecraft.world.item.ItemStack;
+
++// CraftBukkit start
++import org.bukkit.craftbukkit.inventory.CraftInventory;
++import org.bukkit.craftbukkit.inventory.CraftInventoryView;
++// CraftBukkit end
++
+ public class HopperMenu extends AbstractContainerMenu {
+
+ public static final int CONTAINER_SIZE = 5;
+ private final Container hopper;
+
+- public HopperMenu(int i, Inventory inventory) {
+- this(i, inventory, new SimpleContainer(5));
++ // CraftBukkit start
++ private CraftInventoryView bukkitEntity = null;
++ private Inventory player;
++
++ @Override
++ public CraftInventoryView getBukkitView() {
++ if (bukkitEntity != null) {
++ return bukkitEntity;
++ }
++
++ CraftInventory inventory = new CraftInventory(this.hopper);
++ bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), inventory, this);
++ return bukkitEntity;
+ }
++ // CraftBukkit end
+
+- public HopperMenu(int i, Inventory inventory, Container container) {
+- super(MenuType.HOPPER, i);
++ public HopperMenu(int containerId, Inventory playerInventory) {
++ this(containerId, playerInventory, new SimpleContainer(5));
++ }
++
++ public HopperMenu(int containerId, Inventory playerInventory, Container container) {
++ super(MenuType.HOPPER, containerId);
+ this.hopper = container;
++ this.player = playerInventory; // CraftBukkit - save player
+ checkContainerSize(container, 5);
+- container.startOpen(inventory.player);
++ container.startOpen(playerInventory.player);
+ boolean flag = true;
+
+ int j;
+@@ -30,33 +52,32 @@
+
+ for (j = 0; j < 3; ++j) {
+ for (int k = 0; k < 9; ++k) {
+- this.addSlot(new Slot(inventory, k + j * 9 + 9, 8 + k * 18, j * 18 + 51));
++ this.addSlot(new Slot(playerInventory, k + j * 9 + 9, 8 + k * 18, j * 18 + 51));
+ }
+ }
+
+ for (j = 0; j < 9; ++j) {
+- this.addSlot(new Slot(inventory, j, 8 + j * 18, 109));
++ this.addSlot(new Slot(playerInventory, j, 8 + j * 18, 109));
+ }
+
+ }
+
+ @Override
+- @Override
+ public boolean stillValid(Player player) {
++ if (!this.checkReachable) return true; // CraftBukkit
+ return this.hopper.stillValid(player);
+ }
+
+ @Override
+- @Override
+- public ItemStack quickMoveStack(Player player, int i) {
++ public ItemStack quickMoveStack(Player player, int index) {
+ ItemStack itemstack = ItemStack.EMPTY;
+- Slot slot = (Slot) this.slots.get(i);
++ Slot slot = (Slot) this.slots.get(index);
+
+ if (slot != null && slot.hasItem()) {
+ ItemStack itemstack1 = slot.getItem();
+
+ itemstack = itemstack1.copy();
+- if (i < this.hopper.getContainerSize()) {
++ if (index < this.hopper.getContainerSize()) {
+ if (!this.moveItemStackTo(itemstack1, this.hopper.getContainerSize(), this.slots.size(), true)) {
+ return ItemStack.EMPTY;
+ }
+@@ -75,7 +96,6 @@
+ }
+
+ @Override
+- @Override
+ public void removed(Player player) {
+ super.removed(player);
+ this.hopper.stopOpen(player);