82 lines
3.4 KiB
Diff
82 lines
3.4 KiB
Diff
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
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
|
index 36ea76bfe0bd96ead82ed1ad34f25de10b7fa30e..021394a0e668d2cfccd8617d4aee79147181fa22 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
|
@@ -458,6 +458,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
|
|
return this.getHandle().containerMenu.getBukkitView();
|
|
}
|
|
|
|
+ // Paper start - Add additional containers
|
|
+ @Override
|
|
+ public InventoryView openAnvil(Location location, boolean force) {
|
|
+ return openInventory(location, force, Material.ANVIL);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public InventoryView openCartographyTable(Location location, boolean force) {
|
|
+ return openInventory(location, force, Material.CARTOGRAPHY_TABLE);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public InventoryView openGrindstone(Location location, boolean force) {
|
|
+ return openInventory(location, force, Material.GRINDSTONE);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public InventoryView openLoom(Location location, boolean force) {
|
|
+ return openInventory(location, force, Material.LOOM);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public InventoryView openSmithingTable(Location location, boolean force) {
|
|
+ return openInventory(location, force, Material.SMITHING_TABLE);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public InventoryView openStonecutter(Location location, boolean force) {
|
|
+ return openInventory(location, force, Material.STONECUTTER);
|
|
+ }
|
|
+
|
|
+ private InventoryView openInventory(Location location, boolean force, Material material) {
|
|
+ org.spigotmc.AsyncCatcher.catchOp("open" + material);
|
|
+ if (location == null) {
|
|
+ location = getLocation();
|
|
+ }
|
|
+ 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);
|
|
+ }
|
|
+ getHandle().openMenu(block.getMenuProvider(null, getHandle().level, new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ())));
|
|
+ getHandle().containerMenu.checkReachable = !force;
|
|
+ return getHandle().containerMenu.getBukkitView();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public void closeInventory() {
|
|
this.getHandle().closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.PLUGIN);
|