Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-30 04:29:05 +00:00
Code Issues Releases 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

8
src/main/java/com/volmit/iris/object/IrisBiome.java
View File

@@ -6,7 +6,7 @@ import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.ContextualChunkGenerator;
import com.volmit.iris.gen.ContextualTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.noise.CNG;
import com.volmit.iris.util.ArrayType;
@@ -207,7 +207,7 @@ public class IrisBiome extends IrisRegistrant implements IRare
});
}
public double getHeight(ContextualChunkGenerator xg, double x, double z, long seed)
public double getHeight(ContextualTerrainProvider xg, double x, double z, long seed)
{
double height = 0;
@@ -494,7 +494,7 @@ public class IrisBiome extends IrisRegistrant implements IRare
return biomeSkyScatter.get(getBiomeGenerator(rng).fit(0, biomeSkyScatter.size() - 1, x, y, z));
}
public KList<IrisBiome> getRealChildren(ContextualChunkGenerator g)
public KList<IrisBiome> getRealChildren(ContextualTerrainProvider g)
{
return realChildren.aquire(() ->
{
@@ -509,7 +509,7 @@ public class IrisBiome extends IrisRegistrant implements IRare
});
}
public KList<String> getAllChildren(ContextualChunkGenerator g, int limit)
public KList<String> getAllChildren(ContextualTerrainProvider g, int limit)
{
KSet<String> m = new KSet<>();
m.addAll(getChildren());

6
src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java
View File

@@ -1,7 +1,7 @@
package com.volmit.iris.object;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.ContextualChunkGenerator;
import com.volmit.iris.gen.ContextualTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.util.DependsOn;
import com.volmit.iris.util.Desc;
@@ -46,7 +46,7 @@ public class IrisBiomeGeneratorLink
}
public IrisGenerator getCachedGenerator(ContextualChunkGenerator g)
public IrisGenerator getCachedGenerator(ContextualTerrainProvider g)
{
return gen.aquire(() ->
{
@@ -61,7 +61,7 @@ public class IrisBiomeGeneratorLink
});
}
public double getHeight(ContextualChunkGenerator xg, double x, double z, long seed)
public double getHeight(ContextualTerrainProvider xg, double x, double z, long seed)
{
double g = getCachedGenerator(xg).getHeight(x, z, seed);
g = g < 0 ? 0 : g;

8
src/main/java/com/volmit/iris/object/IrisBiomeMutation.java
View File

@@ -1,6 +1,6 @@
package com.volmit.iris.object;
import com.volmit.iris.gen.ContextualChunkGenerator;
import com.volmit.iris.gen.ContextualTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.util.ArrayType;
import com.volmit.iris.util.Desc;
@@ -56,17 +56,17 @@ public class IrisBiomeMutation
private transient AtomicCache<KList<String>> sideACache = new AtomicCache<>();
private transient AtomicCache<KList<String>> sideBCache = new AtomicCache<>();
public KList<String> getRealSideA(ContextualChunkGenerator xg)
public KList<String> getRealSideA(ContextualTerrainProvider xg)
{
return sideACache.aquire(() -> processList(xg, getSideA()));
}
public KList<String> getRealSideB(ContextualChunkGenerator xg)
public KList<String> getRealSideB(ContextualTerrainProvider xg)
{
return sideBCache.aquire(() -> processList(xg, getSideB()));
}
public KList<String> processList(ContextualChunkGenerator xg, KList<String> s)
public KList<String> processList(ContextualTerrainProvider xg, KList<String> s)
{
KSet<String> r = new KSet<>();

4
src/main/java/com/volmit/iris/object/IrisDepositGenerator.java
View File

@@ -5,7 +5,7 @@ import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator.ChunkData;
import org.bukkit.util.BlockVector;
import com.volmit.iris.gen.TerrainChunkGenerator;
import com.volmit.iris.gen.TopographicTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.util.ArrayType;
import com.volmit.iris.util.B;
@@ -153,7 +153,7 @@ public class IrisDepositGenerator
});
}
public void generate(ChunkData data, RNG rng, TerrainChunkGenerator g, int cx, int cz)
public void generate(ChunkData data, RNG rng, TopographicTerrainProvider g, int cx, int cz)
{
for(int l = 0; l < rng.i(getMinPerChunk(), getMaxPerChunk()); l++)
{

14
src/main/java/com/volmit/iris/object/IrisDimension.java
View File

@@ -6,9 +6,9 @@ import org.bukkit.block.data.BlockData;
import org.bukkit.util.BlockVector;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.ContextualChunkGenerator;
import com.volmit.iris.gen.ParallelChunkGenerator;
import com.volmit.iris.gen.PostBlockChunkGenerator;
import com.volmit.iris.gen.ContextualTerrainProvider;
import com.volmit.iris.gen.ParallelTerrainProvider;
import com.volmit.iris.gen.PostBlockTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.noise.CNG;
import com.volmit.iris.util.ArrayType;
@@ -310,7 +310,7 @@ public class IrisDimension extends IrisRegistrant
private transient AtomicCache<Double> cosr = new AtomicCache<>();
private transient AtomicCache<Double> rad = new AtomicCache<>();
public KList<IrisPostBlockFilter> getPostBlockProcessors(PostBlockChunkGenerator g)
public KList<IrisPostBlockFilter> getPostBlockProcessors(PostBlockTerrainProvider g)
{
return cacheFilters.aquire(() ->
{
@@ -595,7 +595,7 @@ public class IrisDimension extends IrisRegistrant
return cosr.aquire(() -> Math.cos(getDimensionAngle()));
}
public KList<IrisRegion> getAllRegions(ContextualChunkGenerator g)
public KList<IrisRegion> getAllRegions(ContextualTerrainProvider g)
{
KList<IrisRegion> r = new KList<>();
@@ -607,7 +607,7 @@ public class IrisDimension extends IrisRegistrant
return r;
}
public KList<IrisBiome> getAllBiomes(ContextualChunkGenerator g)
public KList<IrisBiome> getAllBiomes(ContextualTerrainProvider g)
{
KList<IrisBiome> r = new KList<>();
@@ -619,7 +619,7 @@ public class IrisDimension extends IrisRegistrant
return r;
}
public ChunkPosition getParallaxSize(ParallelChunkGenerator g)
public ChunkPosition getParallaxSize(ParallelTerrainProvider g)
{
return parallaxSize.aquire(() ->
{

4
src/main/java/com/volmit/iris/object/IrisEffect.java
View File

@@ -8,7 +8,7 @@ import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.IrisChunkGenerator;
import com.volmit.iris.gen.IrisTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.util.ChronoLatch;
import com.volmit.iris.util.DependsOn;
@@ -220,7 +220,7 @@ public class IrisEffect
});
}
public void apply(Player p, IrisChunkGenerator g)
public void apply(Player p, IrisTerrainProvider g)
{
if(!canTick())
{

6
src/main/java/com/volmit/iris/object/IrisEntity.java
View File

@@ -17,7 +17,7 @@ import org.bukkit.loot.LootTable;
import org.bukkit.loot.Lootable;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.IrisChunkGenerator;
import com.volmit.iris.gen.IrisTerrainProvider;
import com.volmit.iris.util.ArrayType;
import com.volmit.iris.util.C;
import com.volmit.iris.util.Desc;
@@ -122,12 +122,12 @@ public class IrisEntity extends IrisRegistrant
@Desc("If specified, this entity will be leashed by this entity. I.e. THIS ENTITY Leashed by SPECIFIED. This has no effect on EnderDragons, Withers, Players, or Bats.Non-living entities excluding leashes will not persist as leashholders.")
private IrisEntity leashHolder = null;
public Entity spawn(IrisChunkGenerator gen, Location at)
public Entity spawn(IrisTerrainProvider gen, Location at)
{
return spawn(gen, at, new RNG(at.hashCode()));
}
public Entity spawn(IrisChunkGenerator gen, Location at, RNG rng)
public Entity spawn(IrisTerrainProvider gen, Location at, RNG rng)
{
Entity e = at.getWorld().spawnEntity(at, getType());
e.setCustomName(getCustomName() != null ? C.translateAlternateColorCodes('&', getCustomName()) : null);

8
src/main/java/com/volmit/iris/object/IrisEntitySpawn.java
View File

@@ -5,7 +5,7 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.event.entity.EntitySpawnEvent;
import com.volmit.iris.gen.IrisChunkGenerator;
import com.volmit.iris.gen.IrisTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.util.Desc;
import com.volmit.iris.util.DontObfuscate;
@@ -43,7 +43,7 @@ public class IrisEntitySpawn
private transient AtomicCache<RNG> rng = new AtomicCache<>();
private transient AtomicCache<IrisEntity> ent = new AtomicCache<>();
public Entity on(IrisChunkGenerator g, Location at, EntityType t, EntitySpawnEvent ee)
public Entity on(IrisTerrainProvider g, Location at, EntityType t, EntitySpawnEvent ee)
{
if(!trigger.equals(EntityType.UNKNOWN))
{
@@ -64,12 +64,12 @@ public class IrisEntitySpawn
return e;
}
public IrisEntity getRealEntity(IrisChunkGenerator g)
public IrisEntity getRealEntity(IrisTerrainProvider g)
{
return ent.aquire(() -> g.getData().getEntityLoader().load(getEntity()));
}
public Entity spawn(IrisChunkGenerator g, Location at)
public Entity spawn(IrisTerrainProvider g, Location at)
{
if(getRealEntity(g) == null)
{

4
src/main/java/com/volmit/iris/object/IrisLootReference.java
View File

@@ -1,6 +1,6 @@
package com.volmit.iris.object;
import com.volmit.iris.gen.DimensionChunkGenerator;
import com.volmit.iris.gen.DimensionalTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.util.ArrayType;
import com.volmit.iris.util.Desc;
@@ -37,7 +37,7 @@ public class IrisLootReference
}
public KList<IrisLootTable> getLootTables(DimensionChunkGenerator g)
public KList<IrisLootTable> getLootTables(DimensionalTerrainProvider g)
{
return tt.aquire(() ->
{

4
src/main/java/com/volmit/iris/object/IrisObjectPlacement.java
View File

@@ -1,7 +1,7 @@
package com.volmit.iris.object;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.ContextualChunkGenerator;
import com.volmit.iris.gen.ContextualTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.noise.CNG;
import com.volmit.iris.util.ArrayType;
@@ -140,7 +140,7 @@ public class IrisObjectPlacement
return getSurfaceWarp(rng).fitDouble(-(getWarp().getMultiplier() / 2D), (getWarp().getMultiplier() / 2D), x, y, z);
}
public IrisObject getSchematic(ContextualChunkGenerator g, RNG random)
public IrisObject getSchematic(ContextualTerrainProvider g, RNG random)
{
if(place.isEmpty())
{

18
src/main/java/com/volmit/iris/object/IrisRegion.java
View File

@@ -1,7 +1,7 @@
package com.volmit.iris.object;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.ContextualChunkGenerator;
import com.volmit.iris.gen.ContextualTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.noise.CNG;
import com.volmit.iris.util.ArrayType;
@@ -332,7 +332,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
return getShoreHeightGenerator().fitDouble(shoreHeightMin, shoreHeightMax, x / shoreHeightZoom, z / shoreHeightZoom);
}
public KList<IrisBiome> getAllBiomes(ContextualChunkGenerator g)
public KList<IrisBiome> getAllBiomes(ContextualTerrainProvider g)
{
KMap<String, IrisBiome> b = new KMap<>();
KSet<String> names = new KSet<>();
@@ -365,7 +365,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
return b.v();
}
public KList<IrisBiome> getBiomes(ContextualChunkGenerator g, InferredType type)
public KList<IrisBiome> getBiomes(ContextualTerrainProvider g, InferredType type)
{
if(type.equals(InferredType.LAND))
{
@@ -400,7 +400,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
return new KList<>();
}
public KList<IrisBiome> getRealCaveBiomes(ContextualChunkGenerator g)
public KList<IrisBiome> getRealCaveBiomes(ContextualTerrainProvider g)
{
return realCaveBiomes.aquire(() ->
{
@@ -415,7 +415,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
});
}
public KList<IrisBiome> getRealLakeBiomes(ContextualChunkGenerator g)
public KList<IrisBiome> getRealLakeBiomes(ContextualTerrainProvider g)
{
return realLakeBiomes.aquire(() ->
{
@@ -430,7 +430,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
});
}
public KList<IrisBiome> getRealRiverBiomes(ContextualChunkGenerator g)
public KList<IrisBiome> getRealRiverBiomes(ContextualTerrainProvider g)
{
return realRiverBiomes.aquire(() ->
{
@@ -445,7 +445,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
});
}
public KList<IrisBiome> getRealShoreBiomes(ContextualChunkGenerator g)
public KList<IrisBiome> getRealShoreBiomes(ContextualTerrainProvider g)
{
return realShoreBiomes.aquire(() ->
{
@@ -460,7 +460,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
});
}
public KList<IrisBiome> getRealSeaBiomes(ContextualChunkGenerator g)
public KList<IrisBiome> getRealSeaBiomes(ContextualTerrainProvider g)
{
return realSeaBiomes.aquire(() ->
{
@@ -475,7 +475,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
});
}
public KList<IrisBiome> getRealLandBiomes(ContextualChunkGenerator g)
public KList<IrisBiome> getRealLandBiomes(ContextualTerrainProvider g)
{
return realLandBiomes.aquire(() ->
{

20
src/main/java/com/volmit/iris/object/IrisStructurePlacement.java
View File

@@ -1,8 +1,8 @@
package com.volmit.iris.object;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.ContextualChunkGenerator;
import com.volmit.iris.gen.ParallaxChunkGenerator;
import com.volmit.iris.gen.ContextualTerrainProvider;
import com.volmit.iris.gen.ParallaxTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.noise.CellGenerator;
import com.volmit.iris.util.ChunkPosition;
@@ -65,7 +65,7 @@ public class IrisStructurePlacement
}
public void place(ParallaxChunkGenerator g, RNG rngno, int cx, int cz)
public void place(ParallaxTerrainProvider g, RNG rngno, int cx, int cz)
{
try
{
@@ -118,7 +118,7 @@ public class IrisStructurePlacement
}
}
public void placeLayer(ParallaxChunkGenerator g, RNG rng, RNG rnp, int i, int k, int j, int s, int sh)
public void placeLayer(ParallaxTerrainProvider g, RNG rng, RNG rnp, int i, int k, int j, int s, int sh)
{
if(!hasStructure(g, rng, i, k, j))
{
@@ -156,27 +156,27 @@ public class IrisStructurePlacement
});
}
public IrisObject load(ContextualChunkGenerator g, String s)
public IrisObject load(ContextualTerrainProvider g, String s)
{
return g.getData().getObjectLoader().load(s);
}
public int gridSize(ContextualChunkGenerator g)
public int gridSize(ContextualTerrainProvider g)
{
return getStructure(g).getGridSize();
}
public int gridHeight(ContextualChunkGenerator g)
public int gridHeight(ContextualTerrainProvider g)
{
return getStructure(g).getGridHeight();
}
public IrisStructure getStructure(ContextualChunkGenerator g)
public IrisStructure getStructure(ContextualTerrainProvider g)
{
return structure.aquire(() -> (g == null ? Iris.globaldata : g.getData()).getStructureLoader().load(getTileset()));
}
public boolean hasStructure(ParallaxChunkGenerator g, RNG random, double x, double y, double z)
public boolean hasStructure(ParallaxTerrainProvider g, RNG random, double x, double y, double z)
{
if(g.getGlCarve().isCarved((int) x, (int) y, (int) z))
{
@@ -191,7 +191,7 @@ public class IrisStructurePlacement
return false;
}
public CellGenerator getChanceGenerator(ParallaxChunkGenerator g, RNG random)
public CellGenerator getChanceGenerator(ParallaxTerrainProvider g, RNG random)
{
return chanceCell.aquire(() ->
{

4
src/main/java/com/volmit/iris/object/IrisTextPlacement.java
View File

@@ -1,6 +1,6 @@
package com.volmit.iris.object;
import com.volmit.iris.gen.ParallaxChunkGenerator;
import com.volmit.iris.gen.ParallaxTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.util.ArrayType;
import com.volmit.iris.util.Desc;
@@ -107,7 +107,7 @@ public class IrisTextPlacement
return m;
}
public void place(ParallaxChunkGenerator g, RNG rng, int x, int z)
public void place(ParallaxTerrainProvider g, RNG rng, int x, int z)
{
int tr = getConfig().getTriesForChunk(rng);

6
src/main/java/com/volmit/iris/object/IrisTextRenderer.java
View File

@@ -4,7 +4,7 @@ import java.awt.Canvas;
import java.awt.Font;
import java.awt.FontMetrics;
import com.volmit.iris.gen.ParallaxChunkGenerator;
import com.volmit.iris.gen.ParallaxTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.util.ArrayType;
import com.volmit.iris.util.Desc;
@@ -60,7 +60,7 @@ public class IrisTextRenderer
}
public KList<IrisObject> getObjects(ParallaxChunkGenerator g, RNG rng)
public KList<IrisObject> getObjects(ParallaxTerrainProvider g, RNG rng)
{
return objects.aquire(() ->
{
@@ -138,7 +138,7 @@ public class IrisTextRenderer
});
}
public void place(ParallaxChunkGenerator g, RNG rng, IrisObjectPlacement config, int xb, int zb)
public void place(ParallaxTerrainProvider g, RNG rng, IrisObjectPlacement config, int xb, int zb)
{
getObjects(g, rng).get(rng.nextInt(getObjects(g, rng).size())).place(xb, zb, g, config, rng);
}