Iris doesnt need worlds anymore

This commit is contained in:
Daniel Mills
2020-09-06 03:19:01 -04:00
parent 035f2a0236
commit 036dc289d5
41 changed files with 2640 additions and 413 deletions

View File

@@ -7,10 +7,9 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.zip.GZIPInputStream;
import org.bukkit.World;
import com.volmit.iris.Iris;
import com.volmit.iris.IrisSettings;
import com.volmit.iris.gen.scaffold.TerrainTarget;
import com.volmit.iris.util.ByteArrayTag;
import com.volmit.iris.util.CompoundTag;
import com.volmit.iris.util.CustomOutputStream;
@@ -21,10 +20,10 @@ import com.volmit.iris.util.Tag;
public class AtomicRegionData
{
private final World world;
private final TerrainTarget world;
private Tag[] tag;
public AtomicRegionData(World world)
public AtomicRegionData(TerrainTarget world)
{
this.world = world;
tag = new Tag[1024];
@@ -148,7 +147,7 @@ public class AtomicRegionData
return data;
}
public World getWorld()
public TerrainTarget getWorld()
{
return world;
}

View File

@@ -5,9 +5,8 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import org.bukkit.World;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.scaffold.TerrainTarget;
import com.volmit.iris.util.ChunkPosition;
import com.volmit.iris.util.KList;
import com.volmit.iris.util.KMap;
@@ -15,7 +14,7 @@ import com.volmit.iris.util.M;
public class AtomicWorldData
{
private World world;
private TerrainTarget world;
private KMap<ChunkPosition, AtomicSliverMap> loadedChunks;
private KMap<ChunkPosition, AtomicRegionData> loadedSections;
private KMap<ChunkPosition, Long> lastRegion;
@@ -24,7 +23,7 @@ public class AtomicWorldData
private KList<ChunkPosition> unloadChunks;
private long last = M.ms();
public AtomicWorldData(World world)
public AtomicWorldData(TerrainTarget world)
{
this.world = world;
loadedSections = new KMap<>();
@@ -254,7 +253,7 @@ public class AtomicWorldData
public File getSubregionFolder()
{
return new File(world.getWorldFolder(), "region-parallax");
return new File(world.getFolder(), "parallax");
}
public KMap<ChunkPosition, AtomicSliverMap> getLoadedChunks()