wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show real pregen speed quicker

Browse Source
This commit is contained in:
s809
2026-03-13 00:00:42 +05:00
parent 212031a05f
commit 8b72920652
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/generation/PregenManager.java
+11 -3
View File
@@ -9,7 +9,6 @@ import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
import com.seibel.distanthorizons.core.file.fullDatafile.GeneratedFullDataSourceProvider;
import com.seibel.distanthorizons.core.generation.tasks.DataSourceRetrievalResult;
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
import com.seibel.distanthorizons.core.generation.tasks.ERetrievalResultState;
import com.seibel.distanthorizons.core.pos.DhSectionPos;
import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
import com.seibel.distanthorizons.core.util.FormatUtil;
@@ -93,7 +92,8 @@ public class PregenManager
private final AtomicInteger nextSectionSpiralIndex = new AtomicInteger(0);
private final AtomicLong lastTaskFinishTime = new AtomicLong(System.currentTimeMillis());
private final RollingAverage averageTaskCompletionIntervalMs = new RollingAverage(1000);
private RollingAverage averageTaskCompletionIntervalMs = new RollingAverage(1000);
private final RollingAverage averageTaskCompletionIntervalMsShort = new RollingAverage(50);
private final AtomicLong lastLogTime = new AtomicLong();
@@ -112,6 +112,7 @@ public class PregenManager
long timeSincePreviousTaskFinish = System.currentTimeMillis() - this.lastTaskFinishTime.getAndSet(System.currentTimeMillis());
this.averageTaskCompletionIntervalMs.add(timeSincePreviousTaskFinish);
this.averageTaskCompletionIntervalMsShort.add(timeSincePreviousTaskFinish);
PregenState.this.fillPendingQueue();
})
@@ -181,7 +182,14 @@ public class PregenManager
double chunksToGenerate = Math.ceil(Math.sqrt(this.sectionsToGenerate) / 2 * 4 * 10) / 10; // ceil to nearest 0.1
int chunkRatePerSecond = (int) (1000 / this.averageTaskCompletionIntervalMs.getAverage() * 4 * 4);
double etaMs = this.averageTaskCompletionIntervalMs.getAverage() * (this.sectionsToGenerate - this.nextSectionSpiralIndex.get());
// Reset long rolling average if short average diverged too much (<0.5 / >2.0)
double averageRatio = this.averageTaskCompletionIntervalMsShort.getAverage() / this.averageTaskCompletionIntervalMs.getAverage();
if (averageRatio < 0.5 || averageRatio > 2.0)
{
this.averageTaskCompletionIntervalMs = new RollingAverage(1000);
}
return MessageFormat.format("Generated radius: {0,number,#.###} / {1,number,#.#} chunks ({2} cps, {3,number,#.###%}), ETA: {4}",
this.generatedRadius.getValue(),
chunksToGenerate,