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

Update engine compounds for iris worlds

Browse Source
This commit is contained in:
Daniel Mills 2021-07-18 18:22:51 -04:00
parent 879bcdf8d8
commit 1bb9090434
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/volmit/iris/engine/IrisEngineCompound.java
View File

@ -28,6 +28,7 @@ import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.object.IrisDimension;
import com.volmit.iris.engine.object.IrisDimensionIndex; import com.volmit.iris.engine.object.IrisDimensionIndex;
import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.engine.object.IrisPosition;
import com.volmit.iris.engine.object.common.IrisWorld;
import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.engine.parallel.MultiBurst;
import com.volmit.iris.util.atomics.AtomicRollingSequence; import com.volmit.iris.util.atomics.AtomicRollingSequence;
import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KList;
@ -50,7 +51,7 @@ import java.util.List;
public class IrisEngineCompound implements EngineCompound { public class IrisEngineCompound implements EngineCompound {
@Getter @Getter
private World world; private IrisWorld world;
private final AtomicRollingSequence wallClock; private final AtomicRollingSequence wallClock;
@ -77,7 +78,7 @@ public class IrisEngineCompound implements EngineCompound {
@Setter @Setter
private boolean studio; private boolean studio;
public IrisEngineCompound(World world, IrisDimension rootDimension, IrisDataManager data, int maximumThreads) { public IrisEngineCompound(IrisWorld world, IrisDimension rootDimension, IrisDataManager data, int maximumThreads) {
wallClock = new AtomicRollingSequence(32); wallClock = new AtomicRollingSequence(32);
this.rootDimension = rootDimension; this.rootDimension = rootDimension;
Iris.info("Initializing Engine Composite for " + world.getName()); Iris.info("Initializing Engine Composite for " + world.getName());
@ -274,11 +275,6 @@ public class IrisEngineCompound implements EngineCompound {
return defaultEngine; return defaultEngine;
} }
@Override
public void updateWorld(World world) {
this.world = world;
}
@Override @Override
public void hotload() { public void hotload() {
for (int i = 0; i < getSize(); i++) { for (int i = 0; i < getSize(); i++) {

5
src/main/java/com/volmit/iris/engine/framework/EngineCompound.java
View File

@ -26,6 +26,7 @@ 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;
import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.engine.object.IrisPosition;
import com.volmit.iris.engine.object.common.IrisWorld;
import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.engine.parallel.MultiBurst;
import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KMap;
@ -43,7 +44,7 @@ public interface EngineCompound extends Listener, Hotloadable, DataProvider {
void generate(int x, int z, Hunk<BlockData> blocks, Hunk<BlockData> postblocks, Hunk<Biome> biomes); void generate(int x, int z, Hunk<BlockData> blocks, Hunk<BlockData> postblocks, Hunk<Biome> biomes);
World getWorld(); IrisWorld getWorld();
List<IrisPosition> getStrongholdPositions(); List<IrisPosition> getStrongholdPositions();
@ -149,8 +150,6 @@ public interface EngineCompound extends Listener, Hotloadable, DataProvider {
return v.v(); return v.v();
} }
void updateWorld(World world);
default int getLowestBedrock() { default int getLowestBedrock() {
int f = Integer.MAX_VALUE; int f = Integer.MAX_VALUE;