Added farm settings to config. Added 'per action' costs.

This commit is contained in:
CrazyPants committed 2014-05-04 15:55:09 +08:00
1 parent 0a56bfed16
commit 7c5d1c24a7
9 files changed
+108 -108

No files matched your search

@@ -127,7 +127,11 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im
}
protected double usePower() {
double used = Math.min(powerHandler.getEnergyStored(), getPowerUsePerTick());
return usePower(getPowerUsePerTick());
}
protected double usePower(double wantToUse) {
double used = Math.min(powerHandler.getEnergyStored(), wantToUse);
powerHandler.setEnergy(powerHandler.getEnergyStored() - used);
currentTask.update((float) used);
return used;
@@ -140,8 +144,8 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im
if(output != null && output.length > 0) {
ResultStack[] results = currentTask.getCompletedResult();
mergeResults(results);
}
}
}
}
markDirty();
currentTask = null;
}