Skip to content

Commit

Permalink
Revert "Optimized even further getting all storage items from wild ch…
Browse files Browse the repository at this point in the history 
…ests using the bukkit API (#189)"

This reverts commit bcbccc8.
  • Loading branch information
@OmerBenGera
OmerBenGera committed Jul 28, 2023
1 parent bcbccc8 commit 34418ae
Show file tree
Hide file tree
Showing 11 changed files with 1 addition and 131 deletions.
12 changes: 0 additions & 12 deletions ...17/src/main/java/com/bgsoftware/wildchests/nms/v117/inventory/CraftWildInventoryImpl.java
View file
Expand Up @@ -3,10 +3,8 @@
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;

Expand Down Expand Up @@ -36,16 +34,6 @@ 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();
Expand Down
12 changes: 0 additions & 12 deletions ...2/src/main/java/com/bgsoftware/wildchests/nms/v1182/inventory/CraftWildInventoryImpl.java
View file
Expand Up @@ -3,10 +3,8 @@
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;

Expand Down Expand Up @@ -36,16 +34,6 @@ 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();
Expand Down
12 changes: 0 additions & 12 deletions ...19/src/main/java/com/bgsoftware/wildchests/nms/v119/inventory/CraftWildInventoryImpl.java
View file
Expand Up @@ -3,10 +3,8 @@
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;

Expand Down Expand Up @@ -36,16 +34,6 @@ 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();
Expand Down
12 changes: 0 additions & 12 deletions ...1/src/main/java/com/bgsoftware/wildchests/nms/v1191/inventory/CraftWildInventoryImpl.java
View file
Expand Up @@ -3,10 +3,8 @@
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;

Expand Down Expand Up @@ -36,16 +34,6 @@ 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();
Expand Down
12 changes: 0 additions & 12 deletions ...2/src/main/java/com/bgsoftware/wildchests/nms/v1192/inventory/CraftWildInventoryImpl.java
View file
Expand Up @@ -3,10 +3,8 @@
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;

Expand Down Expand Up @@ -36,16 +34,6 @@ 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();
Expand Down
12 changes: 0 additions & 12 deletions ...3/src/main/java/com/bgsoftware/wildchests/nms/v1193/inventory/CraftWildInventoryImpl.java
View file
Expand Up @@ -3,10 +3,8 @@
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;

Expand Down Expand Up @@ -36,16 +34,6 @@ 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();
Expand Down
12 changes: 0 additions & 12 deletions ...4/src/main/java/com/bgsoftware/wildchests/nms/v1194/inventory/CraftWildInventoryImpl.java
View file
Expand Up @@ -3,10 +3,8 @@
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;

Expand Down Expand Up @@ -36,16 +34,6 @@ 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();
Expand Down
12 changes: 0 additions & 12 deletions ...1/src/main/java/com/bgsoftware/wildchests/nms/v1201/inventory/CraftWildInventoryImpl.java
View file
Expand Up @@ -3,10 +3,8 @@
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;

Expand Down Expand Up @@ -36,16 +34,6 @@ 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();
Expand Down
12 changes: 0 additions & 12 deletions ...R1/src/main/java/com/bgsoftware/wildchests/nms/v1_12_R1/inventory/CraftWildInventory.java
View file
Expand Up @@ -3,9 +3,7 @@
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;

Expand Down Expand Up @@ -35,16 +33,6 @@ 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();
Expand Down
12 changes: 0 additions & 12 deletions ...R3/src/main/java/com/bgsoftware/wildchests/nms/v1_16_R3/inventory/CraftWildInventory.java
View file
Expand Up @@ -3,9 +3,7 @@
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;

Expand Down Expand Up @@ -35,16 +33,6 @@ 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();
Expand Down
12 changes: 1 addition & 11 deletions ..._R3/src/main/java/com/bgsoftware/wildchests/nms/v1_8_R3/inventory/CraftWildInventory.java
View file
Expand Up @@ -4,7 +4,6 @@
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;

Expand All @@ -19,6 +18,7 @@ public Chest getOwner() {
return getInventory().chest;
}


@Override
public WildContainerItemImpl getWildItem(int slot) {
return getInventory().getWildItem(slot);
Expand All @@ -34,16 +34,6 @@ 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();
Expand Down

0 comments on commit 34418ae

Please sign in to comment.