2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: JRoy <joshroy126@gmail.com>
Date: Wed, 26 Aug 2020 02:12:31 -0400
Subject: [PATCH] Add additional open container api to HumanEntity
2024-04-26 05:15:07 +02:00
== AT ==
public net/minecraft/world/level/block/state/BlockBehaviour getMenuProvider(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/MenuProvider;
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
2024-10-23 17:13:43 +02:00
index b2ab430392fc0f214ba8c5383e3f3ad5c548bda2..9022555db0df8c269fc039c895422cf36c08097e 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
2024-09-15 21:39:53 +02:00
@@ -471,6 +471,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
2021-06-11 14:02:28 +02:00
return this.getHandle().containerMenu.getBukkitView();
}
+ // Paper start - Add additional containers
+ @Override
+ public InventoryView openAnvil(Location location, boolean force) {
2023-06-08 02:30:05 +02:00
+ return this.openInventory(location, force, Material.ANVIL);
2021-06-11 14:02:28 +02:00
+ }
+
+ @Override
+ public InventoryView openCartographyTable(Location location, boolean force) {
2023-06-08 02:30:05 +02:00
+ return this.openInventory(location, force, Material.CARTOGRAPHY_TABLE);
2021-06-11 14:02:28 +02:00
+ }
+
+ @Override
+ public InventoryView openGrindstone(Location location, boolean force) {
2023-06-08 02:30:05 +02:00
+ return this.openInventory(location, force, Material.GRINDSTONE);
2021-06-11 14:02:28 +02:00
+ }
+
+ @Override
+ public InventoryView openLoom(Location location, boolean force) {
2023-06-08 02:30:05 +02:00
+ return this.openInventory(location, force, Material.LOOM);
2021-06-11 14:02:28 +02:00
+ }
+
+ @Override
+ public InventoryView openSmithingTable(Location location, boolean force) {
2023-06-08 02:30:05 +02:00
+ return this.openInventory(location, force, Material.SMITHING_TABLE);
2021-06-11 14:02:28 +02:00
+ }
+
+ @Override
+ public InventoryView openStonecutter(Location location, boolean force) {
2023-06-08 02:30:05 +02:00
+ return this.openInventory(location, force, Material.STONECUTTER);
2021-06-11 14:02:28 +02:00
+ }
+
+ private InventoryView openInventory(Location location, boolean force, Material material) {
+ org.spigotmc.AsyncCatcher.catchOp("open" + material);
+ if (location == null) {
2023-06-08 02:30:05 +02:00
+ location = this.getLocation();
2021-06-11 14:02:28 +02:00
+ }
+ if (!force) {
+ Block block = location.getBlock();
+ if (block.getType() != material) {
+ return null;
+ }
+ }
+ net.minecraft.world.level.block.Block block;
+ if (material == Material.ANVIL) {
+ block = Blocks.ANVIL;
+ } else if (material == Material.CARTOGRAPHY_TABLE) {
+ block = Blocks.CARTOGRAPHY_TABLE;
+ } else if (material == Material.GRINDSTONE) {
+ block = Blocks.GRINDSTONE;
+ } else if (material == Material.LOOM) {
+ block = Blocks.LOOM;
+ } else if (material == Material.SMITHING_TABLE) {
+ block = Blocks.SMITHING_TABLE;
+ } else if (material == Material.STONECUTTER) {
+ block = Blocks.STONECUTTER;
+ } else {
+ throw new IllegalArgumentException("Unsupported inventory type: " + material);
+ }
2023-06-08 02:30:05 +02:00
+ this.getHandle().openMenu(block.getMenuProvider(null, this.getHandle().level(), new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ())));
+ this.getHandle().containerMenu.checkReachable = !force;
+ return this.getHandle().containerMenu.getBukkitView();
2021-06-11 14:02:28 +02:00
+ }
+ // Paper end
+
@Override
public void closeInventory() {
2024-01-21 19:37:09 +01:00
// Paper start - Inventory close reason