BRNSystems/Server_storage
3
3
Fork 2
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crafting

Browse Source
This commit is contained in:
Bruno Rybársky
2024-07-12 22:09:55 +02:00
parent 6bdacc88fa
commit 42f37ea5df
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/systems/brn/serverstorage/items/HardDrive.java
View File

@@ -132,6 +132,7 @@ public class HardDrive {
} else {
entry.setValue(countInDrive - outCount);
outCount -= countInDrive;
outCount = Math.max(outCount, 0);
}
break;
}

10
src/main/java/systems/brn/serverstorage/lib/StorageNetwork.java
View File

@@ -210,13 +210,15 @@ public class StorageNetwork {
ItemStack outStack = stackToRemove.copy();
for (HardDrive drive : drives) {
ItemStack removedStack = drive.removeStackFromInventoryRemains(outStack);
if (removedStack.getCount() <= 0) {
break;
outStack = drive.removeStackFromInventoryRemains(outStack);
if (outStack.getCount() <= 0) {
// If all items are removed, return an empty stack
return ItemStack.EMPTY; // Assuming ItemStack.EMPTY represents an empty stack
}
}
// If we still have remaining items, return false
// Return the remaining stack if some items could not be removed
return outStack;
}
}

8
src/main/java/systems/brn/serverstorage/screens/CraftingScreen.java
View File

@@ -171,13 +171,11 @@ public class CraftingScreen extends PagedGui {
private void removeItems(ItemStack stack) {
ItemStack removedFromStorage = this.blockEntity.network.removeItemStack(stack);
ItemStack fromPlayer = stack.copy();
fromPlayer.setCount(stack.getCount() - removedFromStorage.getCount());
if (fromPlayer.getCount() > 0) {
if (removedFromStorage.getCount() > 0) {
Inventory playerInventory = player.getInventory();
for (int i = 0; i < playerInventory.size(); i++) {
if (ItemStack.areItemsEqual(playerInventory.getStack(i), fromPlayer)) {
playerInventory.removeStack(i, fromPlayer.getCount());
if (ItemStack.areItemsEqual(playerInventory.getStack(i), removedFromStorage)) {
playerInventory.removeStack(i, removedFromStorage.getCount());
break; // Only remove one stack per crafting iteration
}
}