mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to patch mca holes

Browse Source
This commit is contained in:
Daniel Mills 2021-07-17 07:36:15 -04:00
parent 487dab793a
commit 6903f67f0f
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/volmit/iris/core/gui/Pregenerator.java
View File

@ -22,6 +22,7 @@ import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.engine.IrisWorlds; import com.volmit.iris.engine.IrisWorlds;
import com.volmit.iris.engine.data.DirectWorldWriter; import com.volmit.iris.engine.data.DirectWorldWriter;
import com.volmit.iris.engine.data.mca.MCAFile;
import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.engine.framework.IrisAccess;
import com.volmit.iris.engine.parallel.BurstExecutor; import com.volmit.iris.engine.parallel.BurstExecutor;
import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.engine.parallel.MultiBurst;
@ -254,6 +255,7 @@ public class Pregenerator implements Listener {
vcaz.set(jj); vcaz.set(jj);
})); }));
e.complete(); e.complete();
verifyMCA(x, z, burst);
directWriter.flush(); directWriter.flush();
install(mcg, mca); install(mcg, mca);
} else { } else {
@ -266,6 +268,37 @@ public class Pregenerator implements Listener {
return true; return true;
} }
private void verifyMCA(int x, int z, MultiBurst burst) {
MCAFile rg = directWriter.getMCA(x, z);
KList<Runnable> requeue = new KList<>();
for (int i = 0; i < 32; i++)
{
for(int j = 0; j < 32; j++)
{
com.volmit.iris.engine.data.mca.Chunk c = rg.getChunk(i, j);
if(c == null)
{
draw(((x << 5) + i), ((z << 5) + j), COLOR_ERROR);
Iris.warn("Caught Ungenerated Chunk @ " + ((x << 5) + i) + ", " + ((z << 5) + j) + " Regenerating before flush, CHECK THIS CHUNK IN THE OVERWORLD TO MAKE SURE WE FIXED IT!");
int finalI = i;
int finalJ = j;
requeue.add(() -> {
access.directWriteChunk(world, ((x << 5) + finalI), ((z << 5) + finalJ), directWriter);
draw(((x << 5) + finalI), ((z << 5) + finalJ), COLOR_MCA_GENERATED);
});
}
}
}
if(requeue.isNotEmpty())
{
burst.burst(requeue);
verifyMCA(x, z, burst);
}
}
private boolean install(File from, File to) { private boolean install(File from, File to) {
try { try {
Files.move(from.toPath(), to.toPath()); Files.move(from.toPath(), to.toPath());