sigonasr2/TwosideKeeper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make Item Pickups auto update Cube inventory lists.

Browse Source
This commit is contained in:
sigonasr2 2017-01-17 21:32:52 -06:00
parent c6ac33e728
commit 45ec9bf301
3 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

17
src/sig/plugin/TwosideKeeper/HelperStructures/Utils/InventoryUtils.java
View File

@ -16,6 +16,7 @@ import sig.plugin.TwosideKeeper.HelperStructures.CubeType;
import sig.plugin.TwosideKeeper.HelperStructures.CustomItem;
import sig.plugin.TwosideKeeper.HelperStructures.ItemCube;
import sig.plugin.TwosideKeeper.HelperStructures.Common.GenericFunctions;
import sig.plugin.TwosideKeeper.HelperStructures.Common.ItemContainer;
import sig.plugin.TwosideKeeper.HolidayEvents.Christmas;
public class InventoryUtils {
@ -43,12 +44,26 @@ public class InventoryUtils {
//TwosideKeeper.log("Items: "+ArrayUtils.toString(remaining), 0);
HashMap<Integer,ItemStack> remainingitems = virtualinventory.addItem(remaining);
List<ItemStack> itemslist = new ArrayList<ItemStack>();
List<ItemContainer> itemcube_list = new ArrayList<ItemContainer>();
for (int i=0;i<virtualinventory.getSize();i++) {
itemslist.add(virtualinventory.getItem(i));
if (ItemUtils.isValidItem(virtualinventory.getItem(i))) {
boolean found=false;
for (int j=0;j<itemcube_list.size();j++) {
if (itemcube_list.get(j).getItem().isSimilar(virtualinventory.getItem(i))) {
itemcube_list.get(j).setAmount(itemcube_list.get(j).getAmount()+virtualinventory.getItem(i).getAmount());
found=true;
break;
}
}
if (!found) {
itemcube_list.add(new ItemContainer(virtualinventory.getItem(i)));
}
}
}
ItemCube.addToViewersOfItemCube(id,remaining,null);
TwosideKeeper.itemCube_saveConfig(id, itemslist, CubeType.VACUUM);
TwosideKeeper.itemcube_updates.put(id, itemcube_list);//This Item Cube can be saved.
/*for (ItemStack i : remainingitems.values()) {
TwosideKeeper.log("Item "+i+" remains", 0);
}*/

31
src/sig/plugin/TwosideKeeper/HelperStructures/Utils/ItemCubeUtils.java
View File

@ -23,6 +23,7 @@ import org.bukkit.inventory.ItemStack;
import sig.plugin.TwosideKeeper.TwosideKeeper;
import sig.plugin.TwosideKeeper.HelperStructures.CubeType;
import sig.plugin.TwosideKeeper.HelperStructures.ItemCube;
import sig.plugin.TwosideKeeper.HelperStructures.Common.ItemContainer;
public class ItemCubeUtils {
public static int getItemCubeID(ItemStack item) {
@ -59,22 +60,52 @@ public class ItemCubeUtils {
HashMap<Integer,ItemStack> extras = cube_inv.addItem(it);
if (extras.size()==0) {
List<ItemStack> itemslist = new ArrayList<ItemStack>();
List<ItemContainer> itemcube_list = new ArrayList<ItemContainer>();
for (int i=0;i<cube_inv.getSize();i++) {
itemslist.add(cube_inv.getItem(i));
if (ItemUtils.isValidItem(cube_inv.getItem(i))) {
boolean found=false;
for (int j=0;j<itemcube_list.size();j++) {
if (itemcube_list.get(j).getItem().isSimilar(cube_inv.getItem(i))) {
itemcube_list.get(j).setAmount(itemcube_list.get(j).getAmount()+cube_inv.getItem(i).getAmount());
found=true;
break;
}
}
if (!found) {
itemcube_list.add(new ItemContainer(cube_inv.getItem(i)));
}
}
}
ItemCube.addToViewersOfItemCube(id,remaining,null);
if (!testing) {
TwosideKeeper.itemCube_saveConfig(id, itemslist);
TwosideKeeper.itemcube_updates.put(id, itemcube_list);//This Item Cube can be saved.
}
} else {
for (ItemStack i : extras.values()) {
reject_items.put(reject_items.size(), i);
List<ItemStack> itemslist = new ArrayList<ItemStack>();
List<ItemContainer> itemcube_list = new ArrayList<ItemContainer>();
for (int j=0;j<cube_inv.getSize();j++) {
itemslist.add(cube_inv.getItem(j));
if (ItemUtils.isValidItem(cube_inv.getItem(j))) {
boolean found=false;
for (int k=0;k<itemcube_list.size();k++) {
if (itemcube_list.get(k).getItem().isSimilar(cube_inv.getItem(j))) {
itemcube_list.get(k).setAmount(itemcube_list.get(k).getAmount()+cube_inv.getItem(j).getAmount());
found=true;
break;
}
}
if (!found) {
itemcube_list.add(new ItemContainer(cube_inv.getItem(j)));
}
}
}
if (!testing) {
TwosideKeeper.itemCube_saveConfig(id, itemslist);
TwosideKeeper.itemcube_updates.put(id, itemcube_list);//This Item Cube can be saved.
}
}
}