Skip to content

Fix multiple export cables not working. #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KishCom wants to merge 1 commit into
base: trunk/1.20.1
Choose a base branch
from
Open

Fix multiple export cables not working. #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ org.gradle.daemon=false

mod_id=storagenetwork
curse_id=268495
mod_version=1.12.1
mod_version=1.13.0

mc_version=1.20.1

Expand Down
25 changes: 23 additions & 2 deletions src/main/java/com/lothrazar/storagenetwork/block/main/TileMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.lothrazar.storagenetwork.block.main;

import java.util.List;
import com.lothrazar.storagenetwork.StorageNetworkMod;
import com.lothrazar.storagenetwork.api.DimPos;
import com.lothrazar.storagenetwork.api.EnumStorageDirection;
Expand All @@ -9,11 +10,13 @@
import com.lothrazar.storagenetwork.capability.handler.ItemStackMatcher;
import com.lothrazar.storagenetwork.registry.SsnRegistry;
import com.lothrazar.storagenetwork.registry.StorageNetworkCapabilities;
import com.lothrazar.storagenetwork.util.Request;
import com.lothrazar.storagenetwork.util.RequestBatch;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.Connection;
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity;
Expand Down Expand Up @@ -119,7 +122,8 @@ private void tick() {
return;
}
refresh();
RequestBatch requestBatch = null;
RequestBatch requestBatch = new RequestBatch();
int exportCableCount = 0;
for (IConnectable connectable : nw.getConnectables()) {
if (connectable == null || connectable.getPos() == null) {
continue;
Expand All @@ -142,10 +146,27 @@ private void tick() {
ioCap.runImport(this);
}
if (ioCap.ioDirection() == EnumStorageDirection.OUT) {
requestBatch = ioCap.runExport(this);
exportCableCount++;
RequestBatch cableBatch = ioCap.runExport(this);
StorageNetworkMod.log("Export cable #" + exportCableCount + " at " + connectable.getPos().getBlockPos() + " created batch with " + (cableBatch == null ? "0" : cableBatch.size()) + " item types");
if (cableBatch != null) {
// Merge this cable's requests into the accumulated batch
for (Item item : cableBatch.keySet()) {
List<Request> requests = cableBatch.get(item);
if (requests != null) {
for (Request request : requests) {
requestBatch.put(item, request);
}
}
}
}
}
}
}
// Execute all accumulated export requests at once, properly sorted by priority
if (!requestBatch.isEmpty()) {
StorageNetworkMod.log("Executing accumulated batch with " + requestBatch.size() + " item types from " + exportCableCount + " cables");
}
executeRequestBatch(requestBatch);
}

Expand Down