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

some performance enhancement to loop checks in the preview

Browse Source
This commit is contained in:
way2muchnoise
2016-09-25 17:27:03 +02:00
parent 67075b38e0
commit e016683c19
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewData.java
View File

@@ -15,7 +15,6 @@ import java.util.HashMap;
public class CraftingPreviewData {
private HashMap<Integer, CraftingPreviewStack> data = new HashMap<>();
private INetworkMaster network;
private int depth = 0;
private boolean depthCheck = false;
public CraftingPreviewData(INetworkMaster network) {
@@ -23,34 +22,34 @@ public class CraftingPreviewData {
}
public void calculate(ItemStack stack, int quantity) {
calculate(stack, quantity, true);
calculate(stack, quantity, true, 0);
}
private void calculate(ItemStack stack, int quantity, boolean baseStack) {
quantity = -add(stack, quantity, baseStack);
if (quantity > 0 && !get(stack).cantCraft()) {
ICraftingPattern pattern = NetworkUtils.getPattern(network, stack);
private void calculate(ItemStack stack, int quantity, boolean baseStack, int depth) {
if (!this.depthCheck) {
quantity = -add(stack, quantity, baseStack);
if (pattern != null && depth < CraftingTask.MAX_DEPTH) {
int quantityPerRequest = pattern.getQuantityPerRequest(stack);
if (quantity > 0 && !get(stack).cantCraft()) {
ICraftingPattern pattern = NetworkUtils.getPattern(network, stack);
while (quantity > 0) {
for (ItemStack ingredient : pattern.getInputs()) {
depth++;
calculate(ingredient, ingredient.stackSize, false);
depth--;
if (pattern != null && depth < CraftingTask.MAX_DEPTH) {
int quantityPerRequest = pattern.getQuantityPerRequest(stack);
while (quantity > 0) {
for (ItemStack ingredient : pattern.getInputs()) {
calculate(ingredient, ingredient.stackSize, false, depth + 1);
}
get(stack).addExtras(quantityPerRequest);
quantity -= quantityPerRequest;
}
get(stack).addExtras(quantityPerRequest);
quantity -= quantityPerRequest;
} else {
if (depth >= CraftingTask.MAX_DEPTH) {
this.depthCheck = true;
}
get(stack).setCantCraft(true);
}
} else {
if (depth >= CraftingTask.MAX_DEPTH) {
this.depthCheck = true;
}
get(stack).setCantCraft(true);
}
}
}