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

Fixes & Fixes

Browse Source
This commit is contained in:
Daniel Mills
2020-12-04 05:07:44 -05:00
parent f3eb1bb45e
commit 4902e5b9bb
17 changed files with 402 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/volmit/iris/scaffold/IrisWorlds.java
View File

@@ -2,6 +2,7 @@ package com.volmit.iris.scaffold;
import com.volmit.iris.Iris;
import com.volmit.iris.scaffold.engine.IrisAccess;
import com.volmit.iris.scaffold.engine.IrisAccessProvider;
import com.volmit.iris.util.KMap;
import com.volmit.iris.util.MortarSender;
import org.bukkit.Bukkit;
@@ -24,7 +25,7 @@ public class IrisWorlds
return true;
}
return world.getGenerator() instanceof IrisAccess;
return world.getGenerator() instanceof IrisAccess || world.getGenerator() instanceof IrisAccessProvider;
}
public static IrisAccess access(World world)
@@ -36,7 +37,7 @@ public class IrisWorlds
return provisioned.get(world.getUID().toString());
}
return ((IrisAccess) world.getGenerator());
return world.getGenerator() instanceof IrisAccessProvider ? (((IrisAccessProvider)world.getGenerator()).getAccess()) : ((IrisAccess) world.getGenerator());
}
return null;

9
src/main/java/com/volmit/iris/scaffold/engine/Engine.java
View File

@@ -26,6 +26,8 @@ import java.util.Arrays;
public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootProvider, BlockUpdater, Renderer, Hotloadable {
public void close();
public int getCurrentlyGenerating();
public boolean isClosed();
public EngineWorldManager getWorldManager();
@@ -145,8 +147,11 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro
if(B.isUpdatable(data))
{
getParallax().updateBlock(x,y,z);
getParallax().getMetaRW(x>>4, z>>4).setUpdates(true);
synchronized (getParallax())
{
getParallax().updateBlock(x,y,z);
getParallax().getMetaRW(x>>4, z>>4).setUpdates(true);
}
}
}

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

