Merge pull request #788 from VolmitSoftware/Development

2.0.7-1.18.2

build.gradle

@@ -24,11 +24,10 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-group 'com.volmit.iris'
-version '2.0.1-1.18.X'
-def nmsVersion = "1.18.1"
+version '2.0.7-1.18.2' // Needs to be version specific
+def nmsVersion = "1.18.2"
 def apiVersion = '1.18'
-def spigotJarVersion = '1.18.1-R0.1-SNAPSHOT'
+def spigotJarVersion = '1.18.2-R0.1-SNAPSHOT'
 def name = getRootProject().getName() // Defined in settings.gradle
 def main = 'com.volmit.iris.Iris'
 
@@ -39,9 +38,9 @@ registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins'
 registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins')
 registerCustomOutputTask('Coco', 'D://Documents/MC/plugins')
 registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins')
-registerCustomOutputTask('Vatuu', 'D://Minecraft/Servers/1.18.1/plugins')
+registerCustomOutputTask('Vatuu', 'D://Minecraft/Servers/1.18.2/plugins')
 // ========================== UNIX ==============================
-registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/Documents/development/server/plugins')
+registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/development/server/plugins')
 registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Desktop/REMOTES/RemoteMinecraft/plugins')
 // ==============================================================
 
@@ -123,10 +122,10 @@ dependencies {
     // Provided or Classpath
     compileOnly 'org.projectlombok:lombok:1.18.22'
     annotationProcessor 'org.projectlombok:lombok:1.18.22'
-    implementation 'org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT'
-    implementation 'me.clip:placeholderapi:2.10.10'
+    implementation 'org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT'
+    implementation 'me.clip:placeholderapi:2.11.1'
     implementation 'io.th0rgal:oraxen:1.94.0'
-    implementation 'org.bukkit:craftbukkit:1.18.1-R0.1-SNAPSHOT:remapped-mojang'
+    implementation 'org.bukkit:craftbukkit:1.18.2-R0.1-SNAPSHOT:remapped-mojang'
 
     // Shaded
     implementation 'com.dfsek:Paralithic:0.4.0'
@@ -137,15 +136,15 @@ dependencies {
 
     // Dynamically Loaded
     implementation 'io.timeandspace:smoothie-map:2.0.2'
-    implementation 'it.unimi.dsi:fastutil:8.5.6'
+    implementation 'it.unimi.dsi:fastutil:8.5.8'
     implementation 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2'
     implementation 'org.zeroturnaround:zt-zip:1.14'
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'org.ow2.asm:asm:9.2'
-    implementation 'com.google.guava:guava:31.0.1-jre'
+    implementation 'com.google.guava:guava:31.1-jre'
     implementation 'bsf:bsf:2.4.0'
     implementation 'rhino:js:1.7R2'
-    implementation 'com.github.ben-manes.caffeine:caffeine:3.0.5'
+    implementation 'com.github.ben-manes.caffeine:caffeine:3.0.6'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
 }
 

src/main/java/com/volmit/iris/Iris.java

@@ -27,25 +27,27 @@ import com.volmit.iris.core.link.OraxenLink;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.core.service.StudioSVC;
+import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.EnginePanic;
 import com.volmit.iris.engine.object.IrisBiome;
 import com.volmit.iris.engine.object.IrisCompat;
 import com.volmit.iris.engine.object.IrisDimension;
+import com.volmit.iris.engine.object.IrisObject;
 import com.volmit.iris.engine.object.IrisWorld;
 import com.volmit.iris.engine.platform.BukkitChunkGenerator;
 import com.volmit.iris.engine.platform.DummyChunkGenerator;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
+import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.exceptions.IrisException;
 import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.function.NastyRunnable;
-import com.volmit.iris.util.io.FileWatcher;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.io.InstanceState;
-import com.volmit.iris.util.io.JarScanner;
+import com.volmit.iris.util.io.*;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.matter.IrisMatter;
+import com.volmit.iris.util.matter.Matter;
 import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.plugin.IrisService;
 import com.volmit.iris.util.plugin.Metrics;
@@ -61,13 +63,16 @@ import net.kyori.adventure.text.serializer.ComponentSerializer;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
+import org.bukkit.block.data.BlockData;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
@@ -189,7 +194,6 @@ public class Iris extends VolmitPlugin implements Listener {
             }
         }
     }
