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

Cleanup

Browse Source
This commit is contained in:
cyberpwn
2021-08-24 22:28:33 -04:00
parent 432e95e4ec
commit 8df789ae34
84 changed files with 404 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/volmit/iris/engine/object/basic/IrisPosition.java
View File

@@ -54,8 +54,9 @@ public class IrisPosition {
public IrisPosition(Vector v) {
this(v.getBlockX(), v.getBlockY(), v.getBlockZ());
}
public IrisPosition(double x, double y, double z) {
this((int)x,(int)y,(int)z);
this((int) x, (int) y, (int) z);
}

1
src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java
View File

@@ -35,7 +35,6 @@ import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement;
import com.volmit.iris.engine.object.loot.IrisLootReference;
import com.volmit.iris.engine.object.meta.IrisEffect;
import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
import com.volmit.iris.engine.object.noise.IrisShapedGeneratorStyle;
import com.volmit.iris.engine.object.noise.IrisSlopeClip;
import com.volmit.iris.engine.object.noise.NoiseStyle;
import com.volmit.iris.engine.object.objects.IrisObject;

10
src/main/java/com/volmit/iris/engine/object/cave/IrisCave.java
View File

@@ -18,26 +18,16 @@
package com.volmit.iris.engine.object.cave;
import com.volmit.iris.core.project.loader.IrisData;
import com.volmit.iris.core.project.loader.IrisRegistrant;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.noise.IrisWorm;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.data.B;
import com.volmit.iris.util.json.JSONObject;
import com.volmit.iris.util.mantle.Mantle;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.noise.Worm;
import com.volmit.iris.util.noise.Worm3;
import com.volmit.iris.util.noise.WormIterator3;
import com.volmit.iris.util.plugin.VolmitSender;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.bukkit.block.data.BlockData;
import org.bukkit.util.Vector;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)

17
src/main/java/com/volmit/iris/engine/object/cave/IrisCavePlacer.java
View File

