From ebfd24ad0e3f0d204cf676b30b37cfa9c7e3f466 Mon Sep 17 00:00:00 2001 From: Morlok8k Date: Tue, 1 May 2012 18:52:10 -0700 Subject: [PATCH] 1.6.11 --- src/corrodias/minecraft/landgenerator/Main.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/corrodias/minecraft/landgenerator/Main.java b/src/corrodias/minecraft/landgenerator/Main.java index 2331782..8a377a5 100644 --- a/src/corrodias/minecraft/landgenerator/Main.java +++ b/src/corrodias/minecraft/landgenerator/Main.java @@ -529,15 +529,24 @@ public class Main { if (currentIteration >= 4) { differenceTime = (timeTracking[3] - timeTracking[0]) / 3; // well, this is what it boils down to differenceTime *= 1 + (totalIterations - currentIteration); - out("Estimated time remaining: " + displayEstimatedTime(differenceTime)); - } else if (currentIteration == 3) { + out(String.format("Estimated time remaining: %dh%dm%ds", differenceTime + / (1000 * 60 * 60), (differenceTime % (1000 * 60 * 60)) + / (1000 * 60), + ((differenceTime % (1000 * 60 * 60)) % (1000 * 60)) / 1000)); + } else if (currentIteration == 3) { differenceTime = (timeTracking[3] - timeTracking[1]) / 2; // well, this is what it boils down to differenceTime *= 1 + (totalIterations - currentIteration); - out("Estimated time remaining: " + displayEstimatedTime(differenceTime)); + out(String.format("Estimated time remaining: %dh%dm%ds", differenceTime + / (1000 * 60 * 60), (differenceTime % (1000 * 60 * 60)) + / (1000 * 60), + ((differenceTime % (1000 * 60 * 60)) % (1000 * 60)) / 1000)); } else if (currentIteration == 2) { differenceTime = (timeTracking[3] - timeTracking[2]); // well, this is what it boils down to differenceTime *= 1 + (totalIterations - currentIteration); - out("Estimated time remaining: " + displayEstimatedTime(differenceTime)); + out(String.format("Estimated time remaining: %dh%dm%ds", differenceTime + / (1000 * 60 * 60), (differenceTime % (1000 * 60 * 60)) + / (1000 * 60), + ((differenceTime % (1000 * 60 * 60)) % (1000 * 60)) / 1000)); } else if (currentIteration <= 1) { out("Estimated time remaining: Calculating..."); }