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

Fix failed to gen on really anything fixes #424

Browse Source
This commit is contained in:
Daniel Mills 2021-07-18 04:47:11 -04:00
parent a03539ad8b
commit 2a7f5f55b0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java
View File

@ -27,8 +27,8 @@ import com.volmit.iris.engine.IrisEngineCompound;
import com.volmit.iris.engine.IrisWorlds; import com.volmit.iris.engine.IrisWorlds;
import com.volmit.iris.engine.cache.Cache; import com.volmit.iris.engine.cache.Cache;
import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.data.DirectWorldWriter;
import com.volmit.iris.engine.data.chunk.TerrainChunk; import com.volmit.iris.engine.data.chunk.TerrainChunk;
import com.volmit.iris.engine.data.mca.NBTWorld;
import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.object.IrisDimension;
@ -104,7 +104,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
populators = new KList<BlockPopulator>().qadd(new BlockPopulator() { populators = new KList<BlockPopulator>().qadd(new BlockPopulator() {
@Override @Override
public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) { public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) {
if (compound != null) { if (compound.get() != null) {
for (BlockPopulator i : compound.get().getPopulators()) { for (BlockPopulator i : compound.get().getPopulators()) {
i.populate(world, random, chunk); i.populate(world, random, chunk);
} }
@ -295,7 +295,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
} }
public synchronized void initialize(World world) { public synchronized void initialize(World world) {
if (!(world instanceof FakeWorld) && fake.get() && this.compound != null) { if (!(world instanceof FakeWorld) && fake.get() && this.compound.get() != null) {
fake.set(false); fake.set(false);
this.compound.get().updateWorld(world); this.compound.get().updateWorld(world);
getTarget().updateWorld(world); getTarget().updateWorld(world);
@ -469,7 +469,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
return tc.getRaw(); return tc.getRaw();
} }
public void directWriteMCA(World w, int x, int z, DirectWorldWriter writer, MultiBurst burst) { public void directWriteMCA(World w, int x, int z, NBTWorld writer, MultiBurst burst) {
BurstExecutor e = burst.burst(1024); BurstExecutor e = burst.burst(1024);
int mcaox = x << 5; int mcaox = x << 5;
int mcaoz = z << 5; int mcaoz = z << 5;
@ -485,7 +485,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
e.complete(); e.complete();
} }
public void directWriteChunk(World w, int x, int z, DirectWorldWriter writer) { public void directWriteChunk(World w, int x, int z, NBTWorld writer) {
int ox = x << 4; int ox = x << 4;
int oz = z << 4; int oz = z << 4;
com.volmit.iris.engine.data.mca.Chunk cc = writer.getChunk(x, z); com.volmit.iris.engine.data.mca.Chunk cc = writer.getChunk(x, z);
@ -543,7 +543,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
return; return;
} }
cc.setBlockStateAt(xx, y, zz, DirectWorldWriter.getCompound(blockData), false); cc.setBlockStateAt(xx, y, zz, NBTWorld.getCompound(blockData), false);
} }
@NotNull @NotNull
@ -557,7 +557,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
y = 0; y = 0;
} }
return DirectWorldWriter.getBlockData(cc.getBlockStateAt((x + ox) & 15, y, (z + oz) & 15)); return NBTWorld.getBlockData(cc.getBlockStateAt((x + ox) & 15, y, (z + oz) & 15));
} }
@Override @Override