@@ -33,13 +33,11 @@ import com.volmit.iris.util.mantle.Mantle;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.noise.Worm3;
import com.volmit.iris.util.noise.WormIterator3;
import com.volmit.iris.util.plugin.VolmitSender;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.bukkit.block.data.BlockData;
import org.bukkit.util.BlockVector;
import org.bukkit.util.Vector;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -66,22 +64,18 @@ public class IrisCavePlacer implements IRare {
private transient final AtomicCache<IrisCave> caveCache = new AtomicCache<>();
private transient final AtomicBoolean fail = new AtomicBoolean(false);
public IrisCave getRealCave(IrisData data)
{
public IrisCave getRealCave(IrisData data) {
return caveCache.aquire(() -> data.getCaveLoader().load(getCave()));
}
public void generateCave(Mantle mantle, RNG rng, IrisData data, int x, int y, int z)
{
if(fail.get())
{
public void generateCave(Mantle mantle, RNG rng, IrisData data, int x, int y, int z) {
if (fail.get()) {
return;
}
IrisCave cave = getRealCave(data);
if(cave == null)
{
if (cave == null) {
Iris.warn("Unable to locate cave for generation!");
fail.set(true);
return;
@@ -90,8 +84,7 @@ public class IrisCavePlacer implements IRare {
WormIterator3 w = cave.getWorm().iterate3D(rng, data, x, y, z);
KList<Vector> points = new KList<>();
int itr = 0;
while(w.hasNext())
{
while (w.hasNext()) {
itr++;
Worm3 wx = w.next();
points.add(new Vector(wx.getX().getPosition(), wx.getY().getPosition(), wx.getZ().getPosition()));

9
src/main/java/com/volmit/iris/engine/object/common/HeadlessWorld.java
View File

@@ -70,16 +70,13 @@ public class HeadlessWorld {
public HeadlessGenerator generate() {
Engine e = null;
if(getWorld().tryGetRealWorld())
{
if(IrisToolbelt.isIrisWorld(getWorld().realWorld()))
{
if (getWorld().tryGetRealWorld()) {
if (IrisToolbelt.isIrisWorld(getWorld().realWorld())) {
e = IrisToolbelt.access(getWorld().realWorld()).getEngine();
}
}
if(e != null)
{
if (e != null) {
Iris.info("Using Existing Engine " + getWorld().name() + " for Headless Pregeneration.");
}

9
src/main/java/com/volmit/iris/engine/object/common/IrisWorld.java
View File

@@ -62,17 +62,14 @@ public class IrisWorld {
.environment(world.getEnvironment());
}
public boolean tryGetRealWorld()
{
if(hasRealWorld())
{
public boolean tryGetRealWorld() {
if (hasRealWorld()) {
return true;
}
World w = Bukkit.getWorld(name);
if(w != null)
{
if (w != null) {
realWorld = w;
return true;
}

1
src/main/java/com/volmit/iris/engine/object/deposits/IrisDepositGenerator.java
View File

@@ -22,7 +22,6 @@ import com.volmit.iris.core.project.loader.IrisData;
import com.volmit.iris.engine.data.cache.AtomicCache;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.engine.object.block.IrisBlockData;
import com.volmit.iris.engine.object.noise.IrisGenerator;
import com.volmit.iris.engine.object.objects.IrisObject;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.RNG;

1
src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java
View File

@@ -39,7 +39,6 @@ import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure;
import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement;
import com.volmit.iris.engine.object.loot.IrisLootReference;
import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
import com.volmit.iris.engine.object.noise.IrisInterpolator;
import com.volmit.iris.engine.object.noise.IrisShapedGeneratorStyle;
import com.volmit.iris.engine.object.noise.NoiseStyle;
import com.volmit.iris.engine.object.objects.IrisObjectPlacement;

17
src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java
View File

@@ -105,21 +105,14 @@ public class IrisEntitySpawn implements IRare {
};
if (l != null) {
if(referenceSpawner.getAllowedLightLevels().getMin() > 0 || referenceSpawner.getAllowedLightLevels().getMax() < 15)
{
if(referenceSpawner.getAllowedLightLevels().contains(l.getBlock().getLightLevel()))
{
if (spawn100(gen, l) != null)
{
if (referenceSpawner.getAllowedLightLevels().getMin() > 0 || referenceSpawner.getAllowedLightLevels().getMax() < 15) {
if (referenceSpawner.getAllowedLightLevels().contains(l.getBlock().getLightLevel())) {
if (spawn100(gen, l) != null) {
s++;
}
}
}
else
{
if (spawn100(gen, l) != null)
{
} else {
if (spawn100(gen, l) != null) {
s++;
}
}

8
src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePositional.java
View File

@@ -65,13 +65,9 @@ public class IrisFeaturePositional {
public static IrisFeaturePositional read(DataInputStream s) throws IOException {
String sx = s.readUTF();
try
{
try {
return new Gson().fromJson(sx, IrisFeaturePositional.class);
}
catch(Throwable e)
{
} catch (Throwable e) {
Iris.error(sx);
e.printStackTrace();
throw new IOException(e);

1
src/main/java/com/volmit/iris/engine/object/noise/IrisGenerator.java
View File

@@ -24,7 +24,6 @@ import com.volmit.iris.engine.data.cache.AtomicCache;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.engine.object.common.IRare;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.context.IrisContext;
import com.volmit.iris.util.interpolation.IrisInterpolation;
import com.volmit.iris.util.json.JSONObject;
import com.volmit.iris.util.math.RNG;

1
src/main/java/com/volmit/iris/engine/object/noise/IrisGeneratorStyle.java
View File

@@ -18,7 +18,6 @@
package com.volmit.iris.engine.object.noise;
import com.volmit.iris.Iris;
import com.volmit.iris.core.project.loader.IrisData;
import com.volmit.iris.engine.data.cache.AtomicCache;
import com.volmit.iris.engine.object.annotations.Desc;

18
src/main/java/com/volmit/iris/engine/object/noise/IrisWorm.java
View File

@@ -21,17 +21,8 @@ package com.volmit.iris.engine.object.noise;
import com.volmit.iris.core.project.loader.IrisData;
import com.volmit.iris.engine.data.cache.AtomicCache;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.engine.object.basic.IrisRange;
import com.volmit.iris.engine.object.common.IRare;
import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
import com.volmit.iris.engine.object.noise.IrisNoiseGenerator;
import com.volmit.iris.engine.object.noise.IrisStyledRange;
import com.volmit.iris.engine.object.noise.NoiseStyle;
import com.volmit.iris.util.function.NoiseProvider;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.noise.Worm;
import com.volmit.iris.util.noise.WormIterator2;
import com.volmit.iris.util.noise.WormIterator3;
import lombok.AllArgsConstructor;
@@ -64,13 +55,11 @@ public class IrisWorm {
private transient final AtomicCache<NoiseProvider> angleProviderCache = new AtomicCache<>();
public NoiseProvider getAngleProvider(RNG rng, IrisData data)
{
public NoiseProvider getAngleProvider(RNG rng, IrisData data) {
return angleProviderCache.aquire(() -> (xx, zz) -> angleStyle.create(rng, data).fitDouble(-0.5, 0.5, xx, zz) * segmentDistance.get(rng, xx, zz, data));
}
public WormIterator2 iterate2D(RNG rng, IrisData data, int x, int z)
{
public WormIterator2 iterate2D(RNG rng, IrisData data, int x, int z) {
return WormIterator2.builder()
.maxDistance(maxDistance)
.maxIterations(maxSegments == -1 ? maxDistance : maxSegments)
@@ -78,8 +67,7 @@ public class IrisWorm {
.build();
}
public WormIterator3 iterate3D(RNG rng, IrisData data, int x, int y, int z)
{
public WormIterator3 iterate3D(RNG rng, IrisData data, int x, int y, int z) {
return WormIterator3.builder()
.maxDistance(maxDistance)
.maxIterations(maxSegments == -1 ? maxDistance : maxSegments)

1
src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java
View File

@@ -34,7 +34,6 @@ import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement;
import com.volmit.iris.engine.object.loot.IrisLootReference;
import com.volmit.iris.engine.object.meta.IrisEffect;
import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
import com.volmit.iris.engine.object.noise.IrisShapedGeneratorStyle;
import com.volmit.iris.engine.object.noise.NoiseStyle;
import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
import com.volmit.iris.engine.object.spawners.IrisSpawner;

1
src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java
View File

@@ -35,7 +35,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.bukkit.Bukkit;
import org.bukkit.World;
@EqualsAndHashCode(callSuper = true)