SeanOMik
/
EnergeticStorage
mirror of https://github.com/SeanOMik/EnergeticStorage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix displaying amounts for an item type that is in more than one drive

This commit is contained in:
SeanOMik 2022-01-27 14:05:33 -05:00
parent 277974edae
commit 226d28cd3b
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/seanomik/energeticstorage/gui/ESTerminalGUI.java
View File

@ -120,9 +120,7 @@ public class ESTerminalGUI implements InventoryHolder, Listener {
break; break;
case AMOUNT: case AMOUNT:
Map<ItemStack, Integer> finalItems = items; Map<ItemStack, Integer> finalItems = items;
sortedKeys.sort((i1, i2) -> { sortedKeys.sort((i1, i2) -> finalItems.get(i2).compareTo(finalItems.get(i1)));
return finalItems.get(i2).compareTo(finalItems.get(i1));
});
break; break;
case ID: case ID:
sortedKeys.sort(Comparator.comparing(ItemStack::getType)); sortedKeys.sort(Comparator.comparing(ItemStack::getType));

17
src/main/java/net/seanomik/energeticstorage/objects/ESDrive.java
View File

@ -68,6 +68,20 @@ public class ESDrive implements Cloneable, ConfigurationSerializable {
uuid = (driveNBT.hasKey("ES_DriveUUID")) ? UUID.fromString(driveNBT.getString("ES_DriveUUID")) : UUID.randomUUID(); uuid = (driveNBT.hasKey("ES_DriveUUID")) ? UUID.fromString(driveNBT.getString("ES_DriveUUID")) : UUID.randomUUID();
} }
public static ItemStack sterilizedItem(ItemStack item) {
ItemMeta meta = item.getItemMeta();
if (meta.hasLore()) {
List<String> itemLore = meta.getLore();
itemLore.removeIf(lore -> lore.startsWith("Amount:"));
meta.setLore(itemLore);
item.setItemMeta(meta);
}
return item;
}
public UUID getUUID() { public UUID getUUID() {
return uuid; return uuid;
} }
@ -142,7 +156,8 @@ public class ESDrive implements Cloneable, ConfigurationSerializable {
} }
public boolean addItem(ItemStack item) { public boolean addItem(ItemStack item) {
item = item.clone(); // Sterilize items of the "Amount: " lore
item = sterilizedItem(item.clone());
if (canAddItem(item)) { if (canAddItem(item)) {
// The item is contained, then update the amount. // The item is contained, then update the amount.

14
src/main/java/net/seanomik/energeticstorage/objects/ESSystem.java
View File

@ -168,13 +168,15 @@ public class ESSystem implements Cloneable, ConfigurationSerializable {
for (ESDrive drive : esDrives) { for (ESDrive drive : esDrives) {
for (Map.Entry<ItemStack, Integer> entry : drive.getItems().entrySet()) { for (Map.Entry<ItemStack, Integer> entry : drive.getItems().entrySet()) {
if (items.containsKey(entry.getKey())) { ItemStack sterilizedItem = ESDrive.sterilizedItem(entry.getKey());
// Set the ItemStack amount to the already existing item's amount + this amount
entry.getKey().setAmount(Math.min(entry.getValue(), 64));
items.remove(entry.getKey());
}
items.put(entry.getKey(), entry.getValue()); if (items.containsKey(entry.getKey())) {
int amount = items.get(entry.getKey());
items.put(sterilizedItem, amount + entry.getValue());
} else {
items.put(sterilizedItem, entry.getValue());
}
} }
} }