Merge pull request #883 from VolmitSoftware/Development

Development

.github/ISSUE_TEMPLATE/bug.yml

@@ -39,6 +39,7 @@ body:
         - 1.17
         - 1.17.1
         - 1.18
+        - 1.19
     validations:
       required: true
   - type: input

build.gradle

@@ -24,10 +24,10 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-version '2.2.1-1.19' // Needs to be version specific
-def nmsVersion = "1.19"
+version '2.2.15-1.19.2' // Needs to be version specific
+def nmsVersion = "1.19.2"
 def apiVersion = '1.19'
-def spigotJarVersion = '1.19-R0.1-SNAPSHOT'
+def spigotJarVersion = '1.19.2-R0.1-SNAPSHOT'
 def name = getRootProject().getName() // Defined in settings.gradle
 def main = 'com.volmit.iris.Iris'
 
@@ -38,7 +38,7 @@ 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.19/plugins')
+registerCustomOutputTask('Vatuu', 'D://Minecraft/Servers/1.19.2/plugins')
 // ========================== UNIX ==============================
 registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/development/server/plugins')
 registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Desktop/REMOTES/RemoteMinecraft/plugins')
@@ -124,10 +124,10 @@ dependencies {
     // Provided or Classpath
     compileOnly 'org.projectlombok:lombok:1.18.24'
     annotationProcessor 'org.projectlombok:lombok:1.18.24'
-    implementation 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT'
+    implementation 'org.spigotmc:spigot-api:1.19.1-R0.1-SNAPSHOT'
     implementation 'me.clip:placeholderapi:2.11.1'
     implementation 'io.th0rgal:oraxen:1.94.0'
-    implementation 'org.bukkit:craftbukkit:1.19-R0.1-SNAPSHOT:remapped-mojang'
+    implementation 'org.bukkit:craftbukkit:1.19.2-R0.1-SNAPSHOT:remapped-mojang'
     implementation 'com.github.LoneDev6:api-itemsadder:3.1.0b'
 
     // Shaded

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

@@ -26,6 +26,7 @@ import com.volmit.iris.core.ServerConfigurator;
 import com.volmit.iris.core.link.*;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.nms.INMS;
+import com.volmit.iris.core.pregenerator.LazyPregenerator;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.EnginePanic;
@@ -85,7 +86,11 @@ import java.util.Objects;
 
 @SuppressWarnings("CanBeFinal")
 public class Iris extends VolmitPlugin implements Listener {
+
+    public static final String OVERWORLD_TAG = "2086";
+
     private static final Queue<Runnable> syncJobs = new ShurikenQueue<>();
+
     public static Iris instance;
     public static BukkitAudiences audiences;
     public static MultiverseCoreLink linkMultiverseCore;
@@ -400,6 +405,7 @@ public class Iris extends VolmitPlugin implements Listener {
         J.s(() -> {
             J.a(() -> PaperLib.suggestPaper(this));
             J.a(() -> IO.delete(getTemp()));
+            J.a(LazyPregenerator::loadLazyGenerators, 100);
             J.a(this::bstats);
             J.ar(this::checkConfigHotload, 60);
             J.sr(this::tickQueue, 0);

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

@@ -30,6 +30,7 @@ import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.io.IO;
 import com.volmit.iris.util.plugin.VolmitSender;
 import com.volmit.iris.util.scheduling.J;
+import com.volmit.iris.util.scheduling.Queue;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -38,6 +39,7 @@ import org.bukkit.entity.Player;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 public class ServerConfigurator {
@@ -82,43 +84,21 @@ public class ServerConfigurator {
         }
     }
 
-    private static File getDatapacksFolder() {
+    private static List<File> getDatapacksFolder() {
         if(!IrisSettings.get().getGeneral().forceMainWorld.isEmpty()) {
-            return new File(IrisSettings.get().getGeneral().forceMainWorld + "/datapacks");
+            return new KList<File>().qadd(new File(IrisSettings.get().getGeneral().forceMainWorld + "/datapacks"));
         }
-
-        File props = new File("server.properties");
-
-        if(props.exists()) {
-            try {
-                KList<String> m = new KList<>(IO.readAll(props).split("\\Q\n\\E"));
-
-                for(String i : m) {
-                    if(i.trim().startsWith("level-name=")) {
-                        return new File(i.trim().split("\\Q=\\E")[1] + "/datapacks");
-                    }
-                }
-            } catch(IOException e) {
-                Iris.reportError(e);
-                e.printStackTrace();
-            }
-        }
-
-        return null;
+        KList<File> worlds = new KList<>();
+        Bukkit.getServer().getWorlds().forEach(w -> worlds.add(new File(w.getWorldFolder(), "datapacks")));
+        return worlds;
     }
 
+
     public static void installDataPacks(boolean fullInstall) {
         Iris.info("Checking Data Packs...");
-        boolean reboot = false;
         File packs = new File("plugins/Iris/packs");
-        File dpacks = getDatapacksFolder();
 
-        if(dpacks == null) {
-            Iris.error("Cannot find the datapacks folder! Please try generating a default world first maybe? Is this a new server?");
-            return;
-        }
-
-        if(packs.exists()) {
+         if(packs.exists()) {
             for(File i : packs.listFiles()) {
                 if(i.isDirectory()) {
                     Iris.verbose("Checking Pack: " + i.getPath());
@@ -135,8 +115,8 @@ public class ServerConfigurator {
                                 }
 
                                 Iris.verbose("  Checking Dimension " + dim.getLoadFile().getPath());
-                                if(dim.installDataPack(() -> data, dpacks)) {
-                                    reboot = true;
+                                for(File dpack : getDatapacksFolder()) {
+                                    dim.installDataPack(() -> data, dpack);
                                 }
                             }
                         }
@@ -147,19 +127,12 @@ public class ServerConfigurator {
 
         Iris.info("Data Packs Setup!");
 
-        if(fullInstall) {
+        if(fullInstall)
             verifyDataPacksPost(IrisSettings.get().getAutoConfiguration().isAutoRestartOnCustomBiomeInstall());
-        }
     }
 
     private static void verifyDataPacksPost(boolean allowRestarting) {
         File packs = new File("plugins/Iris/packs");
-        File dpacks = getDatapacksFolder();
-
-        if(dpacks == null) {
-            Iris.error("Cannot find the datapacks folder! Please try generating a default world first maybe? Is this a new server?");
-            return;
-        }
 
         boolean bad = false;
         if(packs.exists()) {

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

@@ -38,10 +38,12 @@ import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.plugin.VolmitSender;
 import com.volmit.iris.util.scheduling.J;
 import com.volmit.iris.util.scheduling.jobs.QueueJob;
+import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
@@ -76,8 +78,6 @@ public class CommandIris implements DecreeExecutor {
             return;
         }
 
-        sender().sendMessage(C.RED + "You should not be using this command to create new worlds. Instead, use the tutorial: https://docs.volmit.com/iris/getting-started");
-
         try {
             IrisToolbelt.createWorld()
                 .dimension(type.getLoadKey())
@@ -96,6 +96,37 @@ public class CommandIris implements DecreeExecutor {
         sender().sendMessage(C.GREEN + "Successfully created your world!");
     }
 
+    @Decree(description = "Remove an Iris world", aliases = {"del", "rm"}, sync = true)
+    public void remove(
+            @Param(description = "The world to remove")
+            World world,
+            @Param(description = "Whether to also remove the folder (if set to false, just does not load the world)", defaultValue = "true")
+            boolean delete
+    ) {
+        if (!IrisToolbelt.isIrisWorld(world)) {
+            sender().sendMessage(C.RED + "This is not an Iris world. Iris worlds: " + String.join(", ", Bukkit.getServer().getWorlds().stream().filter(IrisToolbelt::isIrisWorld).map(World::getName).toList()));
+            return;
+        }
+        sender().sendMessage(C.GREEN + "Removing world: " + world.getName());
+        try {
+            if (IrisToolbelt.removeWorld(world)) {
+                sender().sendMessage(C.GREEN + "Successfully removed " + world.getName() + " from bukkit.yml");
+            } else {
+                sender().sendMessage(C.YELLOW + "Looks like the world was already removed from bukkit.yml");
+            }
+        } catch (IOException e) {
+            sender().sendMessage(C.RED + "Failed to save bukkit.yml because of " + e.getMessage());
+            e.printStackTrace();
+        }
+        IrisToolbelt.evacuate(world, "Deleting world");
+        Bukkit.unloadWorld(world, false);
+        if (delete && world.getWorldFolder().delete()) {
+            sender().sendMessage(C.GREEN + "Successfully removed world folder");
+        } else {
+            sender().sendMessage(C.RED + "Failed to remove world folder");
+        }
+    }
+
     @Decree(description = "Print version information")
     public void version() {
         sender().sendMessage(C.GREEN + "Iris v" + Iris.instance.getDescription().getVersion() + " by Volmit Software");
@@ -107,6 +138,12 @@ public class CommandIris implements DecreeExecutor {
         sender().sendMessage(C.GREEN + "Total Height: " + (sender().player().getWorld().getMaxHeight() - sender().player().getWorld().getMinHeight()));
     }
 
+    @Decree(description = "QOL command to open a overworld studio world.", sync = true)
+    public void so() {
+        sender().sendMessage(C.GREEN + "Opening studio for the \"Overworld\" pack (seed: 1337)");
+        Iris.service(StudioSVC.class).open(sender(), 1337, "overworld");
+    }
+
     @Decree(description = "Set aura spins")
     public void aura(
         @Param(description = "The h color value", defaultValue = "-20")
@@ -170,9 +207,13 @@ public class CommandIris implements DecreeExecutor {
         @Param(name = "overwrite", description = "Whether or not to overwrite the pack with the downloaded one", aliases = "force", defaultValue = "false")
             boolean overwrite
     ) {
-        branch = pack.equals("overworld") ? "stable" : branch;
         sender().sendMessage(C.GREEN + "Downloading pack: " + pack + "/" + branch + (trim ? " trimmed" : "") + (overwrite ? " overwriting" : ""));
-        Iris.service(StudioSVC.class).downloadSearch(sender(), "IrisDimensions/" + pack + "/" + branch, trim, overwrite);
+        if(pack.equals("overworld")) {
+            String url = "https://github.com/IrisDimensions/overworld/releases/download/" + Iris.OVERWORLD_TAG + "/overworld.zip";
+            Iris.service(StudioSVC.class).downloadRelease(sender(), url, trim, overwrite);
+        } else {
+            Iris.service(StudioSVC.class).downloadSearch(sender(), "IrisDimensions/" + pack + "/" + branch, trim, overwrite);
+        }
     }
 
     @Decree(description = "Get metrics for your world", aliases = "measure", origin = DecreeOrigin.PLAYER)

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

@@ -65,7 +65,7 @@ public class CommandWhat implements DecreeExecutor {
     @Decree(description = "What biome am i in?", origin = DecreeOrigin.PLAYER)
     public void biome() {
         try {
-            IrisBiome b = engine().getBiome(player().getLocation().getBlockX(), player().getLocation().getBlockY(), player().getLocation().getBlockZ());
+            IrisBiome b = engine().getBiome(player().getLocation().getBlockX(), player().getLocation().getBlockY() - player().getWorld().getMinHeight(), player().getLocation().getBlockZ());
             sender().sendMessage("IBiome: " + b.getLoadKey() + " (" + b.getDerivative().name() + ")");
 
         } catch(Throwable e) {

src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java

@@ -148,7 +148,7 @@ public class NoiseExplorerGUI extends JPanel implements MouseWheelListener, List
         JFrame frame = new JFrame("Noise Explorer");
         NoiseExplorerGUI nv = new NoiseExplorerGUI();
         frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
-        KList<String> li = new KList<>(NoiseStyle.values()).toStringList();
+        KList<String> li = new KList<>(NoiseStyle.values()).toStringList().sort();
         combo = new JComboBox<>(li.toArray(new String[0]));
         combo.setSelectedItem("STATIC");
         combo.setFocusable(false);

src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java

@@ -83,7 +83,6 @@ public class PregeneratorJob implements PregenListener {
         this.pregenerator = new IrisPregenerator(task, method, this);
         max = new Position2(0, 0);
         min = new Position2(0, 0);
-        KList<Runnable> draw = new KList<>();
         task.iterateRegions((xx, zz) -> {
             min.setX(Math.min(xx << 5, min.getX()));
             min.setZ(Math.min(zz << 5, min.getZ()));

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

@@ -20,6 +20,7 @@ package com.volmit.iris.core.link;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.tools.IrisToolbelt;
+import com.volmit.iris.engine.object.IrisBiome;
 import com.volmit.iris.engine.platform.PlatformChunkGenerator;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.Location;
@@ -59,15 +60,15 @@ public class IrisPapiExpansion extends PlaceholderExpansion {
 
         if(p.equalsIgnoreCase("biome_name")) {
             if(a != null) {
-                return a.getEngine().getBiome(l).getName();
+                return getBiome(a, l).getName();
             }
         } else if(p.equalsIgnoreCase("biome_id")) {
             if(a != null) {
-                return a.getEngine().getBiome(l).getLoadKey();
+                return getBiome(a, l).getLoadKey();
             }
         } else if(p.equalsIgnoreCase("biome_file")) {
             if(a != null) {
-                return a.getEngine().getBiome(l).getLoadFile().getPath();
+                return getBiome(a, l).getLoadFile().getPath();
             }
         } else if(p.equalsIgnoreCase("region_name")) {
             if(a != null) {
@@ -107,4 +108,8 @@ public class IrisPapiExpansion extends PlaceholderExpansion {
 
         return null;
     }
+
+    private IrisBiome getBiome(PlatformChunkGenerator a, Location l) {
+        return a.getEngine().getBiome(l.getBlockX(), l.getBlockY() - l.getWorld().getMinHeight(), l.getBlockZ());
+    }
 }

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

@@ -68,33 +68,26 @@ public class ObjectResourceLoader extends ResourceLoader<IrisObject> {
         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(".iob")) {
-                    m.add(j.getName().replaceAll("\\Q.iob\\E", ""));
-                } else if(j.isDirectory()) {
-                    for(File k : j.listFiles()) {
-                        if(k.isFile() && k.getName().endsWith(".iob")) {
-                            m.add(j.getName() + "/" + k.getName().replaceAll("\\Q.iob\\E", ""));
-                        } else if(k.isDirectory()) {
-                            for(File l : k.listFiles()) {
-                                if(l.isFile() && l.getName().endsWith(".iob")) {
-                                    m.add(j.getName() + "/" + k.getName() + "/" + l.getName().replaceAll("\\Q.iob\\E", ""));
-                                }
-                            }
-                        }
-                    }
-                }
+            m.addAll(getFiles(i, ".iob", true));
+        }
+        possibleKeys = m.toArray(new String[0]);
+        return possibleKeys;
+    }
+
+    private KList<String> getFiles(File dir, String ext, boolean skipDirName) {
+        KList<String> paths = new KList<>();
+        String name = skipDirName ? "" : dir.getName() + "/";
+        for(File f : dir.listFiles()) {
+            if(f.isFile() && f.getName().endsWith(ext)) {
+                paths.add(name + f.getName().replaceAll("\\Q" + ext + "\\E", ""));
+            } else if(f.isDirectory()) {
+                getFiles(f, ext, false).forEach(e -> paths.add(name + e));
             }
         }
-
-        KList<String> v = new KList<>(m);
-        possibleKeys = v.toArray(new String[0]);
-        return possibleKeys;
+        return paths;
     }
 
     public File findFile(String 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.v19_1.NMSBinding19_1;
+import com.volmit.iris.core.nms.v19_2.NMSBinding19_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_19_R1", NMSBinding19_1.class);
+        .qput("v1_19_R1", NMSBinding19_2.class);
     //@done
     private static final INMSBinding binding = bind();
 

src/main/java/com/volmit/iris/core/nms/v19_2/NMSBinding19_2.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.nms.v19_1;
+package com.volmit.iris.core.nms.v19_2;
 
 
 import com.volmit.iris.Iris;
@@ -39,15 +39,10 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import net.minecraft.core.*;
 import net.minecraft.nbt.NbtIo;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.BitStorage;
-import net.minecraft.util.Mth;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.LevelChunkSection;
-import net.minecraft.world.level.chunk.Palette;
-import net.minecraft.world.level.chunk.PalettedContainer;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -74,7 +69,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class NMSBinding19_1 implements INMSBinding {
+public class NMSBinding19_2 implements INMSBinding {
 
     private final KMap<Biome, Object> baseBiomeCache = new KMap<>();
     private final BlockData AIR = Material.AIR.createBlockData();
@@ -344,44 +339,12 @@ public class NMSBinding19_1 implements INMSBinding {
             ChunkAccess s = (ChunkAccess) getFieldForBiomeStorage(chunk).get(chunk);
             Holder<net.minecraft.world.level.biome.Biome> biome = (Holder<net.minecraft.world.level.biome.Biome>) somethingVeryDirty;
             s.setBiome(x, y, z, biome);
-            /*int l = QuartPos.fromBlock(s.getMinBuildHeight());
-            int i1 = l + QuartPos.fromBlock(s.getHeight()) - 1;
-            PalettedContainer<Holder<net.minecraft.world.level.biome.Biome>> palette = getPalette(s, s.getSectionIndex(QuartPos.toBlock(Mth.clamp(y, l, i1))));
-            int index = getPaletteIndex(x, y, z, s, palette);
-            int data = getPaletteDataId(palette, biome);
-            setPaletteData(palette, index, data);*/
         } catch(IllegalAccessException e) {
             Iris.reportError(e);
             e.printStackTrace();
         }
     }
 
-    private PalettedContainer<Holder<net.minecraft.world.level.biome.Biome>> getPalette(ChunkAccess ca, int index) {
-        LevelChunkSection[] sections = fieldForClass(LevelChunkSection[].class, ChunkAccess.class, ca);
-        return fieldForClass(PalettedContainer.class, LevelChunkSection.class, sections[index]);
-    }
-
-    private int getPaletteIndex(int x, int y, int z, ChunkAccess s, PalettedContainer<?> palette) {
-        int l = QuartPos.fromBlock(s.getMinBuildHeight());
-        int i1 = l + QuartPos.fromBlock(s.getHeight()) - 1;
-        int j1 = Mth.clamp(y, l, i1);
-        return fieldForClass(PalettedContainer.Strategy.class, PalettedContainer.class, palette).getIndex(x & 3, j1 & 3, z & 3);
-    }
-
-    private <T extends Holder<?>> int getPaletteDataId(PalettedContainer<T> palette, T data) throws ClassNotFoundException {
-        Class<?> dataType = getClassType(PalettedContainer.class, 1);
-        Object paletteData = fieldFor(dataType, palette);
-        Palette<T> fuckinFinally = fieldForClass(Palette.class,dataType, paletteData);
-        return fuckinFinally.idFor(data);
-    }
-
-    private void setPaletteData(PalettedContainer<?> palette, int index, int data) throws ClassNotFoundException {
-        Class<?> dataType = getClassType(PalettedContainer.class, 1);
-        Object paletteData = fieldFor(dataType, palette);
-        BitStorage storage = fieldForClass(BitStorage.class, dataType, paletteData);
-        storage.set(index, data);
-    }
-
     private Field getFieldForBiomeStorage(Object storage) {
         Field f = biomeStorageCache;
 

src/main/java/com/volmit/iris/core/pregenerator/IrisPregenerator.java

@@ -29,6 +29,7 @@ import com.volmit.iris.util.scheduling.ChronoLatch;
 import com.volmit.iris.util.scheduling.J;
 import com.volmit.iris.util.scheduling.Looper;
 
+import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
@@ -55,10 +56,12 @@ public class IrisPregenerator {
     private final KSet<Position2> retry;
     private final KSet<Position2> net;
     private final ChronoLatch cl;
+    private final Semaphore limiter;
 
     public IrisPregenerator(PregenTask task, PregeneratorMethod generator, PregenListener listener) {
         this.listener = listenify(listener);
         cl = new ChronoLatch(5000);
+        limiter = new Semaphore(Runtime.getRuntime().availableProcessors());
         generatedRegions = new KSet<>();
         this.shutdown = new AtomicBoolean(false);
         this.paused = new AtomicBoolean(false);
@@ -140,6 +143,7 @@ public class IrisPregenerator {
         generator.close();
         ticker.interrupt();
         listener.onClose();
+        getMantle().trim(0);
     }
 
     private void visitRegion(int x, int z, boolean regions) {
@@ -162,12 +166,26 @@ public class IrisPregenerator {
         boolean hit = false;
         if(generator.supportsRegions(x, z, listener) && regions) {
             hit = true;
-            listener.onRegionGenerating(x, z);
-            generator.generateRegion(x, z, listener);
+            try {
+                limiter.acquire();
+                listener.onRegionGenerating(x, z);
+                generator.generateRegion(x, z, listener);
+                limiter.release();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
         } else if(!regions) {
             hit = true;
             listener.onRegionGenerating(x, z);
-            PregenTask.iterateRegion(x, z, (xx, zz) -> generator.generateChunk(xx, zz, listener));
+            PregenTask.iterateRegion(x, z, (xx, zz) -> {
+                try {
+                    limiter.acquire();
+                    generator.generateChunk(xx, zz, listener);
+                    limiter.release();
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            });
         }
 
         if(hit) {

src/main/java/com/volmit/iris/core/pregenerator/LazyPregenerator.java

@@ -0,0 +1,178 @@
+package com.volmit.iris.core.pregenerator;
+
+import com.google.gson.Gson;
+import com.volmit.iris.Iris;
+import com.volmit.iris.util.format.Form;
+import com.volmit.iris.util.io.IO;
+import com.volmit.iris.util.math.Position2;
+import com.volmit.iris.util.math.Spiraler;
+import com.volmit.iris.util.scheduling.ChronoLatch;
+import com.volmit.iris.util.scheduling.J;
+import io.papermc.lib.PaperLib;
+import lombok.Builder;
+import lombok.Data;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.world.WorldUnloadEvent;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class LazyPregenerator extends Thread implements Listener
+{
+    private final LazyPregenJob job;
+    private final File destination;
+    private final int maxPosition;
+    private final World world;
+    private final long rate;
+    private final ChronoLatch latch;
+
+    public LazyPregenerator(LazyPregenJob job, File destination)
+    {
+        this.job = job;
+        this.destination = destination;
+        this.maxPosition = new Spiraler(job.getRadiusBlocks() * 2, job.getRadiusBlocks() * 2, (x, z) -> {}).count();
+        this.world = Bukkit.getWorld(job.getWorld());
+        this.rate = Math.round((1D / (job.chunksPerMinute / 60D)) * 1000D);
+        this.latch = new ChronoLatch(60000);
+    }
+
+    public LazyPregenerator(File file) throws IOException {
+        this(new Gson().fromJson(IO.readAll(file), LazyPregenJob.class), file);
+    }
+
+    @EventHandler
+    public void on(WorldUnloadEvent e)
+    {
+        if(e.getWorld().equals(world)) {
+            interrupt();
+        }
+    }
+
+    public void run()
+    {
+        while(!interrupted()) {
+            J.sleep(rate);
+            tick();
+        }
+
+        try {
+            saveNow();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void tick() {
+        if(latch.flip())
+        {
+            save();
+            Iris.info("LazyGen: " + world.getName() + " RTT: " + Form.duration((Math.pow((job.radiusBlocks / 16D), 2) / job.chunksPerMinute) * 60 * 1000, 2));
+        }
+
+        if(job.getPosition() >= maxPosition)
+        {
+            if(job.isHealing())
+            {
+                int pos = (job.getHealingPosition() + 1) % maxPosition;
+                job.setHealingPosition(pos);
+                tickRegenerate(getChunk(pos));
+            }
+
+            else
+            {
+                Iris.verbose("Completed Lazy Gen!");
+                interrupt();
+            }
+        }
+
+        else
+        {
+            int pos = job.getPosition() + 1;
+            job.setPosition(pos);
+            tickGenerate(getChunk(pos));
+        }
+    }
+
+    private void tickGenerate(Position2 chunk) {
+        if(PaperLib.isPaper()) {
+            PaperLib.getChunkAtAsync(world, chunk.getX(), chunk.getZ(), true).thenAccept((i) -> Iris.verbose("Generated Async " + chunk));
+        }
+        else {
+            J.s(() -> world.getChunkAt(chunk.getX(), chunk.getZ()));
+            Iris.verbose("Generated " + chunk);
+        }
+    }
+
+    private void tickRegenerate(Position2 chunk) {
+        J.s(() -> world.regenerateChunk(chunk.getX(), chunk.getZ()));
+        Iris.verbose("Regenerated " + chunk);
+    }
+
+    public Position2 getChunk(int position)
+    {
+        int p = -1;
+        AtomicInteger xx = new AtomicInteger();
+        AtomicInteger zz = new AtomicInteger();
+        Spiraler s = new Spiraler(job.getRadiusBlocks() * 2, job.getRadiusBlocks() * 2, (x, z) -> {
+            xx.set(x);
+            zz.set(z);
+        });
+
+        while(s.hasNext() && p++ < position) {
+            s.next();
+        }
+
+        return new Position2(xx.get(), zz.get());
+    }
+
+    public void save()
+    {
+        J.a(() -> {
+            try {
+                saveNow();
+            }
+
+            catch (Throwable e) {
+                e.printStackTrace();
+            }
+        });
+    }
+
+    public void saveNow() throws IOException {
+        IO.writeAll(this.destination, new Gson().toJson(job));
+    }
+
+    public static void loadLazyGenerators()
+    {
+        for(World i : Bukkit.getWorlds())
+        {
+            File lazygen = new File(i.getWorldFolder(), "lazygen.json");
+
+            if(lazygen.exists()) {
+                try {
+                    LazyPregenerator p = new LazyPregenerator(lazygen);
+                    p.start();
+                    Iris.info("Started Lazy Pregenerator: " + p.job);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+
+    @Data
+    @Builder
+    public static class LazyPregenJob
+    {
+        private String world;
+        @Builder.Default private int healingPosition = 0;
+        @Builder.Default private boolean healing = false;
+        @Builder.Default private int chunksPerMinute = 32; // 48 hours is roughly 5000 radius
+        @Builder.Default private int radiusBlocks = 5000;
+        @Builder.Default private int position = 0;
+    }
+}

src/main/java/com/volmit/iris/core/project/SchemaBuilder.java

@@ -22,17 +22,7 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.core.loader.ResourceLoader;
-import com.volmit.iris.engine.object.annotations.ArrayType;
-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.RegistryListBlockType;
-import com.volmit.iris.engine.object.annotations.RegistryListFont;
-import com.volmit.iris.engine.object.annotations.RegistryListItemType;
-import com.volmit.iris.engine.object.annotations.RegistryListResource;
-import com.volmit.iris.engine.object.annotations.RegistryListSpecialEntity;
-import com.volmit.iris.engine.object.annotations.Required;
-import com.volmit.iris.engine.object.annotations.Snippet;
+import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.data.B;
@@ -52,7 +42,7 @@ public class SchemaBuilder {
     private static final String SYMBOL_LIMIT__N = "*";
     private static final String SYMBOL_TYPE__N = "";
     private static final JSONArray POTION_TYPES = getPotionTypes();
-    private static final JSONArray ENCHANT_TYPES = getEnchantmentTypes();
+    private static final JSONArray ENCHANT_TYPES = getEnchantTypes();
     private static final JSONArray ITEM_TYPES = new JSONArray(B.getItemTypes());
     private static final JSONArray FONT_TYPES = new JSONArray(GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames());
     private final KMap<String, JSONObject> definitions;
@@ -67,16 +57,6 @@ public class SchemaBuilder {
         this.root = root;
     }
 
-    private static JSONArray getEnchantmentTypes() {
-        JSONArray a = new JSONArray();
-
-        for(Field gg : Enchantment.class.getDeclaredFields()) {
-            a.put(gg.getName());
-        }
-
-        return a;
-    }
-
     private static JSONArray getPotionTypes() {
         JSONArray a = new JSONArray();
 
@@ -87,6 +67,14 @@ public class SchemaBuilder {
         return a;
     }
 
+    private static JSONArray getEnchantTypes() {
+        JSONArray array = new JSONArray();
+        for(Enchantment e : Enchantment.values()) {
+            array.put(e.getKey().getKey());
+        }
+        return array;
+    }
+
     public JSONObject construct() {
         JSONObject schema = new JSONObject();
         schema.put("$schema", "http://json-schema.org/draft-07/schema#");
@@ -309,7 +297,7 @@ public class SchemaBuilder {
                     prop.put("$ref", "#/definitions/" + key);
                     description.add(SYMBOL_TYPE__N + "  Must be a valid Font Family (use ctrl+space for auto complete!)");
 
-                } else if(k.getType().equals(Enchantment.class)) {
+                } else if(k.isAnnotationPresent(RegistryListEnchantment.class)) {
                     String key = "enum-enchantment";
 
                     if(!definitions.containsKey(key)) {
@@ -483,7 +471,7 @@ public class SchemaBuilder {
                                 items.put("$ref", "#/definitions/" + key);
                                 prop.put("items", items);
                                 description.add(SYMBOL_TYPE__N + "  Must be a valid Font Family (use ctrl+space for auto complete!)");
-                            } else if(t.type().equals(Enchantment.class)) {
+                            } else if(k.isAnnotationPresent(RegistryListEnchantment.class)) {
                                 fancyType = "List of Enchantment Types";
                                 String key = "enum-enchantment";
 

src/main/java/com/volmit/iris/core/service/StudioSVC.java

@@ -171,7 +171,7 @@ public class StudioSVC implements IrisService {
             String[] nodes = url.split("\\Q/\\E");
             String repo = nodes.length == 1 ? "IrisDimensions/" + nodes[0] : nodes[0] + "/" + nodes[1];
             branch = nodes.length > 2 ? nodes[2] : branch;
-            download(sender, repo, branch, trim, forceOverwrite);
+            download(sender, repo, branch, trim, forceOverwrite, false);
         } catch(Throwable e) {
             Iris.reportError(e);
             e.printStackTrace();
@@ -179,12 +179,22 @@ public class StudioSVC implements IrisService {
         }
     }
 
-    public void download(VolmitSender sender, String repo, String branch, boolean trim) throws JsonSyntaxException, IOException {
-        download(sender, repo, branch, trim, false);
+    public void downloadRelease(VolmitSender sender, String url, boolean trim, boolean forceOverwrite) {
+        try {
+            download(sender, "IrisDimensions", url, trim, forceOverwrite, true);
+        } catch(Throwable e) {
+            Iris.reportError(e);
+            e.printStackTrace();
+            sender.sendMessage("Failed to download 'IrisDimensions/overworld' from " + url + ".");
+        }
     }
 
-    public void download(VolmitSender sender, String repo, String branch, boolean trim, boolean forceOverwrite) throws JsonSyntaxException, IOException {
-        String url = "https://codeload.github.com/" + repo + "/zip/refs/heads/" + branch;
+    public void download(VolmitSender sender, String repo, String branch, boolean trim) throws JsonSyntaxException, IOException {
+        download(sender, repo, branch, trim, false, false);
+    }
+
+    public void download(VolmitSender sender, String repo, String branch, boolean trim, boolean forceOverwrite, boolean directUrl) throws JsonSyntaxException, IOException {
+        String url = directUrl ? branch : "https://codeload.github.com/" + repo + "/zip/refs/heads/" + branch;
         sender.sendMessage("Downloading " + url + " "); //The extra space stops a bug in adventure API from repeating the last letter of the URL
         File zip = Iris.getNonCachedFile("pack-" + trim + "-" + repo, url);
         File temp = Iris.getTemp();

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

@@ -38,8 +38,11 @@ import org.bukkit.GameRule;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -102,6 +105,9 @@ public class IrisCreator {
             throw new IrisException("Dimension cannot be found null for id " + dimension());
         }
 
+        if(sender == null)
+            sender = Iris.getSender();
+
         if(!studio()) {
             Iris.service(StudioSVC.class).installIntoWorld(sender, d.getLoadKey(), new File(name()));
         }
@@ -174,7 +180,8 @@ public class IrisCreator {
                     world.get().setTime(6000);
                 }
             });
-        }
+        } else
+            addToBukkitYml();
 
         if(pregen != null) {
             CompletableFuture<Boolean> ff = new CompletableFuture<>();
@@ -204,7 +211,38 @@ public class IrisCreator {
                 e.printStackTrace();
             }
         }
-
         return world.get();
     }
+
+    private static final File BUKKIT_YML = new File(Bukkit.getServer().getWorldContainer(), "bukkit.yml");
+
+    private void addToBukkitYml() {
+        YamlConfiguration yml = YamlConfiguration.loadConfiguration(BUKKIT_YML);
+        String gen = "Iris:" + dimension;
+        ConfigurationSection section = yml.contains("worlds") ? yml.getConfigurationSection("worlds") : yml.createSection("worlds");
+        if(!section.contains(name)) {
+            section.createSection(name).set("generator", gen);
+            try {
+                yml.save(BUKKIT_YML);
+                Iris.info("Registered \"" + name + "\" in bukkit.yml");
+            } catch(IOException e) {
+                Iris.error("Failed to update bukkit.yml!");
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public static boolean removeFromBukkitYml(String name) throws IOException {
+        YamlConfiguration yml = YamlConfiguration.loadConfiguration(BUKKIT_YML);
+        ConfigurationSection section = yml.getConfigurationSection("worlds");
+        if (section == null) {
+            return false;
+        }
+        section.set(name, null);
+        if (section.getValues(false).keySet().stream().noneMatch(k -> section.get(k) != null)) {
+            yml.set("worlds", null);
+        }
+        yml.save(BUKKIT_YML);
+        return true;
+    }
 }

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

@@ -36,6 +36,7 @@ import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
@@ -221,7 +222,6 @@ public class IrisToolbelt {
                     new VolmitSender(j, Iris.instance.getTag()).sendMessage("You have been evacuated from this world. " + m);
                     j.teleport(i.getSpawnLocation());
                 }
-
                 return true;
             }
         }
@@ -248,4 +248,8 @@ public class IrisToolbelt {
         if(e == null) {return;}
         e.getEngine().getMantle().getMantle().remove(x, y - world.getMinHeight(), z, of);
     }
+
+    public static boolean removeWorld(World world) throws IOException {
+        return IrisCreator.removeFromBukkitYml(world.getName());
+    }
 }

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

@@ -20,20 +20,10 @@ package com.volmit.iris.engine;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.engine.data.cache.Cache;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedWorldManager;
-import com.volmit.iris.engine.object.IRare;
-import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.IrisBlockDrops;
-import com.volmit.iris.engine.object.IrisEngineChunkData;
-import com.volmit.iris.engine.object.IrisEngineData;
-import com.volmit.iris.engine.object.IrisEngineSpawnerCooldown;
-import com.volmit.iris.engine.object.IrisEntitySpawn;
-import com.volmit.iris.engine.object.IrisMarker;
-import com.volmit.iris.engine.object.IrisPosition;
-import com.volmit.iris.engine.object.IrisRegion;
-import com.volmit.iris.engine.object.IrisSpawner;
+import com.volmit.iris.engine.object.*;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
@@ -55,6 +45,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
+import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -69,7 +60,6 @@ import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -617,7 +607,6 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
     @Override
     public void onBlockBreak(BlockBreakEvent e) {
         if(e.getBlock().getWorld().equals(getTarget().getWorld().realWorld())) {
-
             J.a(() -> {
                 MatterMarker marker = getMantle().get(e.getBlock().getX(), e.getBlock().getY(), e.getBlock().getZ(), MatterMarker.class);
 
@@ -635,52 +624,30 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
             });
 
             KList<ItemStack> d = new KList<>();
-            Runnable drop = () -> J.s(() -> d.forEach((i) -> e.getBlock().getWorld().dropItemNaturally(e.getBlock().getLocation().clone().add(0.5, 0.5, 0.5), i)));
-            IrisBiome b = getEngine().getBiome(e.getBlock().getLocation());
+            IrisBiome b = getEngine().getBiome(e.getBlock().getLocation().clone().subtract(0, getEngine().getWorld().minHeight(), 0));
+            List<IrisBlockDrops> dropProviders = filterDrops(b.getBlockDrops(), e, getData());
 
-            if(dropItems(e, d, drop, b.getBlockDrops(), b)) {
-                return;
+            if(dropProviders.stream().noneMatch(IrisBlockDrops::isSkipParents)) {
+                IrisRegion r = getEngine().getRegion(e.getBlock().getLocation());
+                dropProviders.addAll(filterDrops(r.getBlockDrops(), e, getData()));
+                dropProviders.addAll(filterDrops(getEngine().getDimension().getBlockDrops(), e, getData()));
             }
 
-            IrisRegion r = getEngine().getRegion(e.getBlock().getLocation());
+            dropProviders.forEach(provider -> provider.fillDrops(false, d));
 
-            if(dropItems(e, d, drop, r.getBlockDrops(), b)) {
-                return;
+            if(dropProviders.stream().anyMatch(IrisBlockDrops::isReplaceVanillaDrops)) {
+                e.setDropItems(false);
             }
 
-            for(IrisBlockDrops i : getEngine().getDimension().getBlockDrops()) {
-                if(i.shouldDropFor(e.getBlock().getBlockData(), getData())) {
-                    if(i.isReplaceVanillaDrops()) {
-                        e.setDropItems(false);
-                    }
-
-                    i.fillDrops(false, d);
-
-                    if(i.isSkipParents()) {
-                        drop.run();
-                        return;
-                    }
-                }
+            if(d.isNotEmpty()) {
+                World w = e.getBlock().getWorld();
+                J.s(() -> d.forEach(item -> w.dropItemNaturally(e.getBlock().getLocation().clone().add(.5, .5, .5), item)));
             }
         }
     }
 
-    private boolean dropItems(BlockBreakEvent e, KList<ItemStack> d, Runnable drop, KList<IrisBlockDrops> blockDrops, IrisBiome b) {
-        for(IrisBlockDrops i : blockDrops) {
-            if(i.shouldDropFor(e.getBlock().getBlockData(), getData())) {
-                if(i.isReplaceVanillaDrops()) {
-                    e.setDropItems(false);
-                }
-
-                i.fillDrops(false, d);
-
-                if(i.isSkipParents()) {
-                    drop.run();
-                    return true;
-                }
-            }
-        }
-        return false;
+    private List<IrisBlockDrops> filterDrops(KList<IrisBlockDrops> drops, BlockBreakEvent e, IrisData data) {
+        return new KList<>(drops.stream().filter(d -> d.shouldDropFor(e.getBlock().getBlockData(), data)).toList());
     }
 
     @Override

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

@@ -27,6 +27,7 @@ import com.volmit.iris.engine.object.IrisBiome;
 import com.volmit.iris.engine.object.IrisBiomeCustom;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.hunk.Hunk;
+import com.volmit.iris.util.hunk.view.BiomeGridHunkHolder;
 import com.volmit.iris.util.hunk.view.BiomeGridHunkView;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.parallel.BurstExecutor;
@@ -56,6 +57,14 @@ public class IrisBiomeActuator extends EngineAssignedActuator<Biome> {
                     hh.forceBiomeBaseInto(x, y, z, bb);
                 }
                 return true;
+            } else if(h instanceof BiomeGridHunkHolder hh) {
+                ChunkGenerator.BiomeGrid g = hh.getChunk();
+                if(g instanceof TerrainChunk) {
+                    ((TerrainChunk) g).getBiomeBaseInjector().setBiome(x, y, z, bb);
+                } else {
+                    hh.forceBiomeBaseInto(x, y, z, bb);
+                }
+                return true;
             }
         } catch(Throwable e) {
             e.printStackTrace();

src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java

@@ -23,11 +23,13 @@ import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.IrisBiome;
 import com.volmit.iris.engine.object.IrisDecorationPart;
 import com.volmit.iris.engine.object.IrisDecorator;
+import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.hunk.Hunk;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.MultipleFacing;
 import org.bukkit.block.data.type.PointedDripstone;
 
 public class IrisCeilingDecorator extends IrisEngineDecorator {
@@ -39,11 +41,10 @@ public class IrisCeilingDecorator extends IrisEngineDecorator {
     @Override
     public void decorate(int x, int z, int realX, int realX1, int realX_1, int realZ, int realZ1, int realZ_1, Hunk<BlockData> data, IrisBiome biome, int height, int max) {
         IrisDecorator decorator = getDecorator(biome, realX, realZ);
-
         if(decorator != null) {
             if(!decorator.isStacking()) {
                 if(height >= 0 || height < getEngine().getHeight()) {
-                    data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
+                    data.set(x, height, z, fixFaces(decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()), realX, height, realZ));
                 }
             } else {
                 int stack = decorator.getHeight(getRng().nextParallelRNG(Cache.key(realX, realZ)), realX, realZ, getData());
@@ -98,4 +99,24 @@ public class IrisCeilingDecorator extends IrisEngineDecorator {
             }
         }
     }
+
+    private BlockData fixFaces(BlockData b, int x, int y, int z) {
+        if(B.isVineBlock(b)) {
+            MultipleFacing data = (MultipleFacing)b.clone();
+            boolean found = false;
+            for(BlockFace f : BlockFace.values()) {
+                if(!f.isCartesian())
+                    continue;
+                Material m = getEngine().getMantle().get(x + f.getModX(), y + f.getModY(), z + f.getModZ()).getMaterial();
+                if(m.isSolid()) {
+                    found = true;
+                    data.setFace(f, m.isSolid());
+                }
+            }
+            if(!found)
+                data.setFace(BlockFace.UP, true);
+            return data;
+        }
+        return b;
+    }
 }

src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java

@@ -25,12 +25,14 @@ import com.volmit.iris.engine.object.InferredType;
 import com.volmit.iris.engine.object.IrisBiome;
 import com.volmit.iris.engine.object.IrisDecorationPart;
 import com.volmit.iris.engine.object.IrisDecorator;
+import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.hunk.Hunk;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.data.Bisected;
 import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.MultipleFacing;
 import org.bukkit.block.data.type.PointedDripstone;
 
 public class IrisSurfaceDecorator extends IrisEngineDecorator {
@@ -55,11 +57,14 @@ public class IrisSurfaceDecorator extends IrisEngineDecorator {
                 bd = decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData());
 
                 if(!underwater) {
-                    if(!canGoOn(bd, bdx)) {
+                    if(!canGoOn(bd, bdx) && (!decorator.isForcePlace() && decorator.getForceBlock() == null) ) {
                         return;
                     }
                 }
 
+                if(decorator.getForceBlock() != null)
+                    data.set(x, height, z, fixFaces(decorator.getForceBlock().getBlockData(getData()), x, height, z));
+
                 if(bd instanceof Bisected) {
                     bd = bd.clone();
                     ((Bisected) bd).setHalf(Bisected.Half.TOP);
@@ -72,7 +77,7 @@ public class IrisSurfaceDecorator extends IrisEngineDecorator {
                     ((Bisected) bd).setHalf(Bisected.Half.BOTTOM);
                 }
 
-                data.set(x, height + 1, z, bd);
+                data.set(x, height + 1, z, fixFaces(bd, x, height + 1, z));
 
             } else {
                 if(height < getDimension().getFluidHeight()) {
@@ -139,4 +144,24 @@ public class IrisSurfaceDecorator extends IrisEngineDecorator {
             }
         }
     }
+
+    private BlockData fixFaces(BlockData b, int x, int y, int z) {
+        if(B.isVineBlock(b)) {
+            MultipleFacing data = (MultipleFacing)b.clone();
+            boolean found = false;
+            for(BlockFace f : BlockFace.values()) {
+                if(!f.isCartesian())
+                    continue;
+                Material m = getEngine().getMantle().get(x + f.getModX(), y + f.getModY(), z + f.getModZ()).getMaterial();
+                if(m.isSolid()) {
+                    found = true;
+                    data.setFace(f, m.isSolid());
+                }
+            }
+            if(!found)
+                data.setFace(BlockFace.UP, true);
+            return data;
+        }
+        return b;
+    }
 }

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

@@ -24,7 +24,6 @@ import com.volmit.iris.core.gui.components.RenderType;
 import com.volmit.iris.core.gui.components.Renderer;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.loader.IrisRegistrant;
-import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.data.chunk.TerrainChunk;
@@ -422,21 +421,27 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
     default KList<IrisLootTable> getLootTables(RNG rng, Block b) {
         int rx = b.getX();
         int rz = b.getZ();
+        int ry = b.getY() - getWorld().minHeight();
         double he = getComplex().getHeightStream().get(rx, rz);
-        PlacedObject po = getObjectPlacement(rx, b.getY(), rz);
-        if(po != null && po.getPlacement() != null) {
+        KList<IrisLootTable> tables = new KList<>();
 
+        PlacedObject po = getObjectPlacement(rx, ry, rz);
+        if(po != null && po.getPlacement() != null) {
             if(B.isStorageChest(b.getBlockData())) {
                 IrisLootTable table = po.getPlacement().getTable(b.getBlockData(), getData());
                 if(table != null) {
-                    return new KList<>(table);
+                    tables.add(table);
+                    if(po.getPlacement().isOverrideGlobalLoot()) {
+                        return new KList<>(table);
+                    }
                 }
             }
         }
+
         IrisRegion region = getComplex().getRegionStream().get(rx, rz);
         IrisBiome biomeSurface = getComplex().getTrueBiomeStream().get(rx, rz);
-        IrisBiome biomeUnder = b.getY() < he ? getComplex().getCaveBiomeStream().get(rx, rz) : biomeSurface;
-        KList<IrisLootTable> tables = new KList<>();
+        IrisBiome biomeUnder = ry < he ? getComplex().getCaveBiomeStream().get(rx, rz) : biomeSurface;
+
         double multiplier = 1D * getDimension().getLoot().getMultiplier() * region.getLoot().getMultiplier() * biomeSurface.getLoot().getMultiplier() * biomeUnder.getLoot().getMultiplier();
         injectTables(tables, getDimension().getLoot());
         injectTables(tables, region.getLoot());

src/main/java/com/volmit/iris/engine/mode/ModeOverworld.java

@@ -42,10 +42,10 @@ public class ModeOverworld extends IrisEngineMode implements EngineMode {
         var deposit = new IrisDepositModifier(getEngine());
         var perfection = new IrisPerfectionModifier(getEngine());
 
+        registerStage((x, z, k, p, m) -> biome.actuate(x, z, p, m));
         registerStage(burst(
             (x, z, k, p, m) -> generateMatter(x >> 4, z >> 4, m),
-            (x, z, k, p, m) -> terrain.actuate(x, z, k, m),
-            (x, z, k, p, m) -> biome.actuate(x, z, p, m)
+            (x, z, k, p, m) -> terrain.actuate(x, z, k, m)
         ));
         registerStage((x, z, k, p, m) -> cave.modify(x >> 4, z >> 4, k, m));
         registerStage((x, z, k, p, m) -> deposit.modify(x, z, k, m));

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

@@ -28,6 +28,7 @@ import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.Levelled;
+import org.bukkit.block.data.MultipleFacing;
 import org.bukkit.block.data.Waterlogged;
 import org.bukkit.block.data.type.Slab;
 
@@ -221,10 +222,20 @@ public class IrisPostModifier extends EngineAssignedModifier<BlockData> {
         // Foliage
         b = getPostBlock(x, h + 1, z, currentPostX, currentPostZ, currentData);
 
+        if(B.isVineBlock(b) && b instanceof MultipleFacing f) {
+            int finalH = h + 1;
+
+            f.getAllowedFaces().forEach(face -> {
+                BlockData d = getPostBlock(x + face.getModX(), finalH + face.getModY(), z + face.getModZ(), currentPostX, currentPostZ, currentData);
+                f.setFace(face, !B.isAir(d) && !B.isVineBlock(d));
+            });
+            setPostBlock(x, h + 1, z, b, currentPostX, currentPostZ, currentData);
+        }
+
         if(B.isFoliage(b) || b.getMaterial().equals(Material.DEAD_BUSH)) {
             Material onto = getPostBlock(x, h, z, currentPostX, currentPostZ, currentData).getMaterial();
 
-            if(!B.canPlaceOnto(b.getMaterial(), onto)) {
+            if(!B.canPlaceOnto(b.getMaterial(), onto) && !B.isDecorant(b)) {
                 setPostBlock(x, h + 1, z, AIR, currentPostX, currentPostZ, currentData);
             }
         }
@@ -242,7 +253,7 @@ public class IrisPostModifier extends EngineAssignedModifier<BlockData> {
 
     public boolean isSolid(int x, int y, int z, int currentPostX, int currentPostZ, Hunk<BlockData> currentData) {
         BlockData d = getPostBlock(x, y, z, currentPostX, currentPostZ, currentData);
-        return d.getMaterial().isSolid();
+        return d.getMaterial().isSolid() && !B.isVineBlock(d);
     }
 
     public boolean isSolidNonSlab(int x, int y, int z, int currentPostX, int currentPostZ, Hunk<BlockData> currentData) {

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

@@ -56,8 +56,7 @@ public class IrisBlockDrops {
     private boolean replaceVanillaDrops = false;
 
     public boolean shouldDropFor(BlockData data, IrisData rdata) {
-        KList<BlockData> list = this.data.aquire(() ->
-        {
+        KList<BlockData> list = this.data.aquire(() -> {
             KList<BlockData> b = new KList<>();
 
             for(IrisBlockData i : getBlocks()) {

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

@@ -53,6 +53,8 @@ public class IrisDecorator {
     private IrisGeneratorStyle variance = NoiseStyle.STATIC.style();
     @Desc("Forcefully place this decorant anywhere it is supposed to go even if it should not go on a specific surface block. For example, you could force tallgrass to place on top of stone by using this.")
     private boolean forcePlace = false;
+    @Desc("Forced the surface block of this decorant to be the specified block. Assumes forcePlace.")
+    private IrisBlockData forceBlock;
     @DependsOn({"scaleStack", "stackMin", "stackMax"})
     @Desc("If stackMax is set to true, use this to limit its max height for large caverns")
     private int absoluteMaxStack = 30;

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

@@ -19,21 +19,17 @@
 package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
-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.object.annotations.Snippet;
+import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.math.RNG;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.bukkit.NamespacedKey;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 
-import java.lang.reflect.Field;
 
 @Snippet("enchantment")
 @Accessors(chain = true)
@@ -43,8 +39,9 @@ import java.lang.reflect.Field;
 @Data
 public class IrisEnchantment {
     @Required
+    @RegistryListEnchantment
     @Desc("The enchantment")
-    private String enchantment = "";
+    private String enchantment;
 
     @MinNumber(1)
     @Desc("Minimum amount of this loot")
@@ -61,12 +58,17 @@ public class IrisEnchantment {
 
     public void apply(RNG rng, ItemMeta meta) {
         try {
+            Enchantment enchant = Enchantment.getByKey(NamespacedKey.minecraft(getEnchantment()));
+            if(enchant == null) {
+                Iris.warn("Unknown Enchantment: " + getEnchantment());
+                return;
+            }
             if(rng.nextDouble() < chance) {
                 if(meta instanceof EnchantmentStorageMeta) {
-                    ((EnchantmentStorageMeta) meta).addStoredEnchant(getEnchant(), getLevel(rng), true);
+                    ((EnchantmentStorageMeta) meta).addStoredEnchant(enchant, getLevel(rng), true);
                     return;
                 }
-                meta.addEnchant(getEnchant(), getLevel(rng), true);
+                meta.addEnchant(enchant, getLevel(rng), true);
             }
         } catch(Throwable e) {
             Iris.reportError(e);
@@ -74,21 +76,6 @@ public class IrisEnchantment {
         }
     }
 
-    public Enchantment getEnchant() {
-        for(Field i : Enchantment.class.getDeclaredFields()) {
-            if(i.getType().equals(Enchantment.class) && i.getName().equals(getEnchantment())) {
-                try {
-                    return (Enchantment) i.get(null);
-                } catch(IllegalArgumentException | IllegalAccessException e) {
-                    e.printStackTrace();
-                    Iris.reportError(e);
-                }
-            }
-        }
-
-        return null;
-    }
-
     public int getLevel(RNG rng) {
         return rng.i(getMinLevel(), getMaxLevel());
     }

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

@@ -213,24 +213,24 @@ public class IrisGenerator extends IrisRegistrant {
             return 0;
         }
 
-        int hc = (int) ((cliffHeightMin * 10) + 10 + cliffHeightMax * seed + offsetX + offsetZ);
+        int hc = (int) ((cliffHeightMin * 10) + 10 + cliffHeightMax * getSeed() + offsetX + offsetZ);
         double h = multiplicitive ? 1 : 0;
         double tp = 0;
 
         if(composite.size() == 1) {
             if(multiplicitive) {
-                h *= composite.get(0).getNoise(seed + superSeed + hc, (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());
+                h *= composite.get(0).getNoise(getSeed() + superSeed + hc, (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());
             } else {
                 tp += composite.get(0).getOpacity();
-                h += composite.get(0).getNoise(seed + superSeed + hc, (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());
+                h += composite.get(0).getNoise(getSeed() + superSeed + hc, (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());
             }
         } else {
             for(IrisNoiseGenerator i : composite) {
                 if(multiplicitive) {
-                    h *= i.getNoise(seed + superSeed + hc, (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());
+                    h *= i.getNoise(getSeed() + superSeed + hc, (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());
                 } else {
                     tp += i.getOpacity();
-                    h += i.getNoise(seed + superSeed + hc, (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());
+                    h += i.getNoise(getSeed() + superSeed + hc, (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());
                 }
             }
         }
@@ -248,8 +248,8 @@ public class IrisGenerator extends IrisRegistrant {
     }
 
     public double cell(double rx, double rz, double v, double superSeed) {
-        getCellGenerator(seed + 46222).setShuffle(getCellFractureShuffle());
-        return getCellGenerator(seed + 46222).getDistance(rx / getCellFractureZoom(), rz / getCellFractureZoom()) > getCellPercentSize() ? (v * getCellFractureHeight()) : v;
+        getCellGenerator(getSeed() + 46222).setShuffle(getCellFractureShuffle());
+        return getCellGenerator(getSeed() + 46222).getDistance(rx / getCellFractureZoom(), rz / getCellFractureZoom()) > getCellPercentSize() ? (v * getCellFractureHeight()) : v;
     }
 
     private boolean hasCellCracks() {
@@ -257,8 +257,8 @@ public class IrisGenerator extends IrisRegistrant {
     }
 
     public double getCliffHeight(double rx, double rz, double superSeed) {
-        int hc = (int) ((cliffHeightMin * 10) + 10 + cliffHeightMax * seed + offsetX + offsetZ);
-        double h = cliffHeightGenerator.getNoise((long) (seed + superSeed + hc), (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());
+        int hc = (int) ((cliffHeightMin * 10) + 10 + cliffHeightMax * getSeed() + offsetX + offsetZ);
+        double h = cliffHeightGenerator.getNoise((long) (getSeed() + superSeed + hc), (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());
         return IrisInterpolation.lerp(cliffHeightMin, cliffHeightMax, h);
     }
 

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

@@ -105,7 +105,7 @@ public class IrisLoot {
     private KList<String> lore = new KList<>();
     @RegistryListItemType
     @Required
-    @Desc("This is the item or block type. Does not accept minecraft:*. Only materials such as DIAMOND_SWORD or DIRT.")
+    @Desc("This is the item or block type. Does not accept minecraft:*, only materials such as DIAMOND_SWORD or DIRT. The exception are modded materials, as they require a namespace.")
     private String type = "";
     @Desc("The dye color")
     private DyeColor dyeColor = null;
@@ -120,89 +120,15 @@ public class IrisLoot {
 
     public ItemStack get(boolean debug, RNG rng) {
         try {
-            ItemStack is;
-            if(!type.startsWith("minecraft:") && type.contains(":")) {
-                Optional<ItemStack> opt = Iris.service(ExternalDataSVC.class).getItemStack(NamespacedKey.fromString(type));
-                if(opt.isEmpty()) {
-                    //TODO Better third party provider
-                    Iris.warn("Unknown Material: " + type);
-                    return null;
-                }
-                is = opt.get();
-                is.setAmount(Math.max(1, rng.i(getMinAmount(), getMaxAmount())));
-            } else {
-                is = new ItemStack(getType(), Math.max(1, rng.i(getMinAmount(), getMaxAmount())));
-            }
-
-            ItemMeta m = is.getItemMeta();
-
-            if(is.getType().getMaxDurability() > 0 && m instanceof Damageable d) {
-                int max = is.getType().getMaxDurability();
-                d.setDamage((int) Math.round(Math.max(0, Math.min(max, (1D - rng.d(getMinDurability(), getMaxDurability())) * max))));
-            }
-
-            for(IrisEnchantment i : getEnchantments()) {
-                i.apply(rng, m);
-            }
-
-            for(IrisAttributeModifier i : getAttributes()) {
-                i.apply(rng, m);
-            }
-
-            try {
-                m.setCustomModelData(getCustomModel());
-            } catch(Throwable e) {
-                Iris.reportError(e);
-            }
-            m.setLocalizedName(C.translateAlternateColorCodes('&', displayName));
-            m.setDisplayName(C.translateAlternateColorCodes('&', displayName));
-            m.setUnbreakable(isUnbreakable());
-
-            for(ItemFlag i : getItemFlags()) {
-                m.addItemFlags(i);
-            }
-
-            KList<String> lore = new KList<>();
-
-            getLore().forEach((i) ->
-            {
-                String mf = C.translateAlternateColorCodes('&', i);
-
-                if(mf.length() > 24) {
-                    for(String g : Form.wrapWords(mf, 24).split("\\Q\n\\E")) {
-                        lore.add(g.trim());
-                    }
-                } else {
-                    lore.add(mf);
-                }
-            });
-
-            if(debug) {
-                if(lore.isNotEmpty()) {
-                    lore.add(C.GRAY + "--------------------");
-                }
-
-                lore.add(C.GRAY + "1 in " + (getRarity()) + " Chance (" + Form.pc(1D / (getRarity()), 5) + ")");
-            }
-
-            m.setLore(lore);
-
-            if(getLeatherColor() != null && m instanceof LeatherArmorMeta) {
-                Color c = Color.decode(getLeatherColor());
-                ((LeatherArmorMeta) m).setColor(org.bukkit.Color.fromRGB(c.getRed(), c.getGreen(), c.getBlue()));
-            }
-
-            if(getDyeColor() != null && m instanceof Colorable) {
-                ((Colorable) m).setColor(getDyeColor());
-            }
-
-            is.setItemMeta(m);
+            ItemStack is = getItemStack(rng);
+            if(is == null)
+                return new ItemStack(Material.AIR);
+            is.setItemMeta(applyProperties(is, rng, debug, null));
             return applyCustomNbt(is);
         } catch(Throwable e) {
             Iris.reportError(e);
+            return new ItemStack(Material.AIR);
         }
-
-        return new ItemStack(Material.AIR);
     }
 
     public ItemStack get(boolean debug, boolean giveSomething, IrisLootTable table, RNG rng, int x, int y, int z) {
@@ -212,75 +138,10 @@ public class IrisLoot {
 
         if(giveSomething || chance.aquire(() -> NoiseStyle.STATIC.create(rng)).fit(1, rarity * table.getRarity(), x, y, z) == 1) {
             try {
-                ItemStack is;
-                if(!type.startsWith("minecraft:") && type.contains(":")) {
-                    Optional<ItemStack> opt = Iris.service(ExternalDataSVC.class).getItemStack(NamespacedKey.fromString(type));
-                    if(opt.isEmpty()) {
-                        Iris.warn("Unknown Material: " + type);
-                        return null;
-                    }
-                    is = opt.get();
-                    is.setAmount(Math.max(1, rng.i(getMinAmount(), getMaxAmount())));
-                    return is;
-                } else {
-                    is = new ItemStack(getType(), Math.max(1, rng.i(getMinAmount(), getMaxAmount())));
-                }
-
-                ItemMeta m = is.getItemMeta();
-
-                if(is.getType().getMaxDurability() > 0 && m instanceof Damageable d) {
-                    int max = is.getType().getMaxDurability();
-                    d.setDamage((int) Math.round(Math.max(0, Math.min(max, (1D - rng.d(getMinDurability(), getMaxDurability())) * max))));
-                }
-
-                for(IrisEnchantment i : getEnchantments()) {
-                    i.apply(rng, m);
-                }
-
-                for(IrisAttributeModifier i : getAttributes()) {
-                    i.apply(rng, m);
-                }
-
-                try {
-                    m.setCustomModelData(getCustomModel());
-                } catch(Throwable e) {
-                    Iris.reportError(e);
-                }
-
-                m.setLocalizedName(C.translateAlternateColorCodes('&', displayName));
-                m.setDisplayName(C.translateAlternateColorCodes('&', displayName));
-                m.setUnbreakable(isUnbreakable());
-
-                for(ItemFlag i : getItemFlags()) {
-                    m.addItemFlags(i);
-                }
-
-                KList<String> lore = new KList<>();
-
-                getLore().forEach((i) ->
-                {
-                    String mf = C.translateAlternateColorCodes('&', i);
-
-                    if(mf.length() > 24) {
-                        for(String g : Form.wrapWords(mf, 24).split("\\Q\n\\E")) {
-                            lore.add(g.trim());
-                        }
-                    } else {
-                        lore.add(mf);
-                    }
-                });
-
-                if(debug) {
-                    if(lore.isNotEmpty()) {
-                        lore.add(C.GRAY + "--------------------");
-                    }
-
-                    lore.add(C.GRAY + "From: " + table.getName() + " (" + Form.pc(1D / table.getRarity(), 5) + ")");
-                    lore.add(C.GRAY + "1 in " + (table.getRarity() * getRarity()) + " Chance (" + Form.pc(1D / (table.getRarity() * getRarity()), 5) + ")");
-                }
-
-                m.setLore(lore);
-                is.setItemMeta(m);
+                ItemStack is = getItemStack(rng);
+                if(is == null)
+                    return null;
+                is.setItemMeta(applyProperties(is, rng, debug, table));
                 return applyCustomNbt(is);
             } catch(Throwable e) {
                 //Iris.reportError(e);
@@ -291,6 +152,98 @@ public class IrisLoot {
         return null;
     }
 
+    // TODO Better Third Party Item Acquisition
+    private ItemStack getItemStack(RNG rng) {
+        if(!type.startsWith("minecraft:") && type.contains(":")) {
+            Optional<ItemStack> opt = Iris.service(ExternalDataSVC.class).getItemStack(NamespacedKey.fromString(type));
+            if(opt.isEmpty()) {
+                Iris.warn("Unknown Material: " + type);
+                return null;
+            }
+            ItemStack is = opt.get();
+            is.setAmount(Math.max(1, rng.i(getMinAmount(), getMaxAmount())));
+            return is;
+        }
+        return new ItemStack(getType(), Math.max(1, rng.i(getMinAmount(), getMaxAmount())));
+    }
+
+    private ItemMeta applyProperties(ItemStack is, RNG rng, boolean debug, IrisLootTable table) {
+        ItemMeta m = is.getItemMeta();
+        if(m == null) {
+            return null;
+        }
+
+        for(IrisEnchantment i : getEnchantments()) {
+            i.apply(rng, m);
+        }
+
+        for(IrisAttributeModifier i : getAttributes()) {
+            i.apply(rng, m);
+        }
+
+        m.setUnbreakable(isUnbreakable());
+        for(ItemFlag i : getItemFlags()) {
+            m.addItemFlags(i);
+        }
+
+        if(getCustomModel() != null) {
+            m.setCustomModelData(getCustomModel());
+        }
+
+        if(is.getType().getMaxDurability() > 0 && m instanceof Damageable d) {
+            int max = is.getType().getMaxDurability();
+            d.setDamage((int) Math.round(Math.max(0, Math.min(max, (1D - rng.d(getMinDurability(), getMaxDurability())) * max))));
+        }
+
+        if(getLeatherColor() != null && m instanceof LeatherArmorMeta leather) {
+            Color c = Color.decode(getLeatherColor());
+            leather.setColor(org.bukkit.Color.fromRGB(c.getRed(), c.getGreen(), c.getBlue()));
+        }
+
+        if(getDyeColor() != null && m instanceof Colorable colorable) {
+            colorable.setColor(getDyeColor());
+        }
+
+        m.setLocalizedName(C.translateAlternateColorCodes('&', displayName));
+        m.setDisplayName(C.translateAlternateColorCodes('&', displayName));
+
+        KList<String> lore = new KList<>();
+
+        getLore().forEach((i) ->
+        {
+            String mf = C.translateAlternateColorCodes('&', i);
+
+            if(mf.length() > 24) {
+                for(String g : Form.wrapWords(mf, 24).split("\\Q\n\\E")) {
+                    lore.add(g.trim());
+                }
+            } else {
+                lore.add(mf);
+            }
+        });
+
+        if(debug) {
+            if(table == null) {
+                if(lore.isNotEmpty()) {
+                    lore.add(C.GRAY + "--------------------");
+                }
+                lore.add(C.GRAY + "1 in " + (getRarity()) + " Chance (" + Form.pc(1D / (getRarity()), 5) + ")");
+            } else {
+                if(lore.isNotEmpty()) {
+                    lore.add(C.GRAY + "--------------------");
+                }
+
+                lore.add(C.GRAY + "From: " + table.getName() + " (" + Form.pc(1D / table.getRarity(), 5) + ")");
+                lore.add(C.GRAY + "1 in " + (table.getRarity() * getRarity()) + " Chance (" + Form.pc(1D / (table.getRarity() * getRarity()), 5) + ")");
+            }
+        }
+
+        m.setLore(lore);
+
+        return m;
+    }
+
+
     private ItemStack applyCustomNbt(ItemStack stack) throws CommandSyntaxException {
         if(customNbt == null || customNbt.isEmpty())
             return stack;

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

@@ -47,9 +47,11 @@ import lombok.experimental.Accessors;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.TileState;
 import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.MultipleFacing;
 import org.bukkit.block.data.Waterlogged;
 import org.bukkit.block.data.type.Leaves;
 import org.bukkit.util.BlockVector;
@@ -779,7 +781,7 @@ public class IrisObject extends IrisRegistrant {
                     zz += config.warp(rng, i.getZ() + z, i.getY() + y, i.getX() + x, getLoader());
                 }
 
-                if(yv < 0 && (config.getMode().equals(ObjectPlaceMode.PAINT))) {
+                if(yv < 0 && (config.getMode().equals(ObjectPlaceMode.PAINT)) && !B.isVineBlock(data)) {
                     yy = (int) Math.round(i.getY()) + Math.floorDiv(h, 2) + placer.getHighest(xx, zz, getLoader(), config.isUnderwater());
                 }
 
@@ -799,10 +801,20 @@ public class IrisObject extends IrisRegistrant {
                     continue;
                 }
 
-                if(config.isWaterloggable() && yy <= placer.getFluidHeight() && data instanceof Waterlogged) {
+                if((config.isWaterloggable() || config.isUnderwater()) && yy <= placer.getFluidHeight() && data instanceof Waterlogged) {
                     ((Waterlogged) data).setWaterlogged(true);
                 }
 
+                if(B.isVineBlock(data)) {
+                    MultipleFacing f = (MultipleFacing)data;
+                    for(BlockFace face : f.getAllowedFaces()) {
+                        BlockData facingBlock = placer.get(xx + face.getModX(), yy + face.getModY(), zz + face.getModZ());
+                        if(B.isSolid(facingBlock) && !B.isVineBlock(facingBlock)) {
+                            f.setFace(face, true);
+                        }
+                    }
+                }
+
                 if(listener != null) {
                     listener.accept(new BlockPosition(xx, yy, zz));
                 }
@@ -811,7 +823,9 @@ public class IrisObject extends IrisRegistrant {
                     placer.getEngine().getMantle().getMantle().set(xx, yy, zz, new MatterMarker(markers.get(g)));
                 }
 
-                if(!data.getMaterial().equals(Material.AIR) && !data.getMaterial().equals(Material.CAVE_AIR)) {
+                boolean wouldReplace = B.isSolid(placer.get(xx, yy, zz)) && B.isVineBlock(data);
+
+                if(!data.getMaterial().equals(Material.AIR) && !data.getMaterial().equals(Material.CAVE_AIR) && !wouldReplace) {
                     placer.set(xx, yy, zz, data);
                     if(tile != null) {
                         placer.setTile(xx, yy, zz, tile);
@@ -849,6 +863,7 @@ public class IrisObject extends IrisRegistrant {
                 BlockVector i = g.clone();
                 i = config.getRotation().rotate(i.clone(), spinx, spiny, spinz).clone();
                 i = config.getTranslate().translate(i.clone(), config.getRotation(), spinx, spiny, spinz).clone();
+                d = config.getRotation().rotate(d, spinx, spiny, spinz);
 
                 if(i.getBlockY() != lowest)
                     continue;
@@ -882,7 +897,7 @@ public class IrisObject extends IrisRegistrant {
 
                 int highest = placer.getHighest(xx, zz, getLoader(), true);
 
-                if(config.isWaterloggable() && highest <= placer.getFluidHeight() && d instanceof Waterlogged)
+                if((config.isWaterloggable() || config.isUnderwater()) && highest <= placer.getFluidHeight() && d instanceof Waterlogged)
                     ((Waterlogged) d).setWaterlogged(true);
 
                 if(yv >= 0 && config.isBottom())
@@ -894,8 +909,19 @@ public class IrisObject extends IrisRegistrant {
                     if(settings.getYMax() != 0)
                         lowerBound -= Math.min(config.getStiltSettings().getYMax() - (lowest + y - highest), 0);
                 }
-                for(int j = lowest + y; j > lowerBound; j--)
+                for(int j = lowest + y; j > lowerBound; j--) {
+                    if(B.isVineBlock(d)) {
+                        MultipleFacing f = (MultipleFacing)d;
+                        for(BlockFace face : f.getAllowedFaces()) {
+                            BlockData facingBlock = placer.get(xx + face.getModX(), j + face.getModY(), zz + face.getModZ());
+                            if(B.isSolid(facingBlock) && !B.isVineBlock(facingBlock)) {
+                                f.setFace(face, true);
+                            }
+                        }
+                    }
                     placer.set(xx, j, zz, d);
+                }
+
             }
 
             readLock.unlock();

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

@@ -122,6 +122,8 @@ public class IrisObjectPlacement {
     @ArrayType(min = 1, type = IrisObjectLoot.class)
     @Desc("The loot tables to apply to these objects")
     private KList<IrisObjectLoot> loot = new KList<>();
+    @Desc("Whether the given loot tables override any and all other loot tables available in the dimension, region or biome.")
+    private boolean overrideGlobalLoot = false;
     @Desc("This object / these objects override the following trees when they grow...")
     @ArrayType(min = 1, type = IrisTree.class)
     private KList<IrisTree> trees = new KList<>();

src/main/java/com/volmit/iris/engine/object/annotations/RegistryListEnchantment.java

@@ -0,0 +1,12 @@
+package com.volmit.iris.engine.object.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Retention(RUNTIME)
+@Target({PARAMETER, TYPE, FIELD})
+public @interface RegistryListEnchantment {
+}

src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java

@@ -81,12 +81,14 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun
     private Engine engine;
     private Looper hotloader;
     private StudioMode lastMode;
+    private DummyBiomeProvider dummyBiomeProvider;
     @Setter
     private StudioGenerator studioGenerator;
 
     public BukkitChunkGenerator(IrisWorld world, boolean studio, File dataLocation, String dimensionKey) {
         setup = new AtomicBoolean(false);
         studioGenerator = null;
+        dummyBiomeProvider = new DummyBiomeProvider();
         populators = new KList<>();
         loadLock = new Semaphore(LOAD_LOCKS);
         this.world = world;
@@ -368,6 +370,6 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun
     @Nullable
     @Override
     public BiomeProvider getDefaultBiomeProvider(@NotNull WorldInfo worldInfo) {
-        return null;
+        return dummyBiomeProvider;
     }
 }

src/main/java/com/volmit/iris/engine/platform/DummyBiomeProvider.java

@@ -0,0 +1,25 @@
+package com.volmit.iris.engine.platform;
+
+import com.volmit.iris.util.collection.KList;
+import org.bukkit.block.Biome;
+import org.bukkit.generator.BiomeProvider;
+import org.bukkit.generator.WorldInfo;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class DummyBiomeProvider extends BiomeProvider {
+    private final List<Biome> ALL = new KList<>(Biome.values()).qdel(Biome.CUSTOM);
+
+    @NotNull
+    @Override
+    public Biome getBiome(@NotNull WorldInfo worldInfo, int x, int y, int z) {
+        return Biome.PLAINS;
+    }
+
+    @NotNull
+    @Override
+    public List<Biome> getBiomes(@NotNull WorldInfo worldInfo) {
+        return ALL;
+    }
+}

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

@@ -199,7 +199,10 @@ public class B {
             STONE_BUTTON,
             WARPED_BUTTON,
             TORCH,
-            SOUL_TORCH
+            SOUL_TORCH,
+            GLOW_LICHEN,
+            VINE,
+            SCULK_VEIN
         }).forEach((i) -> b.add(i.ordinal()));
         b.addAll(foliageCache);
 
@@ -402,6 +405,8 @@ public class B {
     }
 
     public static boolean isSolid(BlockData mat) {
+        if(mat == null)
+            return false;
         return mat.getMaterial().isSolid();
     }
 
@@ -672,4 +677,11 @@ public class B {
     public static void registerCustomBlockData(String namespace, String key, BlockData blockData) {
         custom.put(namespace + ":" + key, blockData);
     }
+
+    public static boolean isVineBlock(BlockData data) {
+        return switch(data.getMaterial()) {
+            case VINE, SCULK_VEIN, GLOW_LICHEN -> true;
+            default -> false;
+        };
+    }
 }

src/main/java/com/volmit/iris/util/hunk/view/BiomeGridHunkView.java

@@ -62,7 +62,6 @@ public class BiomeGridHunkView implements Hunk<Biome> {
         if(y > highest)
         {
             highest = y;
-            Iris.info("Highest = " + highest);
         }
     }
 

src/main/java/com/volmit/iris/util/mantle/Mantle.java

@@ -579,8 +579,7 @@ public class Mantle {
     }
 
     public void deleteChunkSlice(int x, int z, Class<?> c) {
-        if(!IrisToolbelt.toolbeltConfiguration.isEmpty() && IrisToolbelt.toolbeltConfiguration.getOrDefault("retain.mantle." + c.getCanonicalName(), false))
-        {
+        if(!IrisToolbelt.toolbeltConfiguration.isEmpty() && IrisToolbelt.toolbeltConfiguration.getOrDefault("retain.mantle." + c.getCanonicalName(), false)) {
             return;
         }
 

src/main/java/com/volmit/iris/util/math/Spiraler.java

@@ -75,4 +75,14 @@ public class Spiraler {
         z += dz;
         i++;
     }
+
+    public int count() {
+        int c = 0;
+        while(hasNext()) {
+            next();
+            c++;
+        }
+
+        return c;
+    }
 }

src/main/java/com/volmit/iris/util/stream/ProceduralStream.java

@@ -20,6 +20,7 @@ package com.volmit.iris.util.stream;
 
 import com.volmit.iris.Iris;
 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.IRare;
 import com.volmit.iris.engine.object.IrisStyledRange;
@@ -531,6 +532,21 @@ public interface ProceduralStream<T> extends ProceduralLayer, Interpolated<T> {
 
     ProceduralStream<?> getSource();
 
+    default void fillChunk(int x, int z, T[] c) {
+        if(c.length != 256) {
+            throw new RuntimeException("Not 256 Length for chunk get");
+        }
+
+        int xs = x << 4;
+        int zs = z << 4;
+
+        for(int i = 0; i < 16; i++) {
+            for(int j = 0; j < 16; j++) {
+                c[Cache.to1D(i+xs, j+zs, 0, 16, 16)] = get(i+xs, j+zs);
+            }
+        }
+    }
+
     T get(double x, double z);
 
     T get(double x, double y, double z);

src/main/resources/plugin.yml

@@ -2,7 +2,7 @@ name: ${name}
 version: ${version}
 main: ${main}
 load: STARTUP
-authors: [ cyberpwn, NextdoorPsycho ]
+authors: [ cyberpwn, NextdoorPsycho, Vatuu ]
 website: volmit.com
 description: More than a Dimension!
 libraries:
@@ -19,7 +19,6 @@ libraries:
   - bsf:bsf:2.4.0
 commands:
   iris:
-    aliases: [ ir, irs ]
+    aliases: [ ir, irs]
 api-version: ${apiversion}
-hotload-dependencies: false
-softdepend: [ "Oraxen", "ItemsAdder", "IrisFeller", "WorldEdit"]
+hotload-dependencies: false