Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9301)

This commit is contained in:
Jake Potrebic 2023-06-12 16:51:45 -07:00 committed by GitHub
parent b48e2e352e
commit c287e921a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
904 changed files with 1598 additions and 1695 deletions

View file

@ -1,103 +0,0 @@
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 7e9e1e0b21314e6542f5f40503cd6926c75cc369..94f2c3167f4ce7f5f2b4ecc067739c64af0a2508 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -174,6 +174,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.
*/