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

Test fix

Browse Source
This commit is contained in:
Bruno Rybársky 2024-07-10 00:11:03 +02:00
parent e016690fcb
commit 6bdacc88fa
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gradle.properties
View File

@ -4,14 +4,14 @@ org.gradle.jvmargs=-Xmx1G
# check these on https://modmuss50.me/fabric.html # check these on https://modmuss50.me/fabric.html
minecraft_version=1.21 minecraft_version=1.21
yarn_mappings=1.21+build.7 yarn_mappings=1.21+build.8
loader_version=0.15.11 loader_version=0.15.11
# Fabric API # Fabric API
fabric_version=0.100.4+1.21 fabric_version=0.100.6+1.21
# Mod Properties # Mod Properties
mod_version=3.0.9 mod_version=3.1.0
maven_group=systems.brn maven_group=systems.brn
archives_base_name=Serverstorage archives_base_name=Serverstorage

4
src/main/java/systems/brn/serverstorage/blockentities/InventoryInterfaceBlockEntity.java
View File

@ -124,7 +124,7 @@ public class InventoryInterfaceBlockEntity extends BlockEntity {
} }
public static <T extends BlockEntity> void tick(World world, BlockPos blockPos, BlockState ignoredState, T ignoredt) { public static <T extends BlockEntity> void tick(World world, BlockPos blockPos, BlockState ignoredState, T ignoredt) {
if (!world.getGameRules().getBoolean(ServerStorage_Interface_Enable)){ if (!world.getGameRules().getBoolean(ServerStorage_Interface_Enable)) {
return; return;
} }
InventoryInterfaceBlockEntity blockEntity = (InventoryInterfaceBlockEntity) world.getBlockEntity(blockPos); InventoryInterfaceBlockEntity blockEntity = (InventoryInterfaceBlockEntity) world.getBlockEntity(blockPos);
@ -157,12 +157,12 @@ public class InventoryInterfaceBlockEntity extends BlockEntity {
insertingStack.setCount(count); insertingStack.setCount(count);
if (count > 0) { if (count > 0) {
int canPutInside = count - blockEntity.network.putItemStackRemainder(insertingStack.copy()); int canPutInside = count - blockEntity.network.putItemStackRemainder(insertingStack.copy());
blockEntity.network.updateDisplays();
if (canPutInside > 0) { if (canPutInside > 0) {
removeFromInventory(targetedBlockEntityInventory, insertingStack.copy(), canPutInside); removeFromInventory(targetedBlockEntityInventory, insertingStack.copy(), canPutInside);
} }
} }
} }
blockEntity.network.updateDisplays();
} }
} }
} }

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

@ -98,7 +98,6 @@ public class HardDrive {
public ItemStack getCommitedStack() { public ItemStack getCommitedStack() {
ItemStack tempDriveStack = driveStack.copy(); ItemStack tempDriveStack = driveStack.copy();
driveStack = ensureUUID(tempDriveStack); driveStack = ensureUUID(tempDriveStack);
loadComponents();
updateData(); updateData();
saveComponents(); saveComponents();
return driveStack; return driveStack;

4
src/main/java/systems/brn/serverstorage/lib/StorageOperations.java
View File

@ -21,7 +21,9 @@ public class StorageOperations {
Map<ItemStack, Integer> filteredMap = new HashMap<>(); Map<ItemStack, Integer> filteredMap = new HashMap<>();
for (Map.Entry<ItemStack, Integer> entry : itemStackMap.entrySet()) { for (Map.Entry<ItemStack, Integer> entry : itemStackMap.entrySet()) {
if (filterItem(entry.getKey().getItem(), query)){ if (filterItem(entry.getKey().getItem(), query)){
filteredMap.put(entry.getKey(), entry.getValue()); ItemStack stack = entry.getKey();
stack.setCount(Math.min(entry.getValue(), stack.getMaxCount()));
filteredMap.put(stack, entry.getValue());
} }
} }
sortedMap.putAll(filteredMap); sortedMap.putAll(filteredMap);