PAtch commands

src/main/java/com/volmit/iris/core/command/CommandIrisMetrics.java

@@ -19,8 +19,9 @@
 package com.volmit.iris.core.command;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.IrisAccess;
+import com.volmit.iris.engine.IrisEngine;
+import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.plugin.MortarCommand;
 import com.volmit.iris.util.plugin.VolmitSender;
@@ -46,12 +47,12 @@ public class CommandIrisMetrics extends MortarCommand {
         if (sender.isPlayer()) {
             Player p = sender.player();
             World world = p.getWorld();
-            if (!IrisWorlds.isIrisWorld(world)) {
+            if (!IrisToolbelt.isIrisWorld(world)) {
                 sender.sendMessage("You must be in an iris world.");
                 return true;
             }
 
-            IrisAccess g = IrisWorlds.access(world);
+            Engine g = IrisToolbelt.access(world).getEngine();
 
             try {
                 g.printMetrics(sender);

src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java

@@ -21,7 +21,7 @@ package com.volmit.iris.core.command.jigsaw;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.project.loader.IrisData;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.jigsaw.PlannedStructure;
 import com.volmit.iris.engine.object.basic.IrisPosition;
 import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure;
@@ -42,8 +42,8 @@ public class CommandIrisJigsawPlace extends MortarCommand {
 
     @Override
     public void addTabOptions(VolmitSender sender, String[] args, KList<String> list) {
-        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisWorlds.isIrisWorld(sender.player().getWorld())) {
+        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisToolbelt.isIrisWorld(sender.player().getWorld())) {
-            IrisData data = IrisWorlds.access(sender.player().getWorld()).getData();
+            IrisData data = IrisToolbelt.access(sender.player().getWorld()).getEngine().getData();
             if (data == null) {
                 sender.sendMessage("Tab complete options only work for jigsaw structures while in an Iris world.");
             } else if (args.length == 0) {

src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectAnalyze.java

@@ -4,7 +4,7 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.ProjectManager;
 import com.volmit.iris.core.project.loader.IrisData;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.object.objects.IrisObject;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.plugin.MortarCommand;
@@ -31,8 +31,8 @@ public class CommandIrisObjectAnalyze extends MortarCommand {
 
     @Override
     public void addTabOptions(VolmitSender sender, String[] args, KList<String> list) {
-        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisWorlds.isIrisWorld(sender.player().getWorld())) {
+        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisToolbelt.isIrisWorld(sender.player().getWorld())) {
-            IrisData data = IrisWorlds.access(sender.player().getWorld()).getData();
+            IrisData data = IrisToolbelt.access(sender.player().getWorld()).getEngine().getData();
             if (data == null) {
                 sender.sendMessage("Tab complete options only work for objects while in an Iris world.");
             } else if (args.length == 0) {

src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java

@@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.ProjectManager;
 import com.volmit.iris.core.WandManager;
 import com.volmit.iris.core.project.loader.IrisData;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.object.common.IObjectPlacer;
 import com.volmit.iris.engine.object.objects.IrisObject;
 import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
@@ -57,8 +57,8 @@ public class CommandIrisObjectPaste extends MortarCommand {
 
     @Override
     public void addTabOptions(VolmitSender sender, String[] args, KList<String> list) {
-        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisWorlds.isIrisWorld(sender.player().getWorld())) {
+        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisToolbelt.isIrisWorld(sender.player().getWorld())) {
-            IrisData data = IrisWorlds.access(sender.player().getWorld()).getData();
+            IrisData data = IrisToolbelt.access(sender.player().getWorld()).getEngine().getData();
             if (data == null) {
                 sender.sendMessage("Tab complete options only work for objects while in an Iris world.");
             } else if (args.length == 0) {

src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPasteMatter.java

@@ -21,7 +21,7 @@ package com.volmit.iris.core.command.object;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.project.loader.IrisData;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.object.common.IObjectPlacer;
 import com.volmit.iris.engine.object.tile.TileData;
 import com.volmit.iris.util.collection.KList;
@@ -52,8 +52,8 @@ public class CommandIrisObjectPasteMatter extends MortarCommand {
 
     @Override
     public void addTabOptions(VolmitSender sender, String[] args, KList<String> list) {
-        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisWorlds.isIrisWorld(sender.player().getWorld())) {
+        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisToolbelt.isIrisWorld(sender.player().getWorld())) {
-            IrisData data = IrisWorlds.access(sender.player().getWorld()).getData();
+            IrisData data = IrisToolbelt.access(sender.player().getWorld()).getEngine().getData();
             if (data == null) {
                 sender.sendMessage("Tab complete options only work for objects while in an Iris world.");
             } else if (args.length == 0) {

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExecute.java

@@ -22,9 +22,8 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.core.tools.IrisWorlds;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.framework.IrisAccess;
+import com.volmit.iris.engine.platform.PlatformChunkGenerator;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.plugin.MortarCommand;
 import com.volmit.iris.util.plugin.VolmitSender;
@@ -39,8 +38,8 @@ public class CommandIrisStudioExecute extends MortarCommand {
 
     @Override
     public void addTabOptions(VolmitSender sender, String[] args, KList<String> list) {
-        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisWorlds.isIrisWorld(sender.player().getWorld())) {
+        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisToolbelt.isIrisWorld(sender.player().getWorld())) {
-            IrisData data = IrisWorlds.access(sender.player().getWorld()).getData();
+            IrisData data = IrisToolbelt.access(sender.player().getWorld()).getEngine().getData();
             if (data == null) {
                 sender.sendMessage("Tab complete options only work for summons while in an Iris world.");
             } else if (args.length == 0) {
@@ -58,10 +57,10 @@ public class CommandIrisStudioExecute extends MortarCommand {
             return true;
         }
 
-        IrisAccess a = IrisToolbelt.access(sender.player().getWorld());
+        PlatformChunkGenerator a = IrisToolbelt.access(sender.player().getWorld());
 
         if (a != null) {
-            ((Engine) a.getEngineAccess(0)).getExecution().execute(args[0]);
+            a.getEngine().getExecution().execute(args[0]);
             Iris.info("Executed. See script output in console.");
         }
 

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java

@@ -22,7 +22,7 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.gui.NoiseExplorerGUI;
 import com.volmit.iris.core.project.loader.IrisData;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.object.noise.IrisGenerator;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.function.Function2;
@@ -42,8 +42,8 @@ public class CommandIrisStudioExplorerGenerator extends MortarCommand {
 
     @Override
     public void addTabOptions(VolmitSender sender, String[] args, KList<String> list) {
-        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisWorlds.isIrisWorld(sender.player().getWorld())) {
+        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisToolbelt.isIrisWorld(sender.player().getWorld())) {
-            IrisData data = IrisWorlds.access(sender.player().getWorld()).getData();
+            IrisData data = IrisToolbelt.access(sender.player().getWorld()).getData();
             if (data == null) {
                 sender.sendMessage("Issue when loading tab completions. No data found (?)");
             } else if (args.length == 0) {

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java

@@ -20,8 +20,9 @@ package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.project.loader.IrisData;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.IrisAccess;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.object.basic.IrisPosition;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure;
 import com.volmit.iris.engine.object.regional.IrisRegion;
@@ -49,8 +50,8 @@ public class CommandIrisStudioGoto extends MortarCommand {
 
     @Override
     public void addTabOptions(VolmitSender sender, String[] args, KList<String> list) {
-        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisWorlds.isIrisWorld(sender.player().getWorld())) {
+        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisToolbelt.isIrisWorld(sender.player().getWorld())) {
-            IrisData data = IrisWorlds.access(sender.player().getWorld()).getData();
+            IrisData data = IrisToolbelt.access(sender.player().getWorld()).getEngine().getData();
             if (data == null) {
                 sender.sendMessage("Issue when loading tab completions. No data found (?)");
             } else if (args.length == 0) {
@@ -75,47 +76,47 @@ public class CommandIrisStudioGoto extends MortarCommand {
                 Player p = sender.player();
                 World world = p.getWorld();
 
-                if (!IrisWorlds.isIrisWorld(world)) {
+                if (!IrisToolbelt.isIrisWorld(world)) {
                     sender.sendMessage("You must be in an iris world.");
                     return true;
                 }
 
-                IrisAccess g = IrisWorlds.access(world);
+                Engine g = IrisToolbelt.access(world).getEngine();
                 IrisBiome b = IrisData.loadAnyBiome(args[0]);
                 IrisRegion r = IrisData.loadAnyRegion(args[0]);
                 IrisJigsawStructure s = IrisData.loadAnyJigsawStructure(args[0]);
 
                 if (b != null) {
                     J.a(() -> {
-                        Location l = g.lookForBiome(b, 10000, (v) -> sender.sendMessage("Looking for " + C.BOLD + C.WHITE + b.getName() + C.RESET + C.GRAY + ": Checked " + Form.f(v) + " Places"));
+                        IrisPosition l = g.lookForBiome(b, 10000, (v) -> sender.sendMessage("Looking for " + C.BOLD + C.WHITE + b.getName() + C.RESET + C.GRAY + ": Checked " + Form.f(v) + " Places"));
 
                         if (l == null) {
                             sender.sendMessage("Couldn't find " + b.getName() + ".");
                         } else {
                             sender.sendMessage("Found " + b.getName() + "!");
-                            J.s(() -> sender.player().teleport(l));
+                            J.s(() -> sender.player().teleport(l.toLocation(world)));
                         }
                     });
                 } else if (r != null) {
                     J.a(() -> {
-                        Location l = g.lookForRegion(r, 60000, (v) -> sender.sendMessage(C.BOLD + "" + C.WHITE + r.getName() + C.RESET + C.GRAY + ": Checked " + Form.f(v) + " Places"));
+                        IrisPosition l = g.lookForRegion(r, 60000, (v) -> sender.sendMessage(C.BOLD + "" + C.WHITE + r.getName() + C.RESET + C.GRAY + ": Checked " + Form.f(v) + " Places"));
 
                         if (l == null) {
                             sender.sendMessage("Couldn't find " + r.getName() + ".");
                         } else {
                             sender.sendMessage("Found " + r.getName() + "!");
-                            J.s(() -> sender.player().teleport(l));
+                            J.s(() -> sender.player().teleport(l.toLocation(world)));
                         }
                     });
                 } else if (s != null) {
                     J.a(() -> {
-                        Location l = g.lookForRegion(r, 60000, (v) -> sender.sendMessage(C.BOLD + "" + C.WHITE + r.getName() + C.RESET + C.GRAY + ": Checked " + Form.f(v) + " Places"));
+                        IrisPosition l = g.lookForRegion(r, 60000, (v) -> sender.sendMessage(C.BOLD + "" + C.WHITE + r.getName() + C.RESET + C.GRAY + ": Checked " + Form.f(v) + " Places"));
 
                         if (l == null) {
                             sender.sendMessage("Couldn't find " + r.getName() + ".");
                         } else {
                             sender.sendMessage("Found " + r.getName() + "!");
-                            J.s(() -> sender.player().teleport(l));
+                            J.s(() -> sender.player().teleport(l.toLocation(world)));
                         }
                     });
                 } else {

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java

@@ -20,8 +20,8 @@ package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.IrisAccess;
+import com.volmit.iris.engine.platform.PlatformChunkGenerator;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.plugin.MortarCommand;
 import com.volmit.iris.util.plugin.VolmitSender;
@@ -57,12 +57,12 @@ public class CommandIrisStudioHotload extends MortarCommand {
         Player p = sender.player();
         World world = p.getWorld();
 
-        if (!IrisWorlds.isIrisWorld(world)) {
+        if (!IrisToolbelt.isIrisWorld(world)) {
             sender.sendMessage("You must be in an iris world.");
             return true;
         }
 
-        IrisAccess worldAccess = IrisWorlds.access(world);
+        PlatformChunkGenerator worldAccess = IrisToolbelt.access(world);
         if (worldAccess == null) {
             sender.sendMessage("Could not gain access to the world you are in");
         } else {

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java

@@ -20,8 +20,8 @@ package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.IrisAccess;
+import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.loot.IrisLootTable;
 import com.volmit.iris.engine.object.meta.InventorySlotType;
 import com.volmit.iris.util.collection.KList;
@@ -56,18 +56,18 @@ public class CommandIrisStudioLoot extends MortarCommand {
 
         if (sender.isPlayer()) {
             Player p = sender.player();
-            IrisAccess prov = IrisWorlds.access(sender.player().getWorld());
+            Engine prov = IrisToolbelt.access(sender.player().getWorld()).getEngine();
 
             if (!Iris.proj.isProjectOpen()) {
                 sender.sendMessage("You can only use /iris studio loot in a studio world of iris.");
                 return true;
             }
 
-            KList<IrisLootTable> tables = prov.getCompound().getEngine(p.getLocation().getBlockY()).getLootTables(RNG.r, p.getLocation().getBlock());
+            KList<IrisLootTable> tables = prov.getLootTables(RNG.r, p.getLocation().getBlock());
             Inventory inv = Bukkit.createInventory(null, 27 * 2);
 
             try {
-                Iris.proj.getActiveProject().getActiveProvider().getCompound().getEngine(p.getLocation().getBlockY()).addItems(true, inv, RNG.r, tables, InventorySlotType.STORAGE, p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ(), 1);
+                Iris.proj.getActiveProject().getActiveProvider().getEngine().addItems(true, inv, RNG.r, tables, InventorySlotType.STORAGE, p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ(), 1);
             } catch (Throwable e) {
                 Iris.reportError(e);
                 sender.sendMessage("You can only use /iris loot in a studio world of iris.");
@@ -109,7 +109,7 @@ public class CommandIrisStudioLoot extends MortarCommand {
                     inv.clear();
                 }
 
-                Iris.proj.getActiveProject().getActiveProvider().getCompound().getEngine(p.getLocation().getBlockY()).addItems(true, inv, new RNG(RNG.r.imax()), tables, InventorySlotType.STORAGE, p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ(), 1);
+                Iris.proj.getActiveProject().getActiveProvider().getEngine().addItems(true, inv, new RNG(RNG.r.imax()), tables, InventorySlotType.STORAGE, p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ(), 1);
             }, 0, fast ? 5 : 35));
 
             return true;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java

@@ -21,9 +21,8 @@ package com.volmit.iris.core.command.studio;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.gui.VisionGUI;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.plugin.MortarCommand;
 import com.volmit.iris.util.plugin.VolmitSender;
@@ -56,12 +55,12 @@ public class CommandIrisStudioMap extends MortarCommand {
         Engine fe;
 
         try {
-            IrisAccess g = Iris.proj.getActiveProject().getActiveProvider();
+            Engine g = Iris.proj.getActiveProject().getActiveProvider().getEngine();
             VisionGUI.launch(g, 0);
             sender.sendMessage("Opening Map!");
         } catch (Throwable e) {
             Iris.reportError(e);
-            IrisAccess g = IrisWorlds.access(sender.player().getWorld());
+            Engine g = IrisToolbelt.access(sender.player().getWorld()).getEngine();
             VisionGUI.launch(g, 0);
             sender.sendMessage("Opening Map!");
         }

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java

@@ -21,9 +21,8 @@ package com.volmit.iris.core.command.studio;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.project.loader.IrisData;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.engine.object.entity.IrisEntity;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.plugin.MortarCommand;
@@ -42,8 +41,8 @@ public class CommandIrisStudioSummon extends MortarCommand {
 
     @Override
     public void addTabOptions(VolmitSender sender, String[] args, KList<String> list) {
-        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisWorlds.isIrisWorld(sender.player().getWorld())) {
+        if ((args.length == 0 || args.length == 1) && sender.isPlayer() && IrisToolbelt.isIrisWorld(sender.player().getWorld())) {
-            IrisData data = IrisWorlds.access(sender.player().getWorld()).getData();
+            IrisData data = IrisToolbelt.access(sender.player().getWorld()).getEngine().getData();
             if (data == null) {
                 sender.sendMessage("Tab complete options only work for summons while in an Iris world.");
             } else if (args.length == 0) {
@@ -64,12 +63,12 @@ public class CommandIrisStudioSummon extends MortarCommand {
         if (sender.isPlayer()) {
             Player p = sender.player();
             World world = p.getWorld();
-            if (!IrisWorlds.isIrisWorld(world)) {
+            if (!IrisToolbelt.isIrisWorld(world)) {
                 sender.sendMessage("You must be in an iris world.");
                 return true;
             }
 
-            IrisAccess g = IrisWorlds.access(world);
+            Engine g = IrisToolbelt.access(world).getEngine();
             if (args.length == 0) {
                 for (String i : g.getData().getEntityLoader().getPossibleKeys()) {
                     sender.sendMessage("- " + i);
@@ -83,7 +82,7 @@ public class CommandIrisStudioSummon extends MortarCommand {
                 }
 
                 Location vl = sender.player().getLocation().clone().add(0, 3, 0);
-                e.spawn((Engine) g.getEngineAccess(vl.getBlockY()), vl);
+                e.spawn(g, vl);
             }
         } else {
             sender.sendMessage("Players only.");

src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java

@@ -20,8 +20,8 @@ package com.volmit.iris.core.command.what;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.nms.INMS;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.IrisAccess;
+import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.plugin.MortarCommand;
@@ -51,7 +51,7 @@ public class CommandIrisWhatBiome extends MortarCommand {
 
             try {
 
-                IrisAccess g = IrisWorlds.access(w);
+                Engine g = IrisToolbelt.access(w).getEngine();
                 assert g != null;
                 IrisBiome b = g.getBiome(p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ());
                 sender.sendMessage("IBiome: " + b.getLoadKey() + " (" + b.getDerivative().name() + ")");

src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatFeatures.java

@@ -20,7 +20,7 @@ package com.volmit.iris.core.command.what;
 
 import com.google.gson.Gson;
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
 import com.volmit.iris.util.collection.KList;
@@ -51,9 +51,9 @@ public class CommandIrisWhatFeatures extends MortarCommand {
             Player p = sender.player();
             Chunk c = p.getLocation().getChunk();
 
-            if (IrisWorlds.isIrisWorld(c.getWorld())) {
+            if (IrisToolbelt.isIrisWorld(c.getWorld())) {
                 int m = 1;
-                for (IrisFeaturePositional i : ((Engine) IrisWorlds.access(c.getWorld()).getEngineAccess(p.getLocation().getBlockY())).getEngineParallax().getFeaturesInChunk(c)) {
+                for (IrisFeaturePositional i : ((Engine) IrisToolbelt.access(c.getWorld()).getEngine()).getEngineParallax().getFeaturesInChunk(c)) {
                     sender.sendMessage("#" + m++ + " " + new JSONObject(new Gson().toJson(i)).toString(4));
                 }
             } else {

src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java

@@ -19,8 +19,8 @@
 package com.volmit.iris.core.command.what;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.IrisAccess;
+import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.objects.IrisObject;
 import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
@@ -68,12 +68,12 @@ public class CommandIrisWhatObjects extends MortarCommand {
             Player p = sender.player();
             World world = p.getWorld();
 
-            if (!IrisWorlds.isIrisWorld(world)) {
+            if (!IrisToolbelt.isIrisWorld(world)) {
                 sender.sendMessage("You must be in an iris world.");
                 return true;
             }
 
-            IrisAccess g = IrisWorlds.access(world);
+            Engine g = IrisToolbelt.access(world).getEngine();
             KList<Chunk> chunks = new KList<>();
             int bx = p.getLocation().getChunk().getX();
             int bz = p.getLocation().getChunk().getZ();
@@ -139,7 +139,7 @@ public class CommandIrisWhatObjects extends MortarCommand {
                         for (int k = 0; k < 16; k += 3) {
 
                             assert g != null;
-                            IrisBiome bb = g.getBiome((i.getX() * 16) + j, (i.getZ() * 16) + k);
+                            IrisBiome bb = g.getSurfaceBiome((i.getX() * 16) + j, (i.getZ() * 16) + k);
                             IrisBiome bxf = g.getCaveBiome((i.getX() * 16) + j, (i.getZ() * 16) + k);
                             biomes.addIfMissing(bb.getName() + " [" + Form.capitalize(bb.getInferredType().name().toLowerCase()) + "] " + " (" + bb.getLoadFile().getName() + ")");
                             caveBiomes.addIfMissing(bxf.getName() + " (" + bxf.getLoadFile().getName() + ")");
@@ -199,7 +199,7 @@ public class CommandIrisWhatObjects extends MortarCommand {
         return true;
     }
 
-    private void exportObjects(IrisBiome bb, PrintWriter pw, IrisAccess g, KMap<String, KMap<String, KList<String>>> objects) {
+    private void exportObjects(IrisBiome bb, PrintWriter pw, Engine g, KMap<String, KMap<String, KList<String>>> objects) {
         String n1 = bb.getName() + " [" + Form.capitalize(bb.getInferredType().name().toLowerCase()) + "] " + " (" + bb.getLoadFile().getName() + ")";
         int m = 0;
         KSet<String> stop = new KSet<>();

src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java

@@ -24,8 +24,8 @@ import com.volmit.iris.core.link.MultiverseCoreLink;
 import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.core.tools.IrisWorldCreator;
-import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.platform.PlatformChunkGenerator;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.plugin.MortarCommand;
@@ -220,9 +220,7 @@ public class CommandIrisCreate extends MortarCommand {
 
             File iris = new File(folder, "iris");
             iris.mkdirs();
-
             dim = Iris.proj.installIntoWorld(sender, type, folder);
-
             WorldCreator wc = new IrisWorldCreator().dimension(dim.getLoadKey()).name(worldName)
                     .productionMode().seed(seed).create();
 
@@ -236,7 +234,7 @@ public class CommandIrisCreate extends MortarCommand {
                     int req = 800;
                     while (!done.get()) {
                         boolean derp = false;
-                        double v = (double) ((IrisAccess) wc.generator()).getGenerated() / (double) req;
+                        double v = (double) ((PlatformChunkGenerator) wc.generator()).getEngine().getGenerated() / (double) req;
 
                         if (last > v || v > 1) {
                             derp = true;

src/main/java/com/volmit/iris/core/command/world/CommandIrisFix.java

@@ -19,8 +19,8 @@
 package com.volmit.iris.core.command.world;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.IrisAccess;
+import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.math.Spiraler;
@@ -46,22 +46,18 @@ public class CommandIrisFix extends MortarCommand {
     @Override
     public boolean handle(VolmitSender sender, String[] args) {
         try {
-            IrisAccess a = IrisWorlds.access(sender.player().getWorld());
+            Engine a = IrisToolbelt.access(sender.player().getWorld()).getEngine();
-            if (a.getCompound().getSize() > 1) {
-                sender.sendMessage("Cant fix engine composite worlds!");
-                return true;
-            }
 
             int viewDistance = args.length > 0 ? Integer.parseInt(args[0]) : -1;
             if (viewDistance <= 1) {
                 J.a(() -> {
-                    int fixed = a.getCompound().getDefaultEngine().getEngineParallax().repairChunk(sender.player().getLocation().getChunk());
+                    int fixed = a.getEngineParallax().repairChunk(sender.player().getLocation().getChunk());
                     sender.sendMessage("Fixed " + Form.f(fixed) + " blocks!");
                 });
             } else {
                 AtomicInteger v = new AtomicInteger();
                 J.a(() -> {
-                    new Spiraler(viewDistance, viewDistance, (x, z) -> v.set(v.get() + a.getCompound().getDefaultEngine().getEngineParallax().repairChunk(sender.player().getWorld().getChunkAt(x, z)))).drain();
+                    new Spiraler(viewDistance, viewDistance, (x, z) -> v.set(v.get() + a.getEngineParallax().repairChunk(sender.player().getWorld().getChunkAt(x, z)))).drain();
                     sender.sendMessage("Fixed " + Form.f(v.get()) + " blocks in " + (viewDistance * viewDistance) + " chunks!");
                 });
             }

src/main/java/com/volmit/iris/core/command/world/CommandIrisVerify.java

@@ -19,8 +19,9 @@
 package com.volmit.iris.core.command.world;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.IrisAccess;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.platform.PlatformChunkGenerator;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.nbt.mca.Chunk;
 import com.volmit.iris.util.nbt.mca.MCAFile;
@@ -50,7 +51,7 @@ public class CommandIrisVerify extends MortarCommand {
     @Override
     public boolean handle(VolmitSender sender, String[] args) {
         try {
-            IrisAccess a = IrisWorlds.access(sender.player().getWorld());
+            Engine a = IrisToolbelt.access(sender.player().getWorld()).getEngine();
             File folder = a.getTarget().getWorld().worldFolder();
             File r = new File(folder, "region");
             BurstExecutor e = MultiBurst.burst.burst(r.listFiles().length);

src/main/java/com/volmit/iris/core/command/world/CommandLocate.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.world;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.plugin.MortarCommand;
 import com.volmit.iris.util.plugin.VolmitSender;
@@ -35,7 +35,7 @@ public class CommandLocate extends MortarCommand implements Listener {
 
     @EventHandler
     public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event) {
-        if (IrisWorlds.isIrisWorld(event.getPlayer().getWorld())) {
+        if (IrisToolbelt.isIrisWorld(event.getPlayer().getWorld())) {
 
             // Make sure the command starts with /locate and does not locate stronghold
             if (event.getMessage().contains("/locate") && event.getMessage().contains("stronghold")) {