Merge pull request #876 from VolmitSoftware/Development

Changelog:

Fixed Versioning compilation issues
Forceblock nolonger Crashes
Forceblock Works now (as intended, as far as we can tell)

build.gradle

@@ -24,8 +24,8 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-version '2.2.7-1.19.1' // Needs to be version specific
-def nmsVersion = "1.19.1"
+version '2.2.13-1.19.2' // Needs to be version specific
+def nmsVersion = "1.19.2"
 def apiVersion = '1.19'
 def spigotJarVersion = '1.19.1-R0.1-SNAPSHOT'
 def name = getRootProject().getName() // Defined in settings.gradle
@@ -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.1/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')
@@ -127,7 +127,7 @@ dependencies {
     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.1-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/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/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();

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);
@@ -163,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/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/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());
+            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/decorator/IrisSurfaceDecorator.java

@@ -57,11 +57,14 @@ public class IrisSurfaceDecorator extends IrisEngineDecorator {
                 bd = decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData());
 
                 if(!underwater) {
-                    if(!canGoOn(bd, bdx) && !decorator.isForcePlace()) {
+                    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);
@@ -74,9 +77,8 @@ public class IrisSurfaceDecorator extends IrisEngineDecorator {
                     ((Bisected) bd).setHalf(Bisected.Half.BOTTOM);
                 }
 
-                if(decorator.getForceBlock() != null)
-                    data.set(x, height, z, fixFaces(decorator.getForceBlock().getBlockData(getData()), x, height, z));
-                data.set(x, height + 1, z, fixFaces(bd, x, height, z));
+                data.set(x, height + 1, z, fixFaces(bd, x, height + 1, z));
+
             } else {
                 if(height < getDimension().getFluidHeight()) {
                     max = getDimension().getFluidHeight();

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

@@ -224,7 +224,7 @@ public class IrisPostModifier extends EngineAssignedModifier<BlockData> {
         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);
             }
         }

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/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

@@ -781,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());
                 }
 
@@ -823,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);

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

@@ -405,6 +405,8 @@ public class B {
     }
 
     public static boolean isSolid(BlockData mat) {
+        if(mat == null)
+            return false;
         return mat.getMaterial().isSolid();
     }
 

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/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. Vatuu ]
+authors: [ cyberpwn, NextdoorPsycho, Vatuu ]
 website: volmit.com
 description: More than a Dimension!
 libraries:
@@ -21,5 +21,4 @@ commands:
   iris:
     aliases: [ ir, irs]
 api-version: ${apiversion}
-hotload-dependencies: false
-softdepend: [ "Oraxen", "ItemsAdder", "IrisFeller", "WorldEdit", "PlaceholderAPI"]
+hotload-dependencies: false