-
     public static File getCached(String name, String url) {
         String h = IO.hash(name + "@" + url);
         File f = Iris.instance.getDataFile("cache", h.substring(0, 2), h.substring(3, 5), h);

src/main/java/com/volmit/iris/core/IrisSettings.java

@@ -32,7 +32,7 @@ import java.io.IOException;
 @SuppressWarnings("SynchronizeOnNonFinalField")
 @Data
 public class IrisSettings {
-    public static transient IrisSettings settings;
+    public static IrisSettings settings;
     private IrisSettingsGeneral general = new IrisSettingsGeneral();
     private IrisSettingsWorld world = new IrisSettingsWorld();
     private IrisSettingsGUI gui = new IrisSettingsGUI();

src/main/java/com/volmit/iris/core/commands/CommandIris.java

@@ -101,7 +101,7 @@ public class CommandIris implements DecreeExecutor {
         sender().sendMessage(C.GREEN + "Iris v" + Iris.instance.getDescription().getVersion() + " by Volmit Software");
     }
 
-    @Decree(description = "Print version information", origin = DecreeOrigin.PLAYER)
+    @Decree(description = "Print world height information", origin = DecreeOrigin.PLAYER)
     public void height() {
         sender().sendMessage(C.GREEN + "" + sender().player().getWorld().getMinHeight() + " to " + sender().player().getWorld().getMaxHeight());
         sender().sendMessage(C.GREEN + "Total Height: " + (sender().player().getWorld().getMaxHeight() - sender().player().getWorld().getMinHeight()));

src/main/java/com/volmit/iris/core/commands/CommandObject.java

@@ -327,7 +327,11 @@ public class CommandObject implements DecreeExecutor {
 
         Map<Block, BlockData> futureChanges = new HashMap<>();
 
-        o = o.scaled(scale, IrisObjectPlacementScaleInterpolator.TRICUBIC);
+        if(scale != 1)
+        {
+            o = o.scaled(scale, IrisObjectPlacementScaleInterpolator.TRICUBIC);
+        }
+
         o.place(block.getBlockX(), block.getBlockY() + (int) o.getCenter().getY(), block.getBlockZ(), createPlacer(block.getWorld(), futureChanges), placement, new RNG(), null);
 
         Iris.service(ObjectSVC.class).addChanges(futureChanges);

src/main/java/com/volmit/iris/core/edit/JigsawEditor.java

@@ -68,6 +68,10 @@ public class JigsawEditor implements Listener {
         }
 
         editors.put(player, this);
+        if(object == null)
+        {
+            throw new RuntimeException("Object is null! " + piece.getObject());
+        }
         this.object = object;
         this.player = player;
         origin = player.getLocation().clone().add(0, 7, 0);
@@ -77,7 +81,7 @@ public class JigsawEditor implements Listener {
         this.piece.setObject(object.getLoadKey());
         cuboid = new Cuboid(origin.clone(), origin.clone().add(object.getW() - 1, object.getH() - 1, object.getD() - 1));
         ticker = J.sr(this::onTick, 0);
-        object.placeCenterY(origin);
+        J.s(() -> object.placeCenterY(origin));
         Iris.instance.registerListener(this);
     }
 

src/main/java/com/volmit/iris/core/link/MythicMobsLink.java

@@ -65,7 +65,7 @@ public class MythicMobsLink {
         }
 
         try {
-            Class<?> mythicMobClass = Class.forName("io.lumine.xikage.mythicmobs.MythicMobs");
+            Class<?> mythicMobClass = Class.forName("io.lumine.mythic.bukkit.MythicBukkit");
             Method getInst = mythicMobClass.getDeclaredMethod("inst");
             Object inst = getInst.invoke(null);
             Method getAPIHelper = mythicMobClass.getDeclaredMethod("getAPIHelper");

src/main/java/com/volmit/iris/core/loader/IrisData.java

@@ -31,26 +31,9 @@ import com.google.gson.stream.JsonWriter;
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.IrisBlockData;
-import com.volmit.iris.engine.object.IrisCave;
-import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.engine.object.IrisEntity;
-import com.volmit.iris.engine.object.IrisExpression;
-import com.volmit.iris.engine.object.IrisGenerator;
-import com.volmit.iris.engine.object.IrisImage;
-import com.volmit.iris.engine.object.IrisJigsawPiece;
-import com.volmit.iris.engine.object.IrisJigsawPool;
-import com.volmit.iris.engine.object.IrisJigsawStructure;
-import com.volmit.iris.engine.object.IrisLootTable;
-import com.volmit.iris.engine.object.IrisMarker;
-import com.volmit.iris.engine.object.IrisMod;
-import com.volmit.iris.engine.object.IrisObject;
-import com.volmit.iris.engine.object.IrisRavine;
-import com.volmit.iris.engine.object.IrisRegion;
-import com.volmit.iris.engine.object.IrisScript;
-import com.volmit.iris.engine.object.IrisSpawner;
+import com.volmit.iris.engine.object.*;
 import com.volmit.iris.engine.object.annotations.Snippet;
+import com.volmit.iris.engine.object.matter.IrisMatterObject;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.context.IrisContext;
@@ -87,6 +70,7 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
     private ResourceLoader<IrisBlockData> blockLoader;
     private ResourceLoader<IrisExpression> expressionLoader;
     private ResourceLoader<IrisObject> objectLoader;
+    private ResourceLoader<IrisMatterObject> matterLoader;
     private ResourceLoader<IrisImage> imageLoader;
     private ResourceLoader<IrisScript> scriptLoader;
     private ResourceLoader<IrisCave> caveLoader;
@@ -131,6 +115,9 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
     public static IrisObject loadAnyObject(String key) {
         return loadAny(key, (dm) -> dm.getObjectLoader().load(key, false));
     }
+    public static IrisMatterObject loadAnyMatter(String key) {
+        return loadAny(key, (dm) -> dm.getMatterLoader().load(key, false));
+    }
 
     public static IrisBiome loadAnyBiome(String key) {
         return loadAny(key, (dm) -> dm.getBiomeLoader().load(key, false));
@@ -295,9 +282,12 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
             if(registrant.equals(IrisObject.class)) {
                 r = (ResourceLoader<T>) new ObjectResourceLoader(dataFolder, this, rr.getFolderName(),
                     rr.getTypeName());
+            } else if(registrant.equals(IrisMatterObject.class)) {
+                r = (ResourceLoader<T>) new MatterObjectResourceLoader(dataFolder, this, rr.getFolderName(),
+                        rr.getTypeName());
             } else if(registrant.equals(IrisScript.class)) {
                 r = (ResourceLoader<T>) new ScriptResourceLoader(dataFolder, this, rr.getFolderName(),
-                    rr.getTypeName());
+                        rr.getTypeName());
             } else if(registrant.equals(IrisImage.class)) {
                 r = (ResourceLoader<T>) new ImageResourceLoader(dataFolder, this, rr.getFolderName(),
                     rr.getTypeName());

src/main/java/com/volmit/iris/core/loader/MatterObjectResourceLoader.java

@@ -0,0 +1,146 @@
+/*
+ * Iris is a World Generator for Minecraft Bukkit Servers
+ * Copyright (c) 2022 Arcane Arts (Volmit Software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.volmit.iris.core.loader;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.engine.object.matter.IrisMatterObject;
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.collection.KSet;
+import com.volmit.iris.util.data.KCache;
+import com.volmit.iris.util.scheduling.PrecisionStopwatch;
+
+import java.io.File;
+
+public class MatterObjectResourceLoader extends ResourceLoader<IrisMatterObject> {
+    public MatterObjectResourceLoader(File root, IrisData idm, String folderName, String resourceTypeName) {
+        super(root, idm, folderName, resourceTypeName, IrisMatterObject.class);
+        loadCache = new KCache<>(this::loadRaw, IrisSettings.get().getPerformance().getObjectLoaderCacheSize());
+    }
+
+    public boolean supportsSchemas() {
+        return false;
+    }
+
+    public long getSize() {
+        return loadCache.getSize();
+    }
+
+    public long getTotalStorage() {
+        return getSize();
+    }
+
+    protected IrisMatterObject loadFile(File j, String name) {
+        try {
+            PrecisionStopwatch p = PrecisionStopwatch.start();
+            IrisMatterObject t = IrisMatterObject.from(j);
+            t.setLoadKey(name);
+            t.setLoader(manager);
+            t.setLoadFile(j);
+            logLoad(j, t);
+            tlt.addAndGet(p.getMilliseconds());
+            return t;
+        } catch(Throwable e) {
+            Iris.reportError(e);
+            Iris.warn("Couldn't read " + resourceTypeName + " file: " + j.getPath() + ": " + e.getMessage());
+            return null;
+        }
+    }
+
+    public String[] getPossibleKeys() {
+        if(possibleKeys != null) {
+            return possibleKeys;
+        }
+
+        Iris.debug("Building " + resourceTypeName + " Possibility Lists");
+        KSet<String> m = new KSet<>();
+
+        for(File i : getFolders()) {
+            for(File j : i.listFiles()) {
+                if(j.isFile() && j.getName().endsWith(".mat")) {
+                    m.add(j.getName().replaceAll("\\Q.mat\\E", ""));
+                } else if(j.isDirectory()) {
+                    for(File k : j.listFiles()) {
+                        if(k.isFile() && k.getName().endsWith(".mat")) {
+                            m.add(j.getName() + "/" + k.getName().replaceAll("\\Q.mat\\E", ""));
+                        } else if(k.isDirectory()) {
+                            for(File l : k.listFiles()) {
+                                if(l.isFile() && l.getName().endsWith(".mat")) {
+                                    m.add(j.getName() + "/" + k.getName() + "/" + l.getName().replaceAll("\\Q.mat\\E", ""));
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        KList<String> v = new KList<>(m);
+        possibleKeys = v.toArray(new String[0]);
+        return possibleKeys;
+    }
+
+    public File findFile(String name) {
+        for(File i : getFolders(name)) {
+            for(File j : i.listFiles()) {
+                if(j.isFile() && j.getName().endsWith(".mat") && j.getName().split("\\Q.\\E")[0].equals(name)) {
+                    return j;
+                }
+            }
+
+            File file = new File(i, name + ".mat");
+
+            if(file.exists()) {
+                return file;
+            }
+        }
+
+        Iris.warn("Couldn't find " + resourceTypeName + ": " + name);
+
+        return null;
+    }
+
+    public IrisMatterObject load(String name) {
+        return load(name, true);
+    }
+
+    private IrisMatterObject loadRaw(String name) {
+        for(File i : getFolders(name)) {
+            for(File j : i.listFiles()) {
+                if(j.isFile() && j.getName().endsWith(".mat") && j.getName().split("\\Q.\\E")[0].equals(name)) {
+                    return loadFile(j, name);
+                }
+            }
+
+            File file = new File(i, name + ".mat");
+
+            if(file.exists()) {
+                return loadFile(file, name);
+            }
+        }
+
+        Iris.warn("Couldn't find " + resourceTypeName + ": " + name);
+
+        return null;
+    }
+
+    public IrisMatterObject load(String name, boolean warn) {
+        return loadCache.get(name);
+    }
+}

src/main/java/com/volmit/iris/core/nms/INMS.java

@@ -20,7 +20,7 @@ package com.volmit.iris.core.nms;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.nms.v18_1.NMSBinding18_1;
+import com.volmit.iris.core.nms.v18_2.NMSBinding18_2;
 import com.volmit.iris.core.nms.v1X.NMSBinding1X;
 import com.volmit.iris.util.collection.KMap;
 import org.bukkit.Bukkit;
@@ -28,7 +28,7 @@ import org.bukkit.Bukkit;
 public class INMS {
     //@builder
     private static final KMap<String, Class<? extends INMSBinding>> bindings = new KMap<String, Class<? extends INMSBinding>>()
-        .qput("v1_18_R1", NMSBinding18_1.class);
+        .qput("v1_18_R2", NMSBinding18_2.class);
     //@done
     private static final INMSBinding binding = bind();
 

src/main/java/com/volmit/iris/core/nms/INMSBinding.java

@@ -54,6 +54,7 @@ public interface INMSBinding {
     String getTrueBiomeBaseKey(Location location);
 
     Object getCustomBiomeBaseFor(String mckey);
+    Object getCustomBiomeBaseHolderFor(String mckey);
 
     String getKeyForBiomeBase(Object biomeBase);
 

src/main/java/com/volmit/iris/core/nms/NMSVersion.java

@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public enum NMSVersion {
+    R1_18_2,
     R1_18,
     R1_17,
     R1_16,
@@ -98,6 +99,9 @@ public enum NMSVersion {
         if(tryVersion("1_18_R1")) {
             return R1_18;
         }
+        if(tryVersion("1_18_R2")) {
+            return R1_18_2;
+        }
         return null;
     }
 

src/main/java/com/volmit/iris/core/nms/v18_2/NMSBinding18_2.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.nms.v18_1;
+package com.volmit.iris.core.nms.v18_2;
 
 
 import com.volmit.iris.Iris;
@@ -36,10 +36,7 @@ import com.volmit.iris.util.nbt.mca.palette.MCAPalettedContainer;
 import com.volmit.iris.util.nbt.mca.palette.MCAWrappedPalettedContainer;
 import com.volmit.iris.util.nbt.tag.CompoundTag;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.IdMap;
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.*;
 import net.minecraft.nbt.NbtIo;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
@@ -52,9 +49,10 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;
-import org.bukkit.craftbukkit.v1_18_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_18_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R1.block.data.CraftBlockData;
+
+import org.bukkit.craftbukkit.v1_18_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_18_R2.block.data.CraftBlockData;
 import org.bukkit.entity.Entity;
 import org.bukkit.generator.ChunkGenerator;
 import org.jetbrains.annotations.NotNull;
@@ -70,7 +68,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class NMSBinding18_1 implements INMSBinding {
+public class NMSBinding18_2 implements INMSBinding {
 
     private final KMap<Biome, Object> baseBiomeCache = new KMap<>();
     private final BlockData AIR = Material.AIR.createBlockData();
@@ -148,7 +146,7 @@ public class NMSBinding18_1 implements INMSBinding {
     }
 
     private RegistryAccess registry() {
-        return registryAccess.aquire(() -> (RegistryAccess) getFor(RegistryAccess.class, ((CraftServer) Bukkit.getServer()).getHandle().getServer()));
+        return registryAccess.aquire(() -> (RegistryAccess) getFor(RegistryAccess.Frozen.class, ((CraftServer) Bukkit.getServer()).getHandle().getServer()));
     }
 
     private Registry<net.minecraft.world.level.biome.Biome> getCustomBiomeRegistry() {
@@ -210,6 +208,10 @@ public class NMSBinding18_1 implements INMSBinding {
     public Object getCustomBiomeBaseFor(String mckey) {
         return getCustomBiomeRegistry().get(new ResourceLocation(mckey));
     }
+    @Override
+    public Object getCustomBiomeBaseHolderFor(String mckey) {
+        return getCustomBiomeRegistry().getHolder(getTrueBiomeBaseId(getCustomBiomeRegistry().get(new ResourceLocation(mckey)))).get();
+    }
 
     @Override
     public String getKeyForBiomeBase(Object biomeBase) {
@@ -229,13 +231,13 @@ public class NMSBinding18_1 implements INMSBinding {
             return v;
         }
         //noinspection unchecked
-        v = org.bukkit.craftbukkit.v1_18_R1.block.CraftBlock.biomeToBiomeBase((Registry<net.minecraft.world.level.biome.Biome>) registry, biome);
+        v = org.bukkit.craftbukkit.v1_18_R2.block.CraftBlock.biomeToBiomeBase((Registry<net.minecraft.world.level.biome.Biome>) registry, biome);
         if(v == null) {
             // Ok so there is this new biome name called "CUSTOM" in Paper's new releases.
             // But, this does NOT exist within CraftBukkit which makes it return an error.
             // So, we will just return the ID that the plains biome returns instead.
             //noinspection unchecked
-            return org.bukkit.craftbukkit.v1_18_R1.block.CraftBlock.biomeToBiomeBase((Registry<net.minecraft.world.level.biome.Biome>) registry, Biome.PLAINS);
+            return org.bukkit.craftbukkit.v1_18_R2.block.CraftBlock.biomeToBiomeBase((Registry<net.minecraft.world.level.biome.Biome>) registry, Biome.PLAINS);
         }
         baseBiomeCache.put(biome, v);
         return v;
@@ -334,7 +336,7 @@ public class NMSBinding18_1 implements INMSBinding {
     public void forceBiomeInto(int x, int y, int z, Object somethingVeryDirty, ChunkGenerator.BiomeGrid chunk) {
         try {
             ChunkAccess s = (ChunkAccess) getFieldForBiomeStorage(chunk).get(chunk);
-            s.setBiome(x, y, z, (net.minecraft.world.level.biome.Biome) somethingVeryDirty);
+            s.setBiome(x, y, z, (Holder<net.minecraft.world.level.biome.Biome>) somethingVeryDirty); // probably not safe? it said it wanted a holder, so i made it a holder...
         } catch(IllegalAccessException e) {
             Iris.reportError(e);
             e.printStackTrace();

src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java

@@ -112,6 +112,11 @@ public class NMSBinding1X implements INMSBinding {
         return null;
     }
 
+    @Override
+    public Object getCustomBiomeBaseHolderFor(String mckey) {
+        return null;
+    }
+
     @Override
     public String getKeyForBiomeBase(Object biomeBase) {
         return null;

src/main/java/com/volmit/iris/core/tools/IrisReflectiveAPI.java

@@ -0,0 +1,40 @@
+package com.volmit.iris.core.tools;
+
+import com.volmit.iris.util.data.B;
+import org.bukkit.World;
+import org.bukkit.block.data.BlockData;
+
+/**
+ * This class is used by an external IrisLib for other plugins to interact with Iris. Do not change
+ * existing methods or their parameters as it will break the library that uses these methods
+ * feel free to add more methods so long as you also add the reflective methods to the library
+ */
+public class IrisReflectiveAPI {
+    public static boolean isIrisWorld(World world) {
+        return IrisToolbelt.isIrisWorld(world);
+    }
+
+    public static boolean isIrisStudioWorld(World world) {
+        return IrisToolbelt.isIrisStudioWorld(world);
+    }
+
+    public static void registerCustomBlockData(String namespace, String key, BlockData blockData) {
+        B.registerCustomBlockData(namespace, key, blockData);
+    }
+
+    public static void retainMantleData(String classname) {
+        IrisToolbelt.retainMantleDataForSlice(classname);
+    }
+
+    public static void setMantleData(World world, int x, int y, int z, Object data) {
+        IrisToolbelt.access(world).getEngine().getMantle().getMantle().set(x, y, z, data);
+    }
+
+    public static void deleteMantleData(World world, int x, int y, int z, Class c) {
+        IrisToolbelt.access(world).getEngine().getMantle().getMantle().remove(x, y, z, c);
+    }
+
+    public static Object getMantleData(World world, int x, int y, int z, Class c) {
+        return IrisToolbelt.access(world).getEngine().getMantle().getMantle().get(x, y, z, c);
+    }
+}

src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java

@@ -32,15 +32,21 @@ import com.volmit.iris.engine.platform.PlatformChunkGenerator;
 import com.volmit.iris.util.plugin.VolmitSender;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
+import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
 
 import java.io.File;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Something you really want to wear if working on Iris. Shit gets pretty hectic down there.
  * Hope you packed snacks & road sodas.
  */
 public class IrisToolbelt {
+    public static Map<String, Boolean> toolbeltConfiguration = new HashMap<>();
+
     /**
      * Will find / download / search for the dimension or return null
      * <p>
@@ -210,4 +216,23 @@ 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> T getMantleData(World world, int x, int y, int z, Class<T> of)
+    {
+        PlatformChunkGenerator e = access(world);
+        if(e == null) {return null;}
+        return e.getEngine().getMantle().getMantle().get(x, y - world.getMinHeight(), z, of);
+    }
+
+    public static <T> void  deleteMantleData(World world, int x, int y, int z, Class<T> of)
+    {
+        PlatformChunkGenerator e = access(world);
+        if(e == null) {return;}
+        e.getEngine().getMantle().getMantle().remove(x, y - world.getMinHeight(), z, of);
+    }
 }

src/main/java/com/volmit/iris/engine/IrisComplex.java

@@ -336,8 +336,7 @@ public class IrisComplex implements DataProvider {
     }
 
     private double getHeight(Engine engine, IrisBiome b, double x, double z, long seed) {
-        return Math.min(engine.getWorld().maxHeight(),
-            Math.max(getInterpolatedHeight(engine, x, z, seed) + fluidHeight + overlayStream.get(x, z), engine.getWorld().minHeight()));
+        return Math.max(Math.min(getInterpolatedHeight(engine, x, z, seed) + fluidHeight + overlayStream.get(x, z), engine.getHeight()), 0);
     }
 
     private void registerGenerator(IrisGenerator cachedGenerator) {

src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java

@@ -57,7 +57,7 @@ public class IrisBiomeActuator extends EngineAssignedActuator<Biome> {
                 return true;
             }
         } catch(Throwable e) {
-
+            e.printStackTrace();
         }
 
         return false;
@@ -79,7 +79,7 @@ public class IrisBiomeActuator extends EngineAssignedActuator<Biome> {
                     if(ib.isCustom()) {
                         try {
                             IrisBiomeCustom custom = ib.getCustomBiome(rng, x, 0, z);
-                            Object biomeBase = INMS.get().getCustomBiomeBaseFor(getDimension().getLoadKey() + ":" + custom.getId());
+                            Object biomeBase = INMS.get().getCustomBiomeBaseHolderFor(getDimension().getLoadKey() + ":" + custom.getId());
 //
                             if(biomeBase == null || !injectBiome(h, x, 0, z, biomeBase)) {
                                 throw new RuntimeException("Cant inject biome!");

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

@@ -18,6 +18,7 @@
 
 package com.volmit.iris.engine.data.chunk;
 
+import com.volmit.iris.Iris;
 import com.volmit.iris.core.nms.BiomeBaseInjector;
 import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.util.data.IrisBiomeStorage;

src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java

@@ -69,24 +69,31 @@ public abstract class EngineAssignedWorldManager extends EngineAssignedComponent
 
     protected AtomicBoolean ignoreTP = new AtomicBoolean(false);
 
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void on(PlayerTeleportEvent e) {
-        if(ignoreTP.get()) {
-            return;
-        }
-
-        if(!PaperLib.isPaper() || e.getTo() == null) {
-            return;
-        }
-
-        try {
-            if(e.getTo().getWorld().equals(getTarget().getWorld().realWorld())) {
-                getEngine().getWorldManager().teleportAsync(e);
-            }
-        } catch(Throwable ex) {
-
-        }
-    }
+//    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+//    public void on(PlayerTeleportEvent e) {
+//        if(ignoreTP.get()) {
+//            System.out.println("IgTP1");
+//            return;
+//        }
+//
+//        if(!PaperLib.isPaper() || e.getTo() == null) {
+//            System.out.println("IgTP2");
+//
+////            return;
+//        }
+//
+////        try {
+////            System.out.println("IgTP3");
+////
+////            if(e.getTo().getWorld().equals(getTarget().getWorld().realWorld())) {
+////                System.out.println("IgTP4");
+////
+////                getEngine().getWorldManager().teleportAsync(e);
+////            }
+////        } catch(Throwable ex) {
+////
+////        }
+//    }
 
     @EventHandler
     public void on(WorldSaveEvent e) {

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 <T> 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 <T> 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 <T> 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 <T> void setElipsoidFunctionWarped(int cx, int cy, int cz, double rx, double ry, double rz, boolean fill, Function3<Integer, Integer, Integer, T> 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
      *

src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java

@@ -29,6 +29,7 @@ import com.volmit.iris.engine.object.IrisDecorator;
 import com.volmit.iris.engine.object.IrisPosition;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
+import com.volmit.iris.util.context.IrisContext;
 import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.function.Consumer4;
 import com.volmit.iris.util.hunk.Hunk;
@@ -148,7 +149,7 @@ public class IrisCarveModifier extends EngineAssignedModifier<BlockData> {
             int buf = v.get(0) - 1;
 
             for(Integer i : v) {
-                if(i < 0 || i > 255) {
+                if(i < 0 || i > getEngine().getHeight()) {
                     continue;
                 }
 
@@ -275,7 +276,7 @@ public class IrisCarveModifier extends EngineAssignedModifier<BlockData> {
         }
 
         public boolean isValid() {
-            return floor < ceiling && ceiling - floor >= 1 && floor >= 0 && ceiling <= 255 && airThickness() > 0;
+            return floor < ceiling && ceiling - floor >= 1 && floor >= 0 && ceiling <= IrisContext.get().getEngine().getHeight() && airThickness() > 0;
         }
 
         public String toString() {

src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java

@@ -101,7 +101,7 @@ public class IrisDepositModifier extends EngineAssignedModifier<BlockData> {
 
             int i = Math.max(0, k.getMinHeight());
             // TODO: WARNING HEIGHT
-            int a = Math.min(height, Math.min(256, k.getMaxHeight()));
+            int a = Math.min(height, Math.min(getEngine().getHeight(), k.getMaxHeight()));
 
             if(i >= a) {
                 return;
@@ -118,7 +118,7 @@ public class IrisDepositModifier extends EngineAssignedModifier<BlockData> {
                 int ny = j.getBlockY() + h;
                 int nz = j.getBlockZ() + z;
 
-                if(ny > height || nx > 15 || nx < 0 || ny > 255 || ny < 0 || nz < 0 || nz > 15) {
+                if(ny > height || nx > 15 || nx < 0 || ny > getEngine().getHeight() || ny < 0 || nz < 0 || nz > 15) {
                     continue;
                 }
 

src/main/java/com/volmit/iris/engine/object/IrisBiome.java

@@ -293,7 +293,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
             height += i.getHeight(xg, x, z, seed);
         }
 
-        return Math.max(0, Math.min(height, 255));
+        return Math.max(0, Math.min(height, xg.getHeight()));
     }
 
     public CNG getBiomeGenerator(RNG random) {
@@ -448,7 +448,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
         }
 
         for(int i = 0; i < maxDepth; i++) {
-            int offset = (255 - height) - i;
+            int offset = (512 - height) - i;
             int index = offset % data.size();
             real.add(data.get(Math.max(index, 0)));
         }

src/main/java/com/volmit/iris/engine/object/IrisDimension.java

@@ -70,6 +70,10 @@ public class IrisDimension extends IrisRegistrant {
     @Required
     @Desc("The human readable name of this dimension")
     private String name = "A Dimension";
+    @MinNumber(1)
+    @MaxNumber(2032)
+    @Desc("Maximum height at which players can be teleported to through gameplay.")
+    private int logicalHeight = 256;
     @RegistryListResource(IrisJigsawStructure.class)
     @Desc("If defined, Iris will place the given jigsaw structure where minecraft should place the overworld stronghold.")
     private String stronghold;
@@ -153,7 +157,7 @@ public class IrisDimension extends IrisRegistrant {
     private KList<IrisJigsawStructurePlacement> jigsawStructures = new KList<>();
     @Required
     @MinNumber(0)
-    @MaxNumber(255)
+    @MaxNumber(1024)
     @Desc("The fluid height for this dimension")
     private int fluidHeight = 63;
     @Desc("Define the min and max Y bounds of this dimension. Please keep in mind that Iris internally generates from 0 to (max - min). \n\nFor example at -64 to 320, Iris is internally generating to 0 to 384, then on outputting chunks, it shifts it down by the min height (64 blocks). The default is -64 to 320. \n\nThe fluid height is placed at (fluid height + min height). So a fluid height of 63 would actually show up in the world at 1.")
@@ -238,13 +242,11 @@ public class IrisDimension extends IrisRegistrant {
     private int caveLavaHeight = 8;
 
     public int getMaxHeight() {
-        return 320;
-        // return (int) getDimensionHeight().getMax();
+        return (int) getDimensionHeight().getMax();
     }
 
     public int getMinHeight() {
-        return -64;
-        // return (int) getDimensionHeight().getMin();
+        return (int) getDimensionHeight().getMin();
     }
 
     public BlockData generateOres(int x, int y, int z, RNG rng, IrisData data) {
@@ -282,6 +284,10 @@ public class IrisDimension extends IrisRegistrant {
         });
     }
 
+    public int getFluidHeight() {
+        return fluidHeight - (int)dimensionHeight.getMin();
+    }
+
     public CNG getCoordFracture(RNG rng, int signature) {
         return coordFracture.aquire(() ->
         {
@@ -399,6 +405,20 @@ public class IrisDimension extends IrisRegistrant {
             }
         }
 
+       /* if(!dimensionHeight.equals(new IrisRange(-64, 320))) {
+            File dimType = new File(datapacks, "iris/data/minecraft/dimension_type/" + getLoadKey().toLowerCase() + ".json");
+            if(!dimType.exists())
+                changed = true;
+
+            Iris.verbose("    Installing Data Pack Dimension Type: " + dimType.getPath());
+            dimType.getParentFile().mkdirs();
+            try {
+                IO.writeAll(dimType, generateDatapackJson());
+            } catch(IOException e) {
+                Iris.reportError(e);
+                e.printStackTrace();
+            }*/
+
         if(write) {
             File mcm = new File(datapacks, "iris/pack.mcmeta");
             try {
@@ -406,7 +426,7 @@ public class IrisDimension extends IrisRegistrant {
                     {
                         "pack": {
                             "description": "Iris Data Pack. This pack contains all installed Iris Packs' resources.",
-                            "pack_format": 7
+                            "pack_format": 9
                         }
                     }
                     """);
@@ -434,4 +454,30 @@ public class IrisDimension extends IrisRegistrant {
     public void scanForErrors(JSONObject p, VolmitSender sender) {
 
     }
+
+    private String generateDatapackJson() {
+        JSONObject obj = new JSONObject(DP_OVERWORLD_DEFAULT);
+        obj.put("min_y", dimensionHeight.getMin());
+        obj.put("height", dimensionHeight.getMax() - dimensionHeight.getMin());
+        obj.put("logical_height", logicalHeight);
+        return obj.toString(4);
+    }
+
+    private static final String DP_OVERWORLD_DEFAULT = """
+            {
+                "name": "minecraft:overworld",
+                "ultrawarm": false,
+                "natural": true,
+                "coordinate_scale": 1.0,
+                "has_skylight": true,
+                "has_ceiling": false,
+                "ambient_light": 0,
+                "fixed_time": false,
+                "piglin_safe": false,
+                "bed_works": true,
+                "respawn_anchor_works": false,
+                "has_raids": true,
+                "infiniburn": "infiniburn_overworld",
+                "effects": "minecraft:overworld"
+            }""";
 }

src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java

@@ -25,6 +25,7 @@ import com.volmit.iris.engine.object.annotations.MaxNumber;
 import com.volmit.iris.engine.object.annotations.MinNumber;
 import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Snippet;
+import com.volmit.iris.util.interpolation.IrisInterpolation;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.noise.CNG;
 import com.volmit.iris.util.noise.ExpressionNoise;
@@ -50,7 +51,6 @@ public class IrisGeneratorStyle {
 
     @Desc("Cell zooms")
     private double cellularZoom = 1;
-
     @MinNumber(0.00001)
     @Desc("The zoom of this style")
     private double zoom = 1;
@@ -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));
     }

src/main/java/com/volmit/iris/engine/object/IrisLoot.java

@@ -18,6 +18,7 @@
 
 package com.volmit.iris.engine.object;
 
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.ArrayType;
@@ -28,17 +29,22 @@ import com.volmit.iris.engine.object.annotations.RegistryListItemType;
 import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.engine.object.annotations.Snippet;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.format.Form;
+import com.volmit.iris.util.json.JSONObject;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.noise.CNG;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.TagParser;
 import org.bukkit.DyeColor;
 import org.bukkit.Material;
+import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.Damageable;
@@ -102,6 +108,8 @@ public class IrisLoot {
     private DyeColor dyeColor = null;
     @Desc("The leather armor color")
     private String leatherColor = null;
+    @Desc("Defines a custom NBT Tag for the item.")
+    private KMap<String, Object> customNbt;
 
     public Material getType() {
         return B.getMaterial(type);
@@ -173,7 +181,7 @@ public class IrisLoot {
             }
 
             is.setItemMeta(m);
-            return is;
+            return applyCustomNbt(is);
         } catch(Throwable e) {
             Iris.reportError(e);
 
@@ -250,13 +258,22 @@ public class IrisLoot {
 
                 m.setLore(lore);
                 is.setItemMeta(m);
-                return is;
+                return applyCustomNbt(is);
             } catch(Throwable e) {
                 Iris.reportError(e);
-
             }
         }
 
         return null;
     }
+
+    private ItemStack applyCustomNbt(ItemStack stack) throws CommandSyntaxException {
+        if(customNbt == null || customNbt.isEmpty())
+            return stack;
+        net.minecraft.world.item.ItemStack s = CraftItemStack.asNMSCopy(stack);
+        CompoundTag tag = TagParser.parseTag(new JSONObject(customNbt).toString());
+        tag.merge(s.getOrCreateTag());
+        s.setTag(tag);
+        return CraftItemStack.asBukkitCopy(s);
+    }
 }

src/main/java/com/volmit/iris/engine/object/IrisObject.java

@@ -34,6 +34,8 @@ import com.volmit.iris.util.math.AxisAlignedBB;
 import com.volmit.iris.util.math.BlockPosition;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.matter.IrisMatter;
+import com.volmit.iris.util.matter.Matter;
 import com.volmit.iris.util.matter.MatterMarker;
 import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.parallel.MultiBurst;

src/main/java/com/volmit/iris/engine/object/IrisObjectLimit.java

@@ -35,12 +35,12 @@ import lombok.experimental.Accessors;
 @Data
 public class IrisObjectLimit {
     @MinNumber(0)
-    @MaxNumber(255)
+    @MaxNumber(1024)
     @Desc("The minimum height for placement (bottom of object)")
     private int minimumHeight = 0;
 
     @MinNumber(0)
-    @MaxNumber(255)
+    @MaxNumber(1024)
     @Desc("The maximum height for placement (top of object)")
     private int maximumHeight = 255;
 

src/main/java/com/volmit/iris/engine/object/IrisSlopeClip.java

@@ -35,12 +35,12 @@ import lombok.experimental.Accessors;
 @Data
 public class IrisSlopeClip {
     @MinNumber(0)
-    @MaxNumber(255)
+    @MaxNumber(1024)
     @Desc("The minimum slope for placement")
     private double minimumSlope = 0;
 
     @MinNumber(0)
-    @MaxNumber(255)
+    @MaxNumber(1024)
     @Desc("The maximum slope for placement")
     private double maximumSlope = 10;
 

src/main/java/com/volmit/iris/engine/object/matter/IrisMatterObject.java

@@ -0,0 +1,56 @@
+package com.volmit.iris.engine.object.matter;
+
+import com.volmit.iris.core.loader.IrisRegistrant;
+import com.volmit.iris.engine.object.IrisObject;
+import com.volmit.iris.util.json.JSONObject;
+import com.volmit.iris.util.matter.IrisMatter;
+import com.volmit.iris.util.matter.Matter;
+import com.volmit.iris.util.plugin.VolmitSender;
+import lombok.Data;
+
+import java.io.File;
+import java.io.IOException;
+
+@Data
+public class IrisMatterObject extends IrisRegistrant {
+    private final Matter matter;
+
+    public IrisMatterObject()
+    {
+        this(1,1,1);
+    }
+
+    public IrisMatterObject(int w, int h, int d)
+    {
+        this(new IrisMatter(w,h,d));
+    }
+
+    public IrisMatterObject(Matter matter)
+    {
+        this.matter = matter;
+    }
+
+    public static IrisMatterObject from(IrisObject object)
+    {
+        return new IrisMatterObject(Matter.from(object));
+    }
+
+    public static IrisMatterObject from(File j) throws IOException, ClassNotFoundException {
+        return new IrisMatterObject(Matter.read(j));
+    }
+
+    @Override
+    public String getFolderName() {
+        return "matter";
+    }
+
+    @Override
+    public String getTypeName() {
+        return "Matter";
+    }
+
+    @Override
+    public void scanForErrors(JSONObject p, VolmitSender sender) {
+
+    }
+}

src/main/java/com/volmit/iris/engine/object/matter/IrisMatterPlacement.java

@@ -0,0 +1,93 @@
+/*
+ * Iris is a World Generator for Minecraft Bukkit Servers
+ * Copyright (c) 2022 Arcane Arts (Volmit Software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.volmit.iris.engine.object.matter;
+
+import com.volmit.iris.core.loader.IrisData;
+import com.volmit.iris.engine.IrisEngine;
+import com.volmit.iris.engine.object.IRare;
+import com.volmit.iris.engine.object.IrisStyledRange;
+import com.volmit.iris.engine.object.annotations.*;
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.mantle.Mantle;
+import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.matter.MatterSlice;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+@Snippet("matter-placer")
+@EqualsAndHashCode()
+@Accessors(chain = true)
+@NoArgsConstructor
+@Desc("Represents an iris object placer. It places matter objects.")
+@Data
+public class IrisMatterPlacement implements IRare {
+    @RegistryListResource(IrisMatterObject.class)
+    @Required
+    @ArrayType(min = 1, type = String.class)
+    @Desc("List of objects to place")
+    private KList<String> place = new KList<>();
+
+    @MinNumber(0)
+    @Desc("The rarity of this object placing")
+    private int rarity = 0;
+
+    @MinNumber(0)
+    @Desc("The styled density of this object")
+    private IrisStyledRange densityRange;
+
+    @Desc("The absolute density for this object")
+    private double density = 1;
+
+    @Desc("Translate this matter object before placement")
+    private IrisMatterTranslate translate;
+
+    @Desc("Place this object on the surface height, bedrock or the sky, then use translate if need be.")
+    private IrisMatterPlacementLocation location = IrisMatterPlacementLocation.SURFACE;
+
+    public void place(IrisEngine engine, IrisData data, RNG rng, int ax, int az)
+    {
+        IrisMatterObject object = data.getMatterLoader().load(place.getRandom(rng));
+        int x = ax;
+        int z = az;
+        int yoff = 0;
+
+        if(translate != null)
+        {
+            x += translate.xOffset(data, rng, x, z);
+            yoff += translate.yOffset(data, rng, x, z);
+            z += translate.zOffset(data, rng, x, z);
+        }
+
+        int y = yoff + location.at(engine, x, z);
+        Mantle mantle = engine.getMantle().getMantle();
+
+        int xx = x;
+        int yy = y;
+        int zz = z;
+
+        for(MatterSlice<?> slice : object.getMatter().getSliceMap().values())
+        {
+            slice.iterate((mx, my, mz, v) -> {
+                mantle.set(xx + mx, yy + my, zz + mz, v);
+            });
+        }
+    }
+}

src/main/java/com/volmit/iris/engine/object/matter/IrisMatterPlacementLocation.java

@@ -0,0 +1,24 @@
+package com.volmit.iris.engine.object.matter;
+
+import com.volmit.iris.engine.IrisEngine;
+import com.volmit.iris.util.function.Function3;
+
+import java.util.function.Function;
+
+public enum IrisMatterPlacementLocation {
+    SURFACE((e, x, z) -> e.getHeight(x, z, true)),
+    SURFACE_ON_FLUID((e, x, z) -> e.getHeight(x, z, false)),
+    BEDROCK((e, x, z) -> 0),
+    SKY((e, x, z) -> e.getHeight());
+
+    private final Function3<IrisEngine, Integer, Integer, Integer> computer;
+
+    private IrisMatterPlacementLocation(Function3<IrisEngine, Integer, Integer, Integer> computer)
+    {
+        this.computer = computer;
+    }
+
+    public int at(IrisEngine engine, int x, int z) {
+        return computer.apply(engine, x, z);
+    }
+}

src/main/java/com/volmit/iris/engine/object/matter/IrisMatterTranslate.java

@@ -0,0 +1,63 @@
+package com.volmit.iris.engine.object.matter;
+
+import com.volmit.iris.core.loader.IrisData;
+import com.volmit.iris.engine.IrisEngine;
+import com.volmit.iris.engine.object.IrisStyledRange;
+import com.volmit.iris.engine.object.annotations.Desc;
+import com.volmit.iris.util.math.RNG;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode()
+@Accessors(chain = true)
+@Desc("Represents a matter translator")
+public class IrisMatterTranslate {
+    @Desc("For varied coordinate shifts use ranges not the literal coordinate")
+    private IrisStyledRange rangeX = null;
+    @Desc("For varied coordinate shifts use ranges not the literal coordinate")
+    private IrisStyledRange rangeY = null;
+    @Desc("For varied coordinate shifts use ranges not the literal coordinate")
+    private IrisStyledRange rangeZ = null;
+    @Desc("Define an absolute shift instead of varied.")
+    private int x = 0;
+    @Desc("Define an absolute shift instead of varied.")
+    private int y = 0;
+    @Desc("Define an absolute shift instead of varied.")
+    private int z = 0;
+
+    public int xOffset(IrisData data, RNG rng, int rx, int rz)
+    {
+        if(rangeX != null)
+        {
+            return (int) Math.round(rangeX.get(rng, rx, rz, data));
+        }
+
+        return x;
+    }
+
+    public int yOffset(IrisData data, RNG rng, int rx, int rz)
+    {
+        if(rangeY != null)
+        {
+            return (int) Math.round(rangeY.get(rng, rx, rz, data));
+        }
+
+        return y;
+    }
+
+    public int zOffset(IrisData data, RNG rng, int rx, int rz)
+    {
+        if(rangeZ != null)
+        {
+            return (int) Math.round(rangeZ.get(rng, rx, rz, data));
+        }
+
+        return z;
+    }
+}

src/main/java/com/volmit/iris/util/data/B.java

@@ -22,6 +22,7 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.service.RegistrySVC;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.scheduling.ChronoLatch;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
@@ -34,6 +35,7 @@ import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.Waterlogged;
 import org.bukkit.block.data.type.Leaves;
 import org.bukkit.block.data.type.PointedDripstone;
+import org.checkerframework.checker.units.qual.K;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -44,6 +46,8 @@ import java.util.stream.Collectors;
 import static org.bukkit.Material.*;
 
 public class B {
+    private static final KMap<String, BlockData> custom = new KMap<>();
+
     private static final Material AIR_MATERIAL = Material.AIR;
     private static final BlockData AIR = AIR_MATERIAL.createBlockData();
     private static final IntSet foliageCache = buildFoliageCache();
@@ -405,6 +409,11 @@ public class B {
         try {
             String bd = bdxf.trim();
 
+            if(!custom.isEmpty() && custom.containsKey(bd))
+            {
+                return custom.get(bd);
+            }
+
             if(bd.startsWith("minecraft:cauldron[level=")) {
                 bd = bd.replaceAll("\\Q:cauldron[\\E", ":water_cauldron[");
             }
@@ -660,6 +669,8 @@ public class B {
             e.printStackTrace();
         }
 
+        bt.addAll(custom.k());
+
         try {
             bt.addAll(Iris.service(RegistrySVC.class).getCustomBlockRegistry().compile());
         } catch(Throwable e) {
@@ -683,4 +694,8 @@ public class B {
     public static boolean isWaterLogged(BlockData b) {
         return (b instanceof Waterlogged) && ((Waterlogged) b).isWaterlogged();
     }
+
+    public static void registerCustomBlockData(String namespace, String key, BlockData blockData) {
+        custom.put(namespace + ":" + key, blockData);
+    }
 }

src/main/java/com/volmit/iris/util/data/HeightMap.java

@@ -21,18 +21,18 @@ package com.volmit.iris.util.data;
 import java.util.Arrays;
 
 public class HeightMap {
-    private final byte[] height;
+    private final int[] height;
 
     public HeightMap() {
-        height = new byte[256];
-        Arrays.fill(height, Byte.MIN_VALUE);
+        height = new int[256];
+        Arrays.fill(height, 0);
     }
 
     public void setHeight(int x, int z, int h) {
-        height[x * 16 + z] = (byte) (h + Byte.MIN_VALUE);
+        height[x * 16 + z] = (h);
     }
 
     public int getHeight(int x, int z) {
-        return height[x * 16 + z] - Byte.MIN_VALUE;
+        return height[x * 16 + z];
     }
 }

src/main/java/com/volmit/iris/util/hunk/Hunk.java

@@ -18,6 +18,7 @@
 
 package com.volmit.iris.util.hunk;
 
+import com.volmit.iris.Iris;
 import com.volmit.iris.engine.object.IrisPosition;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.function.Consumer2;
@@ -1254,6 +1255,12 @@ public interface Hunk<T> {
      *     the value
      */
     default void set(int x, int y, int z, T t) {
+        if(!contains(x, y, z))
+        {
+            Iris.warn("OUT OF BOUNDS " + x + " " + y +  " "+  z + " in bounds " + getWidth() + " " + getHeight() + " " + getDepth() );
+            return;
+        }
+
         setRaw(x, y, z, t);
     }
 
@@ -1561,4 +1568,9 @@ public interface Hunk<T> {
     default boolean contains(int x, int y, int z) {
         return x < getWidth() && x >= 0 && y < getHeight() && y >= 0 && z < getDepth() && z >= 0;
     }
+
+    default int volume()
+    {
+        return getWidth() * getDepth() * getHeight();
+    }
 }

src/main/java/com/volmit/iris/util/interpolation/IrisInterpolation.java

@@ -19,6 +19,7 @@
 package com.volmit.iris.util.interpolation;
 
 import com.google.common.util.concurrent.AtomicDouble;
+import com.volmit.iris.engine.data.chunk.LinkedTerrainChunk;
 import com.volmit.iris.engine.object.NoiseStyle;
 import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.function.Consumer2;
@@ -284,9 +285,24 @@ public class IrisInterpolation {
         //@done
     }
 
+    public static int getRadiusFactor(int coord, double radius)
+    {
+        if(radius == 2) {return coord >> 1;}
+        if(radius == 4) {return coord >> 2;}
+        if(radius == 8) {return coord >> 3;}
+        if(radius == 16) {return coord >> 4;}
+        if(radius == 32) {return coord >> 5;}
+        if(radius == 64) {return coord >> 6;}
+        if(radius == 128) {return coord >> 7;}
+        if(radius == 256) {return coord >> 8;}
+        if(radius == 512) {return coord >> 9;}
+        if(radius == 1024) {return coord >> 10;}
+        return (int) Math.floor(coord / radius);
+    }
+
     public static double getBilinearNoise(int x, int z, double rad, NoiseProvider n) {
-        int fx = (int) Math.floor(x / rad);
-        int fz = (int) Math.floor(z / rad);
+        int fx = getRadiusFactor(x, rad);
+        int fz = getRadiusFactor(z, rad);
         int x1 = (int) Math.round(fx * rad);
         int z1 = (int) Math.round(fz * rad);
         int x2 = (int) Math.round((fx + 1) * rad);
@@ -375,8 +391,8 @@ public class IrisInterpolation {
     }
 
     public static double getBilinearBezierNoise(int x, int z, double rad, NoiseProvider n) {
-        int fx = (int) Math.floor(x / rad);
-        int fz = (int) Math.floor(z / rad);
+        int fx = getRadiusFactor(x, rad);
+        int fz = getRadiusFactor(z, rad);
         int x1 = (int) Math.round(fx * rad);
         int z1 = (int) Math.round(fz * rad);
         int x2 = (int) Math.round((fx + 1) * rad);
@@ -394,8 +410,8 @@ public class IrisInterpolation {
     }
 
     public static double getBilinearParametricNoise(int x, int z, double rad, NoiseProvider n, double a) {
-        int fx = (int) Math.floor(x / rad);
-        int fz = (int) Math.floor(z / rad);
+        int fx = getRadiusFactor(x, rad);
+        int fz = getRadiusFactor(z, rad);
         int x1 = (int) Math.round(fx * rad);
         int z1 = (int) Math.round(fz * rad);
         int x2 = (int) Math.round((fx + 1) * rad);
@@ -417,9 +433,9 @@ public class IrisInterpolation {
     }
 
     public static double getTrilinear(int x, int y, int z, double radx, double rady, double radz, NoiseProvider3 n) {
-        int fx = (int) Math.floor(x / radx);
-        int fy = (int) Math.floor(y / rady);
-        int fz = (int) Math.floor(z / radz);
+        int fx = getRadiusFactor(x, radx);
+        int fy = getRadiusFactor(y, rady);
+        int fz = getRadiusFactor(z, radz);
         int x1 = (int) Math.round(fx * radx);
         int y1 = (int) Math.round(fy * rady);
         int z1 = (int) Math.round(fz * radz);
@@ -448,9 +464,9 @@ public class IrisInterpolation {
     }
 
     public static double getTricubic(int x, int y, int z, double radx, double rady, double radz, NoiseProvider3 n) {
-        int fx = (int) Math.floor(x / radx);
-        int fy = (int) Math.floor(y / rady);
-        int fz = (int) Math.floor(z / radz);
+        int fx = getRadiusFactor(x, radx);
+        int fy = getRadiusFactor(y, rady);
+        int fz = getRadiusFactor(z, radz);
         int x0 = (int) Math.round((fx - 1) * radx);
         int y0 = (int) Math.round((fy - 1) * rady);
         int z0 = (int) Math.round((fz - 1) * radz);
@@ -551,9 +567,9 @@ public class IrisInterpolation {
     }
 
     public static double getTrihermite(int x, int y, int z, double radx, double rady, double radz, NoiseProvider3 n, double tension, double bias) {
-        int fx = (int) Math.floor(x / radx);
-        int fy = (int) Math.floor(y / rady);
-        int fz = (int) Math.floor(z / radz);
+        int fx = getRadiusFactor(x, radx);
+        int fy = getRadiusFactor(y, rady);
+        int fz = getRadiusFactor(z, radz);
         int x0 = (int) Math.round((fx - 1) * radx);
         int y0 = (int) Math.round((fy - 1) * rady);
         int z0 = (int) Math.round((fz - 1) * radz);
@@ -642,8 +658,8 @@ public class IrisInterpolation {
     }
 
     public static double getBilinearCenterSineNoise(int x, int z, double rad, NoiseProvider n) {
-        int fx = (int) Math.floor(x / rad);
-        int fz = (int) Math.floor(z / rad);
+        int fx = getRadiusFactor(x, rad);
+        int fz = getRadiusFactor(z, rad);
         int x1 = (int) Math.round(fx * rad);
         int z1 = (int) Math.round(fz * rad);
         int x2 = (int) Math.round((fx + 1) * rad);
@@ -661,8 +677,8 @@ public class IrisInterpolation {
     }
 
     public static double getBicubicNoise(int x, int z, double rad, NoiseProvider n) {
-        int fx = (int) Math.floor(x / rad);
-        int fz = (int) Math.floor(z / rad);
+        int fx = getRadiusFactor(x, rad);
+        int fz = getRadiusFactor(z, rad);
         int x0 = (int) Math.round((fx - 1) * rad);
         int z0 = (int) Math.round((fz - 1) * rad);
         int x1 = (int) Math.round(fx * rad);
@@ -696,8 +712,8 @@ public class IrisInterpolation {
     }
 
     public static double getBicubicBezierNoise(int x, int z, double rad, NoiseProvider n) {
-        int fx = (int) Math.floor(x / rad);
-        int fz = (int) Math.floor(z / rad);
+        int fx = getRadiusFactor(x, rad);
+        int fz = getRadiusFactor(z, rad);
         int x0 = (int) Math.round((fx - 1) * rad);
         int z0 = (int) Math.round((fz - 1) * rad);
         int x1 = (int) Math.round(fx * rad);
@@ -731,8 +747,8 @@ public class IrisInterpolation {
     }
 
     public static double getBicubicParametricNoise(int x, int z, double rad, NoiseProvider n, double a) {
-        int fx = (int) Math.floor(x / rad);
-        int fz = (int) Math.floor(z / rad);
+        int fx = getRadiusFactor(x, rad);
+        int fz = getRadiusFactor(z, rad);
         int x0 = (int) Math.round((fx - 1) * rad);
         int z0 = (int) Math.round((fz - 1) * rad);
         int x1 = (int) Math.round(fx * rad);
@@ -778,8 +794,8 @@ public class IrisInterpolation {
     }
 
     public static double getHermiteNoise(int x, int z, double rad, NoiseProvider n, double t, double b) {
-        int fx = (int) Math.floor(x / rad);
-        int fz = (int) Math.floor(z / rad);
+        int fx = getRadiusFactor(x, rad);
+        int fz = getRadiusFactor(z, rad);
         int x0 = (int) Math.round((fx - 1) * rad);
         int z0 = (int) Math.round((fz - 1) * rad);
         int x1 = (int) Math.round(fx * rad);
@@ -813,8 +829,8 @@ public class IrisInterpolation {
     }
 
     public static double getHermiteBezierNoise(int x, int z, double rad, NoiseProvider n, double t, double b) {
-        int fx = (int) Math.floor(x / rad);
-        int fz = (int) Math.floor(z / rad);
+        int fx = getRadiusFactor(x, rad);
+        int fz = getRadiusFactor(z, rad);
         int x0 = (int) Math.round((fx - 1) * rad);
         int z0 = (int) Math.round((fz - 1) * rad);
         int x1 = (int) Math.round(fx * rad);
@@ -848,8 +864,8 @@ public class IrisInterpolation {
     }
 
     public static double getHermiteParametricNoise(int x, int z, double rad, NoiseProvider n, double t, double b, double a) {
-        int fx = (int) Math.floor(x / rad);
-        int fz = (int) Math.floor(z / rad);
+        int fx = getRadiusFactor(x, rad);
+        int fz = getRadiusFactor(z, rad);
         int x0 = (int) Math.round((fx - 1) * rad);
         int z0 = (int) Math.round((fz - 1) * rad);
         int x1 = (int) Math.round(fx * rad);
@@ -1027,7 +1043,6 @@ public class IrisInterpolation {
 
         return n.noise(x, z);
     }
-
     public static double rangeScale(double amin, double amax, double bmin, double bmax, double b) {
         return amin + ((amax - amin) * ((b - bmin) / (bmax - bmin)));
     }

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;
@@ -378,6 +379,14 @@ public class Mantle {
         return closed.get();
     }
 
+    public void set(int x, int y, int z, Matter matter)
+    {
+        for(MatterSlice<?> i : matter.getSliceMap().values())
+        {
+            i.iterate((mx, my, mz, v) -> set(mx + x, my + y, mz + z, v));
+        }
+    }
+
     /**
      * Closes the Mantle. By closing the mantle, you can no longer read or writeNodeData
      * any data to the mantle or it's Tectonic Plates. Closing will also flush any
@@ -570,6 +579,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);
     }
 

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());

src/main/java/com/volmit/iris/util/matter/Matter.java

@@ -24,6 +24,7 @@ import com.volmit.iris.engine.object.IrisPosition;
 import com.volmit.iris.util.collection.KSet;
 import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.math.BlockPosition;
+import com.volmit.iris.util.scheduling.J;
 import org.bukkit.World;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Entity;
@@ -59,11 +60,42 @@ import java.util.function.Function;
 public interface Matter {
     int VERSION = 1;
 
+    static long convert(File folder)
+    {
+        if(folder.isDirectory())
+        {
+            long v = 0;
+
+            for(File i : folder.listFiles())
+            {
+                v += convert(i);
+            }
+
+            return v;
+        }
+
+        else
+        {
+            IrisObject object = new IrisObject(1,1,1);
+            try {
+                long fs = folder.length();
+                object.read(folder);
+                Matter.from(object).write(folder);
+                Iris.info("Converted " + folder.getPath() + " Saved " + (fs - folder.length()));
+            } catch(Throwable e) {
+                Iris.error("Failed to convert " + folder.getPath());
+                e.printStackTrace();
+            }
+        }
+
+        return 0;
+    }
+
     static Matter from(IrisObject object) {
         object.clean();
         object.shrinkwrap();
         BlockVector min = new BlockVector();
-        Matter m = new IrisMatter(object.getW(), object.getH(), object.getD());
+        Matter m = new IrisMatter(Math.max(object.getW(), 1)+1, Math.max( object.getH(), 1)+1, Math.max( object.getD(), 1)+1);
 
         for(BlockVector i : object.getBlocks().keySet()) {
             min.setX(Math.min(min.getX(), i.getX()));

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<MatterCavern> {
     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);

src/main/java/com/volmit/iris/util/noise/CNG.java

@@ -19,6 +19,7 @@
 package com.volmit.iris.util.noise;
 
 import com.volmit.iris.Iris;
+import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.IRare;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.function.NoiseInjector;
@@ -129,6 +130,17 @@ public class CNG {
         }, 1D, 1);
     }
 
+    public CNG cached(int size)
+    {
+        if(size <= 0)
+        {
+            return this;
+        }
+
+        generator = new CachedNoise(generator, size);
+        return this;
+    }
+
     public static CNG signature(RNG rng) {
         return signature(rng, NoiseType.SIMPLEX);
     }

src/main/java/com/volmit/iris/util/noise/CachedNoise.java

@@ -16,21 +16,29 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object;
+package com.volmit.iris.util.noise;
 
-import com.volmit.iris.engine.object.annotations.Desc;
-import com.volmit.iris.engine.object.annotations.Snippet;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
+import com.volmit.iris.util.math.RNG;
 
-@Snippet("matter-placer")
-@EqualsAndHashCode()
-@Accessors(chain = true)
-@NoArgsConstructor
-@Desc("Represents an iris object placer. It places objects.")
-@Data
-public class IrisMatterPlacement {
+public class CachedNoise implements NoiseGenerator {
+    private final CachedNoiseMap n;
 
+    public CachedNoise(NoiseGenerator generator, int size) {
+     n = new CachedNoiseMap(size, generator);
+    }
+
+    @Override
+    public double noise(double x) {
+        return n.get((int)Math.round(x), 0);
+    }
+
+    @Override
+    public double noise(double x, double z) {
+        return n.get((int)Math.round(x),(int)Math.round(z));
+    }
+
+    @Override
+    public double noise(double x, double y, double z) {
+        return n.get((int)Math.round(x),(int)Math.round(z));
+    }
 }

src/main/java/com/volmit/iris/util/noise/CachedNoiseMap.java

@@ -0,0 +1,85 @@
+/*
+ * Iris is a World Generator for Minecraft Bukkit Servers
+ * Copyright (c) 2022 Arcane Arts (Volmit Software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.volmit.iris.util.noise;
+
+import com.volmit.iris.util.hunk.bits.Writable;
+import com.volmit.iris.util.interpolation.InterpolationMethod;
+import com.volmit.iris.util.matter.IrisMatter;
+import com.volmit.iris.util.matter.Matter;
+import com.volmit.iris.util.matter.MatterSlice;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.IOException;
+
+public class CachedNoiseMap implements Writable<Integer> {
+    private final Matter noise;
+    private final MatterSlice<Integer> slice;
+
+    public CachedNoiseMap(int size, NoiseGenerator cng)
+    {
+        noise = new IrisMatter(size, size, 1);
+        slice = noise.slice(Integer.class);
+
+        for(int i = 0; i < slice.getWidth(); i++)
+        {
+            for(int j = 0; j < slice.getHeight(); j++)
+            {
+                set(i, j, cng.noise(i, j));
+            }
+        }
+    }
+
+    public CachedNoiseMap(File file) throws IOException, ClassNotFoundException {
+        noise = Matter.read(file);
+        slice = noise.slice(Integer.class);
+    }
+
+    void write(File file) throws IOException {
+        noise.write(file);
+    }
+
+    void set(int x, int y, double value)
+    {
+        slice.set(x%slice.getWidth(), y%slice.getHeight(), 0, Float.floatToIntBits((float)value));
+    }
+
+    double get(int x, int y)
+    {
+        Integer i = slice.get(x%slice.getWidth(), y%slice.getHeight(), 0);
+
+        if(i == null)
+        {
+            return 0;
+        }
+
+        return Float.intBitsToFloat(i);
+    }
+
+    @Override
+    public Integer readNodeData(DataInputStream din) throws IOException {
+        return din.readInt();
+    }
+
+    @Override
+    public void writeNodeData(DataOutputStream dos, Integer integer) throws IOException {
+        dos.writeInt(integer);
+    }
+}