mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-06 07:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Forcefully shove stuff into other stuff

Browse Source
This commit is contained in:
Daniel Mills
2020-11-10 00:49:28 -05:00
parent 50ffcceaf4
commit 4fc8a5ad0c
364 changed files with 2975 additions and 5303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/volmit/iris/util/GenLayer.java
View File

@@ -1,6 +1,6 @@
package com.volmit.iris.util;
import com.volmit.iris.gen.TopographicTerrainProvider;
import com.volmit.iris.generator.legacy.TopographicTerrainProvider;
public abstract class GenLayer
{

2
src/main/java/com/volmit/iris/util/IrisInterpolation.java
View File

@@ -1,6 +1,6 @@
package com.volmit.iris.util;
import com.volmit.iris.noise.CNG;
import com.volmit.iris.generator.noise.CNG;
import com.volmit.iris.object.InterpolationMethod;
import com.volmit.iris.object.NoiseStyle;

2
src/main/java/com/volmit/iris/util/IrisPostBlockFilter.java
View File

@@ -7,7 +7,7 @@ import org.bukkit.block.data.Waterlogged;
import org.bukkit.block.data.type.Slab;
import org.bukkit.generator.ChunkGenerator.ChunkData;
import com.volmit.iris.gen.PostBlockTerrainProvider;
import com.volmit.iris.generator.legacy.PostBlockTerrainProvider;
import lombok.Data;

9
src/main/java/com/volmit/iris/util/ObjectResourceLoader.java
View File

@@ -1,10 +1,10 @@
package com.volmit.iris.util;
import java.io.File;
import com.volmit.iris.Iris;
import com.volmit.iris.object.IrisObject;
import java.io.File;
public class ObjectResourceLoader extends ResourceLoader<IrisObject>
{
private ChronoLatch useFlip = new ChronoLatch(2863);
@@ -15,6 +15,11 @@ public class ObjectResourceLoader extends ResourceLoader<IrisObject>
super(root, folderName, resourceTypeName, IrisObject.class);
}
public int getSize()
{
return loadCache.size();
}
public int getTotalStorage()
{
int m = 0;

2
src/main/java/com/volmit/iris/util/ParallaxChunk.java
View File

@@ -9,7 +9,7 @@ import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator.ChunkData;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.atomics.AtomicSliver;
import com.volmit.iris.generator.legacy.atomics.AtomicSliver;
public class ParallaxChunk implements Writable
{

30
src/main/java/com/volmit/iris/util/PregenJob.java
View File

@@ -1,11 +1,9 @@
package com.volmit.iris.util;
import java.awt.Color;
import java.io.File;
import java.io.IOException;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicInteger;
import com.volmit.iris.Iris;
import com.volmit.iris.IrisSettings;
import com.volmit.iris.manager.gui.PregenGui;
import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.World;
@@ -13,13 +11,11 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.world.ChunkUnloadEvent;
import com.volmit.iris.Iris;
import com.volmit.iris.IrisSettings;
import com.volmit.iris.gen.IrisTerrainProvider;
import com.volmit.iris.gen.scaffold.IrisWorlds;
import com.volmit.iris.gui.PregenGui;
import io.papermc.lib.PaperLib;
import java.awt.*;
import java.io.File;
import java.io.IOException;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicInteger;
public class PregenJob implements Listener
{
@@ -48,7 +44,6 @@ public class PregenJob implements Listener
private Spiraler chunkSpiraler;
private boolean first;
private static Consumer2<ChunkPosition, Color> consumer;
private IrisTerrainProvider tp;
private double cps = 0;
private int lg = 0;
private long lt = M.ms();
@@ -84,7 +79,6 @@ public class PregenJob implements Listener
this.chunkZ = 0;
completed = false;
first = true;
tp = IrisWorlds.getProvider(world);
chunkSpiraler = new Spiraler(cubeSize, cubeSize, (x, z) ->
{
@@ -387,7 +381,7 @@ public class PregenJob implements Listener
if(consumer != null)
{
consumer.accept(new ChunkPosition(chunk.getX(), chunk.getZ()), tp != null ? tp.render(chunk.getX() * 16, chunk.getZ() * 16) : Color.blue);
consumer.accept(new ChunkPosition(chunk.getX(), chunk.getZ()), Color.blue);
}
});
}
@@ -412,7 +406,7 @@ public class PregenJob implements Listener
if(consumer != null)
{
consumer.accept(new ChunkPosition(chunkX, chunkZ), tp != null ? tp.render(chunkX * 16, chunkZ * 16) : Color.blue);
consumer.accept(new ChunkPosition(chunkX, chunkZ), Color.blue);
}
}
}
@@ -486,7 +480,7 @@ public class PregenJob implements Listener
{
if(e.getWorld().equals(world) && isChunkWithin(e.getChunk().getX(), e.getChunk().getZ()) && consumer != null)
{
consumer.accept(new ChunkPosition(e.getChunk().getX(), e.getChunk().getZ()), tp != null ? tp.render(e.getChunk().getX() * 16, e.getChunk().getZ() * 16) : Color.blue.darker());
consumer.accept(new ChunkPosition(e.getChunk().getX(), e.getChunk().getZ()), Color.blue.darker());
}
}

2
src/main/java/com/volmit/iris/util/WorldGenLayer.java
View File

@@ -3,7 +3,7 @@ package com.volmit.iris.util;
import org.bukkit.Chunk;
import org.bukkit.World;
import com.volmit.iris.gen.TopographicTerrainProvider;
import com.volmit.iris.generator.legacy.TopographicTerrainProvider;
public abstract class WorldGenLayer
{