mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-05 23:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deployments

Browse Source
This commit is contained in:
Daniel Mills
2020-01-23 17:42:02 -05:00
parent 64674026a6
commit ea458935f0
43 changed files with 1627 additions and 1493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java
View File

@@ -13,7 +13,6 @@ import org.bukkit.util.NumberConversions;
import mortar.util.text.C;
import ninja.bytecode.iris.Iris;
import ninja.bytecode.iris.IrisMetrics;
import ninja.bytecode.iris.controller.PackController;
import ninja.bytecode.iris.generator.atomics.AtomicChunkData;
import ninja.bytecode.iris.generator.genobject.GenObjectDecorator;
import ninja.bytecode.iris.generator.genobject.PlacedObject;
@@ -63,8 +62,6 @@ public class IrisGenerator extends ParallaxWorldGenerator
private CNG scatter;
private CNG beach;
private CNG swirl;
private MB ICE = new MB(Material.ICE);
private MB PACKED_ICE = new MB(Material.PACKED_ICE);
private MB BEDROCK = new MB(Material.BEDROCK);
private GenObjectDecorator god;
private GenLayerLayeredNoise glLNoise;
@@ -78,7 +75,7 @@ public class IrisGenerator extends ParallaxWorldGenerator
public IrisGenerator()
{
this(Iris.getController(PackController.class).getDimension("overworld"));
this(Iris.pack().getDimension("overworld"));
}
public void hitObject()

3
src/main/java/ninja/bytecode/iris/generator/genobject/GenObjectGroup.java
View File

@@ -8,7 +8,6 @@ import java.util.function.Consumer;
import net.md_5.bungee.api.ChatColor;
import ninja.bytecode.iris.Iris;
import ninja.bytecode.iris.controller.PackController;
import ninja.bytecode.iris.util.Direction;
import ninja.bytecode.shuriken.collections.KList;
import ninja.bytecode.shuriken.format.Form;
@@ -171,7 +170,7 @@ public class GenObjectGroup
public static GenObjectGroup load(String string)
{
File folder = Iris.getController(PackController.class).loadFolder(string);
File folder = Iris.pack().loadFolder(string);
if(folder != null)
{

22
src/main/java/ninja/bytecode/iris/generator/parallax/ParallelChunkGenerator.java
View File

@@ -9,12 +9,9 @@ import org.bukkit.block.Biome;
import org.bukkit.generator.ChunkGenerator;
import ninja.bytecode.iris.Iris;
import ninja.bytecode.iris.controller.ExecutionController;
import ninja.bytecode.iris.controller.TimingsController;
import ninja.bytecode.iris.generator.atomics.AtomicChunkData;
import ninja.bytecode.iris.util.ChunkPlan;
import ninja.bytecode.iris.util.ChunkSpliceListener;
import ninja.bytecode.shuriken.execution.TaskExecutor;
import ninja.bytecode.shuriken.execution.TaskExecutor.TaskGroup;
import ninja.bytecode.shuriken.execution.TaskExecutor.TaskResult;
import ninja.bytecode.shuriken.math.RollingSequence;
@@ -32,8 +29,6 @@ public abstract class ParallelChunkGenerator extends ChunkGenerator
int cg = 0;
private RollingSequence rs = new RollingSequence(512);
private World world;
private TaskExecutor genPool;
private TaskExecutor genPar;
private ChunkSpliceListener splicer;
public void setSplicer(ChunkSpliceListener splicer)
@@ -53,22 +48,12 @@ public abstract class ParallelChunkGenerator extends ChunkGenerator
public TaskGroup startParallaxWork()
{
if(genPar == null)
{
genPar = Iris.getController(ExecutionController.class).getExecutor(world, "Parallax");
}
return genPar.startWork();
return Iris.exec().getExecutor(world, "Parallax").startWork();
}
public TaskGroup startWork()
{
if(genPool == null)
{
genPool = Iris.getController(ExecutionController.class).getExecutor(world, "Generator");
}
return genPool.startWork();
return Iris.exec().getExecutor(world, "Generator").startWork();
}
public ChunkData generateChunkData(World world, Random random, int x, int z, BiomeGrid biome)
@@ -88,8 +73,6 @@ public abstract class ParallelChunkGenerator extends ChunkGenerator
try
{
Iris.getController(TimingsController.class).started("terrain");
this.world = world;
if(!ready)
@@ -127,7 +110,6 @@ public abstract class ParallelChunkGenerator extends ChunkGenerator
postChunk(world, x, z, random, data, plan.get());
rs.put(r.timeElapsed);
cg++;
Iris.getController(TimingsController.class).stopped("terrain");
}
catch(Throwable e)