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

Fixes

Browse Source
This commit is contained in:
Daniel Mills 2020-11-11 00:30:39 -05:00
parent c60a772e84
commit ec39d7146c
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/volmit/iris/generator/IrisEngineCompound.java
View File

@ -42,6 +42,9 @@ public class IrisEngineCompound implements EngineCompound {
@Getter @Getter
private final IrisDimension rootDimension; private final IrisDimension rootDimension;
@Getter
private int threadCount;
public IrisEngineCompound(World world, IrisDimension rootDimension, IrisDataManager data, int maximumThreads) public IrisEngineCompound(World world, IrisDimension rootDimension, IrisDataManager data, int maximumThreads)
{ {
this.rootDimension = rootDimension; this.rootDimension = rootDimension;

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

@ -7,7 +7,6 @@ import com.volmit.iris.manager.IrisDataManager;
import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisBiome;
import com.volmit.iris.object.IrisDimension; import com.volmit.iris.object.IrisDimension;
import com.volmit.iris.scaffold.hunk.Hunk; import com.volmit.iris.scaffold.hunk.Hunk;
import com.volmit.iris.util.Form;
import com.volmit.iris.util.KList; import com.volmit.iris.util.KList;
import com.volmit.iris.util.M; import com.volmit.iris.util.M;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -137,18 +136,17 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
@Override @Override
public ChunkData generateChunkData(@NotNull World world, @NotNull Random ignored, int x, int z, @NotNull BiomeGrid biome) { public ChunkData generateChunkData(@NotNull World world, @NotNull Random ignored, int x, int z, @NotNull BiomeGrid biome) {
TerrainChunk tc = TerrainChunk.create(world, biome); TerrainChunk tc = TerrainChunk.create(world, biome);
generateChunkRawData(world, ignored, x, z, tc); generateChunkRawData(world, x, z, tc);
return tc.getRaw(); return tc.getRaw();
} }
public void generateChunkRawData(World world, Random ignored, int x, int z, TerrainChunk tc) public void generateChunkRawData(World world, int x, int z, TerrainChunk tc)
{ {
initialize(world); initialize(world);
Hunk<BlockData> blocks = Hunk.view((ChunkData) tc); Hunk<BlockData> blocks = Hunk.view((ChunkData) tc);
Hunk<Biome> biomes = Hunk.view((BiomeGrid) tc); Hunk<Biome> biomes = Hunk.view((BiomeGrid) tc);
long m = M.ms(); long m = M.ms();
compound.generate(x * 16, z * 16, blocks, biomes); compound.generate(x * 16, z * 16, blocks, biomes);
System.out.println("Generated " + x + "," + z + " in " + Form.duration(M.ms() - m, 0));
generated++; generated++;
} }
@ -251,16 +249,9 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
return getEngineAccess(y).getHeight(x, z); return getEngineAccess(y).getHeight(x, z);
} }
@Override
public IrisBiome getAbsoluteBiome(int x, int y, int z) {
// TODO: REMOVE GET BIOME OR THIS ONE
return getEngineAccess(y).getBiome(x, y-getComposite().getEngineForHeight(y).getMinHeight(), z);
}
@Override @Override
public int getThreadCount() { public int getThreadCount() {
// TODO: NOT CORRECT return getComposite().getThreadCount();
return Iris.getThreadCount();
} }
@Override @Override

2
src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java
View File

@ -89,4 +89,6 @@ public interface EngineCompound extends Listener
} }
public boolean isFailing(); public boolean isFailing();
public int getThreadCount();
} }

2
src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java
View File

@ -30,8 +30,6 @@ public interface IrisAccess extends Hotloadable, DataProvider {
public int getHeight(int x, int y, int z); public int getHeight(int x, int y, int z);
public IrisBiome getAbsoluteBiome(int x, int y, int z);
public int getThreadCount(); public int getThreadCount();
public void changeThreadCount(int m); public void changeThreadCount(int m);