mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-04 00:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

optimize caching biomes in CLIWorld

Browse Source
This commit is contained in:
dfsek 2022-06-17 00:53:34 -07:00
parent 529cd463de
commit d2055d60fd
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
platforms/cli/src/main/java/com/dfsek/terra/cli/world/CLIWorld.java
View File

@ -1,5 +1,7 @@
package com.dfsek.terra.cli.world; package com.dfsek.terra.cli.world;
import com.dfsek.terra.api.world.biome.generation.ChunkLocalCachingBiomeProvider;
import com.google.common.collect.Streams; import com.google.common.collect.Streams;
import net.jafama.FastMath; import net.jafama.FastMath;
import net.querz.mca.MCAFile; import net.querz.mca.MCAFile;
@ -85,8 +87,9 @@ public class CLIWorld implements ServerWorld, NBTSerializable<Stream<Pair<Vector
try { try {
int num = amount.getAndIncrement(); int num = amount.getAndIncrement();
CLIChunk chunk = getChunkAt(finalX, finalZ); CLIChunk chunk = getChunkAt(finalX, finalZ);
chunkGenerator.generateChunkData(chunk, this, pack.getBiomeProvider().caching(this), finalX, finalZ); ChunkLocalCachingBiomeProvider cachingBiomeProvider = pack.getBiomeProvider().caching(this, finalX, finalZ);
CLIProtoWorld protoWorld = new CLIProtoWorld(this, finalX, finalZ); chunkGenerator.generateChunkData(chunk, this, cachingBiomeProvider, finalX, finalZ);
CLIProtoWorld protoWorld = new CLIProtoWorld(this, cachingBiomeProvider, finalX, finalZ);
pack.getStages().forEach(stage -> stage.populate(protoWorld)); pack.getStages().forEach(stage -> stage.populate(protoWorld));
if(num % 240 == 239) { if(num % 240 == 239) {
long time = System.nanoTime(); long time = System.nanoTime();
@ -224,10 +227,12 @@ public class CLIWorld implements ServerWorld, NBTSerializable<Stream<Pair<Vector
private static final class CLIProtoWorld implements ProtoWorld { private static final class CLIProtoWorld implements ProtoWorld {
private final CLIWorld delegate; private final CLIWorld delegate;
private final BiomeProvider biomeProvider;
private final int x, z; private final int x, z;
private CLIProtoWorld(CLIWorld delegate, int x, int z) { private CLIProtoWorld(CLIWorld delegate, BiomeProvider biomeProvider, int x, int z) {
this.delegate = delegate; this.delegate = delegate;
this.biomeProvider = biomeProvider;
this.x = x; this.x = x;
this.z = z; this.z = z;
} }
@ -269,7 +274,7 @@ public class CLIWorld implements ServerWorld, NBTSerializable<Stream<Pair<Vector
@Override @Override
public BiomeProvider getBiomeProvider() { public BiomeProvider getBiomeProvider() {
return delegate.biomeProvider; return biomeProvider;
} }
@Override @Override