mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-13 11:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweaks

Browse Source
This commit is contained in:
Daniel Mills
2020-09-06 03:29:35 -04:00
parent 7cd268bb4c
commit c5ab77b8ac
51 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/volmit/iris/gen/ContextualChunkGenerator.java → src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java
View File

@@ -51,7 +51,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public abstract class ContextualChunkGenerator implements TerrainProvider, Listener
public abstract class ContextualTerrainProvider implements TerrainProvider, Listener
{
private KList<BlockPosition> noLoot;
private BlockPosition allowLoot;
@@ -75,7 +75,7 @@ public abstract class ContextualChunkGenerator implements TerrainProvider, Liste
private volatile boolean hotloadable = false;
private final TerrainTarget target;
public ContextualChunkGenerator(TerrainTarget target)
public ContextualTerrainProvider(TerrainTarget target)
{
this.target = target;
pushLatch = new ChronoLatch(3000);

4
src/main/java/com/volmit/iris/gen/DimensionChunkGenerator.java → src/main/java/com/volmit/iris/gen/DimensionalTerrainProvider.java
View File

@@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public abstract class DimensionChunkGenerator extends ContextualChunkGenerator
public abstract class DimensionalTerrainProvider extends ContextualTerrainProvider
{
private String dimensionName;
protected static final BlockData AIR = Material.AIR.createBlockData();
@@ -28,7 +28,7 @@ public abstract class DimensionChunkGenerator extends ContextualChunkGenerator
protected static final BlockData BEDROCK = Material.BEDROCK.createBlockData();
protected static final BlockData WATER = Material.WATER.createBlockData();
public DimensionChunkGenerator(TerrainTarget t, String dimensionName)
public DimensionalTerrainProvider(TerrainTarget t, String dimensionName)
{
super(t);
setDimensionName(dimensionName);

10
src/main/java/com/volmit/iris/gen/IrisChunkGenerator.java → src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java
View File

@@ -39,28 +39,28 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class IrisChunkGenerator extends PostBlockChunkGenerator implements IrisContext
public class IrisTerrainProvider extends PostBlockTerrainProvider implements IrisContext
{
private IrisBiome hb = null;
private IrisRegion hr = null;
private boolean spawnable = false;
public IrisChunkGenerator(IrisGenConfiguration config)
public IrisTerrainProvider(IrisGenConfiguration config)
{
super(config.getTarget(), config.getDimension(), config.getThreads());
}
public IrisChunkGenerator(TerrainTarget t, String dimensionName, int threads)
public IrisTerrainProvider(TerrainTarget t, String dimensionName, int threads)
{
super(t, dimensionName, threads);
}
public IrisChunkGenerator(TerrainTarget t, String dimensionName)
public IrisTerrainProvider(TerrainTarget t, String dimensionName)
{
super(t, dimensionName, 16);
}
public IrisChunkGenerator(TerrainTarget t, int tc)
public IrisTerrainProvider(TerrainTarget t, int tc)
{
super(t, "", tc);
}

4
src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java → src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java
View File

@@ -38,7 +38,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator implements IObjectPlacer
public abstract class ParallaxTerrainProvider extends TopographicTerrainProvider implements IObjectPlacer
{
private short cacheID = 0;
private KMap<ChunkPosition, AtomicSliver> sliverCache;
@@ -50,7 +50,7 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple
private GenLayerText glText;
private int sliverBuffer;
public ParallaxChunkGenerator(TerrainTarget t, String dimensionName, int threads)
public ParallaxTerrainProvider(TerrainTarget t, String dimensionName, int threads)
{
super(t, dimensionName, threads);
setSliverCache(new KMap<>());

4
src/main/java/com/volmit/iris/gen/ParallelChunkGenerator.java → src/main/java/com/volmit/iris/gen/ParallelTerrainProvider.java
View File

@@ -16,13 +16,13 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public abstract class ParallelChunkGenerator extends DimensionChunkGenerator
public abstract class ParallelTerrainProvider extends DimensionalTerrainProvider
{
private GroupedExecutor accelerant;
private int threads;
private boolean cachingAllowed;
public ParallelChunkGenerator(TerrainTarget t, String dimensionName, int threads)
public ParallelTerrainProvider(TerrainTarget t, String dimensionName, int threads)
{
super(t, dimensionName);
setThreads(threads);

4
src/main/java/com/volmit/iris/gen/PostBlockChunkGenerator.java → src/main/java/com/volmit/iris/gen/PostBlockTerrainProvider.java
View File

@@ -26,14 +26,14 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public abstract class PostBlockChunkGenerator extends ParallaxChunkGenerator implements IPostBlockAccess
public abstract class PostBlockTerrainProvider extends ParallaxTerrainProvider implements IPostBlockAccess
{
private String postKey;
private IrisLock postLock;
private int minPhase;
private int maxPhase;
public PostBlockChunkGenerator(TerrainTarget t, String dimensionName, int threads)
public PostBlockTerrainProvider(TerrainTarget t, String dimensionName, int threads)
{
super(t, dimensionName, threads);
setPostKey("post-" + dimensionName);

4
src/main/java/com/volmit/iris/gen/TerrainChunkGenerator.java → src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java
View File

@@ -41,7 +41,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public abstract class TerrainChunkGenerator extends ParallelChunkGenerator
public abstract class TopographicTerrainProvider extends ParallelTerrainProvider
{
private long lastUpdateRequest = M.ms();
private long lastChunkLoad = M.ms();
@@ -54,7 +54,7 @@ public abstract class TerrainChunkGenerator extends ParallelChunkGenerator
private CNG masterFracture;
private ChronoLatch cwarn = new ChronoLatch(1000);
public TerrainChunkGenerator(TerrainTarget t, String dimensionName, int threads)
public TopographicTerrainProvider(TerrainTarget t, String dimensionName, int threads)
{
super(t, dimensionName, threads);
setGenerators(new KMap<>());

4
src/main/java/com/volmit/iris/gen/atomics/AtomicSliverMap.java
View File

@@ -9,7 +9,7 @@ import java.io.OutputStream;
import org.bukkit.generator.ChunkGenerator.BiomeGrid;
import org.bukkit.generator.ChunkGenerator.ChunkData;
import com.volmit.iris.gen.DimensionChunkGenerator;
import com.volmit.iris.gen.DimensionalTerrainProvider;
import com.volmit.iris.object.IrisStructure;
import com.volmit.iris.object.IrisStructureTile;
import com.volmit.iris.util.HeightMap;
@@ -56,7 +56,7 @@ public class AtomicSliverMap
structures.put(y, s.getLoadKey() + "." + s.getTiles().indexOf(t));
}
public IrisStructureResult getStructure(DimensionChunkGenerator g, int y)
public IrisStructureResult getStructure(DimensionalTerrainProvider g, int y)
{
String v = structures.get(y);

6
src/main/java/com/volmit/iris/gen/layer/BiomeDataProvider.java
View File

@@ -1,6 +1,6 @@
package com.volmit.iris.gen.layer;
import com.volmit.iris.gen.ContextualChunkGenerator;
import com.volmit.iris.gen.ContextualTerrainProvider;
import com.volmit.iris.noise.CNG;
import com.volmit.iris.object.InferredType;
import com.volmit.iris.object.IrisBiome;
@@ -23,12 +23,12 @@ public class BiomeDataProvider
generator = layer.getIris().getDimension().getBiomeStyle(type).create(rng.nextParallelRNG(4645079 + (type.ordinal() * 23845)));
}
public IrisBiome generatePureData(ContextualChunkGenerator g, double bx, double bz, int rawX, int rawZ, IrisRegion regionData)
public IrisBiome generatePureData(ContextualTerrainProvider g, double bx, double bz, int rawX, int rawZ, IrisRegion regionData)
{
return layer.generateBiomeData(bx, bz, regionData, getGenerator(), regionData.getBiomes(g, getType()), getType(), rawX, rawZ, true);
}
public IrisBiome generateData(ContextualChunkGenerator g, double bx, double bz, int rawX, int rawZ, IrisRegion regionData)
public IrisBiome generateData(ContextualTerrainProvider g, double bx, double bz, int rawX, int rawZ, IrisRegion regionData)
{
return layer.generateBiomeData(bx, bz, regionData, getGenerator(), regionData.getBiomes(g, getType()), getType(), rawX, rawZ, false);
}

6
src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java
View File

@@ -2,7 +2,7 @@ package com.volmit.iris.gen.layer;
import com.volmit.iris.Iris;
import com.volmit.iris.IrisSettings;
import com.volmit.iris.gen.DimensionChunkGenerator;
import com.volmit.iris.gen.DimensionalTerrainProvider;
import com.volmit.iris.noise.CNG;
import com.volmit.iris.object.InferredType;
import com.volmit.iris.object.IrisBiome;
@@ -30,9 +30,9 @@ public class GenLayerBiome extends GenLayer
private BiomeDataProvider caveProvider;
private BiomeDataProvider riverProvider;
private BiomeDataProvider lakeProvider;
private DimensionChunkGenerator iris;
private DimensionalTerrainProvider iris;
public GenLayerBiome(DimensionChunkGenerator iris, RNG rng)
public GenLayerBiome(DimensionalTerrainProvider iris, RNG rng)
{
super(iris, rng);
this.iris = iris;

4
src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java
View File

@@ -1,6 +1,6 @@
package com.volmit.iris.gen.layer;
import com.volmit.iris.gen.DimensionChunkGenerator;
import com.volmit.iris.gen.DimensionalTerrainProvider;
import com.volmit.iris.object.IrisCarveLayer;
import com.volmit.iris.util.GenLayer;
import com.volmit.iris.util.RNG;
@@ -11,7 +11,7 @@ public class GenLayerCarve extends GenLayer
private int minimum;
private int maximum;
public GenLayerCarve(DimensionChunkGenerator iris, RNG rng)
public GenLayerCarve(DimensionalTerrainProvider iris, RNG rng)
{
super(iris, rng);

4
src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java
View File

@@ -3,7 +3,7 @@ package com.volmit.iris.gen.layer;
import org.bukkit.Material;
import org.bukkit.block.data.BlockData;
import com.volmit.iris.gen.DimensionChunkGenerator;
import com.volmit.iris.gen.DimensionalTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicSliver;
import com.volmit.iris.noise.FastNoise;
import com.volmit.iris.noise.FastNoise.CellularDistanceFunction;
@@ -24,7 +24,7 @@ public class GenLayerCave extends GenLayer
private static final KList<CaveResult> EMPTY = new KList<>();
private FastNoise gg;
public GenLayerCave(DimensionChunkGenerator iris, RNG rng)
public GenLayerCave(DimensionalTerrainProvider iris, RNG rng)
{
//@builder
super(iris, rng);

4
src/main/java/com/volmit/iris/gen/layer/GenLayerText.java
View File

@@ -8,7 +8,7 @@ import java.awt.image.BufferedImage;
import org.bukkit.block.data.BlockData;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.DimensionChunkGenerator;
import com.volmit.iris.gen.DimensionalTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.object.IrisMaterialPalette;
import com.volmit.iris.object.IrisObject;
@@ -22,7 +22,7 @@ public class GenLayerText extends GenLayer
private AtomicCache<IrisObject> debug = new AtomicCache<>();
public GenLayerText(DimensionChunkGenerator iris, RNG rng)
public GenLayerText(DimensionalTerrainProvider iris, RNG rng)
{
super(iris, rng);
}

6
src/main/java/com/volmit/iris/gen/layer/GenLayerUpdate.java
View File

@@ -13,7 +13,7 @@ import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.ParallaxChunkGenerator;
import com.volmit.iris.gen.ParallaxTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicSliverMap;
import com.volmit.iris.object.InventorySlotType;
import com.volmit.iris.object.IrisBiome;
@@ -29,10 +29,10 @@ import com.volmit.iris.util.RNG;
public class GenLayerUpdate extends BlockPopulator
{
private ParallaxChunkGenerator gen;
private ParallaxTerrainProvider gen;
private RNG rng;
public GenLayerUpdate(ParallaxChunkGenerator gen)
public GenLayerUpdate(ParallaxTerrainProvider gen)
{
this.gen = gen;
this.rng = new RNG(gen.getTarget().getSeed() + 4996788).nextParallelRNG(-98618289);

6
src/main/java/com/volmit/iris/gen/post/PostFloatingNibDeleter.java
View File

@@ -3,7 +3,7 @@ package com.volmit.iris.gen.post;
import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator.ChunkData;
import com.volmit.iris.gen.PostBlockChunkGenerator;
import com.volmit.iris.gen.PostBlockTerrainProvider;
import com.volmit.iris.util.B;
import com.volmit.iris.util.DontObfuscate;
import com.volmit.iris.util.IrisPostBlockFilter;
@@ -14,13 +14,13 @@ public class PostFloatingNibDeleter extends IrisPostBlockFilter
private static final BlockData AIR = B.getBlockData("AIR");
@DontObfuscate
public PostFloatingNibDeleter(PostBlockChunkGenerator gen, int phase)
public PostFloatingNibDeleter(PostBlockTerrainProvider gen, int phase)
{
super(gen, phase);
}
@DontObfuscate
public PostFloatingNibDeleter(PostBlockChunkGenerator gen)
public PostFloatingNibDeleter(PostBlockTerrainProvider gen)
{
this(gen, 0);
}

6
src/main/java/com/volmit/iris/gen/post/PostFoliageCleaner.java
View File

@@ -4,7 +4,7 @@ import org.bukkit.Material;
import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator.ChunkData;
import com.volmit.iris.gen.PostBlockChunkGenerator;
import com.volmit.iris.gen.PostBlockTerrainProvider;
import com.volmit.iris.util.B;
import com.volmit.iris.util.DontObfuscate;
import com.volmit.iris.util.IrisPostBlockFilter;
@@ -15,13 +15,13 @@ public class PostFoliageCleaner extends IrisPostBlockFilter
public static final BlockData AIR = B.get("AIR");
@DontObfuscate
public PostFoliageCleaner(PostBlockChunkGenerator gen, int phase)
public PostFoliageCleaner(PostBlockTerrainProvider gen, int phase)
{
super(gen, phase);
}
@DontObfuscate
public PostFoliageCleaner(PostBlockChunkGenerator gen)
public PostFoliageCleaner(PostBlockTerrainProvider gen)
{
this(gen, 0);
}

6
src/main/java/com/volmit/iris/gen/post/PostNibSmoother.java
View File

@@ -4,7 +4,7 @@ import org.bukkit.Material;
import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator.ChunkData;
import com.volmit.iris.gen.PostBlockChunkGenerator;
import com.volmit.iris.gen.PostBlockTerrainProvider;
import com.volmit.iris.util.DontObfuscate;
import com.volmit.iris.util.IrisPostBlockFilter;
@@ -12,13 +12,13 @@ import com.volmit.iris.util.IrisPostBlockFilter;
public class PostNibSmoother extends IrisPostBlockFilter
{
@DontObfuscate
public PostNibSmoother(PostBlockChunkGenerator gen, int phase)
public PostNibSmoother(PostBlockTerrainProvider gen, int phase)
{
super(gen, phase);
}
@DontObfuscate
public PostNibSmoother(PostBlockChunkGenerator gen)
public PostNibSmoother(PostBlockTerrainProvider gen)
{
this(gen, 0);
}

6
src/main/java/com/volmit/iris/gen/post/PostPotholeFiller.java
View File

@@ -2,7 +2,7 @@ package com.volmit.iris.gen.post;
import org.bukkit.generator.ChunkGenerator.ChunkData;
import com.volmit.iris.gen.PostBlockChunkGenerator;
import com.volmit.iris.gen.PostBlockTerrainProvider;
import com.volmit.iris.util.DontObfuscate;
import com.volmit.iris.util.IrisPostBlockFilter;
@@ -10,13 +10,13 @@ import com.volmit.iris.util.IrisPostBlockFilter;
public class PostPotholeFiller extends IrisPostBlockFilter
{
@DontObfuscate
public PostPotholeFiller(PostBlockChunkGenerator gen, int phase)
public PostPotholeFiller(PostBlockTerrainProvider gen, int phase)
{
super(gen, phase);
}
@DontObfuscate
public PostPotholeFiller(PostBlockChunkGenerator gen)
public PostPotholeFiller(PostBlockTerrainProvider gen)
{
this(gen, 0);
}

6
src/main/java/com/volmit/iris/gen/post/PostSlabber.java
View File

@@ -4,7 +4,7 @@ import org.bukkit.Material;
import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator.ChunkData;
import com.volmit.iris.gen.PostBlockChunkGenerator;
import com.volmit.iris.gen.PostBlockTerrainProvider;
import com.volmit.iris.util.DontObfuscate;
import com.volmit.iris.util.IrisPostBlockFilter;
import com.volmit.iris.util.RNG;
@@ -17,14 +17,14 @@ public class PostSlabber extends IrisPostBlockFilter
private RNG rng;
@DontObfuscate
public PostSlabber(PostBlockChunkGenerator gen, int phase)
public PostSlabber(PostBlockTerrainProvider gen, int phase)
{
super(gen, phase);
rng = gen.getMasterRandom().nextParallelRNG(166456);
}
@DontObfuscate
public PostSlabber(PostBlockChunkGenerator gen)
public PostSlabber(PostBlockTerrainProvider gen)
{
this(gen, 0);
}

6
src/main/java/com/volmit/iris/gen/post/PostWallPatcher.java
View File

@@ -4,7 +4,7 @@ import org.bukkit.Material;
import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator.ChunkData;
import com.volmit.iris.gen.PostBlockChunkGenerator;
import com.volmit.iris.gen.PostBlockTerrainProvider;
import com.volmit.iris.object.IrisBiome;
import com.volmit.iris.util.DontObfuscate;
import com.volmit.iris.util.IrisPostBlockFilter;
@@ -17,14 +17,14 @@ public class PostWallPatcher extends IrisPostBlockFilter
private RNG rng;
@DontObfuscate
public PostWallPatcher(PostBlockChunkGenerator gen, int phase)
public PostWallPatcher(PostBlockTerrainProvider gen, int phase)
{
super(gen, phase);
rng = gen.getMasterRandom().nextParallelRNG(1239456);
}
@DontObfuscate
public PostWallPatcher(PostBlockChunkGenerator gen)
public PostWallPatcher(PostBlockTerrainProvider gen)
{
this(gen, 0);
}

6
src/main/java/com/volmit/iris/gen/post/PostWaterlogger.java
View File

@@ -5,7 +5,7 @@ import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.Waterlogged;
import org.bukkit.generator.ChunkGenerator.ChunkData;
import com.volmit.iris.gen.PostBlockChunkGenerator;
import com.volmit.iris.gen.PostBlockTerrainProvider;
import com.volmit.iris.util.B;
import com.volmit.iris.util.DontObfuscate;
import com.volmit.iris.util.IrisPostBlockFilter;
@@ -16,13 +16,13 @@ public class PostWaterlogger extends IrisPostBlockFilter
private static final BlockData WATER = B.getBlockData("WATER");
@DontObfuscate
public PostWaterlogger(PostBlockChunkGenerator gen, int phase)
public PostWaterlogger(PostBlockTerrainProvider gen, int phase)
{
super(gen, phase);
}
@DontObfuscate
public PostWaterlogger(PostBlockChunkGenerator gen)
public PostWaterlogger(PostBlockTerrainProvider gen)
{
super(gen);
}

6
src/main/java/com/volmit/iris/gen/scaffold/IrisGenConfiguration.java
View File

@@ -1,6 +1,6 @@
package com.volmit.iris.gen.scaffold;
import com.volmit.iris.gen.IrisChunkGenerator;
import com.volmit.iris.gen.IrisTerrainProvider;
import lombok.Builder;
import lombok.Data;
@@ -17,8 +17,8 @@ public class IrisGenConfiguration
@Builder.Default
private String dimension = "";
public IrisChunkGenerator buildGenerator()
public IrisTerrainProvider buildGenerator()
{
return new IrisChunkGenerator(this);
return new IrisTerrainProvider(this);
}
}

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

@@ -2,7 +2,7 @@ package com.volmit.iris.gen.scaffold;
import org.bukkit.World;
import com.volmit.iris.gen.IrisChunkGenerator;
import com.volmit.iris.gen.IrisTerrainProvider;
public class IrisWorlds
{
@@ -11,11 +11,11 @@ public class IrisWorlds
return world.getGenerator() instanceof Provisioned;
}
public IrisChunkGenerator getProvider(World world)
public IrisTerrainProvider getProvider(World world)
{
if(isIrisWorld(world))
{
return (IrisChunkGenerator) ((Provisioned) world.getGenerator()).getProvider();
return (IrisTerrainProvider) ((Provisioned) world.getGenerator()).getProvider();
}
return null;