2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/InventoryCrafting.java
|
|
|
|
+++ b/net/minecraft/server/InventoryCrafting.java
|
2019-04-23 04:00:00 +02:00
|
|
|
@@ -1,6 +1,14 @@
|
|
|
|
package net.minecraft.server;
|
2014-11-25 22:32:16 +01:00
|
|
|
|
2016-11-17 02:41:03 +01:00
|
|
|
import java.util.Iterator;
|
2014-11-25 22:32:16 +01:00
|
|
|
+// CraftBukkit start
|
|
|
|
+import java.util.List;
|
2016-02-29 22:32:46 +01:00
|
|
|
+import org.bukkit.Location;
|
2014-11-25 22:32:16 +01:00
|
|
|
+
|
|
|
|
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
|
|
|
|
+import org.bukkit.entity.HumanEntity;
|
|
|
|
+import org.bukkit.event.inventory.InventoryType;
|
|
|
|
+// CraftBukkit end
|
2016-05-10 13:47:39 +02:00
|
|
|
|
2018-07-15 02:00:00 +02:00
|
|
|
public class InventoryCrafting implements IInventory, AutoRecipeOutput {
|
2014-11-25 22:32:16 +01:00
|
|
|
|
2019-04-23 04:00:00 +02:00
|
|
|
@@ -9,6 +17,68 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
private final int c;
|
2017-05-14 04:00:00 +02:00
|
|
|
public final Container container;
|
2015-02-26 23:41:06 +01:00
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit start - add fields
|
|
|
|
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
|
2018-07-15 02:00:00 +02:00
|
|
|
+ private IRecipe currentRecipe;
|
2014-11-25 22:32:16 +01:00
|
|
|
+ public IInventory resultInventory;
|
|
|
|
+ private EntityHuman owner;
|
|
|
|
+ private int maxStack = MAX_STACK;
|
|
|
|
+
|
2016-11-17 02:41:03 +01:00
|
|
|
+ public List<ItemStack> getContents() {
|
2014-11-25 22:32:16 +01:00
|
|
|
+ return this.items;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void onOpen(CraftHumanEntity who) {
|
|
|
|
+ transaction.add(who);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public InventoryType getInvType() {
|
2016-11-17 02:41:03 +01:00
|
|
|
+ return items.size() == 4 ? InventoryType.CRAFTING : InventoryType.WORKBENCH;
|
2014-11-25 22:32:16 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void onClose(CraftHumanEntity who) {
|
|
|
|
+ transaction.remove(who);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public List<HumanEntity> getViewers() {
|
|
|
|
+ return transaction;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public org.bukkit.inventory.InventoryHolder getOwner() {
|
2015-05-21 08:56:58 +02:00
|
|
|
+ return (owner == null) ? null : owner.getBukkitEntity();
|
2014-11-25 22:32:16 +01:00
|
|
|
+ }
|
|
|
|
+
|
2019-04-23 04:00:00 +02:00
|
|
|
+ @Override
|
|
|
|
+ public int getMaxStackSize() {
|
|
|
|
+ return maxStack;
|
|
|
|
+ }
|
|
|
|
+
|
2014-11-25 22:32:16 +01:00
|
|
|
+ public void setMaxStackSize(int size) {
|
|
|
|
+ maxStack = size;
|
|
|
|
+ resultInventory.setMaxStackSize(size);
|
|
|
|
+ }
|
|
|
|
+
|
2016-02-29 22:32:46 +01:00
|
|
|
+ @Override
|
|
|
|
+ public Location getLocation() {
|
2019-05-27 22:30:00 +02:00
|
|
|
+ return container instanceof ContainerWorkbench ? ((ContainerWorkbench) container).containerAccess.getLocation() : owner.getBukkitEntity().getLocation();
|
2016-02-29 22:32:46 +01:00
|
|
|
+ }
|
|
|
|
+
|
2018-07-15 02:00:00 +02:00
|
|
|
+ @Override
|
|
|
|
+ public IRecipe getCurrentRecipe() {
|
|
|
|
+ return currentRecipe;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setCurrentRecipe(IRecipe currentRecipe) {
|
|
|
|
+ this.currentRecipe = currentRecipe;
|
|
|
|
+ }
|
|
|
|
+
|
2014-11-25 22:32:16 +01:00
|
|
|
+ public InventoryCrafting(Container container, int i, int j, EntityHuman player) {
|
|
|
|
+ this(container, i, j);
|
|
|
|
+ this.owner = player;
|
|
|
|
+ }
|
2015-02-26 23:41:06 +01:00
|
|
|
+ // CraftBukkit end
|
|
|
|
+
|
2014-11-25 22:32:16 +01:00
|
|
|
public InventoryCrafting(Container container, int i, int j) {
|
2020-06-25 02:00:00 +02:00
|
|
|
this.items = NonNullList.a(i * j, ItemStack.b);
|
2017-05-14 04:00:00 +02:00
|
|
|
this.container = container;
|