From 18efdbf4ca94f223acc1c7bb072d5f8562d79fd9 Mon Sep 17 00:00:00 2001 From: Towdium Date: Mon, 29 Feb 2016 21:07:54 +0800 Subject: [PATCH] Calculating core fix --- .../core/Calculator.java | 4 +- .../core/CostRecord.java | 57 +++++++++++-------- .../core/ItemRecord.java | 2 +- .../core/ItemStackWrapper.java | 3 + 4 files changed, 38 insertions(+), 28 deletions(-) diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java b/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java index 510e42c..198f1dd 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java @@ -25,7 +25,7 @@ public class Calculator { // all the recipes for one item LOOP1: for(Recipe recipe : JustEnoughCalculation.proxy.getPlayerHandler().getAllRecipeOf(itemRecord.toItemStack(), null)){ - CostRecord record = new CostRecord(costRecords.get(costRecords.size()-1), new CostRecord(recipe, getCount(itemRecord, recipe))); + CostRecord record = new CostRecord(costRecords.get(costRecords.size()-1), new CostRecord(recipe, getCount(itemRecord, recipe), itemRecord.approx)); for(CostRecord costRecord : costRecords){ if(costRecord.equals(record)){ continue LOOP1; @@ -48,6 +48,4 @@ public class Calculator { long a = recipe.getOutputAmount(itemRecord.toItemStack()); return (long) ((double)itemRecord.amount/a + 0.5f); } - - } diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/CostRecord.java b/src/main/java/pers/towdium/justEnoughCalculation/core/CostRecord.java index 0f403c8..3ef65cd 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/CostRecord.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/CostRecord.java @@ -22,19 +22,24 @@ public class CostRecord{ input.add(itemRecord); } - public CostRecord(Recipe recipe, long count){ + public CostRecord(Recipe recipe, long count, boolean approx){ output = new ArrayList<>(); input = new ArrayList<>(); catalyst = new LinkedList<>(); + boolean b = recipe.isApprox() || approx; for(ItemStack itemStack : recipe.output){ if(itemStack != null){ - output.add(new ItemRecord(itemStack, count)); + ItemRecord record = new ItemRecord(itemStack, count); + record.approx = b; + output.add(record); } } for(ItemStack itemStack : recipe.input){ if(itemStack != null){ - input.add(new ItemRecord(itemStack, count)); - catalyst.add(new ItemRecord(itemStack, count)); + ItemRecord record = new ItemRecord(itemStack, count); + record.approx = b; + input.add(record); + catalyst.add(record.copy()); } } } @@ -45,11 +50,17 @@ public class CostRecord{ */ public CostRecord(CostRecord costRecord1, CostRecord costRecord2){ output = new ArrayList<>(); - output.addAll(costRecord1.output); + for (ItemRecord record : costRecord1.output){ + output.add(record.copy()); + } input = new ArrayList<>(); - input.addAll(costRecord1.input); + for (ItemRecord record : costRecord1.input){ + input.add(record.copy()); + } catalyst = new LinkedList<>(); - catalyst.addAll(costRecord1.catalyst); + for (ItemRecord record : costRecord1.catalyst){ + catalyst.add(record.copy()); + } // merge output LOOP: for(ItemRecord itemRecordAdd : costRecord2.output){ @@ -59,7 +70,7 @@ public class CostRecord{ continue LOOP; } } - output.add(itemRecordAdd); + output.add(itemRecordAdd.copy()); } // merge input LOOP: @@ -70,7 +81,7 @@ public class CostRecord{ continue LOOP; } } - input.add(itemRecordAdd); + input.add(itemRecordAdd.copy()); } // cancel catalyst by output LOOP: @@ -81,7 +92,7 @@ public class CostRecord{ catalyst.remove(i); continue LOOP; }else if(itemRecordAdd.isSameType(itemRecordExt)) { - itemRecordExt.amount -= itemRecordAdd.amount; + itemRecordExt.minus(itemRecordAdd); continue LOOP; } } @@ -91,20 +102,17 @@ public class CostRecord{ for(ItemRecord itemRecordAdd : costRecord2.catalyst){ for (ItemRecord itemRecordExt : catalyst) { if (itemRecordAdd.isSameType(itemRecordExt)) { - itemRecordExt.amount += itemRecordAdd.amount; + itemRecordExt.add(itemRecordAdd); continue LOOP; } } - catalyst.add(itemRecordAdd); + catalyst.add(itemRecordAdd.copy()); } // cancel input and output for(ItemRecord itemRecordIn : input){ for(ItemRecord itemRecordOut : output){ if(itemRecordIn.isSameType(itemRecordOut)){ - long a = itemRecordIn.amount; - long b = itemRecordOut.amount; - itemRecordIn.amount -= a>b ? b : a; - itemRecordOut.amount -= a>b ? b : a; + itemRecordIn.cancel(itemRecordOut); } } } @@ -145,13 +153,14 @@ public class CostRecord{ LOOP: for(ItemRecord itemRecord : catalyst){ if(itemRecord.amount != 0){ - for(ItemRecord record : output){ - if(itemRecord.isSameType(record)){ + for(ItemRecord record : input){ + if(itemRecord.isSameType(record) && record.amount != 0){ continue LOOP; } } - itemRecord.amount = 0; - builder.add(itemRecord.toItemStack()); + ItemRecord buffer = itemRecord.copy(); + buffer.amount=0; + builder.add(buffer.toItemStack()); } } return builder.build(); @@ -162,28 +171,28 @@ public class CostRecord{ if (obj instanceof CostRecord) { for (ItemRecord itemRecordIn : output) { for (ItemRecord itemRecordExt : ((CostRecord) obj).output) { - if ((itemRecordExt.isSameType(itemRecordIn) && itemRecordExt.amount != itemRecordIn.amount) || !itemRecordExt.isSameType(itemRecordIn)) { + if (itemRecordExt.isSameType(itemRecordIn) && itemRecordExt.amount != itemRecordIn.amount) { return false; } } } for (ItemRecord itemRecordIn : input) { for (ItemRecord itemRecordExt : ((CostRecord) obj).input) { - if ((itemRecordExt.isSameType(itemRecordIn) && itemRecordExt.amount != itemRecordIn.amount)|| !itemRecordExt.isSameType(itemRecordIn)) { + if (itemRecordExt.isSameType(itemRecordIn) && itemRecordExt.amount != itemRecordIn.amount) { return false; } } } for (ItemRecord itemRecordIn : ((CostRecord) obj).output) { for (ItemRecord itemRecordExt : output) { - if ((itemRecordExt.isSameType(itemRecordIn) && itemRecordExt.amount != itemRecordIn.amount) || !itemRecordExt.isSameType(itemRecordIn)) { + if (itemRecordExt.isSameType(itemRecordIn) && itemRecordExt.amount != itemRecordIn.amount) { return false; } } } for (ItemRecord itemRecordIn : ((CostRecord) obj).input) { for (ItemRecord itemRecordExt : input) { - if ((itemRecordExt.isSameType(itemRecordIn) && itemRecordExt.amount != itemRecordIn.amount)|| !itemRecordExt.isSameType(itemRecordIn)) { + if (itemRecordExt.isSameType(itemRecordIn) && itemRecordExt.amount != itemRecordIn.amount) { return false; } } diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/ItemRecord.java b/src/main/java/pers/towdium/justEnoughCalculation/core/ItemRecord.java index 94a1a09..40462a0 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/ItemRecord.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/ItemRecord.java @@ -21,7 +21,7 @@ public class ItemRecord{ item = itemStack.getItem(); meta = itemStack.getMetadata(); amount = ItemStackWrapper.getUnifiedAmount(itemStack) * multiplier; - approx = itemStack.hasTagCompound() && itemStack.getTagCompound().getBoolean("approx"); + approx = itemStack.hasTagCompound() && itemStack.getTagCompound().getBoolean("percentage"); } public ItemRecord(ItemStack itemStack){ diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java b/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java index 8c4f212..2952b61 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java @@ -31,6 +31,9 @@ public class ItemStackWrapper { return ""; } long l = itemStack.getTagCompound().getLong("amount"); + if(l == 0){ + return ""; + } int i = itemStack.getTagCompound().getInteger("percentage"); if(i != 0){ return i + "%";