mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 02:25:28 +01:00
77a5779e24
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 2ec53f49 PR-1050: Fix empty result check for Complex Recipes 10671012 PR-1044: Add CrafterCraftEvent 4d87ffe0 Use correct method in JavaDoc ae5e5817 SPIGOT-7850: Add API for Bogged shear state 46b6d445 SPIGOT-7837: Support data pack banner patterns d5d0cefc Fix JavaDoc error b3c2b83d PR-1036: Add API for InventoryView derivatives 1fe2c75a SPIGOT-7809: Add ShieldMeta CraftBukkit Changes: 8ee6fd1b8 SPIGOT-7857: Improve ItemMeta block data deserialization 8f26c30c6 SPIGOT-7857: Fix spurious internal NBT tag when deserializing BlockStateMeta 759061b93 SPIGOT-7855: Fire does not spread or burn blocks 00fc9fb64 SPIGOT-7853: AnvilInventory#getRepairCost() always returns 0 7501e2e04 PR-1450: Add CrafterCraftEvent 8c51673e7 SPIGOT-5731: PortalCreateEvent#getEntity returns null for nether portals ignited by flint and steel d53d0d0b1 PR-1456: Fix inverted logic in CraftCrafterView#setSlotDisabled 682a678c8 SPIGOT-7850: Add API for Bogged shear state fccf5243a SPIGOT-7837: Support data pack banner patterns 9c3bd4390 PR-1431: Add API for InventoryView derivatives 0cc6acbc4 SPIGOT-7849: Fix FoodComponent serialize with "using-converts-to" using null 2c5474952 Don't rely on tags for CraftItemMetas 20d107e46 SPIGOT-7846: Fix ItemMeta for hanging signs 76f59e315 Remove redundant clone in Dropper InventoryMoveItemEvent e61a53d25 SPIGOT-7817: Call InventoryMoveItemEvent for Crafters 894682e2d SPIGOT-7839: Remove redundant Java version checks 2c12b2187 SPIGOT-7809: Add ShieldMeta and fix setting shield base colours Spigot Changes: fb8fb722 Rebuild patches 34bd42b7 SPIGOT-7835: Fix issue with custom hopper settings
104 lines
4.3 KiB
Diff
104 lines
4.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: JRoy <joshroy126@gmail.com>
|
|
Date: Wed, 26 Aug 2020 02:11:58 -0400
|
|
Subject: [PATCH] Add additional open container api to HumanEntity
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
index 11c5846848a6631a9376934622caeadd448b0391..f20b0a439c4d5cd2c6caa70a46b1b49f8ab23425 100644
|
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
@@ -182,6 +182,92 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
|
|
@Nullable
|
|
public InventoryView openMerchant(@NotNull Merchant merchant, boolean force);
|
|
|
|
+ // Paper start - Add additional containers
|
|
+ /**
|
|
+ * Opens an empty anvil inventory window with the player's inventory
|
|
+ * on the bottom.
|
|
+ *
|
|
+ * @param location The location to attach it to. If null, the player's
|
|
+ * location is used.
|
|
+ * @param force If false, and there is no anvil block at the location,
|
|
+ * no inventory will be opened and null will be returned.
|
|
+ * @return The newly opened inventory view, or null if it could not be
|
|
+ * opened.
|
|
+ */
|
|
+ @Nullable
|
|
+ public InventoryView openAnvil(@Nullable Location location, boolean force);
|
|
+
|
|
+ /**
|
|
+ * Opens an empty cartography table inventory window with the player's inventory
|
|
+ * on the bottom.
|
|
+ *
|
|
+ * @param location The location to attach it to. If null, the player's
|
|
+ * location is used.
|
|
+ * @param force If false, and there is no cartography table block at the location,
|
|
+ * no inventory will be opened and null will be returned.
|
|
+ * @return The newly opened inventory view, or null if it could not be
|
|
+ * opened.
|
|
+ */
|
|
+ @Nullable
|
|
+ public InventoryView openCartographyTable(@Nullable Location location, boolean force);
|
|
+
|
|
+ /**
|
|
+ * Opens an empty grindstone inventory window with the player's inventory
|
|
+ * on the bottom.
|
|
+ *
|
|
+ * @param location The location to attach it to. If null, the player's
|
|
+ * location is used.
|
|
+ * @param force If false, and there is no grindstone block at the location,
|
|
+ * no inventory will be opened and null will be returned.
|
|
+ * @return The newly opened inventory view, or null if it could not be
|
|
+ * opened.
|
|
+ */
|
|
+ @Nullable
|
|
+ public InventoryView openGrindstone(@Nullable Location location, boolean force);
|
|
+
|
|
+ /**
|
|
+ * Opens an empty loom inventory window with the player's inventory
|
|
+ * on the bottom.
|
|
+ *
|
|
+ * @param location The location to attach it to. If null, the player's
|
|
+ * location is used.
|
|
+ * @param force If false, and there is no loom block at the location,
|
|
+ * no inventory will be opened and null will be returned.
|
|
+ * @return The newly opened inventory view, or null if it could not be
|
|
+ * opened.
|
|
+ */
|
|
+ @Nullable
|
|
+ public InventoryView openLoom(@Nullable Location location, boolean force);
|
|
+
|
|
+ /**
|
|
+ * Opens an empty smithing table inventory window with the player's inventory
|
|
+ * on the bottom.
|
|
+ *
|
|
+ * @param location The location to attach it to. If null, the player's
|
|
+ * location is used.
|
|
+ * @param force If false, and there is no smithing table block at the location,
|
|
+ * no inventory will be opened and null will be returned.
|
|
+ * @return The newly opened inventory view, or null if it could not be
|
|
+ * opened.
|
|
+ */
|
|
+ @Nullable
|
|
+ public InventoryView openSmithingTable(@Nullable Location location, boolean force);
|
|
+
|
|
+ /**
|
|
+ * Opens an empty stonecutter inventory window with the player's inventory
|
|
+ * on the bottom.
|
|
+ *
|
|
+ * @param location The location to attach it to. If null, the player's
|
|
+ * location is used.
|
|
+ * @param force If false, and there is no stonecutter block at the location,
|
|
+ * no inventory will be opened and null will be returned.
|
|
+ * @return The newly opened inventory view, or null if it could not be
|
|
+ * opened.
|
|
+ */
|
|
+ @Nullable
|
|
+ public InventoryView openStonecutter(@Nullable Location location, boolean force);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Force-closes the currently open inventory view for this player, if any.
|
|
*/
|