fg

This reverts commit da09f4d6d8.

.gitignore

@@ -6,3 +6,7 @@ build/
 .idea/
 
 .DS_Store
+
+collection/
+
+src/main/java/com/volmit/iris/util/uniques/

build.gradle

@@ -24,7 +24,7 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-version '2.1.1-1.18.2' // Needs to be version specific
+version '2.1.3-1.18.2' // Needs to be version specific
 def nmsVersion = "1.18.2"
 def apiVersion = '1.18'
 def spigotJarVersion = '1.18.2-R0.1-SNAPSHOT'
@@ -74,6 +74,7 @@ repositories {
         }
     }
     maven { url "https://dl.cloudsmith.io/public/arcane/archive/maven/" }
+    maven { url "https://maven.enginehub.org/repo/" }
     mavenCentral()
     mavenLocal()
     maven { url "https://jitpack.io"}

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

@@ -28,6 +28,7 @@ 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.service.StudioSVC;
+import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.EnginePanic;
 import com.volmit.iris.engine.object.IrisCompat;
 import com.volmit.iris.engine.object.IrisDimension;
@@ -60,6 +61,7 @@ import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
+import org.bukkit.block.data.BlockData;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -407,6 +409,8 @@ public class Iris extends VolmitPlugin implements Listener {
             splash();
             autoStartStudio();
             checkForBukkitWorlds();
+            IrisToolbelt.retainMantleDataForSlice(String.class.getCanonicalName());
+            IrisToolbelt.retainMantleDataForSlice(BlockData.class.getCanonicalName());
         });
     }
 

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

@@ -74,6 +74,7 @@ public class IrisSettings {
         public double targetSpawnEntitiesPerChunk = 0.95;
         public boolean markerEntitySpawningSystem = true;
         public boolean effectSystem = true;
+        public boolean worldEditWandCUI = true;
     }
 
     @Data

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

@@ -18,7 +18,9 @@
 
 package com.volmit.iris.core.commands;
 
+import com.mojang.datafixers.util.Pair;
 import com.volmit.iris.Iris;
+import com.volmit.iris.core.link.WorldEditLink;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.service.ObjectSVC;
 import com.volmit.iris.core.service.StudioSVC;
@@ -41,12 +43,7 @@ import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.math.Direction;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.scheduling.Queue;
-import org.bukkit.ChatColor;
-import org.bukkit.HeightMap;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.TileState;
@@ -232,7 +229,7 @@ public class CommandObject implements DecreeExecutor {
         }
 
 
-        Location[] b = WandSVC.getCuboid(player().getInventory().getItemInMainHand());
+        Location[] b = WandSVC.getCuboid(player());
         Location a1 = b[0].clone();
         Location a2 = b[1].clone();
         Cuboid cursor = new Cuboid(a1, a2);
@@ -256,10 +253,8 @@ public class CommandObject implements DecreeExecutor {
             return;
         }
 
