Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-28 11:39:07 +00:00
Code Issues Releases Activity

Cleanup

Browse Source
This commit is contained in:
Daniel Mills
2021-07-16 02:25:35 -04:00
parent 22387b2610
commit 71140381e0
198 changed files with 1033 additions and 1146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/volmit/iris/engine/IrisComplex.java
View File

@@ -20,17 +20,17 @@ package com.volmit.iris.engine;
import com.google.common.util.concurrent.AtomicDouble;
import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.engine.actuator.IrisTerrainActuator;
import com.volmit.iris.engine.modifier.IrisCaveModifier;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.object.*;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.modifier.IrisCaveModifier;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.*;
import com.volmit.iris.engine.object.common.CaveResult;
import com.volmit.iris.engine.stream.ProceduralStream;
import com.volmit.iris.engine.stream.interpolation.Interpolated;
import com.volmit.iris.engine.object.common.CaveResult;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.M;
import com.volmit.iris.util.math.RNG;

19
src/main/java/com/volmit/iris/engine/IrisEngine.java
View File

@@ -19,12 +19,15 @@
package com.volmit.iris.engine;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.object.*;
import com.volmit.iris.engine.framework.*;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisBiomePaletteLayer;
import com.volmit.iris.engine.object.IrisDecorator;
import com.volmit.iris.engine.object.IrisObjectPlacement;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.scheduling.J;
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import com.volmit.iris.util.math.RNG;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.Chunk;
@@ -97,28 +100,24 @@ public class IrisEngine extends BlockPopulator implements Engine {
}
private void computeBiomeMaxes() {
for(IrisBiome i : getDimension().getAllBiomes(this))
{
for (IrisBiome i : getDimension().getAllBiomes(this)) {
double density = 0;
for(IrisObjectPlacement j : i.getObjects())
{
for (IrisObjectPlacement j : i.getObjects()) {
density += j.getDensity() * j.getChance();
}
maxBiomeObjectDensity = Math.max(maxBiomeObjectDensity, density);
density = 0;
for(IrisDecorator j : i.getDecorators())
{
for (IrisDecorator j : i.getDecorators()) {
density += Math.max(j.getStackMax(), 1) * j.getChance();
}
maxBiomeDecoratorDensity = Math.max(maxBiomeDecoratorDensity, density);
density = 0;
for(IrisBiomePaletteLayer j : i.getLayers())
{
for (IrisBiomePaletteLayer j : i.getLayers()) {
density++;
}

6
src/main/java/com/volmit/iris/engine/IrisEngineCompound.java
View File

@@ -20,14 +20,14 @@ package com.volmit.iris.engine;
import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.object.IrisDimension;
import com.volmit.iris.engine.object.IrisDimensionIndex;
import com.volmit.iris.engine.object.IrisPosition;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineCompound;
import com.volmit.iris.engine.framework.EngineData;
import com.volmit.iris.engine.framework.EngineTarget;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.IrisDimension;
import com.volmit.iris.engine.object.IrisDimensionIndex;
import com.volmit.iris.engine.object.IrisPosition;
import com.volmit.iris.engine.parallel.MultiBurst;
import com.volmit.iris.util.atomics.AtomicRollingSequence;
import com.volmit.iris.util.collection.KList;

2
src/main/java/com/volmit/iris/engine/IrisEngineFramework.java
View File

@@ -23,11 +23,11 @@ import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.engine.actuator.IrisBiomeActuator;
import com.volmit.iris.engine.actuator.IrisDecorantActuator;
import com.volmit.iris.engine.actuator.IrisTerrainActuator;
import com.volmit.iris.engine.framework.*;
import com.volmit.iris.engine.modifier.IrisCaveModifier;
import com.volmit.iris.engine.modifier.IrisDepositModifier;
import com.volmit.iris.engine.modifier.IrisPostModifier;
import com.volmit.iris.engine.modifier.IrisRavineModifier;
import com.volmit.iris.engine.framework.*;
import com.volmit.iris.util.scheduling.ChronoLatch;
import lombok.Getter;
import org.bukkit.block.Biome;

2
src/main/java/com/volmit/iris/engine/IrisWorldCreator.java
View File

@@ -19,8 +19,8 @@
package com.volmit.iris.engine;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.object.IrisDimension;
import com.volmit.iris.engine.framework.EngineCompositeGenerator;
import com.volmit.iris.engine.object.IrisDimension;
import com.volmit.iris.util.fakenews.FakeWorld;
import org.bukkit.World;
import org.bukkit.WorldCreator;

4
src/main/java/com/volmit/iris/engine/IrisWorldManager.java
View File

@@ -20,13 +20,13 @@ package com.volmit.iris.engine;
import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.engine.object.*;
import com.volmit.iris.engine.cache.Cache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineAssignedWorldManager;
import com.volmit.iris.util.scheduling.J;
import com.volmit.iris.engine.object.*;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.scheduling.J;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.event.block.BlockBreakEvent;

8
src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java
View File

@@ -20,15 +20,15 @@ package com.volmit.iris.engine.actuator;
import com.volmit.iris.Iris;
import com.volmit.iris.core.nms.INMS;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisBiomeCustom;
import com.volmit.iris.engine.data.chunk.TerrainChunk;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineAssignedActuator;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.hunk.view.BiomeGridHunkView;
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisBiomeCustom;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.engine.data.chunk.TerrainChunk;
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import org.bukkit.block.Biome;
import org.bukkit.generator.ChunkGenerator;

4
src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java
View File

@@ -19,13 +19,13 @@
package com.volmit.iris.engine.actuator;
import com.volmit.iris.engine.decorator.*;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineAssignedActuator;
import com.volmit.iris.engine.framework.EngineDecorator;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import lombok.Getter;
import org.bukkit.Material;
import org.bukkit.block.data.BlockData;

4
src/main/java/com/volmit/iris/engine/actuator/IrisTerrainActuator.java
View File

@@ -18,13 +18,13 @@
package com.volmit.iris.engine.actuator;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineAssignedActuator;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import lombok.Getter;
import org.bukkit.Material;
import org.bukkit.block.data.BlockData;

2
src/main/java/com/volmit/iris/engine/cache/AtomicCache.java vendored
View File

@@ -18,8 +18,8 @@
package com.volmit.iris.engine.cache;
import com.volmit.iris.util.scheduling.IrisLock;
import com.volmit.iris.util.math.M;
import com.volmit.iris.util.scheduling.IrisLock;
import java.util.function.Supplier;

12
src/main/java/com/volmit/iris/engine/data/B.java
View File

@@ -76,7 +76,8 @@ public class B {
Material mm = Material.valueOf(bx);
materialCache.put(bx, mm);
return mm;
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
nullMaterialCache.add(bx);
return null;
}
@@ -111,7 +112,8 @@ public class B {
}
return bdx;
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
Iris.warn("Unknown Block Data '" + bdxf + "'");
}
@@ -143,7 +145,8 @@ public class B {
BlockData bx = Bukkit.createBlockData(ix);
blockDataCache.put(ix, bx);
return bx;
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
@@ -154,7 +157,8 @@ public class B {
try {
BlockData bd = Material.valueOf(i).createBlockData();
blockDataCache.put(ix, bd);
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}

15
src/main/java/com/volmit/iris/engine/data/DirectWorldWriter.java
View File

@@ -69,7 +69,8 @@ public class DirectWorldWriter {
MCAUtil.write(writeBuffer.get(i), f, true);
writeBuffer.remove(i);
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
e.printStackTrace();
}
});
@@ -157,7 +158,8 @@ public class DirectWorldWriter {
}
return getBlockData(tag);
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
return B.get("AIR");
@@ -238,14 +240,11 @@ public class DirectWorldWriter {
public void verify(int mcaox, int mcaoz) {
MCAFile file = getMCA(mcaox, mcaoz);
for(int i = 0; i < 32; i++)
{
for(int j = 0; j < 32; j++)
{
for (int i = 0; i < 32; i++) {
for (int j = 0; j < 32; j++) {
Chunk c = file.getChunk(i, j);
if(c == null)
{
if (c == null) {
Iris.warn("Chunk " + ((mcaox << 5) + i) + ", " + ((mcaoz << 5) + j) + " is null in MCA File " + mcaox + ", " + mcaoz);
}
}

3
src/main/java/com/volmit/iris/engine/data/chunk/LinkedTerrainChunk.java
View File

@@ -60,7 +60,8 @@ public class LinkedTerrainChunk implements TerrainChunk {
private ChunkData createChunkData(int maxHeight) {
try {
return Bukkit.createChunkData(new HeightedFakeWorld(maxHeight));
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
e.printStackTrace();
}

12
src/main/java/com/volmit/iris/engine/data/loader/ResourceLoader.java
View File

@@ -126,23 +126,21 @@ public class ResourceLoader<T extends IrisRegistrant> {
t.setLoader(manager);
lock.unlock();
return t;
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
lock.unlock();
failLoad(j, e);
return null;
}
}
public KList<T> loadAll(KList<String> s)
{
public KList<T> loadAll(KList<String> s) {
KList<T> m = new KList<>();
for(String i : s)
{
for (String i : s) {
T t = load(i);
if(t != null)
{
if (t != null) {
m.add(t);
}
}

21
src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTParser.java
View File

@@ -93,19 +93,22 @@ public final class SNBTParser implements MaxDepthIO {
} else if (SHORT_LITERAL_PATTERN.matcher(s).matches()) {
try {
return new ShortTag(Short.parseShort(s.substring(0, s.length() - 1)));
} catch (NumberFormatException ex) {Iris.reportError(ex);
} catch (NumberFormatException ex) {
Iris.reportError(ex);
throw ptr.parseException("short not in range: \"" + s.substring(0, s.length() - 1) + "\"");
}
} else if (LONG_LITERAL_PATTERN.matcher(s).matches()) {
try {
return new LongTag(Long.parseLong(s.substring(0, s.length() - 1)));
} catch (NumberFormatException ex) {Iris.reportError(ex);
} catch (NumberFormatException ex) {
Iris.reportError(ex);
throw ptr.parseException("long not in range: \"" + s.substring(0, s.length() - 1) + "\"");
}
} else if (INT_LITERAL_PATTERN.matcher(s).matches()) {
try {
return new IntTag(Integer.parseInt(s));
} catch (NumberFormatException ex) {Iris.reportError(ex);
} catch (NumberFormatException ex) {
Iris.reportError(ex);
throw ptr.parseException("int not in range: \"" + s.substring(0, s.length() - 1) + "\"");
}
} else if (DOUBLE_LITERAL_PATTERN.matcher(s).matches()) {
@@ -152,7 +155,8 @@ public final class SNBTParser implements MaxDepthIO {
Tag<?> element = parseAnything(decrementMaxDepth(maxDepth));
try {
list.addUnchecked(element);
} catch (IllegalArgumentException ex) {Iris.reportError(ex);
} catch (IllegalArgumentException ex) {
Iris.reportError(ex);
throw ptr.parseException(ex.getMessage());
}
if (!ptr.nextArrayElement()) {
@@ -187,7 +191,8 @@ public final class SNBTParser implements MaxDepthIO {
if (NUMBER_PATTERN.matcher(s).matches()) {
try {
byteList.add(Byte.parseByte(s));
} catch (NumberFormatException ex) {Iris.reportError(ex);
} catch (NumberFormatException ex) {
Iris.reportError(ex);
throw ptr.parseException("byte not in range: \"" + s + "\"");
}
} else {
@@ -213,7 +218,8 @@ public final class SNBTParser implements MaxDepthIO {
if (NUMBER_PATTERN.matcher(s).matches()) {
try {
intList.add(Integer.parseInt(s));
} catch (NumberFormatException ex) {Iris.reportError(ex);
} catch (NumberFormatException ex) {
Iris.reportError(ex);
throw ptr.parseException("int not in range: \"" + s + "\"");
}
} else {
@@ -235,7 +241,8 @@ public final class SNBTParser implements MaxDepthIO {
if (NUMBER_PATTERN.matcher(s).matches()) {
try {
longList.add(Long.parseLong(s));
} catch (NumberFormatException ex) {Iris.reportError(ex);
} catch (NumberFormatException ex) {
Iris.reportError(ex);
throw ptr.parseException("long not in range: \"" + s + "\"");
}
} else {

6
src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java
View File

@@ -18,12 +18,12 @@
package com.volmit.iris.engine.decorator;
import com.volmit.iris.engine.object.DecorationPart;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDecorator;
import com.volmit.iris.engine.cache.Cache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.DecorationPart;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDecorator;
import org.bukkit.block.data.BlockData;
public class IrisCeilingDecorator extends IrisEngineDecorator {

6
src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java
View File

@@ -19,13 +19,13 @@
package com.volmit.iris.engine.decorator;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.object.DecorationPart;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDecorator;
import com.volmit.iris.engine.cache.Cache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineAssignedComponent;
import com.volmit.iris.engine.framework.EngineDecorator;
import com.volmit.iris.engine.object.DecorationPart;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDecorator;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.RNG;
import lombok.Getter;

6
src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java
View File

@@ -18,12 +18,12 @@
package com.volmit.iris.engine.decorator;
import com.volmit.iris.engine.object.DecorationPart;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDecorator;
import com.volmit.iris.engine.cache.Cache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.DecorationPart;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDecorator;
import org.bukkit.block.data.BlockData;
public class IrisSeaFloorDecorator extends IrisEngineDecorator {

6
src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java
View File

@@ -18,12 +18,12 @@
package com.volmit.iris.engine.decorator;
import com.volmit.iris.engine.object.DecorationPart;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDecorator;
import com.volmit.iris.engine.cache.Cache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.DecorationPart;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDecorator;
import org.bukkit.block.data.BlockData;
public class IrisSeaSurfaceDecorator extends IrisEngineDecorator {

6
src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java
View File

@@ -18,12 +18,12 @@
package com.volmit.iris.engine.decorator;
import com.volmit.iris.engine.object.DecorationPart;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDecorator;
import com.volmit.iris.engine.cache.Cache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.DecorationPart;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDecorator;
import org.bukkit.block.data.BlockData;
public class IrisShoreLineDecorator extends IrisEngineDecorator {

6
src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java
View File

@@ -19,13 +19,13 @@
package com.volmit.iris.engine.decorator;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.cache.Cache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.DecorationPart;
import com.volmit.iris.engine.object.InferredType;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDecorator;
import com.volmit.iris.engine.cache.Cache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.hunk.Hunk;
import org.bukkit.block.data.Bisected;
import org.bukkit.block.data.BlockData;

12
src/main/java/com/volmit/iris/engine/framework/Engine.java
View File

@@ -20,13 +20,13 @@ package com.volmit.iris.engine.framework;
import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.core.gui.Renderer;
import com.volmit.iris.core.gui.RenderType;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.object.*;
import com.volmit.iris.core.gui.Renderer;
import com.volmit.iris.engine.cache.Cache;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.*;
import com.volmit.iris.engine.parallax.ParallaxAccess;
import com.volmit.iris.engine.parallel.MultiBurst;
import com.volmit.iris.util.collection.KList;
@@ -231,7 +231,8 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro
try {
InventoryHolder m = (InventoryHolder) block.getState();
addItems(false, m.getInventory(), rx, tables, slot, x, y, z, 15);
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
}
@@ -269,7 +270,8 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro
try {
Arrays.parallelSort(nitems, (a, b) -> rng.nextInt());
break;
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
}

5
src/main/java/com/volmit/iris/engine/framework/EngineComponent.java
View File

@@ -19,8 +19,8 @@
package com.volmit.iris.engine.framework;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.IrisComplex;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.IrisComplex;
import com.volmit.iris.engine.object.IrisDimension;
import com.volmit.iris.engine.parallax.ParallaxAccess;
import com.volmit.iris.util.math.RollingSequence;
@@ -38,7 +38,8 @@ public interface EngineComponent {
if (this instanceof Listener) {
Iris.instance.unregisterListener((Listener) this);
}
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
}

41
src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java
View File

@@ -19,20 +19,20 @@
package com.volmit.iris.engine.framework;
import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.engine.IrisEngineCompound;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.core.nms.BiomeBaseInjector;
import com.volmit.iris.core.nms.INMS;
import com.volmit.iris.engine.IrisEngineCompound;
import com.volmit.iris.engine.IrisWorlds;
import com.volmit.iris.engine.cache.Cache;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.data.DirectWorldWriter;
import com.volmit.iris.engine.data.chunk.TerrainChunk;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDimension;
import com.volmit.iris.engine.object.IrisPosition;
import com.volmit.iris.engine.data.DirectWorldWriter;
import com.volmit.iris.engine.IrisWorlds;
import com.volmit.iris.engine.cache.Cache;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.parallel.BurstExecutor;
import com.volmit.iris.engine.parallel.MultiBurst;
import com.volmit.iris.util.collection.KList;
@@ -120,7 +120,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
new MortarSender(i, Iris.instance.getTag()).sendMessage("Dimension Hotloaded");
i.playSound(i.getLocation(), Sound.BLOCK_COPPER_PLACE, 1f, 1.25f);
}
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
});
@@ -142,7 +143,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
J.a(() -> hotloader.check());
getComposite().clean();
}
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
@@ -163,7 +165,6 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
File iris = new File(world.getWorldFolder(), "iris");
if (iris.exists() && iris.isDirectory()) {
searching:
for (File i : iris.listFiles()) {
// Look for v1 location
if (i.isDirectory() && i.getName().equals("dimensions")) {
@@ -318,7 +319,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
populators.addAll(compound.get().getPopulators());
hotloader = new ReactiveFolder(data.getDataFolder(), (a, c, d) -> hotload());
dim.installDataPack(() -> data, Iris.instance.getDatapacksFolder());
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
e.printStackTrace();
Iris.error("FAILED TO INITIALIZE DIMENSION FROM " + world.toString());
}
@@ -326,7 +328,6 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
/**
* Place strongholds in the world
*
*/
public void placeStrongholds(World world) {
EngineData metadata = getComposite().getEngineMetadata();
@@ -362,7 +363,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
try {
Object o = getBP(clazz, clazzSG, clazzBP, nmsWorld, blockPosToTest, chunkGenerator);
future.complete(o);
} catch (Exception e) {Iris.reportError(e);
} catch (Exception e) {
Iris.reportError(e);
e.printStackTrace();
future.complete(e);
}
@@ -383,7 +385,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
strongholds.add(ipos);
}
} catch (Exception e) {Iris.reportError(e);
} catch (Exception e) {
Iris.reportError(e);
e.printStackTrace();
}
}
@@ -398,7 +401,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
getComposite().saveEngineMetadata();
});
} catch (Exception e) {Iris.reportError(e);
} catch (Exception e) {
Iris.reportError(e);
strongholds.add(new IrisPosition(1337, 32, -1337));
metadata.setStrongholdPositions(strongholds);
Iris.warn("Couldn't properly find the stronghold position for this world. Is this headless mode? Are you not using 1.16 or higher?");
@@ -917,7 +921,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
public boolean isClosed() {
try {
return getComposite().getEngine(0).isClosed();
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
return false;
}
}
@@ -926,7 +931,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
public EngineTarget getTarget() {
try {
return getComposite().getEngine(0).getTarget();
} catch (NullPointerException e) {Iris.reportError(e);
} catch (NullPointerException e) {
Iris.reportError(e);
Iris.info("Failed to get composite engine. Please re-create the world in case you notice issues");
return null;
}
@@ -965,7 +971,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
try {
dim.getDimensionalComposite().forEach((m) -> IrisDataManager.loadAnyDimension(m.getDimension()).getAllAnyBiomes().forEach((i) -> v.put(i.getLoadKey(), i)));
} catch (Throwable ignored) {Iris.reportError(ignored);
} catch (Throwable ignored) {
Iris.reportError(ignored);
}

6
src/main/java/com/volmit/iris/engine/framework/EngineCompound.java
View File

@@ -19,13 +19,13 @@
package com.volmit.iris.engine.framework;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.actuator.IrisTerrainActuator;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.actuator.IrisTerrainActuator;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDimension;
import com.volmit.iris.engine.object.IrisPosition;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.parallel.MultiBurst;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap;

3
src/main/java/com/volmit/iris/engine/framework/EngineData.java
View File

@@ -48,7 +48,8 @@ public class EngineData {
try {
f.getParentFile().mkdirs();
return new Gson().fromJson(IO.readAll(f), EngineData.class);
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}

4
src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java
View File

@@ -18,9 +18,9 @@
package com.volmit.iris.engine.framework;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.IrisBiome;
import org.bukkit.block.data.BlockData;
public interface EngineDecorator extends EngineComponent {

2
src/main/java/com/volmit/iris/engine/framework/EngineFramework.java
View File

@@ -18,8 +18,8 @@
package com.volmit.iris.engine.framework;
import com.volmit.iris.engine.IrisComplex;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.IrisComplex;
import com.volmit.iris.engine.data.DataProvider;
import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData;

52
src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java
View File

@@ -19,16 +19,16 @@
package com.volmit.iris.engine.framework;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.IrisComplex;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.object.*;
import com.volmit.iris.engine.object.common.IObjectPlacer;
import com.volmit.iris.engine.object.tile.TileData;
import com.volmit.iris.engine.IrisComplex;
import com.volmit.iris.engine.cache.Cache;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.jigsaw.PlannedStructure;
import com.volmit.iris.engine.object.*;
import com.volmit.iris.engine.object.common.IObjectPlacer;
import com.volmit.iris.engine.object.tile.TileData;
import com.volmit.iris.engine.parallax.ParallaxAccess;
import com.volmit.iris.engine.parallax.ParallaxChunkMeta;
import com.volmit.iris.engine.parallel.BurstExecutor;
@@ -184,7 +184,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
});
getEngine().getMetrics().getParallaxInsert().put(p.getMilliseconds());
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
Iris.error("Failed to insert parallax at chunk " + (x >> 4) + " " + (z >> 4));
e.printStackTrace();
}
@@ -214,7 +215,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
}
}
}
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
e.printStackTrace();
Iris.warn("Failed to read positional features in chunk " + (i + cx) + " " + (j + cz) + "(" + e.getClass().getSimpleName() + ")");
}
@@ -252,8 +254,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
burst.complete();
if(getEngine().getDimension().isPlaceObjects())
{
if (getEngine().getDimension().isPlaceObjects()) {
burst = MultiBurst.burst.burst(bs);
for (i = -s; i <= s; i++) {
@@ -287,7 +288,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
getParallaxAccess().setChunkGenerated(x, z);
p.end();
getEngine().getMetrics().getParallax().put(p.getMilliseconds());
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
Iris.error("Failed to generate parallax in " + x + " " + z);
e.printStackTrace();
}
@@ -299,8 +301,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
return after;
}
if(getEngine().getDimension().isPlaceObjects())
{
if (getEngine().getDimension().isPlaceObjects()) {
int xx = x << 4;
int zz = z << 4;
RNG rng = new RNG(Cache.key(x, z)).nextParallelRNG(getEngine().getTarget().getWorld().getSeed());
@@ -376,8 +377,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
default KList<Runnable> generateParallaxJigsaw(RNG rng, int x, int z, IrisBiome biome, IrisRegion region) {
KList<Runnable> placeAfter = new KList<>();
if(getEngine().getDimension().isPlaceObjects())
{
if (getEngine().getDimension().isPlaceObjects()) {
boolean placed = false;
if (getEngine().getDimension().getStronghold() != null) {
@@ -441,7 +441,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
if (rng.chance(i.getChance() + rng.d(-0.005, 0.005)) && rng.chance(getComplex().getObjectChanceStream().get(x << 4, z << 4))) {
try {
place(rng, x << 4, z << 4, i);
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
Iris.error("Failed to place objects in the following biome: " + biome.getName());
Iris.error("Object(s) " + i.getPlace().toString(", ") + " (" + e.getClass().getSimpleName() + ").");
Iris.error("Are these objects missing?");
@@ -458,7 +459,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
if (rng.chance(i.getChance() + rng.d(-0.005, 0.005)) && rng.chance(getComplex().getObjectChanceStream().get(x << 4, z << 4))) {
try {
place(rng, x << 4, z << 4, i);
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
Iris.error("Failed to place objects in the following biome: " + biome.getName());
Iris.error("Object(s) " + i.getPlace().toString(", ") + " (" + e.getClass().getSimpleName() + ").");
Iris.error("Are these objects missing?");
@@ -589,8 +591,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
int x = xg.get();
int z = zg.get();
if(getEngine().getDimension().isPlaceObjects())
{
if (getEngine().getDimension().isPlaceObjects()) {
KList<IrisRegion> r = getAllRegions();
KList<IrisBiome> b = getAllBiomes();
@@ -629,7 +630,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
if (getEngine().getDimension().getStronghold() != null) {
try {
jig = Math.max(jig, getData().getJigsawStructureLoader().load(getEngine().getDimension().getStronghold()).getMaxDimension());
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
Iris.error("THIS IS THE ONE");
e.printStackTrace();
}
@@ -648,7 +650,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
try {
return IrisObject.sampleSize(getData().getObjectLoader().findFile(i));
} catch (IOException ex) {Iris.reportError(ex);
} catch (IOException ex) {
Iris.reportError(ex);
ex.printStackTrace();
}
@@ -668,7 +671,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
synchronized (zg) {
zg.getAndSet(Math.max(bv.getBlockZ(), zg.get()));
}
} catch (Throwable ed) {Iris.reportError(ed);
} catch (Throwable ed) {
Iris.reportError(ed);
}
});
@@ -686,7 +690,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
try {
return IrisObject.sampleSize(getData().getObjectLoader().findFile(j));
} catch (IOException ioException) {Iris.reportError(ioException);
} catch (IOException ioException) {
Iris.reportError(ioException);
ioException.printStackTrace();
}
@@ -706,7 +711,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
synchronized (zg) {
zg.getAndSet((int) Math.max(Math.ceil(bv.getBlockZ() * ms), zg.get()));
}
} catch (Throwable ee) {Iris.reportError(ee);
} catch (Throwable ee) {
Iris.reportError(ee);
}
});

8
src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java
View File

@@ -22,8 +22,8 @@ import com.volmit.iris.Iris;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisEffect;
import com.volmit.iris.engine.object.IrisRegion;
import com.volmit.iris.util.scheduling.J;
import com.volmit.iris.util.math.M;
import com.volmit.iris.util.scheduling.J;
import lombok.Data;
import org.bukkit.Location;
import org.bukkit.entity.Player;
@@ -64,7 +64,8 @@ public class EnginePlayer {
for (IrisEffect j : biome.getEffects()) {
try {
j.apply(player, getEngine());
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
}
@@ -83,7 +84,8 @@ public class EnginePlayer {
lastSample = M.ms();
sampleBiomeRegion();
}
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
}

2
src/main/java/com/volmit/iris/engine/framework/GeneratorAccess.java
View File

@@ -20,10 +20,10 @@ package com.volmit.iris.engine.framework;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.core.gui.Renderer;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisObjectPlacement;
import com.volmit.iris.engine.object.IrisRegion;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.parallax.ParallaxAccess;
public interface GeneratorAccess extends DataProvider, Renderer {

10
src/main/java/com/volmit/iris/engine/framework/IrisAccess.java
View File

@@ -20,10 +20,10 @@ package com.volmit.iris.engine.framework;
import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.data.DirectWorldWriter;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisRegion;
import com.volmit.iris.engine.data.DirectWorldWriter;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.parallel.MultiBurst;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.M;
@@ -139,7 +139,8 @@ public interface IrisAccess extends Hotloadable, DataProvider {
return;
}
}
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
e.printStackTrace();
}
});
@@ -199,7 +200,8 @@ public interface IrisAccess extends Hotloadable, DataProvider {
}
tries.getAndIncrement();
} catch (Throwable xe) {Iris.reportError(xe);
} catch (Throwable xe) {
Iris.reportError(xe);
xe.printStackTrace();
return;
}

2
src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java
View File

@@ -18,9 +18,9 @@
package com.volmit.iris.engine.framework;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.data.chunk.TerrainChunk;
import com.volmit.iris.engine.hunk.Hunk;
import lombok.Data;
import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData;

4
src/main/java/com/volmit/iris/engine/hunk/io/HunkIOAdapter.java
View File

@@ -20,9 +20,9 @@ package com.volmit.iris.engine.hunk.io;
import com.volmit.iris.engine.data.IOAdapter;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.util.oldnbt.ByteArrayTag;
import com.volmit.iris.util.io.CustomOutputStream;
import com.volmit.iris.util.function.Function3;
import com.volmit.iris.util.io.CustomOutputStream;
import com.volmit.iris.util.oldnbt.ByteArrayTag;
import java.io.*;
import java.util.zip.GZIPInputStream;

14
src/main/java/com/volmit/iris/engine/hunk/io/HunkRegionSlice.java
View File

@@ -19,8 +19,8 @@
package com.volmit.iris.engine.hunk.io;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.object.tile.TileData;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.tile.TileData;
import com.volmit.iris.engine.parallel.BurstExecutor;
import com.volmit.iris.engine.parallel.GridLock;
import com.volmit.iris.engine.parallel.MultiBurst;
@@ -109,7 +109,8 @@ public class HunkRegionSlice<T> {
try {
lock.withNasty(i.getX(), i.getZ(), () -> save.remove(i));
} catch (Throwable eer) {Iris.reportError(eer);
} catch (Throwable eer) {
Iris.reportError(eer);
}
}
@@ -137,7 +138,8 @@ public class HunkRegionSlice<T> {
try {
return adapter.read(factory, (ByteArrayTag) t);
} catch (IOException xe) {Iris.reportError(xe);
} catch (IOException xe) {
Iris.reportError(xe);
e.set(xe);
}
@@ -175,7 +177,8 @@ public class HunkRegionSlice<T> {
public void save(Hunk<T> region, int x, int z) {
try {
lock.withIO(x, z, () -> write(region, x, z));
} catch (IOException e) {Iris.reportError(e);
} catch (IOException e) {
Iris.reportError(e);
e.printStackTrace();
}
}
@@ -218,7 +221,8 @@ public class HunkRegionSlice<T> {
if (contains(x, z)) {
try {
v = read(x, z);
} catch (IOException e) {Iris.reportError(e);
} catch (IOException e) {
Iris.reportError(e);
e.printStackTrace();
}
}

2
src/main/java/com/volmit/iris/engine/hunk/storage/MappedHunk.java
View File

@@ -19,8 +19,8 @@
package com.volmit.iris.engine.hunk.storage;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.util.function.Consumer4;
import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.function.Consumer4;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
src/main/java/com/volmit/iris/engine/hunk/view/BiomeGridHunkView.java
View File

@@ -19,8 +19,8 @@
package com.volmit.iris.engine.hunk.view;
import com.volmit.iris.core.nms.INMS;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.data.chunk.LinkedTerrainChunk;
import com.volmit.iris.engine.hunk.Hunk;
import lombok.Getter;
import org.bukkit.block.Biome;
import org.bukkit.generator.ChunkGenerator.BiomeGrid;

6
src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java
View File

@@ -19,12 +19,12 @@
package com.volmit.iris.engine.jigsaw;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.object.*;
import com.volmit.iris.engine.object.common.IObjectPlacer;
import com.volmit.iris.engine.object.tile.TileData;
import com.volmit.iris.engine.IrisWorlds;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.IrisAccess;
import com.volmit.iris.engine.object.*;
import com.volmit.iris.engine.object.common.IObjectPlacer;
import com.volmit.iris.engine.object.tile.TileData;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.AxisAlignedBB;
import com.volmit.iris.util.math.BlockPosition;

4
src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java
View File

@@ -20,12 +20,12 @@ package com.volmit.iris.engine.jigsaw;
import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.object.*;
import com.volmit.iris.engine.IrisWorlds;
import com.volmit.iris.engine.framework.EngineParallaxManager;
import com.volmit.iris.engine.framework.IrisAccess;
import com.volmit.iris.engine.parallax.ParallaxChunkMeta;
import com.volmit.iris.engine.object.*;
import com.volmit.iris.engine.object.common.IObjectPlacer;
import com.volmit.iris.engine.parallax.ParallaxChunkMeta;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.math.RNG;

3
src/main/java/com/volmit/iris/engine/lighting/LightingCategory.java
View File

@@ -166,7 +166,6 @@ public enum LightingCategory {
/**
* Initializes the lighting in the chunk for this category
*
*/
public abstract void initialize(LightingChunk chunk);
@@ -180,7 +179,6 @@ public enum LightingCategory {
/**
* Sets whether this category of light is dirty, indicating this category of light is all good,
* or that more work is needed spreading light around.
*
*/
public abstract void setDirty(LightingChunk chunk, boolean dirty);
@@ -195,7 +193,6 @@ public enum LightingCategory {
/**
* Sets the light level in a section at the coordinates specified.
* No bounds checking is performed.
*
*/
public abstract void set(LightingCube section, int x, int y, int z, int level);
}

3
src/main/java/com/volmit/iris/engine/lighting/LightingChunk.java
View File

@@ -462,7 +462,8 @@ public class LightingChunk {
return Boolean.TRUE;
}
}
} catch (Throwable t) {Iris.reportError(t);
} catch (Throwable t) {
Iris.reportError(t);
t.printStackTrace();
}

4
src/main/java/com/volmit/iris/engine/lighting/LightingChunkNeighboring.java
View File

@@ -66,7 +66,7 @@ public class LightingChunkNeighboring {
/**
* Gets a relative neighboring chunk, and then a vertical cube in that chunk, if possible.
*
* @param cy Cube absolute y-coordinate
* @param cy Cube absolute y-coordinate
* @return cube, null if the chunk or cube is not available
*/
public LightingCube getCube(int deltaChunkX, int deltaChunkZ, int cy) {
@@ -77,7 +77,7 @@ public class LightingChunkNeighboring {
/**
* Sets the neighbor representing the given relative chunk
*
* @param neighbor to set to
* @param neighbor to set to
*/
public void set(int deltaChunkX, int deltaChunkZ, LightingChunk neighbor) {
values[getIndexByChunk(deltaChunkX, deltaChunkZ)] = neighbor;

6
src/main/java/com/volmit/iris/engine/lighting/LightingCube.java
View File

@@ -136,9 +136,9 @@ public class LightingCube {
* higher light value if all these tests pass.
* The x/y/z coordinates are allowed to check neighboring cubes.
*
* @param x The X-coordinate of the block (-1 to 16)
* @param y The Y-coordinate of the block (-1 to 16)
* @param z The Z-coordinate of the block (-1 to 16)
* @param x The X-coordinate of the block (-1 to 16)
* @param y The Y-coordinate of the block (-1 to 16)
* @param z The Z-coordinate of the block (-1 to 16)
* @return higher light level if propagated, otherwise the old light value
*/
public int getLightIfHigherNeighbor(LightingCategory category, int old_light, int faceMask, int x, int y, int z) {

2
src/main/java/com/volmit/iris/engine/lighting/LightingCubeNeighboring.java
View File

@@ -68,7 +68,7 @@ public class LightingCubeNeighboring {
/**
* Sets the neighbor representing the given relative cube
*
* @param neighbor to set to, is allowed to be null to set to 'none'
* @param neighbor to set to, is allowed to be null to set to 'none'
*/
public void set(int deltaCubeX, int deltaCubeY, int deltaCubeZ, LightingCube neighbor) {
values[getIndexByCube(deltaCubeX, deltaCubeY, deltaCubeZ)] = neighbor;

6
src/main/java/com/volmit/iris/engine/lighting/LightingService.java
View File

@@ -412,7 +412,8 @@ public class LightingService extends AsyncTask {
while (paused) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {Iris.reportError(e);
} catch (InterruptedException e) {
Iris.reportError(e);
e.printStackTrace();
}
synchronized (tasks) {
@@ -468,7 +469,8 @@ public class LightingService extends AsyncTask {
// Process the task
try {
currentTask.process();
} catch (Throwable t) {Iris.reportError(t);
} catch (Throwable t) {
Iris.reportError(t);
t.printStackTrace();
Iris.error("Failed to process task: " + currentTask.getStatus());
}

20
src/main/java/com/volmit/iris/engine/lighting/LightingTaskBatch.java
View File

@@ -105,10 +105,10 @@ public class LightingTaskBatch implements LightingTask {
return coords;
} else //noinspection ReplaceNullCheck
if (this.chunks_coords != null) {
return this.chunks_coords;
} else {
return new long[0];
}
return this.chunks_coords;
} else {
return new long[0];
}
}
}
@@ -240,7 +240,8 @@ public class LightingTaskBatch implements LightingTask {
return true;
} catch (InterruptedException | TimeoutException e1) {
Iris.reportError(e1);
} catch (ExecutionException ex) {Iris.reportError(ex);
} catch (ExecutionException ex) {
Iris.reportError(ex);
ex.printStackTrace();
Iris.error("Error while processing");
return false;
@@ -441,15 +442,18 @@ public class LightingTaskBatch implements LightingTask {
try {
future.get(200, TimeUnit.MILLISECONDS);
break;
} catch (TimeoutException e) {Iris.reportError(e);
} catch (TimeoutException e) {
Iris.reportError(e);
if (this.aborted) {
return;
}
}
}
} catch (InterruptedException e) {Iris.reportError(e);
} catch (InterruptedException e) {
Iris.reportError(e);
// Ignore
} catch (ExecutionException e) {Iris.reportError(e);
} catch (ExecutionException e) {
Iris.reportError(e);
e.printStackTrace();
Iris.error("Failed to apply lighting data for " + getShortStatus());

6
src/main/java/com/volmit/iris/engine/lighting/LightingTaskWorld.java
View File

@@ -99,9 +99,11 @@ public class LightingTaskWorld implements LightingTask {
// Wait until region list is loaded synchronously
try {
regionsLoadedFuture.get();
} catch (InterruptedException ex) {Iris.reportError(ex);
} catch (InterruptedException ex) {
Iris.reportError(ex);
// Ignore
} catch (ExecutionException ex) {Iris.reportError(ex);
} catch (ExecutionException ex) {
Iris.reportError(ex);
throw new RuntimeException("Failed to load regions", ex.getCause());
}

6
src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java
View File

@@ -19,12 +19,12 @@
package com.volmit.iris.engine.modifier;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.noise.FastNoiseDouble;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisCaveLayer;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineAssignedModifier;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.noise.FastNoiseDouble;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisCaveLayer;
import com.volmit.iris.engine.object.common.CaveResult;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.RNG;

8
src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java
View File

@@ -18,16 +18,16 @@
package com.volmit.iris.engine.modifier;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineAssignedModifier;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDepositGenerator;
import com.volmit.iris.engine.object.IrisObject;
import com.volmit.iris.engine.object.IrisRegion;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineAssignedModifier;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.util.data.HeightMap;
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import org.bukkit.block.data.BlockData;
import org.bukkit.util.BlockVector;

8
src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java
View File

@@ -19,16 +19,16 @@
package com.volmit.iris.engine.modifier;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineAssignedModifier;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.common.CaveResult;
import com.volmit.iris.engine.parallel.BurstExecutor;
import com.volmit.iris.engine.parallel.MultiBurst;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.object.common.CaveResult;
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import org.bukkit.Material;
import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.Levelled;

4
src/main/java/com/volmit/iris/engine/modifier/IrisRavineModifier.java
View File

@@ -19,11 +19,11 @@
package com.volmit.iris.engine.modifier;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.NoiseStyle;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineAssignedModifier;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.NoiseStyle;
import com.volmit.iris.util.math.BlockPosition;
import com.volmit.iris.util.math.ChunkPosition;
import com.volmit.iris.util.math.MathHelper;

2
src/main/java/com/volmit/iris/engine/noise/CNG.java
View File

@@ -19,6 +19,7 @@
package com.volmit.iris.engine.noise;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.object.common.IRare;
import com.volmit.iris.engine.stream.ProceduralStream;
import com.volmit.iris.engine.stream.arithmetic.FittedStream;
@@ -26,7 +27,6 @@ import com.volmit.iris.engine.stream.sources.CNGStream;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.function.NoiseInjector;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import lombok.Data;
import java.util.List;

10
src/main/java/com/volmit/iris/engine/noise/FastNoiseDouble.java
View File

@@ -598,7 +598,7 @@ public class FastNoiseDouble {
long y1 = y0 + 1;
long z1 = z0 + 1;
double xs=0, ys=0, zs=0;
double xs = 0, ys = 0, zs = 0;
switch (m_longerp) {
case Linear -> {
xs = x - x0;
@@ -696,7 +696,7 @@ public class FastNoiseDouble {
long x1 = x0 + 1;
long y1 = y0 + 1;
double xs=0, ys=0;
double xs = 0, ys = 0;
switch (m_longerp) {
case Linear -> {
xs = x - x0;
@@ -794,7 +794,7 @@ public class FastNoiseDouble {
long y1 = y0 + 1;
long z1 = z0 + 1;
double xs=0, ys=0, zs=0;
double xs = 0, ys = 0, zs = 0;
switch (m_longerp) {
case Linear -> {
xs = x - x0;
@@ -1886,7 +1886,7 @@ public class FastNoiseDouble {
long y1 = y0 + 1;
long z1 = z0 + 1;
double xs=0, ys=0, zs=0;
double xs = 0, ys = 0, zs = 0;
switch (m_longerp) {
case Linear -> {
xs = xf - x0;
@@ -1969,7 +1969,7 @@ public class FastNoiseDouble {
long x1 = x0 + 1;
long y1 = y0 + 1;
double xs=0, ys=0;
double xs = 0, ys = 0;
switch (m_longerp) {
case Linear -> {
xs = xf - x0;

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

@@ -19,15 +19,15 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.IrisComplex;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.core.gui.RenderType;
import com.volmit.iris.engine.IrisComplex;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.IrisAccess;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.engine.object.common.IRare;
import com.volmit.iris.util.collection.KList;
@@ -405,7 +405,8 @@ public class IrisBiome extends IrisRegistrant implements IRare {
for (int j = 0; j < d; j++) {
try {
data.add(getLayers().get(i).get(random.nextParallelRNG(i + j), (wx + j) / layers.get(i).getZoom(), j, (wz - j) / layers.get(i).getZoom(), rdata));
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
e.printStackTrace();
}
}
@@ -460,7 +461,8 @@ public class IrisBiome extends IrisRegistrant implements IRare {
try {
data.add(getSeaLayers().get(i).get(random.nextParallelRNG(i + j), (wx + j) / seaLayers.get(i).getZoom(), j, (wz - j) / seaLayers.get(i).getZoom(), rdata));
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
e.printStackTrace();
}
}
@@ -643,8 +645,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
return cacheColorObjectDensity.aquire(() -> {
double density = 0;
for(IrisObjectPlacement i : getObjects())
{
for (IrisObjectPlacement i : getObjects()) {
density += i.getDensity() * i.getChance();
}
@@ -655,8 +656,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
return cacheColorDecoratorLoad.aquire(() -> {
double density = 0;
for(IrisDecorator i : getDecorators())
{
for (IrisDecorator i : getDecorators()) {
density += i.getChance() * Math.min(1, i.getStackMax()) * 256;
}

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

@@ -94,8 +94,7 @@ public class IrisBiomeCustom {
effects.put("water_color", parseColor(getWaterColor()));
effects.put("water_fog_color", parseColor(getWaterFogColor()));
if(ambientParticle != null)
{
if (ambientParticle != null) {
JSONObject particle = new JSONObject();
JSONObject po = new JSONObject();
po.put("type", ambientParticle.getParticle().name().toLowerCase());
@@ -128,18 +127,15 @@ public class IrisBiomeCustom {
j.put("carvers", new JSONObject());
j.put("features", new JSONArray());
if(spawnRarity > 0)
{
if (spawnRarity > 0) {
j.put("creature_spawn_probability", spawnRarity);
}
if(getSpawns() != null && getSpawns().isNotEmpty())
{
if (getSpawns() != null && getSpawns().isNotEmpty()) {
JSONObject spawners = new JSONObject();
KMap<IrisBiomeCustomSpawnType, JSONArray> groups = new KMap<>();
for(IrisBiomeCustomSpawn i : getSpawns())
{
for (IrisBiomeCustomSpawn i : getSpawns()) {
JSONArray g = groups.compute(i.getGroup(), (k, v) -> v != null ? v : new JSONArray());
JSONObject o = new JSONObject();
o.put("type", "minecraft:" + i.getType().name().toLowerCase());
@@ -149,8 +145,7 @@ public class IrisBiomeCustom {
g.put(o);
}
for(IrisBiomeCustomSpawnType i : groups.k())
{
for (IrisBiomeCustomSpawnType i : groups.k()) {
spawners.put(i.name().toLowerCase(Locale.ROOT), groups.get(i));
}
@@ -164,7 +159,8 @@ public class IrisBiomeCustom {
String v = (c.startsWith("#") ? c : "#" + c).trim();
try {
return Color.decode(v).getRGB();
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
Iris.error("Error Parsing '''color''', (" + c + ")");
}

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

@@ -20,8 +20,8 @@ package com.volmit.iris.engine.object;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.object.annotations.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

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

@@ -90,8 +90,7 @@ public class IrisBiomeMutation {
} else if (i.startsWith("!*")) {
String name = i.substring(2);
for(String g : xg.getData().getBiomeLoader().load(name).getAllChildren(xg, 7))
{
for (String g : xg.getData().getBiomeLoader().load(name).getAllChildren(xg, 7)) {
r.remove(g);
}
} else {

2
src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java
View File

@@ -18,9 +18,9 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.RNG;

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

@@ -200,13 +200,15 @@ public class IrisBlockData extends IrisRegistrant {
try {
return Integer.valueOf(string);
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
try {
return Double.valueOf(string).intValue();
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}

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

@@ -18,15 +18,15 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MaxNumber;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.util.math.M;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

2
src/main/java/com/volmit/iris/engine/object/IrisDecorator.java
View File

@@ -19,9 +19,9 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.RNG;

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

@@ -19,10 +19,10 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.io.IO;
@@ -478,7 +478,8 @@ public class IrisDimension extends IrisRegistrant {
output.getParentFile().mkdirs();
try {
IO.writeAll(output, j.generateJson());
} catch (IOException e) {Iris.reportError(e);
} catch (IOException e) {
Iris.reportError(e);
e.printStackTrace();
}
}
@@ -496,7 +497,8 @@ public class IrisDimension extends IrisRegistrant {
}
}
""");
} catch (IOException e) {Iris.reportError(e);
} catch (IOException e) {
Iris.reportError(e);
e.printStackTrace();
}
Iris.verbose(" Installing Data Pack MCMeta: " + mcm.getPath());

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

@@ -193,7 +193,8 @@ public class IrisEffect {
return t;
}
}
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}

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

@@ -80,7 +80,8 @@ public class IrisEnchantment {
try {
return (Enchantment) i.get(null);
} catch (IllegalArgumentException | IllegalAccessException e) {
e.printStackTrace();Iris.reportError(e);
e.printStackTrace();
Iris.reportError(e);
}
}
}

2
src/main/java/com/volmit/iris/engine/object/IrisFeature.java
View File

@@ -20,11 +20,11 @@ package com.volmit.iris.engine.object;
import com.google.gson.Gson;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MaxNumber;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

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

@@ -20,11 +20,11 @@ package com.volmit.iris.engine.object;
import com.google.gson.Gson;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.util.function.NoiseProvider;
import com.volmit.iris.util.math.M;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import lombok.Data;
import lombok.NoArgsConstructor;

2
src/main/java/com/volmit/iris/engine/object/IrisFeaturePotential.java
View File

@@ -20,8 +20,8 @@ package com.volmit.iris.engine.object;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.util.math.RNG;
import lombok.Data;
@Data

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

@@ -19,13 +19,13 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.noise.CellGenerator;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.noise.CellGenerator;
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.math.RNG;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;

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

@@ -18,8 +18,8 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MaxNumber;
import com.volmit.iris.engine.object.annotations.MinNumber;

2
src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java
View File

@@ -18,12 +18,12 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MaxNumber;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.util.function.NoiseProvider;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

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

@@ -81,7 +81,8 @@ public class IrisJigsawPiece extends IrisRegistrant {
try {
BlockVector v = IrisObject.sampleSize(getLoader().getObjectLoader().findFile(getObject()));
return Math.max(Math.max(v.getBlockX(), v.getBlockZ()), v.getBlockY());
} catch (IOException e) {Iris.reportError(e);
} catch (IOException e) {
Iris.reportError(e);
e.printStackTrace();
}

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

@@ -19,9 +19,9 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.format.C;
@@ -190,7 +190,8 @@ public class IrisLoot {
is.setItemMeta(m);
return is;
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
@@ -264,7 +265,8 @@ public class IrisLoot {
m.setLore(lore);
is.setItemMeta(m);
return is;
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
}

2
src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java
View File

@@ -18,9 +18,9 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.ArrayType;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MinNumber;

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

@@ -18,15 +18,15 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.ArrayType;
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.util.collection.KList;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

16
src/main/java/com/volmit/iris/engine/object/IrisObject.java
View File

@@ -20,18 +20,18 @@ package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.object.common.CarveResult;
import com.volmit.iris.engine.object.common.IObjectPlacer;
import com.volmit.iris.engine.object.tile.TileData;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.math.AxisAlignedBB;
import com.volmit.iris.util.math.BlockPosition;
import com.volmit.iris.util.math.ChunkPosition;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.util.scheduling.IrisLock;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -249,7 +249,8 @@ public class IrisObject extends IrisRegistrant {
for (int i = 0; i < size; i++) {
getStates().put(new BlockVector(din.readShort(), din.readShort(), din.readShort()), TileData.read(din));
}
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
}
@@ -329,7 +330,8 @@ public class IrisObject extends IrisRegistrant {
try {
read(fin);
fin.close();
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
fin.close();
fin = new FileInputStream(file);
readLegacy(fin);
@@ -582,7 +584,8 @@ public class IrisObject extends IrisRegistrant {
try {
d = getBlocks().get(g);
tile = getStates().get(g);
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
Iris.warn("Failed to read block node " + g.getBlockX() + "," + g.getBlockY() + "," + g.getBlockZ() + " in object " + getLoadKey() + " (cme)");
d = AIR;
}
@@ -675,7 +678,8 @@ public class IrisObject extends IrisRegistrant {
try {
d = getBlocks().get(g);
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
Iris.warn("Failed to read block node " + g.getBlockX() + "," + g.getBlockY() + "," + g.getBlockZ() + " in object " + getLoadKey() + " (stilt cme)");
d = AIR;
}

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

@@ -19,11 +19,11 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.data.B;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap;

2
src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java
View File

@@ -18,9 +18,9 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.RNG;

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

@@ -83,7 +83,8 @@ public class IrisPotionEffect {
return t;
}
}
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}

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

@@ -19,11 +19,11 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.core.IrisDataManager;
import com.volmit.iris.core.gui.RenderType;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.data.DataProvider;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.engine.object.common.IRare;
import com.volmit.iris.util.collection.KList;
@@ -37,7 +37,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.awt.Color;
import java.awt.*;
import java.util.Random;
@@ -532,7 +533,7 @@ public class IrisRegion extends IrisRegistrant implements IRare {
while (biomes.size() > 0) {
int index = rand.nextInt(biomes.size());
IrisBiome biome = biomes.get(index);
IrisBiome biome = biomes.get(index);
if (biome.getVanillaDerivative() != null) {
RandomColor.Color col = VanillaBiomeMap.getColorType(biome.getVanillaDerivative());

2
src/main/java/com/volmit/iris/engine/object/IrisRegionRidge.java
View File

@@ -18,8 +18,8 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CellGenerator;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.noise.CellGenerator;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.math.RNG;
import lombok.AllArgsConstructor;

2
src/main/java/com/volmit/iris/engine/object/IrisRegionSpot.java
View File

@@ -18,8 +18,8 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CellGenerator;
import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.noise.CellGenerator;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.engine.object.annotations.RegistryListBiome;

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

@@ -33,8 +33,7 @@ public class IrisRegistrant {
private transient File loadFile;
public File openInVSCode()
{
public File openInVSCode() {
try {
Desktop.getDesktop().open(getLoadFile());
} catch (Throwable e) {

2
src/main/java/com/volmit/iris/engine/object/NoiseStyle.java
View File

@@ -21,8 +21,8 @@ package com.volmit.iris.engine.object;
import com.volmit.iris.engine.noise.CNG;
import com.volmit.iris.engine.noise.CNGFactory;
import com.volmit.iris.engine.noise.NoiseType;
import com.volmit.iris.engine.stream.ProceduralStream;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.stream.ProceduralStream;
import com.volmit.iris.util.math.RNG;
@Desc("Styles of noise")

1
src/main/java/com/volmit/iris/engine/object/common/IPostBlockAccess.java
View File

@@ -18,7 +18,6 @@
package com.volmit.iris.engine.object.common;
import com.volmit.iris.engine.object.common.CaveResult;
import com.volmit.iris.util.collection.KList;
import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator.ChunkData;

4
src/main/java/com/volmit/iris/engine/object/common/IRare.java
View File

@@ -22,6 +22,6 @@ public interface IRare {
int getRarity();
static int get(Object v) {
return v instanceof IRare ? Math.max(1, ((IRare) v).getRarity()) : 1;
}
return v instanceof IRare ? Math.max(1, ((IRare) v).getRarity()) : 1;
}
}

6
src/main/java/com/volmit/iris/engine/object/tile/TileData.java
View File

@@ -90,7 +90,8 @@ public interface TileData<T extends TileState> extends Cloneable {
//noinspection unchecked
toBukkit((T) t);
return true;
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}
@@ -102,7 +103,8 @@ public interface TileData<T extends TileState> extends Cloneable {
//noinspection unchecked
fromBukkit((T) t);
return true;
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
}

2
src/main/java/com/volmit/iris/engine/parallax/ParallaxAccess.java
View File

@@ -18,8 +18,8 @@
package com.volmit.iris.engine.parallax;
import com.volmit.iris.engine.object.tile.TileData;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.object.tile.TileData;
import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData;

2
src/main/java/com/volmit/iris/engine/parallax/ParallaxChunkMeta.java
View File

@@ -19,9 +19,9 @@
package com.volmit.iris.engine.parallax;
import com.google.gson.Gson;
import com.volmit.iris.engine.object.IrisFeaturePositional;
import com.volmit.iris.engine.hunk.io.HunkIOAdapter;
import com.volmit.iris.engine.hunk.io.PaletteHunkIOAdapter;
import com.volmit.iris.engine.object.IrisFeaturePositional;
import com.volmit.iris.util.oldnbt.CompoundTag;
import lombok.AllArgsConstructor;
import lombok.Data;

7
src/main/java/com/volmit/iris/engine/parallax/ParallaxRegion.java
View File

@@ -19,15 +19,15 @@
package com.volmit.iris.engine.parallax;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.object.tile.TileData;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.engine.hunk.io.HunkIOAdapter;
import com.volmit.iris.engine.hunk.io.HunkRegion;
import com.volmit.iris.engine.hunk.io.HunkRegionSlice;
import com.volmit.iris.engine.object.tile.TileData;
import com.volmit.iris.engine.parallel.GridLock;
import com.volmit.iris.util.math.M;
import com.volmit.iris.util.oldnbt.ByteArrayTag;
import com.volmit.iris.util.oldnbt.CompoundTag;
import com.volmit.iris.util.math.M;
import com.volmit.iris.util.oldnbt.Tag;
import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData;
@@ -145,7 +145,8 @@ public class ParallaxRegion extends HunkRegion {
try {
getCompound().getValue().put("meta", meta.writeByteArrayTag(metaAdapter, "meta"));
dirtyMeta = false;
} catch (IOException e) {Iris.reportError(e);
} catch (IOException e) {
Iris.reportError(e);
e.printStackTrace();
}
}

10
src/main/java/com/volmit/iris/engine/parallax/ParallaxWorld.java
View File

@@ -20,11 +20,11 @@ package com.volmit.iris.engine.parallax;
import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.engine.object.tile.TileData;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.util.scheduling.J;
import com.volmit.iris.engine.object.tile.TileData;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.scheduling.J;
import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData;
@@ -77,7 +77,8 @@ public class ParallaxWorld implements ParallaxAccess {
public void save(ParallaxRegion region) {
try {
region.save();
} catch (IOException e) {Iris.reportError(e);
} catch (IOException e) {
Iris.reportError(e);
e.printStackTrace();
}
}
@@ -222,7 +223,8 @@ public class ParallaxWorld implements ParallaxAccess {
cc += i.cleanup(c);
}
}
} catch (Throwable e) {Iris.reportError(e);
} catch (Throwable e) {
Iris.reportError(e);
e.printStackTrace();
}
});

2
src/main/java/com/volmit/iris/engine/parallel/GridLock.java
View File

@@ -20,8 +20,8 @@ package com.volmit.iris.engine.parallel;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.hunk.Hunk;
import com.volmit.iris.util.io.IORunnable;
import com.volmit.iris.util.function.NastyRunnable;
import com.volmit.iris.util.io.IORunnable;
import java.io.IOException;
import java.util.concurrent.TimeUnit;

1
src/main/java/com/volmit/iris/engine/parallel/MultiBurst.java
View File

@@ -34,6 +34,7 @@ public class MultiBurst {
public MultiBurst(int tc) {
this("Iris Generator", 6, tc);
}
public MultiBurst(String name, int priority, int tc) {
service = Executors.newFixedThreadPool(tc, r -> {
tid++;

3
src/main/java/com/volmit/iris/engine/stream/ProceduralStream.java
View File

@@ -40,7 +40,8 @@ public interface ProceduralStream<T> extends ProceduralLayer, Interpolated<T> {
try {
return of(f, Interpolated.DOUBLE);
} catch (IncompatibleClassChangeError e) {
Iris.warn(f.toString());Iris.reportError(e);
Iris.warn(f.toString());
Iris.reportError(e);
e.printStackTrace();
return null;
}

2
src/main/java/com/volmit/iris/engine/stream/interpolation/BiHermiteStream.java
View File

@@ -18,9 +18,9 @@
package com.volmit.iris.engine.stream.interpolation;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.stream.BasicStream;
import com.volmit.iris.engine.stream.ProceduralStream;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
public class BiHermiteStream<T> extends BasicStream<T> implements Interpolator<T> {
private final int rx;

2
src/main/java/com/volmit/iris/engine/stream/interpolation/BicubicStream.java
View File

@@ -18,9 +18,9 @@
package com.volmit.iris.engine.stream.interpolation;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.stream.BasicStream;
import com.volmit.iris.engine.stream.ProceduralStream;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
public class BicubicStream<T> extends BasicStream<T> implements Interpolator<T> {
private final int rx;

2
src/main/java/com/volmit/iris/engine/stream/interpolation/BilinearStream.java
View File

@@ -18,9 +18,9 @@
package com.volmit.iris.engine.stream.interpolation;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.stream.BasicStream;
import com.volmit.iris.engine.stream.ProceduralStream;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
public class BilinearStream<T> extends BasicStream<T> implements Interpolator<T> {
private final int rx;

2
src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolated.java
View File

@@ -18,8 +18,8 @@
package com.volmit.iris.engine.stream.interpolation;
import com.volmit.iris.engine.stream.ProceduralStream;
import com.volmit.iris.engine.object.common.CaveResult;
import com.volmit.iris.engine.stream.ProceduralStream;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.RNG;
import org.bukkit.block.data.BlockData;

2
src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatingStream.java
View File

@@ -18,10 +18,10 @@
package com.volmit.iris.engine.stream.interpolation;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.object.InterpolationMethod;
import com.volmit.iris.engine.stream.BasicStream;
import com.volmit.iris.engine.stream.ProceduralStream;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.util.function.NoiseProvider;
public class InterpolatingStream<T> extends BasicStream<T> implements Interpolator<T> {

2
src/main/java/com/volmit/iris/engine/stream/interpolation/TriHermiteStream.java
View File

@@ -18,9 +18,9 @@
package com.volmit.iris.engine.stream.interpolation;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.stream.BasicStream;
import com.volmit.iris.engine.stream.ProceduralStream;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
public class TriHermiteStream<T> extends BasicStream<T> implements Interpolator<T> {
private final int rx;

2
src/main/java/com/volmit/iris/engine/stream/interpolation/TricubicStream.java
View File

@@ -18,9 +18,9 @@
package com.volmit.iris.engine.stream.interpolation;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
import com.volmit.iris.engine.stream.BasicStream;
import com.volmit.iris.engine.stream.ProceduralStream;
import com.volmit.iris.engine.interpolation.IrisInterpolation;
public class TricubicStream<T> extends BasicStream<T> implements Interpolator<T> {
private final int rx;

Some files were not shown because too many files have changed in this diff Show More