Optimized even further getting all storage items from wild chests usi…

…ng the bukkit API (#189)
BG-Software-LLC · Jul 21, 2023 · bcbccc8 · bcbccc8
1 parent 1ca9120
commit bcbccc8
Show file tree

Hide file tree

Showing 11 changed files with 131 additions and 1 deletion.
diff --git a/...17/src/main/java/com/bgsoftware/wildchests/nms/v117/inventory/CraftWildInventoryImpl.java b/...17/src/main/java/com/bgsoftware/wildchests/nms/v117/inventory/CraftWildInventoryImpl.java
@@ -3,8 +3,10 @@
 import com.bgsoftware.wildchests.api.objects.chests.Chest;
 import com.bgsoftware.wildchests.objects.inventory.CraftWildInventory;
 import com.bgsoftware.wildchests.objects.inventory.WildContainerItem;
+import net.minecraft.core.NonNullList;
 import net.minecraft.world.Container;
 import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftInventory;
+import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
@@ -34,6 +36,16 @@ public List<WildContainerItem> getWildContents() {
         return getInventory().items;
     }
 
+    @Override
+    public ItemStack[] getContents() {
+        NonNullList<WildContainerItem> inventoryItems = getInventory().items;
+        ItemStack[] bukkitItems = new ItemStack[inventoryItems.size()];
+        for (int i = 0; i < bukkitItems.length; ++i) {
+            bukkitItems[i] = inventoryItems.get(i).getBukkitItem();
+        }
+        return bukkitItems;
+    }
+
     @Override
     public WildContainer getInventory() {
         return (WildContainer) super.getInventory();

diff --git a/...2/src/main/java/com/bgsoftware/wildchests/nms/v1182/inventory/CraftWildInventoryImpl.java b/...2/src/main/java/com/bgsoftware/wildchests/nms/v1182/inventory/CraftWildInventoryImpl.java
@@ -3,8 +3,10 @@
 import com.bgsoftware.wildchests.api.objects.chests.Chest;
 import com.bgsoftware.wildchests.objects.inventory.CraftWildInventory;
 import com.bgsoftware.wildchests.objects.inventory.WildContainerItem;
+import net.minecraft.core.NonNullList;
 import net.minecraft.world.Container;
 import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftInventory;
+import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
@@ -34,6 +36,16 @@ public List<WildContainerItem> getWildContents() {
         return getInventory().items;
     }
 
+    @Override
+    public ItemStack[] getContents() {
+        NonNullList<WildContainerItem> inventoryItems = getInventory().items;
+        ItemStack[] bukkitItems = new ItemStack[inventoryItems.size()];
+        for (int i = 0; i < bukkitItems.length; ++i) {
+            bukkitItems[i] = inventoryItems.get(i).getBukkitItem();
+        }
+        return bukkitItems;
+    }
+
     @Override
     public WildContainer getInventory() {
         return (WildContainer) super.getInventory();

diff --git a/...19/src/main/java/com/bgsoftware/wildchests/nms/v119/inventory/CraftWildInventoryImpl.java b/...19/src/main/java/com/bgsoftware/wildchests/nms/v119/inventory/CraftWildInventoryImpl.java
@@ -3,8 +3,10 @@
 import com.bgsoftware.wildchests.api.objects.chests.Chest;
 import com.bgsoftware.wildchests.objects.inventory.CraftWildInventory;
 import com.bgsoftware.wildchests.objects.inventory.WildContainerItem;
+import net.minecraft.core.NonNullList;
 import net.minecraft.world.Container;
 import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftInventory;
+import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
@@ -34,6 +36,16 @@ public List<WildContainerItem> getWildContents() {
         return getInventory().items;
     }
 
+    @Override
+    public ItemStack[] getContents() {
+        NonNullList<WildContainerItem> inventoryItems = getInventory().items;
+        ItemStack[] bukkitItems = new ItemStack[inventoryItems.size()];
+        for (int i = 0; i < bukkitItems.length; ++i) {
+            bukkitItems[i] = inventoryItems.get(i).getBukkitItem();
+        }
+        return bukkitItems;
+    }
+
     @Override
     public WildContainer getInventory() {
         return (WildContainer) super.getInventory();

diff --git a/...1/src/main/java/com/bgsoftware/wildchests/nms/v1191/inventory/CraftWildInventoryImpl.java b/...1/src/main/java/com/bgsoftware/wildchests/nms/v1191/inventory/CraftWildInventoryImpl.java
@@ -3,8 +3,10 @@
 import com.bgsoftware.wildchests.api.objects.chests.Chest;
 import com.bgsoftware.wildchests.objects.inventory.CraftWildInventory;
 import com.bgsoftware.wildchests.objects.inventory.WildContainerItem;
+import net.minecraft.core.NonNullList;
 import net.minecraft.world.Container;
 import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftInventory;
+import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
@@ -34,6 +36,16 @@ public List<WildContainerItem> getWildContents() {
         return getInventory().items;
     }
 
+    @Override
+    public ItemStack[] getContents() {
+        NonNullList<WildContainerItem> inventoryItems = getInventory().items;
+        ItemStack[] bukkitItems = new ItemStack[inventoryItems.size()];
+        for (int i = 0; i < bukkitItems.length; ++i) {
+            bukkitItems[i] = inventoryItems.get(i).getBukkitItem();
+        }
+        return bukkitItems;
+    }
+
     @Override
     public WildContainer getInventory() {
         return (WildContainer) super.getInventory();

diff --git a/...2/src/main/java/com/bgsoftware/wildchests/nms/v1192/inventory/CraftWildInventoryImpl.java b/...2/src/main/java/com/bgsoftware/wildchests/nms/v1192/inventory/CraftWildInventoryImpl.java
@@ -3,8 +3,10 @@
 import com.bgsoftware.wildchests.api.objects.chests.Chest;
 import com.bgsoftware.wildchests.objects.inventory.CraftWildInventory;
 import com.bgsoftware.wildchests.objects.inventory.WildContainerItem;
+import net.minecraft.core.NonNullList;
 import net.minecraft.world.Container;
 import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftInventory;
+import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
@@ -34,6 +36,16 @@ public List<WildContainerItem> getWildContents() {
         return getInventory().items;
     }
 
+    @Override
+    public ItemStack[] getContents() {
+        NonNullList<WildContainerItem> inventoryItems = getInventory().items;
+        ItemStack[] bukkitItems = new ItemStack[inventoryItems.size()];
+        for (int i = 0; i < bukkitItems.length; ++i) {
+            bukkitItems[i] = inventoryItems.get(i).getBukkitItem();
+        }
+        return bukkitItems;
+    }
+
     @Override
     public WildContainer getInventory() {
         return (WildContainer) super.getInventory();

diff --git a/...3/src/main/java/com/bgsoftware/wildchests/nms/v1193/inventory/CraftWildInventoryImpl.java b/...3/src/main/java/com/bgsoftware/wildchests/nms/v1193/inventory/CraftWildInventoryImpl.java
@@ -3,8 +3,10 @@
 import com.bgsoftware.wildchests.api.objects.chests.Chest;
 import com.bgsoftware.wildchests.objects.inventory.CraftWildInventory;
 import com.bgsoftware.wildchests.objects.inventory.WildContainerItem;
+import net.minecraft.core.NonNullList;
 import net.minecraft.world.Container;
 import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftInventory;
+import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
@@ -34,6 +36,16 @@ public List<WildContainerItem> getWildContents() {
         return getInventory().items;
     }
 
+    @Override
+    public ItemStack[] getContents() {
+        NonNullList<WildContainerItem> inventoryItems = getInventory().items;
+        ItemStack[] bukkitItems = new ItemStack[inventoryItems.size()];
+        for (int i = 0; i < bukkitItems.length; ++i) {
+            bukkitItems[i] = inventoryItems.get(i).getBukkitItem();
+        }
+        return bukkitItems;
+    }
+
     @Override
     public WildContainer getInventory() {
         return (WildContainer) super.getInventory();

diff --git a/...4/src/main/java/com/bgsoftware/wildchests/nms/v1194/inventory/CraftWildInventoryImpl.java b/...4/src/main/java/com/bgsoftware/wildchests/nms/v1194/inventory/CraftWildInventoryImpl.java
@@ -3,8 +3,10 @@
 import com.bgsoftware.wildchests.api.objects.chests.Chest;
 import com.bgsoftware.wildchests.objects.inventory.CraftWildInventory;
 import com.bgsoftware.wildchests.objects.inventory.WildContainerItem;
+import net.minecraft.core.NonNullList;
 import net.minecraft.world.Container;
 import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftInventory;
+import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
@@ -34,6 +36,16 @@ public List<WildContainerItem> getWildContents() {
         return getInventory().items;
     }
 
+    @Override
+    public ItemStack[] getContents() {
+        NonNullList<WildContainerItem> inventoryItems = getInventory().items;
+        ItemStack[] bukkitItems = new ItemStack[inventoryItems.size()];
+        for (int i = 0; i < bukkitItems.length; ++i) {
+            bukkitItems[i] = inventoryItems.get(i).getBukkitItem();
+        }
+        return bukkitItems;
+    }
+
     @Override
     public WildContainer getInventory() {
         return (WildContainer) super.getInventory();

diff --git a/...1/src/main/java/com/bgsoftware/wildchests/nms/v1201/inventory/CraftWildInventoryImpl.java b/...1/src/main/java/com/bgsoftware/wildchests/nms/v1201/inventory/CraftWildInventoryImpl.java
@@ -3,8 +3,10 @@
 import com.bgsoftware.wildchests.api.objects.chests.Chest;
 import com.bgsoftware.wildchests.objects.inventory.CraftWildInventory;
 import com.bgsoftware.wildchests.objects.inventory.WildContainerItem;
+import net.minecraft.core.NonNullList;
 import net.minecraft.world.Container;
 import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftInventory;
+import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
@@ -34,6 +36,16 @@ public List<WildContainerItem> getWildContents() {
         return getInventory().items;
     }
 
+    @Override
+    public ItemStack[] getContents() {
+        NonNullList<WildContainerItem> inventoryItems = getInventory().items;
+        ItemStack[] bukkitItems = new ItemStack[inventoryItems.size()];
+        for (int i = 0; i < bukkitItems.length; ++i) {
+            bukkitItems[i] = inventoryItems.get(i).getBukkitItem();
+        }
+        return bukkitItems;
+    }
+
     @Override
     public WildContainer getInventory() {
         return (WildContainer) super.getInventory();

diff --git a/...R1/src/main/java/com/bgsoftware/wildchests/nms/v1_12_R1/inventory/CraftWildInventory.java b/...R1/src/main/java/com/bgsoftware/wildchests/nms/v1_12_R1/inventory/CraftWildInventory.java
@@ -3,7 +3,9 @@
 import com.bgsoftware.wildchests.api.objects.chests.Chest;
 import com.bgsoftware.wildchests.objects.inventory.WildContainerItem;
 import net.minecraft.server.v1_12_R1.IInventory;
+import net.minecraft.server.v1_12_R1.NonNullList;
 import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory;
+import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
@@ -33,6 +35,16 @@ public List<WildContainerItem> getWildContents() {
         return getInventory().items;
     }
 
+    @Override
+    public ItemStack[] getContents() {
+        NonNullList<WildContainerItem> inventoryItems = getInventory().items;
+        ItemStack[] bukkitItems = new ItemStack[inventoryItems.size()];
+        for (int i = 0; i < bukkitItems.length; ++i) {
+            bukkitItems[i] = inventoryItems.get(i).getBukkitItem();
+        }
+        return bukkitItems;
+    }
+
     @Override
     public WildInventory getInventory() {
         return (WildInventory) super.getInventory();

diff --git a/...R3/src/main/java/com/bgsoftware/wildchests/nms/v1_16_R3/inventory/CraftWildInventory.java b/...R3/src/main/java/com/bgsoftware/wildchests/nms/v1_16_R3/inventory/CraftWildInventory.java
@@ -3,7 +3,9 @@
 import com.bgsoftware.wildchests.api.objects.chests.Chest;
 import com.bgsoftware.wildchests.objects.inventory.WildContainerItem;
 import net.minecraft.server.v1_16_R3.IInventory;
+import net.minecraft.server.v1_16_R3.NonNullList;
 import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftInventory;
+import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
@@ -33,6 +35,16 @@ public List<WildContainerItem> getWildContents() {
         return getInventory().items;
     }
 
+    @Override
+    public ItemStack[] getContents() {
+        NonNullList<WildContainerItem> inventoryItems = getInventory().items;
+        ItemStack[] bukkitItems = new ItemStack[inventoryItems.size()];
+        for (int i = 0; i < bukkitItems.length; ++i) {
+            bukkitItems[i] = inventoryItems.get(i).getBukkitItem();
+        }
+        return bukkitItems;
+    }
+
     @Override
     public WildInventory getInventory() {
         return (WildInventory) super.getInventory();

diff --git a/..._R3/src/main/java/com/bgsoftware/wildchests/nms/v1_8_R3/inventory/CraftWildInventory.java b/..._R3/src/main/java/com/bgsoftware/wildchests/nms/v1_8_R3/inventory/CraftWildInventory.java
@@ -4,6 +4,7 @@
 import com.bgsoftware.wildchests.objects.inventory.WildContainerItem;
 import net.minecraft.server.v1_8_R3.IInventory;
 import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventory;
+import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
@@ -18,7 +19,6 @@ public Chest getOwner() {
         return getInventory().chest;
     }
 
-
     @Override
     public WildContainerItemImpl getWildItem(int slot) {
         return getInventory().getWildItem(slot);
@@ -34,6 +34,16 @@ public List<WildContainerItem> getWildContents() {
         return getInventory().items;
     }
 
+    @Override
+    public ItemStack[] getContents() {
+        List<WildContainerItem> inventoryItems = getInventory().items;
+        ItemStack[] bukkitItems = new ItemStack[inventoryItems.size()];
+        for (int i = 0; i < bukkitItems.length; ++i) {
+            bukkitItems[i] = inventoryItems.get(i).getBukkitItem();
+        }
+        return bukkitItems;
+    }
+
     @Override
     public WildInventory getInventory() {
         return (WildInventory) super.getInventory();