toolbeltConfiguration = new HashMap<>();
+
/**
* Will find / download / search for the dimension or return null
*
@@ -210,4 +216,64 @@ public class IrisToolbelt {
public static boolean isStudio(World i) {
return isIrisWorld(i) && access(i).isStudio();
}
+
+ public static void retainMantleDataForSlice(String className)
+ {
+ toolbeltConfiguration.put("retain.mantle." + className, true);
+ }
+
+ public static T getMantleData(World world, int x, int y, int z, Class of)
+ {
+ PlatformChunkGenerator e = access(world);
+ if(e == null) {return null;}
+ return e.getEngine().getMantle().getMantle().get(x, y - world.getMinHeight(), z, of);
+ }
+
+ public static void deleteMantleData(World world, int x, int y, int z, Class of)
+ {
+ PlatformChunkGenerator e = access(world);
+ if(e == null) {return;}
+ e.getEngine().getMantle().getMantle().remove(x, y - world.getMinHeight(), z, of);
+ }
+
+ /////////////////// REFLECTIVE METHODS //////////////////////////
+ // Copy this stuff to your project, it's safe to use with a
+ // bukkit api only.
+ /////////////////////////////////////////////////////////////////
+
+ public static void setup() throws Throwable {
+ Method m = Class.forName("com.volmit.iris.core.tools.IrisToolbelt").getDeclaredMethod("retainMantleDataForSlice", String.class);
+ m.invoke(null, String.class.getCanonicalName());
+ m.invoke(null, BlockData.class.getCanonicalName());
+ }
+
+ public static boolean hasMantleObject(World world, int x, int y, int z) {
+ return getMantleIdentity(world, x, y, z) != -1;
+ }
+
+ public static void deleteMantleBlock(World world, int x, int y, int z) {
+ try {
+ Method m = Class.forName("com.volmit.iris.core.tools.IrisToolbelt").getDeclaredMethod("deleteMantleData", World.class, int.class, int.class, int.class, Class.class);
+ m.invoke(null, world, x, y, z, BlockData.class);
+ m.invoke(null, world, x, y, z, String.class);
+ } catch(Throwable ignored) {}
+ }
+
+ public static BlockData getMantleBlock(World world, int x, int y, int z) {
+ try {
+ Method m = Class.forName("com.volmit.iris.core.tools.IrisToolbelt").getDeclaredMethod("getMantleData", World.class, int.class, int.class, int.class, Class.class);
+ BlockData s = (BlockData) m.invoke(null, world, x, y, z, BlockData.class);
+ if(s != null) {return s;}
+ } catch(Throwable ignored) {}
+ return null;
+ }
+
+ public static int getMantleIdentity(World world, int x, int y, int z) {
+ try {
+ Method m = Class.forName("com.volmit.iris.core.tools.IrisToolbelt").getDeclaredMethod("getMantleData", World.class, int.class, int.class, int.class, Class.class);
+ String s = (String) m.invoke(null, world, x, y, z, String.class);
+ if(s != null) {return Integer.parseInt(s.split("\\Q@\\E")[1]);}
+ } catch(Throwable ignored) {}
+ return -1;
+ }
}
diff --git a/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java b/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java
index e97ebc951..7e25db679 100644
--- a/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java
+++ b/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java
@@ -24,6 +24,7 @@ import com.volmit.iris.core.loader.IrisData;
import com.volmit.iris.engine.data.cache.Cache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.object.IObjectPlacer;
+import com.volmit.iris.engine.object.IrisGeneratorStyle;
import com.volmit.iris.engine.object.IrisPosition;
import com.volmit.iris.engine.object.TileData;
import com.volmit.iris.util.collection.KMap;
@@ -31,6 +32,7 @@ import com.volmit.iris.util.collection.KSet;
import com.volmit.iris.util.function.Function3;
import com.volmit.iris.util.mantle.Mantle;
import com.volmit.iris.util.mantle.MantleChunk;
+import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.matter.Matter;
import lombok.Data;
import org.bukkit.block.TileState;
@@ -121,6 +123,13 @@ public class MantleWriter implements IObjectPlacer {
return (x * x) + (z * z);
}
+ public void setDataWarped(int x, int y, int z, T t, RNG rng, IrisData data, IrisGeneratorStyle style)
+ {
+ setData((int)Math.round(style.warp(rng, data, x, x, y, -z)),
+ (int)Math.round(style.warp(rng, data, y, z, -x, y)),
+ (int)Math.round(style.warp(rng, data, z, -y, z, x)), t);
+ }
+
public void setData(int x, int y, int z, T t) {
if(t == null) {
return;
@@ -233,6 +242,10 @@ public class MantleWriter implements IObjectPlacer {
setElipsoidFunction(cx, cy, cz, rx, ry, rz, fill, (a, b, c) -> data);
}
+ public void setElipsoidWarped(int cx, int cy, int cz, double rx, double ry, double rz, boolean fill, T data, RNG rng, IrisData idata, IrisGeneratorStyle style) {
+ setElipsoidFunctionWarped(cx, cy, cz, rx, ry, rz, fill, (a, b, c) -> data, rng, idata, style);
+ }
+
/**
* Set an elipsoid into the mantle
*
@@ -312,6 +325,63 @@ public class MantleWriter implements IObjectPlacer {
}
}
+ public void setElipsoidFunctionWarped(int cx, int cy, int cz, double rx, double ry, double rz, boolean fill, Function3 data, RNG rng, IrisData idata, IrisGeneratorStyle style) {
+ rx += 0.5;
+ ry += 0.5;
+ rz += 0.5;
+ final double invRadiusX = 1 / rx;
+ final double invRadiusY = 1 / ry;
+ final double invRadiusZ = 1 / rz;
+ final int ceilRadiusX = (int) Math.ceil(rx);
+ final int ceilRadiusY = (int) Math.ceil(ry);
+ final int ceilRadiusZ = (int) Math.ceil(rz);
+ double nextXn = 0;
+
+ forX:
+ for(int x = 0; x <= ceilRadiusX; ++x) {
+ final double xn = nextXn;
+ nextXn = (x + 1) * invRadiusX;
+ double nextYn = 0;
+ forY:
+ for(int y = 0; y <= ceilRadiusY; ++y) {
+ final double yn = nextYn;
+ nextYn = (y + 1) * invRadiusY;
+ double nextZn = 0;
+ for(int z = 0; z <= ceilRadiusZ; ++z) {
+ final double zn = nextZn;
+ nextZn = (z + 1) * invRadiusZ;
+
+ double distanceSq = lengthSq(xn, yn, zn);
+ if(distanceSq > 1) {
+ if(z == 0) {
+ if(y == 0) {
+ break forX;
+ }
+ break forY;
+ }
+ break;
+ }
+
+ if(!fill) {
+ if(lengthSq(nextXn, yn, zn) <= 1 && lengthSq(xn, nextYn, zn) <= 1 && lengthSq(xn, yn, nextZn) <= 1) {
+ continue;
+ }
+ }
+
+ setDataWarped(x + cx, y + cy, z + cz, data.apply(x + cx, y + cy, z + cz), rng, idata, style);
+ setDataWarped(-x + cx, y + cy, z + cz, data.apply(-x + cx, y + cy, z + cz), rng, idata, style);
+ setDataWarped(x + cx, -y + cy, z + cz, data.apply(x + cx, -y + cy, z + cz), rng, idata, style);
+ setDataWarped(x + cx, y + cy, -z + cz, data.apply(x + cx, y + cy, -z + cz), rng, idata, style);
+ setDataWarped(-x + cx, y + cy, -z + cz, data.apply(-x + cx, y + cy, -z + cz), rng, idata, style);
+ setDataWarped(-x + cx, -y + cy, z + cz, data.apply(-x + cx, -y + cy, z + cz), rng, idata, style);
+ setDataWarped(x + cx, -y + cy, -z + cz, data.apply(x + cx, -y + cy, -z + cz), rng, idata, style);
+ setDataWarped(-x + cx, y + cy, -z + cz, data.apply(-x + cx, y + cy, -z + cz), rng, idata, style);
+ setDataWarped(-x + cx, -y + cy, -z + cz, data.apply(-x + cx, -y + cy, -z + cz), rng, idata, style);
+ }
+ }
+ }
+ }
+
/**
* Set a cuboid of data in the mantle
*
diff --git a/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java b/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java
index f857bd72e..a793b5dc1 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java
@@ -128,6 +128,11 @@ public class IrisGeneratorStyle {
return cng;
}
+ public double warp(RNG rng, IrisData data, double value, double... coords)
+ {
+ return create(rng, data).noise(coords) + value;
+ }
+
public CNG create(RNG rng, IrisData data) {
return cng.aquire(() -> createNoCache(rng, data));
}
diff --git a/src/main/java/com/volmit/iris/util/data/B.java b/src/main/java/com/volmit/iris/util/data/B.java
index d61ee7542..b0342b9ee 100644
--- a/src/main/java/com/volmit/iris/util/data/B.java
+++ b/src/main/java/com/volmit/iris/util/data/B.java
@@ -462,6 +462,10 @@ public class B {
BlockData bx = null;
if(!ix.startsWith("minecraft:")) {
+ if(ix.startsWith("oraxen:") && Iris.linkOraxen.supported()) {
+ bx = Iris.linkOraxen.getBlockDataFor(ix.split("\\Q:\\E")[1]);
+ }
+
if(bx == null) {
try {
if(ix.contains(":")) {
@@ -648,6 +652,14 @@ public class B {
}
}
+ try {
+ for(String i : Iris.linkOraxen.getItemTypes()) {
+ bt.add("oraxen:" + i);
+ }
+ } catch(Throwable e) {
+ e.printStackTrace();
+ }
+
try {
bt.addAll(Iris.service(RegistrySVC.class).getCustomBlockRegistry().compile());
} catch(Throwable e) {
diff --git a/src/main/java/com/volmit/iris/util/mantle/Mantle.java b/src/main/java/com/volmit/iris/util/mantle/Mantle.java
index 7b308d01a..d548919f9 100644
--- a/src/main/java/com/volmit/iris/util/mantle/Mantle.java
+++ b/src/main/java/com/volmit/iris/util/mantle/Mantle.java
@@ -20,6 +20,7 @@ package com.volmit.iris.util.mantle;
import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.core.tools.IrisToolbelt;
import com.volmit.iris.engine.data.cache.Cache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.mantle.EngineMantle;
@@ -570,6 +571,11 @@ public class Mantle {
}
public void deleteChunkSlice(int x, int z, Class c) {
+ if(!IrisToolbelt.toolbeltConfiguration.isEmpty() && IrisToolbelt.toolbeltConfiguration.getOrDefault("retain.mantle." + c.getCanonicalName(), false))
+ {
+ return;
+ }
+
getChunk(x, z).deleteSlices(c);
}
diff --git a/src/main/java/com/volmit/iris/util/mantle/MantleFlag.java b/src/main/java/com/volmit/iris/util/mantle/MantleFlag.java
index 1ad8728d0..855e5886d 100644
--- a/src/main/java/com/volmit/iris/util/mantle/MantleFlag.java
+++ b/src/main/java/com/volmit/iris/util/mantle/MantleFlag.java
@@ -31,7 +31,8 @@ public enum MantleFlag {
FLUID_BODIES,
INITIAL_SPAWNED_MARKER,
CLEANED,
- PLANNED;
+ PLANNED,
+ ETCHED;
static StateList getStateList() {
return new StateList(MantleFlag.values());
diff --git a/src/main/java/com/volmit/iris/util/matter/slices/CavernMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/CavernMatter.java
index 701cad208..66a00c916 100644
--- a/src/main/java/com/volmit/iris/util/matter/slices/CavernMatter.java
+++ b/src/main/java/com/volmit/iris/util/matter/slices/CavernMatter.java
@@ -29,6 +29,7 @@ import java.io.IOException;
@Sliced
public class CavernMatter extends RawMatter {
public static final MatterCavern EMPTY = new MatterCavern(false, "", (byte) 0);
+ public static final MatterCavern BASIC = new MatterCavern(true, "", (byte) 0);
public CavernMatter() {
this(1, 1, 1);