Skip to content

fix(logistics): enforce correct promise ordering for cascading factory requests #226

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
Eldrinn-Elantey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(logistics): enforce correct promise ordering for cascading factory requests #226

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
23 changes: 18 additions & 5 deletions ...ava/ru/zznty/create_factory_logistics/mixin/logistics/panel/FactoryPanelRequestMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,8 @@ private void tickRequests(Operation<Void> original) {

// Map of result -> requests of its ingredients
// Input items may come from differing networks
Map<PanelRequestedStacks, Multimap<PackagerBlockEntity, GenericRequest>> requests = new HashMap<>();
Map<PanelRequestedStacks, Multimap<PackagerBlockEntity, GenericRequest>> requests = new LinkedHashMap<>();
Set<PanelRequestedStacks> contextsWithRequests = new HashSet<>();

// Collect request distributions
for (PanelRequestedStacks requestContext : toRequest) {
Expand All @@ -255,6 +256,9 @@ private void tickRequests(Operation<Void> original) {
GenericOrder order = GenericOrder.of(requestContext, entry.getValue());
Multimap<PackagerBlockEntity, GenericRequest> request = GenericLogisticsManager.findPackagersForRequest(
entry.getKey(), order, null, requestContext.recipeAddress());
if (!request.isEmpty()) {
contextsWithRequests.add(requestContext);
}

requests.merge(requestContext, request, (a, b) -> {
a.putAll(b);
Expand All @@ -274,11 +278,20 @@ private void tickRequests(Operation<Void> original) {
GenericLogisticsManager.performPackageRequests(entry);

// Keep the output promises
for (Map.Entry<PanelRequestedStacks, Multimap<PackagerBlockEntity, GenericRequest>> entry : requests.entrySet()) {
RequestPromiseQueue promises = Create.LOGISTICS.getQueuedPromises(entry.getKey().resultNetwork());
for (PanelRequestedStacks requestContext : toRequest) {
if (!contextsWithRequests.contains(requestContext)) {
continue;
}

Multimap<PackagerBlockEntity, GenericRequest> request = requests.get(requestContext);
if (request == null || !request.isEmpty()) {
continue;
}

RequestPromiseQueue promises = Create.LOGISTICS.getQueuedPromises(requestContext.resultNetwork());
// if all requests were sent, add the output promise
if (promises != null && entry.getValue().isEmpty())
promises.add(new RequestPromise(BigGenericStack.of(entry.getKey().result()).asStack()));
if (promises != null)
promises.add(new RequestPromise(BigGenericStack.of(requestContext.result()).asStack()));
}

panelBE.advancements.awardPlayer(AllAdvancements.FACTORY_GAUGE);
Expand Down