dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove calculation threads causing concurrency issues (#3002)

Browse Source
This commit is contained in:
Anton Bulakh
2021-06-09 18:54:49 +03:00
committed by GitHub
parent c45991ed83
commit 7a888aaf3e
2 changed files with 53 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java
View File

@@ -99,40 +99,36 @@ public class FluidGridHandler implements IFluidGridHandler {
FluidStack stack = network.getFluidStorageCache().getCraftablesList().get(id);
if (stack != null) {
Thread calculationThread = new Thread(() -> {
ICalculationResult result = network.getCraftingManager().create(stack, quantity);
if (result == null) {
return;
}
ICalculationResult result = network.getCraftingManager().create(stack, quantity);
if (result == null) {
return;
}
if (!result.isOk() && result.getType() != CalculationResultType.MISSING) {
RS.NETWORK_HANDLER.sendTo(
player,
new GridCraftingPreviewResponseMessage(
Collections.singletonList(new ErrorCraftingPreviewElement(result.getType(), result.getRecursedPattern() == null ? ItemStack.EMPTY : result.getRecursedPattern().getStack())),
id,
quantity,
true
)
);
} else if (result.isOk() && noPreview) {
network.getCraftingManager().start(result.getTask());
if (!result.isOk() && result.getType() != CalculationResultType.MISSING) {
RS.NETWORK_HANDLER.sendTo(
player,
new GridCraftingPreviewResponseMessage(
Collections.singletonList(new ErrorCraftingPreviewElement(result.getType(), result.getRecursedPattern() == null ? ItemStack.EMPTY : result.getRecursedPattern().getStack())),
id,
quantity,
true
)
);
} else if (result.isOk() && noPreview) {
network.getCraftingManager().start(result.getTask());
RS.NETWORK_HANDLER.sendTo(player, new GridCraftingStartResponseMessage());
} else {
RS.NETWORK_HANDLER.sendTo(
player,
new GridCraftingPreviewResponseMessage(
result.getPreviewElements(),
id,
quantity,
true
)
);
}
}, "RS crafting preview calculation");
calculationThread.start();
RS.NETWORK_HANDLER.sendTo(player, new GridCraftingStartResponseMessage());
} else {
RS.NETWORK_HANDLER.sendTo(
player,
new GridCraftingPreviewResponseMessage(
result.getPreviewElements(),
id,
quantity,
true
)
);
}
}
}

54
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java
View File

@@ -190,37 +190,33 @@ public class ItemGridHandler implements IItemGridHandler {
ItemStack stack = network.getItemStorageCache().getCraftablesList().get(id);
if (stack != null) {
Thread calculationThread = new Thread(() -> {
ICalculationResult result = network.getCraftingManager().create(stack, quantity);
ICalculationResult result = network.getCraftingManager().create(stack, quantity);
if (!result.isOk() && result.getType() != CalculationResultType.MISSING) {
RS.NETWORK_HANDLER.sendTo(
player,
new GridCraftingPreviewResponseMessage(
Collections.singletonList(new ErrorCraftingPreviewElement(result.getType(), result.getRecursedPattern() == null ? ItemStack.EMPTY : result.getRecursedPattern().getStack())),
id,
quantity,
false
)
);
} else if (result.isOk() && noPreview) {
network.getCraftingManager().start(result.getTask());
if (!result.isOk() && result.getType() != CalculationResultType.MISSING) {
RS.NETWORK_HANDLER.sendTo(
player,
new GridCraftingPreviewResponseMessage(
Collections.singletonList(new ErrorCraftingPreviewElement(result.getType(), result.getRecursedPattern() == null ? ItemStack.EMPTY : result.getRecursedPattern().getStack())),
id,
quantity,
false
)
);
} else if (result.isOk() && noPreview) {
network.getCraftingManager().start(result.getTask());
RS.NETWORK_HANDLER.sendTo(player, new GridCraftingStartResponseMessage());
} else {
RS.NETWORK_HANDLER.sendTo(
player,
new GridCraftingPreviewResponseMessage(
result.getPreviewElements(),
id,
quantity,
false
)
);
}
}, "RS crafting preview calculation");
calculationThread.start();
RS.NETWORK_HANDLER.sendTo(player, new GridCraftingStartResponseMessage());
} else {
RS.NETWORK_HANDLER.sendTo(
player,
new GridCraftingPreviewResponseMessage(
result.getPreviewElements(),
id,
quantity,
false
)
);
}
}
}