Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-15 11:00:06 +01:00
Code Issues Projekte Releases Wiki Aktivität

Add additional open container api to HumanEntity

Quellcode durchsuchen
Dieser Commit ist enthalten in:
JRoy 2020-08-26 02:30:08 -04:00 committet von MiniDigger
Ursprung 44e822f7cf
Commit 794e6baf14
2 geänderte Dateien mit 184 neuen und 0 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

103
Spigot-API-Patches/0226-Add-additional-open-container-api-to-HumanEntity.patch Normale Datei
Datei anzeigen

@ -0,0 +1,103 @@
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 b09d12390d5f77330ac84452e0fee63a169bd01f..77bff8fb6bfdf739e413084e13677a83e723c71e 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -148,6 +148,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.
*/

81
Spigot-Server-Patches/0579-Add-additional-open-container-api-to-HumanEntity.patch Normale Datei
Datei anzeigen

@ -0,0 +1,81 @@
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 9c142fddbfcbff7433c199dbaa679625233db866..53917d3b381730efb079113fdffecdc29939d6ea 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -450,6 +450,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
return this.getHandle().activeContainer.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.server.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().openContainer(block.getInventory(null, getHandle().world, new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ())));
+ getHandle().activeContainer.checkReachable = !force;
+ return getHandle().activeContainer.getBukkitView();
+ }
+ // Paper end
+
@Override
public void closeInventory() {
// Paper start