-        ItemStack wand = player().getInventory().getItemInMainHand();
-
-        if(WandSVC.isWand(wand)) {
-            Location[] g = WandSVC.getCuboid(wand);
+        if(WandSVC.isHoldingWand(player())) {
+            Location[] g = WandSVC.getCuboid(player());
 
             if(!here) {
                 // TODO: WARNING HEIGHT
@@ -281,10 +276,8 @@ public class CommandObject implements DecreeExecutor {
             return;
         }
 
-        ItemStack wand = player().getInventory().getItemInMainHand();
-
-        if(WandSVC.isWand(wand)) {
-            Location[] g = WandSVC.getCuboid(wand);
+        if(WandSVC.isHoldingIrisWand(player())) {
+            Location[] g = WandSVC.getCuboid(player());
 
             if(!here) {
                 // TODO: WARNING HEIGHT
@@ -367,7 +360,7 @@ public class CommandObject implements DecreeExecutor {
         @Param(description = "Overwrite existing object files", defaultValue = "false", aliases = "force")
             boolean overwrite
     ) {
-        IrisObject o = WandSVC.createSchematic(player().getInventory().getItemInMainHand());
+        IrisObject o = WandSVC.createSchematic(player());
 
         if(o == null) {
             sender().sendMessage(C.YELLOW + "You need to hold your wand!");
@@ -401,7 +394,7 @@ public class CommandObject implements DecreeExecutor {
             return;
         }
 
-        Location[] b = WandSVC.getCuboid(player().getInventory().getItemInMainHand());
+        Location[] b = WandSVC.getCuboid(player());
         Location a1 = b[0].clone();
         Location a2 = b[1].clone();
         Direction d = Direction.closest(player().getLocation().getDirection()).reverse();
@@ -426,6 +419,25 @@ public class CommandObject implements DecreeExecutor {
         sender().sendMessage("Reverted " + actualReverts + " pastes!");
     }
 
+    @Decree(description = "Gets an object wand and grabs the current WorldEdit selection.", aliases = "we", origin = DecreeOrigin.PLAYER, studio = true)
+    public void we() {
+        if(!Bukkit.getPluginManager().isPluginEnabled("WorldEdit")) {
+            sender().sendMessage(C.RED + "You can't get a WorldEdit selection without WorldEdit, you know.");
+            return;
+        }
+
+        Cuboid locs = WorldEditLink.getSelection(sender().player());
+
+        if(locs == null)
+        {
+            sender().sendMessage(C.RED + "You don't have a WorldEdit selection in this world.");
+            return;
+        }
+
+        sender().player().getInventory().addItem(WandSVC.createWand(locs.getLowerNE(), locs.getUpperSW()));
+        sender().sendMessage(C.GREEN + "A fresh wand with your current WorldEdit selection on it!");
+    }
+
     @Decree(description = "Get an object wand", sync = true)
     public void wand() {
         player().getInventory().addItem(WandSVC.createWand());
@@ -440,7 +452,7 @@ public class CommandObject implements DecreeExecutor {
             return;
         }
 
-        Location[] b = WandSVC.getCuboid(player().getInventory().getItemInMainHand());
+        Location[] b = WandSVC.getCuboid(player());
         Location a1 = b[0].clone();
         Location a2 = b[1].clone();
         Location a1x = b[0].clone();
@@ -487,7 +499,7 @@ public class CommandObject implements DecreeExecutor {
             return;
         }
 
-        Location[] b = WandSVC.getCuboid(player().getInventory().getItemInMainHand());
+        Location[] b = WandSVC.getCuboid(player());
         b[0].add(new Vector(0, 1, 0));
         b[1].add(new Vector(0, 1, 0));
         Location a1 = b[0].clone();

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

@@ -0,0 +1,37 @@
+package com.volmit.iris.core.link;
+
+import com.volmit.iris.util.data.Cuboid;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+public class WorldEditLink {
+    public static Cuboid getSelection(Player p)
+    {
+        try
+        {
+            Object instance = Class.forName("com.sk89q.worldedit.WorldEdit").getDeclaredMethod("getInstance").invoke(null);
+            Object sessionManager = instance.getClass().getDeclaredMethod("getSessionManager").invoke(instance);
+            Object player = Class.forName("com.sk89q.worldedit.bukkit.BukkitAdapter").getDeclaredMethod("adapt", Player.class).invoke(null, p);
+            Object localSession = sessionManager.getClass().getDeclaredMethod("getIfPresent", Class.forName("com.sk89q.worldedit.session.SessionOwner")).invoke(sessionManager, player);
+            Object world = Class.forName("com.sk89q.worldedit.bukkit.BukkitAdapter").getDeclaredMethod("adapt", World.class).invoke(null, p.getWorld());
+            Object region = localSession.getClass().getDeclaredMethod("getSelection", world.getClass()).invoke(localSession, world);
+            Object min = region.getClass().getDeclaredMethod("getMinimumPoint").invoke(region);
+            Object max = region.getClass().getDeclaredMethod("getMaximumPoint").invoke(region);
+            return new Cuboid(p.getWorld(),
+                    (int)min.getClass().getDeclaredMethod("getX").invoke(min),
+                    (int)min.getClass().getDeclaredMethod("getY").invoke(min),
+                    (int)min.getClass().getDeclaredMethod("getZ").invoke(min),
+                    (int)min.getClass().getDeclaredMethod("getX").invoke(max),
+                    (int)min.getClass().getDeclaredMethod("getY").invoke(max),
+                    (int)min.getClass().getDeclaredMethod("getZ").invoke(max)
+            );
+        }
+
+        catch(Throwable e)
+        {
+
+        }
+
+        return null;
+    }
+}

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

@@ -126,8 +126,8 @@ public class NMSBinding18_2 implements INMSBinding {
     }
 
     @Override
-    public void deserializeTile(CompoundTag c, Location newPosition) {
-        ((CraftWorld) newPosition.getWorld()).getHandle().getChunkAt(new BlockPos(newPosition.getBlockX(), 0, newPosition.getBlockZ())).setBlockEntityNbt(convert(c));
+    public void deserializeTile(CompoundTag c, Location pos) {
+        ((CraftWorld) pos.getWorld()).getHandle().getChunkAt(new BlockPos(pos.getBlockX(), 0, pos.getBlockZ())).setBlockEntityNbt(convert(c));
     }
 
     @Override

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

@@ -19,7 +19,9 @@
 package com.volmit.iris.core.service;
 
 import com.volmit.iris.Iris;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.edit.DustRevealer;
+import com.volmit.iris.core.link.WorldEditLink;
 import com.volmit.iris.core.wand.WandSelection;
 import com.volmit.iris.engine.object.IrisObject;
 import com.volmit.iris.util.collection.KList;
@@ -64,17 +66,17 @@ public class WandSVC implements IrisService {
     /**
      * Creates an Iris Object from the 2 coordinates selected with a wand
      *
-     * @param wand
-     *     The wand itemstack
+     * @param p
+     *     The wand player
      * @return The new object
      */
-    public static IrisObject createSchematic(ItemStack wand) {
-        if(!isWand(wand)) {
+    public static IrisObject createSchematic(Player p) {
+        if(!isHoldingWand(p)) {
             return null;
         }
 
         try {
-            Location[] f = getCuboid(wand);
+            Location[] f = getCuboid(p);
             Cuboid c = new Cuboid(f[0], f[1]);
             IrisObject s = new IrisObject(c.getSizeX(), c.getSizeY(), c.getSizeZ());
             for(Block b : c) {
@@ -98,17 +100,15 @@ public class WandSVC implements IrisService {
     /**
      * Creates an Iris Object from the 2 coordinates selected with a wand
      *
-     * @param wand
-     *     The wand itemstack
      * @return The new object
      */
-    public static Matter createMatterSchem(Player p, ItemStack wand) {
-        if(!isWand(wand)) {
+    public static Matter createMatterSchem(Player p) {
+        if(!isHoldingWand(p)) {
             return null;
         }
 
         try {
-            Location[] f = getCuboid(wand);
+            Location[] f = getCuboid(p);
 
             return WorldMatter.createMatter(p.getName(), f[0], f[1]);
         } catch(Throwable e) {
@@ -226,26 +226,32 @@ public class WandSVC implements IrisService {
         return is;
     }
 
-    /**
-     * Get a pair of locations that are selected in an Iris wand
-     *
-     * @param is
-     *     The wand item
-     * @return An array with the 2 locations
-     */
-    public static Location[] getCuboid(ItemStack is) {
+    public static Location[] getCuboidFromItem(ItemStack is) {
         ItemMeta im = is.getItemMeta();
         return new Location[] {stringToLocation(im.getLore().get(0)), stringToLocation(im.getLore().get(1))};
     }
 
-    /**
-     * Is a player holding an Iris wand
-     *
-     * @param p
-     *     The player
-     * @return True if they are
-     */
+    public static Location[] getCuboid(Player p) {
+        if(isHoldingIrisWand(p))
+        {
+            return getCuboidFromItem(p.getInventory().getItemInMainHand());
+        }
+
+        Cuboid c = WorldEditLink.getSelection(p);
+
+        if(c != null)
+        {
+            return new Location[] {c.getLowerNE(), c.getUpperSW()};
+        }
+
+        return null;
+    }
+
     public static boolean isHoldingWand(Player p) {
+        return isHoldingIrisWand(p) || WorldEditLink.getSelection(p) != null;
+    }
+
+    public static boolean isHoldingIrisWand(Player p) {
         ItemStack is = p.getInventory().getItemInMainHand();
         return is != null && isWand(is);
     }
@@ -286,8 +292,8 @@ public class WandSVC implements IrisService {
     public void tick(Player p) {
         try {
             try {
-                if(isWand(p.getInventory().getItemInMainHand())) {
-                    Location[] d = getCuboid(p.getInventory().getItemInMainHand());
+                if((IrisSettings.get().getWorld().worldEditWandCUI && isHoldingWand(p)) || isWand(p.getInventory().getItemInMainHand())) {
+                    Location[] d = getCuboid(p);
                     new WandSelection(new Cuboid(d[0], d[1]), p).draw();
                 }
             } catch(Throwable e) {
@@ -457,7 +463,7 @@ public class WandSVC implements IrisService {
             return item;
         }
 
-        Location[] f = getCuboid(item);
+        Location[] f = getCuboidFromItem(item);
         Location other = left ? f[1] : f[0];
 
         if(other != null && !other.getWorld().getName().equals(a.getWorld().getName())) {

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

@@ -233,20 +233,17 @@ public class IrisToolbelt {
         return isIrisWorld(i) && access(i).isStudio();
     }
 
-    public static void retainMantleDataForSlice(String className)
-    {
+    public static void retainMantleDataForSlice(String className) {
         toolbeltConfiguration.put("retain.mantle." + className, true);
     }
 
-    public static <T> T getMantleData(World world, int x, int y, int z, Class<T> of)
-    {
+    public static <T> T getMantleData(World world, int x, int y, int z, Class<T> of) {
         PlatformChunkGenerator e = access(world);
         if(e == null) {return null;}
         return e.getEngine().getMantle().getMantle().get(x, y - world.getMinHeight(), z, of);
     }
 
-    public static <T> void  deleteMantleData(World world, int x, int y, int z, Class<T> of)
-    {
+    public static <T> void  deleteMantleData(World world, int x, int y, int z, Class<T> of) {
         PlatformChunkGenerator e = access(world);
         if(e == null) {return;}
         e.getEngine().getMantle().getMantle().remove(x, y - world.getMinHeight(), z, of);

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

@@ -79,7 +79,6 @@ import java.util.stream.Stream;
 public class IrisWorldManager extends EngineAssignedWorldManager {
     private final Looper looper;
     private final int id;
-    private final KMap<Long, Long> chunkCooldowns;
     private final KList<Runnable> updateQueue = new KList<>();
     private final ChronoLatch cl;
     private final ChronoLatch clw;
@@ -99,7 +98,6 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
         ecl = null;
         cln = null;
         clw = null;
-        chunkCooldowns = null;
         looper = null;
         chunkUpdater = null;
         id = -1;
@@ -112,7 +110,6 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
         cl = new ChronoLatch(3000);
         ecl = new ChronoLatch(250);
         clw = new ChronoLatch(1000, true);
-        chunkCooldowns = new KMap<>();
         id = engine.getCacheID();
         energy = 25;
         looper = new Looper() {
@@ -255,14 +252,6 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
             }
         }
 
-        int chunkCooldownSeconds = 60;
-
-        for(Long i : chunkCooldowns.k()) {
-            if(M.ms() - chunkCooldowns.get(i) > TimeUnit.SECONDS.toMillis(chunkCooldownSeconds)) {
-                chunkCooldowns.remove(i);
-            }
-        }
-
         int spawnBuffer = RNG.r.i(2, 12);
 
         Chunk[] cc = getEngine().getWorld().realWorld().getLoadedChunks();
@@ -279,7 +268,6 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
             }
 
             spawnIn(c, false);
-            chunkCooldowns.put(Cache.key(c), M.ms());
         }
 
         energy -= (actuallySpawned / 2D);

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

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

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

@@ -156,7 +156,6 @@ public class IrisTerrainNormalActuator extends EngineAssignedActuator<BlockData>
                     } else {
                         h.set(xf, i, zf, getComplex().getRockStream().get(realX, realZ));
                     }
-
                 }
             }
         }

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

@@ -24,25 +24,12 @@ 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;
 import com.volmit.iris.engine.mantle.EngineMantle;
-import com.volmit.iris.engine.object.InventorySlotType;
-import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.IrisColor;
-import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.engine.object.IrisEngineData;
-import com.volmit.iris.engine.object.IrisJigsawStructure;
-import com.volmit.iris.engine.object.IrisJigsawStructurePlacement;
-import com.volmit.iris.engine.object.IrisLootMode;
-import com.volmit.iris.engine.object.IrisLootReference;
-import com.volmit.iris.engine.object.IrisLootTable;
-import com.volmit.iris.engine.object.IrisObject;
-import com.volmit.iris.engine.object.IrisObjectPlacement;
-import com.volmit.iris.engine.object.IrisPosition;
-import com.volmit.iris.engine.object.IrisRegion;
-import com.volmit.iris.engine.object.IrisWorld;
+import com.volmit.iris.engine.object.*;
 import com.volmit.iris.engine.scripting.EngineExecutionEnvironment;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
@@ -61,6 +48,7 @@ import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.matter.MatterCavern;
 import com.volmit.iris.util.matter.MatterUpdate;
+import com.volmit.iris.util.matter.TileWrapper;
 import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.scheduling.ChronoLatch;
@@ -262,11 +250,6 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
         }
     }
 
-    @ChunkCoordinates
-    default void placeTiles(Chunk c) {
-
-    }
-
     void blockUpdatedMetric();
 
     @ChunkCoordinates
@@ -280,6 +263,15 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
             && c.getWorld().isChunkLoaded(c.getX() - 1, c.getZ())
             && c.getWorld().isChunkLoaded(c.getX() + 1, c.getZ() - 1)
             && c.getWorld().isChunkLoaded(c.getX() - 1, c.getZ() + 1) && getMantle().getMantle().isLoaded(c)) {
+
+            getMantle().getMantle().raiseFlag(c.getX(), c.getZ(), MantleFlag.TILE, () -> J.s(() -> {
+                getMantle().getMantle().iterateChunk(c.getX(), c.getZ(), TileWrapper.class, (x, y, z, tile) -> {
+                    int betterY = y + getWorld().minHeight();
+                    if(!TileData.setTileState(c.getBlock(x, betterY, z), tile.getData()))
+                        Iris.warn("Failed to set tile entity data at [%d %d %d | %s] for tile %s!", x, betterY ,z, c.getBlock(x, betterY, z).getBlockData().getMaterial().getKey(), tile.getData().getTileId());
+                });
+            }));
+
             getMantle().getMantle().raiseFlag(c.getX(), c.getZ(), MantleFlag.UPDATE, () -> J.s(() -> {
                 PrecisionStopwatch p = PrecisionStopwatch.start();
                 KMap<Long, Integer> updates = new KMap<>();

src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java

@@ -38,10 +38,7 @@ import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.mantle.Mantle;
 import com.volmit.iris.util.mantle.MantleChunk;
 import com.volmit.iris.util.mantle.MantleFlag;
-import com.volmit.iris.util.matter.Matter;
-import com.volmit.iris.util.matter.MatterCavern;
-import com.volmit.iris.util.matter.MatterFluidBody;
-import com.volmit.iris.util.matter.MatterMarker;
+import com.volmit.iris.util.matter.*;
 import com.volmit.iris.util.matter.slices.UpdateMatter;
 import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.parallel.MultiBurst;
@@ -109,17 +106,14 @@ public interface EngineMantle extends IObjectPlacer {
 
     @Override
     default void setTile(int x, int y, int z, TileData<? extends TileState> d) {
-        // TODO SET TILE
+        getMantle().set(x, y, z, new TileWrapper(d));
     }
 
     @Override
     default BlockData get(int x, int y, int z) {
         BlockData block = getMantle().get(x, y, z, BlockData.class);
-
-        if(block == null) {
+        if(block == null)
             return AIR;
-        }
-
         return block;
     }
 

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

@@ -38,6 +38,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.EntityType;
 
 import java.util.Map;
 
@@ -199,6 +200,19 @@ public class IrisBlockData extends IrisRegistrant {
         });
     }
 
+    public TileData<?> tryGetTile() {
+        //TODO Do like a registry thing with the tile data registry. Also update the parsing of data to include **block** entities.
+        if(data.containsKey("entitySpawn")) {
+            TileSpawner spawner = new TileSpawner();
+            String name = (String)data.get("entitySpawn");
+            if(name.contains(":"))
+                name = name.split(":")[1];
+            spawner.setEntityType(EntityType.fromName(name));
+            return spawner;
+        }
+        return null;
+    }
+
     private String keyify(String dat) {
         if(dat.contains(":")) {
             return dat;

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

@@ -34,6 +34,8 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.bukkit.block.data.BlockData;
 
+import java.util.Optional;
+
 @Snippet("palette")
 @Accessors(chain = true)
 @NoArgsConstructor
@@ -66,6 +68,14 @@ public class IrisMaterialPalette {
         return getLayerGenerator(rng, rdata).fit(getBlockData(rdata), x / zoom, y / zoom, z / zoom);
     }
 
+    public Optional<TileData<?>> getTile(RNG rng, double x, double y, double z, IrisData rdata) {
+        if(getBlockData(rdata).isEmpty())
+            return Optional.empty();
+
+        TileData<?> tile = getBlockData(rdata).size() == 1 ? palette.get(0).tryGetTile() : palette.getRandom(rng).tryGetTile();
+        return tile != null ? Optional.of(tile) : Optional.empty();
+    }
+
     public CNG getLayerGenerator(RNG rng, IrisData rdata) {
         return layerGenerator.aquire(() ->
         {

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

@@ -34,8 +34,6 @@ import com.volmit.iris.util.math.AxisAlignedBB;
 import com.volmit.iris.util.math.BlockPosition;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.math.RNG;
-import com.volmit.iris.util.matter.IrisMatter;
-import com.volmit.iris.util.matter.Matter;
 import com.volmit.iris.util.matter.MatterMarker;
 import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.parallel.MultiBurst;
@@ -65,11 +63,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 
@@ -739,10 +733,16 @@ public class IrisObject extends IrisRegistrant {
                             if(j.isExact() ? k.matches(data) : k.getMaterial().equals(data.getMaterial())) {
                                 BlockData newData = j.getReplace(rng, i.getX() + x, i.getY() + y, i.getZ() + z, rdata).clone();
 
-                                if(newData.getMaterial() == data.getMaterial()) {
+                                if(newData.getMaterial() == data.getMaterial())
                                     data = data.merge(newData);
-                                } else {
+                                else
                                     data = newData;
+
+                                if(newData.getMaterial() == Material.SPAWNER) {
+                                    Optional<TileData<?>> t = j.getReplace().getTile(rng, x, y, z, rdata);
+                                    if(t.isPresent()) {
+                                        tile = t.get();
+                                    }
                                 }
                             }
                         }

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

@@ -98,7 +98,7 @@ public class TileBanner implements TileData<Banner> {
 
     @SuppressWarnings("deprecation")
     @Override
-    public void toNBT(CompoundTag tag) {
+    public CompoundTag toNBT(CompoundTag tag) {
         @SuppressWarnings("unchecked") ListTag<CompoundTag> listTag = (ListTag<CompoundTag>) ListTag.createUnchecked(CompoundTag.class);
         for(Pattern p : patterns) {
             CompoundTag pattern = new CompoundTag();
@@ -107,6 +107,7 @@ public class TileBanner implements TileData<Banner> {
             listTag.add(pattern);
         }
         tag.put("Patterns", listTag);
+        return tag;
     }
 
     public boolean isBanner(Material material) {

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

@@ -29,11 +29,12 @@ import org.bukkit.block.data.BlockData;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 
 @SuppressWarnings("ALL")
 public interface TileData<T extends TileState> extends Cloneable {
 
-    KList<TileData<? extends TileState>> registry = setup();
+    static final KList<TileData<? extends TileState>> registry = setup();
 
     static KList<TileData<? extends TileState>> setup() {
         KList<TileData<? extends TileState>> registry = new KList<>();
@@ -45,17 +46,21 @@ public interface TileData<T extends TileState> extends Cloneable {
         return registry;
     }
 
-    static TileData<? extends TileState> read(DataInputStream s) throws Throwable {
-        int id = s.readShort();
-        @SuppressWarnings("unchecked") TileData<? extends TileState> d = registry.get(id).getClass().getConstructor().newInstance();
-        d.fromBinary(s);
-        return d;
+    static TileData<? extends TileState> read(DataInputStream s) throws IOException {
+        try {
+            int id = s.readShort();
+            @SuppressWarnings("unchecked") TileData<? extends TileState> d = registry.get(id).getClass().getConstructor().newInstance();
+            d.fromBinary(s);
+            return d;
+        } catch(InvocationTargetException | InstantiationException | IllegalAccessException | NoSuchMethodException e) {
+            throw new IOException("Failed to create TileData instance due to missing type registrar!");
+        }
     }
 
-    static void setTileState(Block block, TileData<? extends TileState> data) {
-        if(data.isApplicable(block.getBlockData())) {
-            data.toBukkitTry(block.getState());
-        }
+    static boolean setTileState(Block block, TileData<? extends TileState> data) {
+        if(block.getState() instanceof TileState && data.isApplicable(block.getBlockData()))
+            return data.toBukkitTry(block.getState());
+        return false;
     }
 
     static TileData<? extends TileState> getTileState(Block block) {
@@ -89,6 +94,7 @@ public interface TileData<T extends TileState> extends Cloneable {
         try {
             //noinspection unchecked
             toBukkit((T) t);
+            t.update();
             return true;
         } catch(Throwable e) {
             Iris.reportError(e);
@@ -111,11 +117,11 @@ public interface TileData<T extends TileState> extends Cloneable {
         return false;
     }
 
-    TileData<T> clone();
+    CompoundTag toNBT(CompoundTag parent);
 
     void toBinary(DataOutputStream out) throws IOException;
 
-    void toNBT(CompoundTag tag);
-
     void fromBinary(DataInputStream in) throws IOException;
+
+    TileData<T> clone();
 }

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

@@ -98,11 +98,12 @@ public class TileSign implements TileData<Sign> {
     }
 
     @Override
-    public void toNBT(CompoundTag tag) {
+    public CompoundTag toNBT(CompoundTag tag) {
         tag.putString("Text1", line1);
         tag.putString("Text2", line2);
         tag.putString("Text3", line3);
         tag.putString("Text4", line4);
         tag.putString("Color", dyeColor.name().toLowerCase());
+        return tag;
     }
 }

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

@@ -32,12 +32,13 @@ import java.io.IOException;
 
 @Data
 public class TileSpawner implements TileData<CreatureSpawner> {
-    public static final int id = 1;
-    private EntityType entityType;
 
+    public static final int id = 1;
+
+    private EntityType entityType;
     @Override
     public String getTileId() {
-        return "minecraft:spawner";
+        return "minecraft:mob_spawner";
     }
 
     @Override
@@ -75,7 +76,7 @@ public class TileSpawner implements TileData<CreatureSpawner> {
     }
 
     @Override
-    public void toNBT(CompoundTag tag) {
+    public CompoundTag toNBT(CompoundTag parent) {
         @SuppressWarnings("unchecked") ListTag<CompoundTag> potentials = (ListTag<CompoundTag>) ListTag.createUnchecked(CompoundTag.class);
         CompoundTag t = new CompoundTag();
         CompoundTag ent = new CompoundTag();
@@ -83,6 +84,7 @@ public class TileSpawner implements TileData<CreatureSpawner> {
         t.put("Entity", ent);
         t.putInt("Weight", 1);
         potentials.add(t);
-        tag.put("SpawnPotentials", potentials);
+        parent.put("SpawnPotentials", potentials);
+        return parent;
     }
 }

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

@@ -64,7 +64,7 @@ import java.util.function.Consumer;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChunkGenerator {
-    private static final int LOAD_LOCKS = 1_000_000;
+    private static final int LOAD_LOCKS = Runtime.getRuntime().availableProcessors() * 4;
     private final Semaphore loadLock;
     private final IrisWorld world;
     private final File dataLocation;

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

@@ -32,7 +32,8 @@ public enum MantleFlag {
     INITIAL_SPAWNED_MARKER,
     CLEANED,
     PLANNED,
-    ETCHED;
+    ETCHED,
+    TILE;
 
     static StateList getStateList() {
         return new StateList(MantleFlag.values());

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

@@ -18,12 +18,10 @@
 
 package com.volmit.iris.util.matter;
 
-import com.volmit.iris.util.nbt.tag.CompoundTag;
-import lombok.AllArgsConstructor;
+import com.volmit.iris.engine.object.TileData;
 import lombok.Data;
 
 @Data
-@AllArgsConstructor
-public class MatterTile {
-    private final CompoundTag tileData;
+public class TileWrapper {
+    private final TileData<?> data;
 }

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

@@ -33,8 +33,8 @@ public class WorldMatter {
             matter.slice(MatterEntityGroup.class).writeInto(at);
         }
 
-        if(matter.hasSlice(MatterTile.class)) {
-            matter.slice(MatterTile.class).writeInto(at);
+        if(matter.hasSlice(TileWrapper.class)) {
+            matter.slice(TileWrapper.class).writeInto(at);
         }
     }
 
@@ -45,7 +45,7 @@ public class WorldMatter {
         s.getHeader().setAuthor(author);
         s.slice(BlockData.class).readFrom(c.getLowerNE());
         s.slice(MatterEntityGroup.class).readFrom(c.getLowerNE());
-        s.slice(MatterTile.class).readFrom(c.getLowerNE());
+        s.slice(TileWrapper.class).readFrom(c.getLowerNE());
         s.trimSlices();
 
         return s;

src/main/java/com/volmit/iris/util/matter/slices/TileMatter.java

@@ -18,11 +18,12 @@
 
 package com.volmit.iris.util.matter.slices;
 
+import com.volmit.iris.Iris;
 import com.volmit.iris.core.nms.INMS;
+import com.volmit.iris.engine.object.TileData;
 import com.volmit.iris.util.data.palette.Palette;
-import com.volmit.iris.util.matter.MatterTile;
 import com.volmit.iris.util.matter.Sliced;
-import com.volmit.iris.util.nbt.io.NBTUtil;
+import com.volmit.iris.util.matter.TileWrapper;
 import com.volmit.iris.util.nbt.tag.CompoundTag;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -31,43 +32,49 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+@SuppressWarnings("rawtypes")
 @Sliced
-public class TileMatter extends RawMatter<MatterTile> {
-    public static final MatterTile EMPTY = new MatterTile(new CompoundTag());
+public class TileMatter extends RawMatter<TileWrapper> {
 
     public TileMatter() {
         this(1, 1, 1);
     }
 
     @Override
-    public Palette<MatterTile> getGlobalPalette() {
+    public Palette<TileWrapper> getGlobalPalette() {
         return null;
     }
 
     public TileMatter(int width, int height, int depth) {
-        super(width, height, depth, MatterTile.class);
-        registerWriter(World.class, ((w, d, x, y, z) -> INMS.get().deserializeTile(d.getTileData(), new Location(w, x, y, z))));
+        super(width, height, depth, TileWrapper.class);
+        registerWriter(World.class, (w, d, x, y, z) -> {
+            CompoundTag tag = commonNbt(x, y, z, d.getData().getTileId());
+            INMS.get().deserializeTile(d.getData().toNBT(d.getData().toNBT(tag)), new Location(w, x, y, z));
+            Iris.warn("S: " + tag);
+        });
         registerReader(World.class, (w, x, y, z) -> {
-            Location l = new Location(w, x, y, z);
-            if(INMS.get().hasTile(l)) {
-                CompoundTag tag = INMS.get().serializeTile(l);
-
-                if(tag != null) {
-                    return new MatterTile(tag);
-                }
-            }
-
-            return null;
+            TileData d = TileData.getTileState(w.getBlockAt(new Location(w, x, y, z)));
+            if(d == null)
+                return null;
+            return new TileWrapper(d);
         });
     }
 
-    @Override
-    public void writeNode(MatterTile b, DataOutputStream dos) throws IOException {
-        NBTUtil.write(b.getTileData(), dos, false);
+    public void writeNode(TileWrapper b, DataOutputStream dos) throws IOException {
+        b.getData().toBinary(dos);
     }
 
-    @Override
-    public MatterTile readNode(DataInputStream din) throws IOException {
-        return new MatterTile((CompoundTag) NBTUtil.read(din, false).getTag());
+    public TileWrapper readNode(DataInputStream din) throws IOException {
+        return new TileWrapper(TileData.read(din));
+    }
+
+    private CompoundTag commonNbt(int x, int y, int z, String mobId) {
+        CompoundTag tag = new CompoundTag();
+        tag.putInt("x", x);
+        tag.putInt("y", y);
+        tag.putInt("z", z);
+        tag.putBoolean("keepPacked", false);
+        tag.putString("id", mobId);
+        return tag;
     }
 }

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

@@ -21,10 +21,13 @@ package com.volmit.iris.util.noise;
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.IRare;
+import com.volmit.iris.engine.object.NoiseStyle;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.function.NoiseInjector;
 import com.volmit.iris.util.interpolation.IrisInterpolation;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import com.volmit.iris.util.stream.ProceduralStream;
 import com.volmit.iris.util.stream.arithmetic.FittedStream;
 import com.volmit.iris.util.stream.sources.CNGStream;
@@ -120,7 +123,7 @@ public class CNG {
 
             @Override
             public double noise(double x, double z) {
-                return (cellularFilter.GetCellular((float) x, (float) z, str, 1) / 2D) + 0.5D;
+                return (cellularFilter.GetCellular((float) x, (float) z, str, 1) * 0.5) + 0.5D;
             }
 
             @Override
@@ -466,4 +469,18 @@ public class CNG {
     public boolean isStatic() {
         return generator != null && generator.isStatic();
     }
+
+    public static void main(String[] a)
+    {
+        CNG cng = NoiseStyle.SIMPLEX.create(new RNG(1234));
+        PrecisionStopwatch p = PrecisionStopwatch.start();
+        double r = 0;
+
+        for(int i = 0; i < 30000000 * 10; i++)
+        {
+            r += cng.fit(-1000, 1000, i, i);
+        }
+
+        System.out.println(Form.duration(p.getMilliseconds(), 10) + " merged = " + r);
+    }
 }

src/main/resources/plugin.yml

@@ -22,4 +22,4 @@ commands:
     aliases: [ ir, irs ]
 api-version: ${apiversion}
 hotload-dependencies: false
-softdepend: [ "Oraxen", "ItemsAdder", "IrisFeller"]
+softdepend: [ "Oraxen", "ItemsAdder", "IrisFeller", "WorldEdit"]