Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-01-06 15:51:30 +00:00
Code Issues Releases Activity

Fix Parallax & update settings

Browse Source
This commit is contained in:
Daniel Mills
2021-01-01 22:54:17 -05:00
parent fcf8a80b0a
commit 9d634ba4d7
15 changed files with 42 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
View File

@@ -163,8 +163,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
}
if (hint == null) {
Iris.error("Cannot find iris dimension data for world: " + world.getName() + "! Assuming " + IrisSettings.get().getDefaultWorldType() + "!");
hint = IrisSettings.get().getDefaultWorldType();
Iris.error("Cannot find iris dimension data for world: " + world.getName() + "! Assuming " + IrisSettings.get().getGenerator().getDefaultWorldType() + "!");
hint = IrisSettings.get().getGenerator().getDefaultWorldType();
}
dim = IrisDataManager.loadAnyDimension(hint);
@@ -238,8 +238,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
}
if (hint == null) {
Iris.error("Cannot find iris dimension data for world: " + world + "! Assuming " + IrisSettings.get().getDefaultWorldType() + "!");
hint = IrisSettings.get().getDefaultWorldType();
Iris.error("Cannot find iris dimension data for world: " + world + "! Assuming " + IrisSettings.get().getGenerator().getDefaultWorldType() + "!");
hint = IrisSettings.get().getGenerator().getDefaultWorldType();
}
dim = IrisDataManager.loadAnyDimension(hint);

2
src/main/java/com/volmit/iris/scaffold/parallax/ParallaxWorld.java
View File

@@ -199,7 +199,7 @@ public class ParallaxWorld implements ParallaxAccess
public void cleanup()
{
cleanup(IrisSettings.get().getParallaxRegionEvictionMS(), IrisSettings.get().getParallaxChunkEvictionMS());
cleanup(IrisSettings.get().getParallaxRegionEvictionMS(), IrisSettings.get().getParallax().getParallaxChunkEvictionMS());
}
@Override

24
src/main/java/com/volmit/iris/scaffold/parallel/MultiBurst.java
View File

@@ -1,7 +1,6 @@
package com.volmit.iris.scaffold.parallel;
import com.volmit.iris.Iris;
import com.volmit.iris.IrisSettings;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -51,15 +50,6 @@ public class MultiBurst
public BurstExecutor burst(int estimate)
{
if(IrisSettings.get().isForceSingleThreadedPerChunk()) {
if(syncService == null)
{
syncService = Executors.newSingleThreadExecutor();
}
return new BurstExecutor(syncService, estimate);
}
return new BurstExecutor(service, estimate);
}
@@ -69,19 +59,7 @@ public class MultiBurst
}
public void lazy(Runnable o) {
if(IrisSettings.get().isForceSingleThreadedPerChunk()) {
if(syncService == null)
{
syncService = Executors.newSingleThreadExecutor();
}
syncService.execute(o);
}
else
{
service.execute(o);
}
service.execute(o);
}
public void shutdownNow() {