@@ -10,6 +10,7 @@ import com.volmit.iris.scaffold.IrisWorlds;
import com.volmit.iris.scaffold.cache.Cache;
import com.volmit.iris.scaffold.hunk.Hunk;
import com.volmit.iris.util.*;
import io.papermc.lib.PaperLib;
import lombok.Getter;
import org.bukkit.*;
import org.bukkit.block.Biome;
@@ -36,6 +37,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
private long mst = 0;
private int generated = 0;
private int lgenerated = 0;
private final KMap<Long, PregeneratedData> chunkCache;
private ChronoLatch hotloadcd;
@Getter
private double generatedPerSecond = 0;
@@ -48,6 +50,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
public EngineCompositeGenerator(String hint, boolean production) {
super();
chunkCache = new KMap<>();
hotloadcd = new ChronoLatch(3500);
mst = M.ms();
this.production = production;
@@ -305,16 +308,70 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
return tc.getRaw();
}
public Chunk generatePaper(World world, int x, int z)
{
precache(world, x, z);
Chunk c = PaperLib.getChunkAtAsync(world, x, z, true).join();
chunkCache.remove(Cache.key(x, z));
return c;
}
public void precache(World world, int x, int z)
{
synchronized (this)
{
initialize(world);
}
synchronized (chunkCache)
{
if(chunkCache.containsKey(Cache.key(x, z)))
{
return;
}
}
PregeneratedData data = new PregeneratedData(getComposite().getHeight()-1);
compound.generate(x * 16, z * 16, data.getBlocks(), data.getPost(), data.getBiomes());
synchronized (chunkCache)
{
chunkCache.put(Cache.key(x, z), data);
}
}
@Override
public int getPrecacheSize() {
return chunkCache.size();
}
public int getCachedChunks()
{
return chunkCache.size();
}
public Runnable generateChunkRawData(World world, int x, int z, TerrainChunk tc)
{
initialize(world);
synchronized (chunkCache)
{
long g = Cache.key(x, z);
if(chunkCache.containsKey(g))
{
generated++;
return chunkCache.remove(g).inject(tc);
}
}
Hunk<BlockData> blocks = Hunk.view((ChunkData) tc);
Hunk<Biome> biomes = Hunk.view((BiomeGrid) tc);
Hunk<BlockData> post = Hunk.newAtomicHunk(biomes.getWidth(), biomes.getHeight(), biomes.getDepth());
AtomicBoolean postMod = new AtomicBoolean(false);
Hunk<BlockData> trk = Hunk.newAtomicHunk(biomes.getWidth(), biomes.getHeight(), biomes.getDepth());
Hunk<BlockData> post = trk.trackWrite(postMod);
compound.generate(x * 16, z * 16, blocks, post, biomes);
generated++;
return () -> blocks.insertSoftly(0,0,0,post, (b) -> b == null || B.isAirOrFluid(b));
return postMod.get() ? () -> blocks.insertSoftly(0,0,0, post, (b) -> b == null || B.isAirOrFluid(b)) : () -> {};
}
@Override
@@ -454,12 +511,6 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
@Override
public void regenerate(int x, int z) {
if (true)
{
return;
}
Chunk chunk = getComposite().getWorld().getChunkAt(x, z);
generateChunkRawData(getComposite().getWorld(), x, z, new TerrainChunk() {
@Override
public void setRaw(ChunkData data) {
@@ -557,6 +608,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
Iris.edit.flushNow();
for (BlockPopulator i : populators) {
Chunk chunk = getComposite().getWorld().getChunkAt(x, z);
i.populate(compound.getWorld(), new RNG(Cache.key(x, z)), chunk);
}
}

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

@@ -23,10 +23,17 @@ public interface EngineCompound extends Listener, Hotloadable, DataProvider
public World getWorld();
public int getCurrentlyGeneratingEngines();
public void printMetrics(CommandSender sender);
public int getSize();
public default int getHeight()
{
return 256;
}
public Engine getEngine(int index);
public MultiBurst getBurster();

16
src/main/java/com/volmit/iris/scaffold/engine/EngineFramework.java
View File

@@ -1,14 +1,12 @@
package com.volmit.iris.scaffold.engine;
import com.volmit.iris.generator.IrisComplex;
import com.volmit.iris.manager.IrisDataManager;
import com.volmit.iris.scaffold.data.DataProvider;
import com.volmit.iris.util.M;
import com.volmit.iris.scaffold.parallel.MultiBurst;
import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData;
import com.volmit.iris.manager.IrisDataManager;
import com.volmit.iris.generator.IrisComplex;
import com.volmit.iris.scaffold.data.DataProvider;
public interface EngineFramework extends DataProvider
{
public Engine getEngine();
@@ -25,10 +23,12 @@ public interface EngineFramework extends DataProvider
{
if(M.r(0.1))
{
MultiBurst.burst.lazy(() -> {
synchronized (getEngine().getParallax())
{
getEngine().getParallax().cleanup();
getData().getObjectLoader().clean();
});
}
getData().getObjectLoader().clean();
}
}

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

@@ -4,7 +4,9 @@ import com.volmit.iris.manager.IrisDataManager;
import com.volmit.iris.object.*;
import com.volmit.iris.scaffold.data.DataProvider;
import com.volmit.iris.util.*;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -388,4 +390,10 @@ public interface IrisAccess extends Hotloadable, DataProvider {
}
public void clearRegeneratedLists(int x, int z);
void precache(World world, int x, int z);
int getPrecacheSize();
Chunk generatePaper(World world, int cx, int cz);
}

5
src/main/java/com/volmit/iris/scaffold/engine/IrisAccessProvider.java Normal file
View File

@@ -0,0 +1,5 @@
package com.volmit.iris.scaffold.engine;
public interface IrisAccessProvider {
public IrisAccess getAccess();
}

50
src/main/java/com/volmit/iris/scaffold/engine/PregeneratedData.java Normal file
View File

@@ -0,0 +1,50 @@
package com.volmit.iris.scaffold.engine;
import com.volmit.iris.scaffold.hunk.Hunk;
import com.volmit.iris.util.B;
import com.volmit.iris.util.TerrainChunk;
import lombok.Data;
import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator;
import java.util.concurrent.atomic.AtomicBoolean;
@Data
public class PregeneratedData {
private final Hunk<BlockData> blocks;
private final Hunk<BlockData> post;
private final Hunk<Biome> biomes;
private final AtomicBoolean postMod;
public PregeneratedData(int height)
{
postMod = new AtomicBoolean(false);
blocks = Hunk.newAtomicHunk(16, height, 16);
biomes = Hunk.newAtomicHunk(16, height, 16);
Hunk<BlockData> p = Hunk.newMappedHunkSynced(16, height, 16);
post = p.trackWrite(postMod);
}
public Runnable inject(TerrainChunk tc) {
blocks.iterateSync((x, y, z, b) -> {
if(b != null)
{
tc.setBlock(x, y, z, b);
}
Biome bf = biomes.get(x,y,z);
if(bf != null)
{
tc.setBiome(x,y,z,bf);
}
});
if(postMod.get())
{
return () -> Hunk.view((ChunkGenerator.ChunkData) tc).insertSoftly(0,0,0, post, (b) -> b == null || B.isAirOrFluid(b));
}
return () -> {};
}
}

8
src/main/java/com/volmit/iris/scaffold/hunk/Hunk.java
View File

@@ -15,6 +15,7 @@ import org.bukkit.generator.ChunkGenerator.ChunkData;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
import java.util.function.Predicate;
@@ -82,6 +83,11 @@ public interface Hunk<T>
return new SynchronizedHunkView<>(this);
}
default Hunk<T> trackWrite(AtomicBoolean b)
{
return new WriteTrackHunk<T>(this, b);
}
public static <T> Hunk<T> newArrayHunk(int w, int h, int d)
{
return new ArrayHunk<>(w, h, d);
@@ -1129,7 +1135,7 @@ public interface Hunk<T>
*/
default T getClosest(int x, int y, int z)
{
return getRaw(x >= getWidth() ? getWidth() - 1 : x, y >= getHeight() ? getHeight() - 1 : y, z >= getDepth() ? getDepth() - 1 : z);
return getRaw(x >= getWidth() ? getWidth() - 1 : x < 0 ? 0 : x, y >= getHeight() ? getHeight() - 1 : y < 0 ? 0 : y, z >= getDepth() ? getDepth() - 1 : z < 0 ? 0 : z);
}
default void fill(T t)

57
src/main/java/com/volmit/iris/scaffold/hunk/view/WriteTrackHunk.java Normal file
View File

@@ -0,0 +1,57 @@
package com.volmit.iris.scaffold.hunk.view;
import com.volmit.iris.scaffold.hunk.Hunk;
import java.util.concurrent.atomic.AtomicBoolean;
public class WriteTrackHunk<T> implements Hunk<T> {
private final Hunk<T> src;
private final AtomicBoolean b;
public WriteTrackHunk(Hunk<T> src, AtomicBoolean b)
{
this.src = src;
this.b = b;
}
@Override
public void setRaw(int x, int y, int z, T t)
{
if(!b.get())
{
b.set(true);
}
src.setRaw(x,y,z,t);
}
@Override
public T getRaw(int x, int y, int z)
{
return src.getRaw(x, y, z);
}
@Override
public int getWidth()
{
return src.getWidth();
}
@Override
public int getHeight()
{
return src.getHeight();
}
@Override
public int getDepth()
{
return src.getDepth();
}
@Override
public Hunk<T> getSource()
{
return src;
}
}