Fixes

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,6 +1,6 @@
 name: Iris Bug Report
 description: File a bug report for Iris
-labels: [bug]
+labels: [ bug ]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,6 +1,6 @@
 name: Iris Feature Request
 description: File a feature request for Iris. If you want to report a bug this is not the place.
-labels: [feature]
+labels: [ feature ]
 body:
   - type: markdown
     attributes:

README.md

@@ -3,6 +3,7 @@
 For 1.16 and below, see the 1.14-1.16 branch. The master branch is for the latest version of minecraft.
 
 # [Support](https://discord.gg/3xxPTpT) **|** [Documentation](https://docs.volmit.com/iris/) **
+
 |** [Git](https://github.com/IrisDimensions)
 
 ## Iris Toolbelt
@@ -16,26 +17,26 @@ package com.volmit.iris.core.tools
 IrisToolbelt.access(anyWorld).getCompound().getData();
 
 // Get Default Engine from world
-IrisToolbelt.access(anyWorld).getCompound().getDefaultEngine();
+        IrisToolbelt.access(anyWorld).getCompound().getDefaultEngine();
 
 // Get the engine at the given height
-IrisToolbelt.access(anyWorld).getCompound().getEngineForHeight(68);
+        IrisToolbelt.access(anyWorld).getCompound().getEngineForHeight(68);
 
 // IS THIS THING ON?
-boolean yes = IrisToolbelt.isIrisWorld(world);
+        boolean yes=IrisToolbelt.isIrisWorld(world);
 
 // GTFO for worlds (moves players to any other world, just not this one)
-IrisToolbelt.evacuate(world);
+        IrisToolbelt.evacuate(world);
 
-IrisAccess access = IrisToolbelt.createWorld() // If you like builders...
+        IrisAccess access=IrisToolbelt.createWorld() // If you like builders...
-    .name("myWorld") // The world name
+        .name("myWorld") // The world name
-    .dimension("terrifyinghands")
+        .dimension("terrifyinghands")
-    .seed(69133742) // The world seed
+        .seed(69133742) // The world seed
-    .headless(true)  // Headless make gen go fast
+        .headless(true)  // Headless make gen go fast
-    .pregen(PregenTask // Define a pregen job to run
+        .pregen(PregenTask // Define a pregen job to run
         .builder()
-            .center(new Position2(0,0)) // REGION coords (1 region = 32x32 chunks)
+        .center(new Position2(0,0)) // REGION coords (1 region = 32x32 chunks)
-            .radius(4)  // Radius in REGIONS. Rad of 4 means a 9x9 Region map.
+        .radius(4)  // Radius in REGIONS. Rad of 4 means a 9x9 Region map.
         .build())
-    .create();
+        .create();
 ```

build.gradle

@@ -1,4 +1,3 @@
-
 /*
  * Iris is a World Generator for Minecraft Bukkit Servers
  * Copyright (c) 2021 Arcane Arts (Volmit Software)
@@ -108,16 +107,16 @@ repositories {
 }
 
 shadowJar
-{
+        {
-    append("plugin.yml")
+            append("plugin.yml")
-    minimize()
+            minimize()
-    relocate 'com.dfsek.paralithic', 'com.volmit.iris.util.paralithic'
+            relocate 'com.dfsek.paralithic', 'com.volmit.iris.util.paralithic'
-    relocate 'io.papermc.lib', 'com.volmit.iris.util.paper'
+            relocate 'io.papermc.lib', 'com.volmit.iris.util.paper'
-    dependencies {
+            dependencies {
-        include(dependency('io.papermc:paperlib:1.0.5'))
+                include(dependency('io.papermc:paperlib:1.0.5'))
-        include(dependency('com.dfsek:Paralithic:0.4.0'))
+                include(dependency('com.dfsek:Paralithic:0.4.0'))
-    }
+            }
-}
+        }
 
 manifest()
 

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

@@ -33,9 +33,6 @@ import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.biome.IrisBiomeCustom;
 import com.volmit.iris.engine.object.compat.IrisCompat;
 import com.volmit.iris.engine.object.dimensional.IrisDimension;
-import com.volmit.iris.util.io.JarScanner;
-import com.volmit.iris.util.matter.Sliced;
-import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KSet;
 import com.volmit.iris.util.format.C;
@@ -43,8 +40,10 @@ import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.function.NastyRunnable;
 import com.volmit.iris.util.io.FileWatcher;
 import com.volmit.iris.util.io.IO;
+import com.volmit.iris.util.io.JarScanner;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.plugin.Metrics;
 import com.volmit.iris.util.plugin.Permission;
 import com.volmit.iris.util.plugin.VolmitPlugin;
@@ -67,7 +66,6 @@ import org.bukkit.plugin.Plugin;
 
 import java.io.*;
 import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.Date;
 
@@ -108,10 +106,8 @@ public class Iris extends VolmitPlugin implements Listener {
         JarScanner js = new JarScanner(instance.getJarFile(), s);
         KList<Object> v = new KList<>();
         J.attempt(js::scan);
-        for(Class<?> i : js.getClasses())
+        for (Class<?> i : js.getClasses()) {
-        {
+            if (slicedClass == null || i.isAnnotationPresent(slicedClass)) {
-            if(slicedClass == null || i.isAnnotationPresent(slicedClass))
-            {
                 try {
                     v.add(i.getDeclaredConstructor().newInstance());
                 } catch (Throwable ignored) {
@@ -123,7 +119,6 @@ public class Iris extends VolmitPlugin implements Listener {
         return v;
     }
 
-
     public void onEnable() {
         instance = this;
         compat = IrisCompat.configured(getDataFile("compat.json"));

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

@@ -20,12 +20,6 @@ package com.volmit.iris.core;
 
 import com.google.gson.Gson;
 import com.volmit.iris.Iris;
-import com.volmit.iris.util.nbt.mca.NBTWorld;
-import com.volmit.iris.util.nbt.io.NBTUtil;
-import com.volmit.iris.util.nbt.io.NamedTag;
-import com.volmit.iris.util.nbt.tag.CompoundTag;
-import com.volmit.iris.util.nbt.tag.IntTag;
-import com.volmit.iris.util.nbt.tag.ListTag;
 import com.volmit.iris.engine.object.basic.IrisPosition;
 import com.volmit.iris.engine.object.jigsaw.IrisJigsawPiece;
 import com.volmit.iris.engine.object.jigsaw.IrisJigsawPieceConnector;
@@ -40,6 +34,12 @@ import com.volmit.iris.util.io.Converter;
 import com.volmit.iris.util.io.IO;
 import com.volmit.iris.util.io.SKConversion;
 import com.volmit.iris.util.json.JSONObject;
+import com.volmit.iris.util.nbt.io.NBTUtil;
+import com.volmit.iris.util.nbt.io.NamedTag;
+import com.volmit.iris.util.nbt.mca.NBTWorld;
+import com.volmit.iris.util.nbt.tag.CompoundTag;
+import com.volmit.iris.util.nbt.tag.IntTag;
+import com.volmit.iris.util.nbt.tag.ListTag;
 import com.volmit.iris.util.plugin.VolmitSender;
 import com.volmit.iris.util.scheduling.J;
 import org.bukkit.Bukkit;

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

@@ -119,10 +119,9 @@ public class IrisBoardManager implements BoardProvider, Listener {
         }
 
         Engine engine = g.getCompound().getEngineForHeight(y);
-        if(ecl.flip())
+        if (ecl.flip()) {
-        {
             energyBar.setProgress(Math.min(1000D, engine.getWorldManager().getEnergy()) / 1000D);
-            energyBar.setTitle("Spawner Energy: " + Form.f((int)Math.min(1000D, engine.getWorldManager().getEnergy())));
+            energyBar.setTitle("Spawner Energy: " + Form.f((int) Math.min(1000D, engine.getWorldManager().getEnergy())));
         }
 
         int parallaxChunks = 0;

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

@@ -74,6 +74,7 @@ public class WandManager implements Listener {
 
     /**
      * Draw the outline of a selected region
+     *
      * @param d The cuboid
      * @param p The player to show it to
      */
@@ -83,6 +84,7 @@ public class WandManager implements Listener {
 
     /**
      * Draw the outline of a selected region
+     *
      * @param d A pair of locations
      * @param p The player to show them to
      */
@@ -191,6 +193,7 @@ public class WandManager implements Listener {
 
     /**
      * Creates an Iris Object from the 2 coordinates selected with a wand
+     *
      * @param wand The wand itemstack
      * @return The new object
      */
@@ -223,6 +226,7 @@ public class WandManager implements Listener {
 
     /**
      * Converts a user friendly location string to an actual Location
+     *
      * @param s The string
      * @return The location
      */
@@ -239,6 +243,7 @@ public class WandManager implements Listener {
 
     /**
      * Get a user friendly string of a location
+     *
      * @param loc The location
      * @return The string
      */
@@ -252,6 +257,7 @@ public class WandManager implements Listener {
 
     /**
      * Create a new blank Iris wand
+     *
      * @return The wand itemstack
      */
     public static ItemStack createWand() {
@@ -260,6 +266,7 @@ public class WandManager implements Listener {
 
     /**
      * Create a new dust itemstack
+     *
      * @return The stack
      */
     public static ItemStack createDust() {
@@ -277,6 +284,7 @@ public class WandManager implements Listener {
 
     /**
      * Is the player holding Dust?
+     *
      * @param p The player
      * @return True if they are
      */
@@ -287,6 +295,7 @@ public class WandManager implements Listener {
 
     /**
      * Is the itemstack passed Iris dust?
+     *
      * @param is The itemstack
      * @return True if it is
      */
@@ -296,8 +305,9 @@ public class WandManager implements Listener {
 
     /**
      * Update the location on an Iris wand
+     *
      * @param left True for first location, false for second
-     * @param a The location
+     * @param a    The location
      * @param item The wand
      * @return The updated wand
      */
@@ -318,6 +328,7 @@ public class WandManager implements Listener {
 
     /**
      * Finds an existing wand in a users inventory
+     *
      * @param inventory The inventory to search
      * @return The slot number the wand is in. Or -1 if none are found
      */
@@ -341,6 +352,7 @@ public class WandManager implements Listener {
 
     /**
      * Creates an Iris wand. The locations should be the currently selected locations, or null
+     *
      * @param a Location A
      * @param b Location B
      * @return A new wand
@@ -360,6 +372,7 @@ public class WandManager implements Listener {
 
     /**
      * Get a pair of locations that are selected in an Iris wand
+     *
      * @param is The wand item
      * @return An array with the 2 locations
      */
@@ -370,6 +383,7 @@ public class WandManager implements Listener {
 
     /**
      * Is a player holding an Iris wand
+     *
      * @param p The player
      * @return True if they are
      */
@@ -380,6 +394,7 @@ public class WandManager implements Listener {
 
     /**
      * Is the itemstack passed an Iris wand
+     *
      * @param is The itemstack
      * @return True if it is
      */

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

@@ -23,8 +23,8 @@ 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.engine.jigsaw.PlannedStructure;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure;
 import com.volmit.iris.engine.object.basic.IrisPosition;
+import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.math.RNG;

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

@@ -17,14 +17,7 @@ import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
 
 import java.text.NumberFormat;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 public class CommandIrisObjectAnalyze extends MortarCommand {
@@ -99,7 +92,7 @@ public class CommandIrisObjectAnalyze extends MortarCommand {
 
 
                 } else
-                amounts.put(block, amounts.get(block) + 1);
+                    amounts.put(block, amounts.get(block) + 1);
 
                 if (!materials.containsKey(block.getMaterial())) {
                     materials.put(block.getMaterial(), 1);
@@ -130,7 +123,7 @@ public class CommandIrisObjectAnalyze extends MortarCommand {
                 if (data.getAsString(true).contains("[")) {
                     string = string + " --> [" + data.getAsString(true).split("\\[")[1]
                             .replaceAll("true", ChatColor.GREEN + "true" + ChatColor.GRAY)
-                            .replaceAll("false", ChatColor.RED + "false" + ChatColor.GRAY)+ "*" + dataAmount;
+                            .replaceAll("false", ChatColor.RED + "false" + ChatColor.GRAY) + "*" + dataAmount;
                 }
 
                 sender.sendMessage(string);

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

@@ -24,21 +24,17 @@ 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.engine.object.common.IObjectPlacer;
 import com.volmit.iris.engine.object.objects.IrisObject;
 import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
 import com.volmit.iris.engine.object.objects.IrisObjectPlacementScaleInterpolator;
 import com.volmit.iris.engine.object.objects.IrisObjectRotation;
-import com.volmit.iris.engine.object.common.IObjectPlacer;
 import com.volmit.iris.engine.object.tile.TileData;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.plugin.MortarCommand;
 import com.volmit.iris.util.plugin.VolmitSender;
-import org.bukkit.HeightMap;
+import org.bukkit.*;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.TileState;
@@ -188,7 +184,7 @@ public class CommandIrisObjectPaste extends MortarCommand {
         //WandManager.pasteSchematic(obj, block);
 
         Map<Block, BlockData> futureChanges = new HashMap<>();
-        obj.place(block.getBlockX(), block.getBlockY() + (int)obj.getCenter().getY(), block.getBlockZ(), createPlacer(sender.player(), block.getWorld(), futureChanges), placement, new RNG(), null);
+        obj.place(block.getBlockX(), block.getBlockY() + (int) obj.getCenter().getY(), block.getBlockZ(), createPlacer(sender.player(), block.getWorld(), futureChanges), placement, new RNG(), null);
         CommandIrisObjectUndo.addChanges(sender.player(), futureChanges);
 
         if (intoWand) {
@@ -231,7 +227,7 @@ public class CommandIrisObjectPaste extends MortarCommand {
 
             @Override
             public int getHighest(int x, int z, IrisData data, boolean ignoreFluid) {
-                return world.getHighestBlockYAt(x, z, ignoreFluid ? HeightMap.OCEAN_FLOOR: HeightMap.MOTION_BLOCKING);
+                return world.getHighestBlockYAt(x, z, ignoreFluid ? HeightMap.OCEAN_FLOOR : HeightMap.MOTION_BLOCKING);
             }
 
             @Override

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

@@ -29,12 +29,8 @@ import org.bukkit.OfflinePlayer;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
-import java.util.ArrayDeque;
+
-import java.util.Deque;
+import java.util.*;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.UUID;
 
 public class CommandIrisObjectUndo extends MortarCommand {
 
@@ -147,6 +143,7 @@ public class CommandIrisObjectUndo extends MortarCommand {
 
     /**
      * Reverts all the block changes provided, 200 blocks per tick
+     *
      * @param blocks The blocks to remove
      */
     private static void revert(Map<Block, BlockData> blocks) {

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

@@ -107,7 +107,7 @@ public class CommandIrisStudioGoto extends MortarCommand {
                             J.s(() -> sender.player().teleport(l));
                         }
                     });
-                }else if (s != null) {
+                } 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"));
 

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

@@ -22,8 +22,8 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.tools.IrisWorlds;
 import com.volmit.iris.engine.framework.IrisAccess;
-import com.volmit.iris.engine.object.meta.InventorySlotType;
 import com.volmit.iris.engine.object.loot.IrisLootTable;
+import com.volmit.iris.engine.object.meta.InventorySlotType;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.plugin.MortarCommand;

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

@@ -22,7 +22,6 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.project.IrisProject;
 import com.volmit.iris.core.project.loader.IrisData;
-import com.volmit.iris.util.interpolation.InterpolationMethod;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer;
 import com.volmit.iris.engine.object.noise.IrisGenerator;
@@ -30,13 +29,14 @@ import com.volmit.iris.engine.object.noise.IrisInterpolator;
 import com.volmit.iris.engine.object.noise.IrisNoiseGenerator;
 import com.volmit.iris.engine.object.noise.NoiseStyle;
 import com.volmit.iris.engine.object.regional.IrisRegion;
-import com.volmit.iris.util.noise.CNG;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.function.NoiseProvider;
+import com.volmit.iris.util.interpolation.InterpolationMethod;
 import com.volmit.iris.util.io.IO;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.noise.CNG;
 import com.volmit.iris.util.plugin.MortarCommand;
 import com.volmit.iris.util.plugin.VolmitSender;
 import com.volmit.iris.util.scheduling.J;

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

@@ -19,8 +19,8 @@
 package com.volmit.iris.core.command.what;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.plugin.MortarCommand;
 import com.volmit.iris.util.plugin.VolmitSender;

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

@@ -52,16 +52,12 @@ public class CommandIrisWhatFeatures extends MortarCommand {
             Player p = sender.player();
             Chunk c = p.getLocation().getChunk();
 
-            if(IrisWorlds.isIrisWorld(c.getWorld()))
+            if (IrisWorlds.isIrisWorld(c.getWorld())) {
-            {int m = 1;
+                int m = 1;
-                for(IrisFeaturePositional i : ((Engine)IrisWorlds.access(c.getWorld()).getEngineAccess(p.getLocation().getBlockY())).getFramework().getEngineParallax().getFeaturesInChunk(c))
+                for (IrisFeaturePositional i : ((Engine) IrisWorlds.access(c.getWorld()).getEngineAccess(p.getLocation().getBlockY())).getFramework().getEngineParallax().getFeaturesInChunk(c)) {
-                {
                     sender.sendMessage("#" + m++ + " " + new JSONObject(new Gson().toJson(i)).toString(4));
                 }
-            }
+            } else {
-
-            else
-            {
                 sender.sendMessage("Iris worlds only.");
             }
         } else {

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

@@ -20,13 +20,13 @@ package com.volmit.iris.core.command.world;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.tools.IrisWorlds;
+import com.volmit.iris.engine.framework.IrisAccess;
+import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.nbt.mca.Chunk;
 import com.volmit.iris.util.nbt.mca.MCAFile;
 import com.volmit.iris.util.nbt.mca.MCAUtil;
-import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.parallel.MultiBurst;
-import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.plugin.MortarCommand;
 import com.volmit.iris.util.plugin.VolmitSender;
 

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

@@ -20,15 +20,15 @@ package com.volmit.iris.core.gui;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.events.IrisEngineHotloadEvent;
-import com.volmit.iris.util.noise.CNG;
 import com.volmit.iris.engine.object.noise.NoiseStyle;
-import com.volmit.iris.util.parallel.BurstExecutor;
-import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.function.Function2;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.math.RollingSequence;
+import com.volmit.iris.util.noise.CNG;
+import com.volmit.iris.util.parallel.BurstExecutor;
+import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.scheduling.J;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import org.bukkit.event.EventHandler;

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

@@ -26,8 +26,8 @@ import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.engine.object.biome.IrisBiome;
-import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.engine.object.common.IrisWorld;
+import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;

src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java

@@ -21,8 +21,8 @@ package com.volmit.iris.core.pregenerator.methods;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.pregenerator.PregenListener;
 import com.volmit.iris.core.pregenerator.PregeneratorMethod;
-import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.scheduling.J;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Chunk;

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

@@ -40,7 +40,6 @@ import com.volmit.iris.engine.object.noise.IrisGenerator;
 import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
 import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.engine.object.spawners.IrisSpawner;
-import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
@@ -51,6 +50,7 @@ import com.volmit.iris.util.io.IO;
 import com.volmit.iris.util.json.JSONArray;
 import com.volmit.iris.util.json.JSONObject;
 import com.volmit.iris.util.math.M;
+import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.plugin.VolmitSender;
 import com.volmit.iris.util.scheduling.ChronoLatch;
 import com.volmit.iris.util.scheduling.J;

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

@@ -21,10 +21,10 @@ package com.volmit.iris.core.project;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.core.project.loader.ResourceLoader;
-import com.volmit.iris.util.data.B;
 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;
 import com.volmit.iris.util.json.JSONArray;
 import com.volmit.iris.util.json.JSONObject;
 import org.bukkit.enchantments.Enchantment;

src/main/java/com/volmit/iris/core/project/loader/IrisRegistrant.java

@@ -19,7 +19,6 @@
 package com.volmit.iris.core.project.loader;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
 import lombok.Data;
 
 import java.awt.*;

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

@@ -20,8 +20,8 @@ package com.volmit.iris.core.tools;
 
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.framework.EngineCompositeGenerator;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.engine.object.common.IrisWorld;
+import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
 

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

@@ -22,11 +22,11 @@ import com.google.common.util.concurrent.AtomicDouble;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.actuator.IrisTerrainNormalActuator;
-import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.modifier.IrisCaveModifier;
 import com.volmit.iris.engine.object.biome.InferredType;
 import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.common.CaveResult;
 import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
 import com.volmit.iris.engine.object.decoration.IrisDecorator;
 import com.volmit.iris.engine.object.dimensional.IrisTerrainMode;
@@ -34,14 +34,14 @@ import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
 import com.volmit.iris.engine.object.noise.IrisGenerator;
 import com.volmit.iris.engine.object.noise.IrisInterpolator;
 import com.volmit.iris.engine.object.regional.IrisRegion;
-import com.volmit.iris.util.noise.CNG;
-import com.volmit.iris.engine.object.common.CaveResult;
-import com.volmit.iris.util.stream.ProceduralStream;
-import com.volmit.iris.util.stream.interpolation.Interpolated;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
+import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.noise.CNG;
+import com.volmit.iris.util.stream.ProceduralStream;
+import com.volmit.iris.util.stream.interpolation.Interpolated;
 import lombok.Data;
 import org.bukkit.Material;
 import org.bukkit.block.Biome;

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

@@ -24,18 +24,18 @@ import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.events.IrisEngineHotloadEvent;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.framework.*;
-import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer;
 import com.volmit.iris.engine.object.decoration.IrisDecorator;
-import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
 import com.volmit.iris.engine.object.engine.IrisEngineData;
+import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.format.Form;
+import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.io.IO;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.scheduling.J;

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

@@ -25,12 +25,10 @@ import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineCompound;
 import com.volmit.iris.engine.framework.EngineData;
 import com.volmit.iris.engine.framework.EngineTarget;
-import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
-import com.volmit.iris.engine.object.dimensional.IrisDimensionIndex;
 import com.volmit.iris.engine.object.basic.IrisPosition;
 import com.volmit.iris.engine.object.common.IrisWorld;
-import com.volmit.iris.util.parallel.MultiBurst;
+import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.dimensional.IrisDimensionIndex;
 import com.volmit.iris.util.atomics.AtomicRollingSequence;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
@@ -38,6 +36,8 @@ import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.format.Form;
+import com.volmit.iris.util.hunk.Hunk;
+import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -82,15 +82,11 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
         looper = new Looper() {
             @Override
             protected long loop() {
-                if(precount != null)
+                if (precount != null) {
-                {
                     entityCount = 0;
-                    for(Entity i : precount)
+                    for (Entity i : precount) {
-                    {
+                        if (i instanceof LivingEntity) {
-                        if(i instanceof LivingEntity)
+                            if (!i.isDead()) {
-                        {
-                            if(!i.isDead())
-                            {
                                 entityCount++;
                             }
                         }
@@ -99,10 +95,8 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
                     precount = null;
                 }
 
-                if(energy < 650)
+                if (energy < 650) {
-                {
+                    if (ecl.flip()) {
-                    if(ecl.flip())
-                    {
                         energy *= 1 + (0.02 * M.clip((1D - getEntitySaturation()), 0D, 1D));
                         fixEnergy();
                     }
@@ -121,8 +115,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
     private boolean onAsyncTick() {
         actuallySpawned = 0;
 
-        if(energy < 100)
+        if (energy < 100) {
-        {
             J.sleep(200);
             return false;
         }
@@ -156,10 +149,8 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
         int spawnBuffer = RNG.r.i(2, 12);
 
         Chunk[] cc = getEngine().getWorld().realWorld().getLoadedChunks();
-        while(spawnBuffer-- > 0)
+        while (spawnBuffer-- > 0) {
-        {
+            if (cc.length == 0) {
-            if(cc.length == 0)
-            {
                 Iris.debug("Can't spawn. No chunks!");
                 return false;
             }
@@ -180,10 +171,8 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
     }
 
     private void spawnIn(Chunk c, IrisBiome biome, IrisRegion region, int max) {
-        for(Entity i : c.getEntities())
+        for (Entity i : c.getEntities()) {
-        {
+            if (i instanceof LivingEntity) {
-            if(i instanceof LivingEntity)
-            {
                 return;
             }
         }
@@ -214,7 +203,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
 
     private void spawn(Chunk c, IrisEntitySpawn i) {
         int s = i.spawn(getEngine(), c, RNG.r);
-        actuallySpawned+= s;
+        actuallySpawned += s;
         if (s > 0) {
             getCooldown(i.getReferenceSpawner()).spawn(getEngine());
             energy -= s * ((i.getEnergyMultiplier() * i.getReferenceSpawner().getEnergyMultiplier() * 1));
@@ -280,13 +269,9 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
 
     @Override
     public void onChunkLoad(Chunk e, boolean generated) {
-        if(generated)
+        if (generated) {
-        {
             energy += 1.2;
-        }
+        } else {
-
-        else
-        {
             energy += 0.3;
         }
 
@@ -367,8 +352,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
 
     @Override
     public double getEntitySaturation() {
-        if(!getEngine().getWorld().hasRealWorld())
+        if (!getEngine().getWorld().hasRealWorld()) {
-        {
             return 1;
         }
 

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

@@ -23,11 +23,11 @@ import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.engine.data.chunk.TerrainChunk;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedActuator;
-import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.util.hunk.view.BiomeGridHunkView;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.biome.IrisBiomeCustom;
 import com.volmit.iris.util.documentation.BlockCoordinates;
+import com.volmit.iris.util.hunk.Hunk;
+import com.volmit.iris.util.hunk.view.BiomeGridHunkView;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import org.bukkit.block.Biome;

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

@@ -22,10 +22,10 @@ import com.volmit.iris.engine.decorator.*;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedActuator;
 import com.volmit.iris.engine.framework.EngineDecorator;
-import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.carve.IrisCaveLayer;
 import com.volmit.iris.util.documentation.BlockCoordinates;
+import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import lombok.Getter;

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

@@ -20,10 +20,10 @@ package com.volmit.iris.engine.actuator;
 
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedActuator;
-import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.documentation.BlockCoordinates;
+import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import lombok.Getter;

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

@@ -20,12 +20,12 @@ package com.volmit.iris.engine.actuator;
 
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedActuator;
-import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.engine.object.biome.IrisBiome;
-import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.documentation.BlockCoordinates;
+import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import lombok.Getter;
 import org.bukkit.Material;

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

@@ -20,11 +20,11 @@ package com.volmit.iris.engine.decorator;
 
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
 import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
 import com.volmit.iris.engine.object.decoration.IrisDecorator;
 import com.volmit.iris.util.documentation.BlockCoordinates;
+import com.volmit.iris.util.hunk.Hunk;
 import org.bukkit.block.data.BlockData;
 
 public class IrisCeilingDecorator extends IrisEngineDecorator {

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

@@ -23,8 +23,8 @@ import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedComponent;
 import com.volmit.iris.engine.framework.EngineDecorator;
-import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
 import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
 import com.volmit.iris.engine.object.decoration.IrisDecorator;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;

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

@@ -20,11 +20,11 @@ package com.volmit.iris.engine.decorator;
 
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
 import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
 import com.volmit.iris.engine.object.decoration.IrisDecorator;
 import com.volmit.iris.util.documentation.BlockCoordinates;
+import com.volmit.iris.util.hunk.Hunk;
 import org.bukkit.block.data.BlockData;
 
 public class IrisSeaFloorDecorator extends IrisEngineDecorator {

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

@@ -20,11 +20,11 @@ package com.volmit.iris.engine.decorator;
 
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
 import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
 import com.volmit.iris.engine.object.decoration.IrisDecorator;
 import com.volmit.iris.util.documentation.BlockCoordinates;
+import com.volmit.iris.util.hunk.Hunk;
 import org.bukkit.block.data.BlockData;
 
 public class IrisSeaSurfaceDecorator extends IrisEngineDecorator {

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

@@ -20,11 +20,11 @@ package com.volmit.iris.engine.decorator;
 
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
 import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
 import com.volmit.iris.engine.object.decoration.IrisDecorator;
 import com.volmit.iris.util.documentation.BlockCoordinates;
+import com.volmit.iris.util.hunk.Hunk;
 import org.bukkit.block.data.BlockData;
 
 public class IrisShoreLineDecorator extends IrisEngineDecorator {

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

@@ -21,12 +21,12 @@ package com.volmit.iris.engine.decorator;
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
 import com.volmit.iris.engine.object.biome.InferredType;
 import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
 import com.volmit.iris.engine.object.decoration.IrisDecorator;
 import com.volmit.iris.util.documentation.BlockCoordinates;
+import com.volmit.iris.util.hunk.Hunk;
 import org.bukkit.block.data.Bisected;
 import org.bukkit.block.data.BlockData;
 

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

@@ -23,27 +23,27 @@ import com.volmit.iris.core.gui.components.RenderType;
 import com.volmit.iris.core.gui.components.Renderer;
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.data.cache.Cache;
-import com.volmit.iris.util.data.B;
-import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.engine.object.basic.IrisColor;
 import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.common.IrisWorld;
 import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.engine.IrisEngineData;
+import com.volmit.iris.engine.object.loot.IrisLootMode;
 import com.volmit.iris.engine.object.loot.IrisLootReference;
 import com.volmit.iris.engine.object.loot.IrisLootTable;
-import com.volmit.iris.engine.object.loot.IrisLootMode;
 import com.volmit.iris.engine.object.meta.InventorySlotType;
 import com.volmit.iris.engine.object.regional.IrisRegion;
-import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.engine.object.common.IrisWorld;
-import com.volmit.iris.engine.object.engine.IrisEngineData;
 import com.volmit.iris.engine.parallax.ParallaxAccess;
-import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.data.B;
+import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
+import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.math.BlockPosition;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import org.bukkit.Chunk;
 import org.bukkit.Location;

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

@@ -18,8 +18,8 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.documentation.BlockCoordinates;
+import com.volmit.iris.util.hunk.Hunk;
 
 public interface EngineActuator<O> extends EngineComponent {
     @BlockCoordinates

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

@@ -18,8 +18,8 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.documentation.BlockCoordinates;
+import com.volmit.iris.util.hunk.Hunk;
 
 public abstract class EngineAssignedActuator<T> extends EngineAssignedComponent implements EngineActuator<T> {
     public EngineAssignedActuator(Engine engine, String name) {

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

@@ -18,8 +18,8 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.documentation.BlockCoordinates;
+import com.volmit.iris.util.hunk.Hunk;
 
 public abstract class EngineAssignedModifier<T> extends EngineAssignedComponent implements EngineModifier<T> {
     public EngineAssignedModifier(Engine engine, String name) {

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

@@ -59,25 +59,21 @@ public abstract class EngineAssignedWorldManager extends EngineAssignedComponent
     @EventHandler
     public void on(EntitySpawnEvent e) {
         if (e.getEntity().getWorld().equals(getTarget().getWorld().realWorld())) {
-            if(e.getEntityType().equals(EntityType.ENDER_SIGNAL))
+            if (e.getEntityType().equals(EntityType.ENDER_SIGNAL)) {
-            {
                 KList<Position2> p = getEngine().getDimension().getStrongholds(getEngine().getWorld().seed());
                 Position2 px = new Position2(e.getEntity().getLocation().getBlockX(), e.getEntity().getLocation().getBlockZ());
                 Position2 pr = null;
                 double d = Double.MAX_VALUE;
 
-                for(Position2 i : p)
+                for (Position2 i : p) {
-                {
                     double dx = i.distance(px);
-                    if(dx < d)
+                    if (dx < d) {
-                    {
                         d = dx;
                         pr = i;
                     }
                 }
 
-                if(pr != null)
+                if (pr != null) {
-                {
                     e.getEntity().getWorld().playSound(e.getEntity().getLocation(), Sound.ITEM_TRIDENT_THROW, 1f, 1.6f);
                     ((EnderSignal) e.getEntity()).setTargetLocation(new Location(e.getEntity().getWorld(), pr.getX(), 40, pr.getZ()));
                 }

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

@@ -25,25 +25,25 @@ import com.volmit.iris.core.pregenerator.PregenListener;
 import com.volmit.iris.core.pregenerator.PregenTask;
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.IrisEngineCompound;
-import com.volmit.iris.util.data.B;
 import com.volmit.iris.engine.data.chunk.MCATerrainChunk;
 import com.volmit.iris.engine.data.chunk.TerrainChunk;
-import com.volmit.iris.util.nbt.mca.NBTWorld;
-import com.volmit.iris.util.nbt.tag.CompoundTag;
 import com.volmit.iris.engine.framework.headless.HeadlessGenerator;
-import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.engine.object.biome.IrisBiome;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.engine.object.basic.IrisPosition;
+import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.common.IrisWorld;
-import com.volmit.iris.util.parallel.BurstExecutor;
+import com.volmit.iris.engine.object.dimensional.IrisDimension;
-import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
+import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.format.Form;
+import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.io.ReactiveFolder;
 import com.volmit.iris.util.math.M;
+import com.volmit.iris.util.nbt.mca.NBTWorld;
+import com.volmit.iris.util.nbt.tag.CompoundTag;
+import com.volmit.iris.util.parallel.BurstExecutor;
+import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.plugin.VolmitSender;
 import com.volmit.iris.util.reflect.V;
 import com.volmit.iris.util.scheduling.ChronoLatch;
@@ -101,19 +101,15 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
             @Override
             protected long loop() {
                 PrecisionStopwatch p = PrecisionStopwatch.start();
-                if(!tickHotloader())
+                if (!tickHotloader()) {
-                {
                     hotloaderMisses++;
-                }
+                } else {
-
-                else
-                {
                     hotloaderMisses = 0;
                 }
-                lastHotloadTime+= p.getMilliseconds();
+                lastHotloadTime += p.getMilliseconds();
                 lastHotloadTime /= 2;
 
-                return 120 + (long)(lastHotloadTime/2) + Math.min(hotloaderMisses * 125, 1375);
+                return 120 + (long) (lastHotloadTime / 2) + Math.min(hotloaderMisses * 125, 1375);
             }
         };
         ticker.setPriority(Thread.MIN_PRIORITY);
@@ -122,8 +118,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
         cleaner = new Looper() {
             @Override
             protected long loop() {
-                if(getComposite() != null)
+                if (getComposite() != null) {
-                {
                     getComposite().clean();
                 }
 
@@ -134,8 +129,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
         cleaner.setName("Iris Parallax Manager");
         cleaner.start();
 
-        if(isStudio())
+        if (isStudio()) {
-        {
             ticker.start();
         }
 
@@ -733,8 +727,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
 
     @Override
     public void close() {
-        if(isStudio())
+        if (isStudio()) {
-        {
             ticker.interrupt();
         }
 

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

@@ -21,15 +21,15 @@ package com.volmit.iris.engine.framework;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.actuator.IrisTerrainNormalActuator;
-import com.volmit.iris.util.data.DataProvider;
-import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.engine.object.biome.IrisBiome;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.engine.object.basic.IrisPosition;
+import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.common.IrisWorld;
-import com.volmit.iris.util.parallel.MultiBurst;
+import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
+import com.volmit.iris.util.data.DataProvider;
+import com.volmit.iris.util.hunk.Hunk;
+import com.volmit.iris.util.parallel.MultiBurst;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.command.CommandSender;

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

@@ -18,10 +18,10 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.util.data.B;
-import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.documentation.BlockCoordinates;
+import com.volmit.iris.util.hunk.Hunk;
 import org.bukkit.block.data.BlockData;
 
 public interface EngineDecorator extends EngineComponent {

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

@@ -18,8 +18,8 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.documentation.BlockCoordinates;
+import com.volmit.iris.util.hunk.Hunk;
 
 public interface EngineModifier<T> extends EngineComponent {
     @BlockCoordinates

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

@@ -22,11 +22,11 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.data.cache.Cache;
-import com.volmit.iris.util.data.B;
+import com.volmit.iris.engine.jigsaw.PlannedStructure;
-import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.engine.object.basic.IrisPosition;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.biome.IrisBiomeMutation;
+import com.volmit.iris.engine.object.common.IObjectPlacer;
 import com.volmit.iris.engine.object.deposits.IrisDepositGenerator;
 import com.volmit.iris.engine.object.feature.IrisFeature;
 import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
@@ -37,22 +37,22 @@ import com.volmit.iris.engine.object.objects.IrisObject;
 import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
 import com.volmit.iris.engine.object.objects.IrisObjectScale;
 import com.volmit.iris.engine.object.regional.IrisRegion;
-import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.engine.jigsaw.PlannedStructure;
-import com.volmit.iris.engine.object.common.IObjectPlacer;
 import com.volmit.iris.engine.object.tile.TileData;
 import com.volmit.iris.engine.parallax.ParallaxAccess;
 import com.volmit.iris.engine.parallax.ParallaxChunkMeta;
-import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
+import com.volmit.iris.util.data.B;
+import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.function.Consumer4;
+import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.scheduling.J;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import org.bukkit.Chunk;
@@ -225,10 +225,10 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
             }
         }
 
-        pos.add(forEachFeature(x<<4, z<<4));
+        pos.add(forEachFeature(x << 4, z << 4));
-        pos.add(forEachFeature(((x+1)<<4)-1, z<<4));
+        pos.add(forEachFeature(((x + 1) << 4) - 1, z << 4));
-        pos.add(forEachFeature(x<<4, ((z+1)<<4)-1));
+        pos.add(forEachFeature(x << 4, ((z + 1) << 4) - 1));
-        pos.add(forEachFeature(((x+1)<<4)-1, ((z+1)<<4)-1));
+        pos.add(forEachFeature(((x + 1) << 4) - 1, ((z + 1) << 4) - 1));
         pos.removeDuplicates();
         return pos;
     }
@@ -598,10 +598,9 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
             }
 
             for (IrisFeaturePotential j : p.getAddFeatures()) {
-                if(j.hasZone(rng, xx >> 4, zz >> 4))
+                if (j.hasZone(rng, xx >> 4, zz >> 4)) {
-                {
                     ParallaxChunkMeta rw = getParallaxAccess().getMetaRW(xx >> 4, zz >> 4);
-                    rw.getFeatures().add(new IrisFeaturePositional(xx+1, zz-1, j.getZone()));
+                    rw.getFeatures().add(new IrisFeaturePositional(xx + 1, zz - 1, j.getZone()));
                 }
             }
         }
@@ -646,10 +645,9 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
                 }
 
                 for (IrisFeaturePotential j : objectPlacement.getAddFeatures()) {
-                    if(j.hasZone(rng, xx >> 4, zz >> 4))
+                    if (j.hasZone(rng, xx >> 4, zz >> 4)) {
-                    {
                         ParallaxChunkMeta rw = getParallaxAccess().getMetaRW(xx >> 4, zz >> 4);
-                        rw.getFeatures().add(new IrisFeaturePositional(xx+1, zz-1, j.getZone()));
+                        rw.getFeatures().add(new IrisFeaturePositional(xx + 1, zz - 1, j.getZone()));
                     }
                 }
             }

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

@@ -20,8 +20,8 @@ package com.volmit.iris.engine.framework;
 
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.project.loader.IrisData;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.engine.object.common.IrisWorld;
+import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.engine.parallax.ParallaxWorld;
 import com.volmit.iris.util.parallel.MultiBurst;
 import lombok.Data;

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

@@ -20,11 +20,11 @@ package com.volmit.iris.engine.framework;
 
 import com.volmit.iris.core.gui.components.Renderer;
 import com.volmit.iris.core.project.loader.IrisData;
-import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
 import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.engine.parallax.ParallaxAccess;
+import com.volmit.iris.util.data.DataProvider;
 
 public interface GeneratorAccess extends DataProvider, Renderer {
     IrisRegion getRegion(int x, int z);

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

@@ -21,16 +21,16 @@ package com.volmit.iris.engine.framework;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.pregenerator.PregenListener;
 import com.volmit.iris.core.project.loader.IrisData;
-import com.volmit.iris.util.data.DataProvider;
-import com.volmit.iris.util.nbt.mca.NBTWorld;
 import com.volmit.iris.engine.framework.headless.HeadlessGenerator;
 import com.volmit.iris.engine.object.biome.IrisBiome;
-import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.engine.object.common.IrisWorld;
-import com.volmit.iris.util.parallel.MultiBurst;
+import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.nbt.mca.NBTWorld;
+import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.scheduling.ChronoLatch;
 import com.volmit.iris.util.scheduling.J;
 import org.bukkit.Location;

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

@@ -18,9 +18,9 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.engine.object.meta.InventorySlotType;
 import com.volmit.iris.engine.object.loot.IrisLootReference;
 import com.volmit.iris.engine.object.loot.IrisLootTable;
+import com.volmit.iris.engine.object.meta.InventorySlotType;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
 import org.bukkit.block.Block;

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

@@ -18,8 +18,8 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.util.data.B;
 import com.volmit.iris.engine.data.chunk.TerrainChunk;
+import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.hunk.Hunk;
 import lombok.Data;
 import org.bukkit.block.Biome;

src/main/java/com/volmit/iris/engine/framework/headless/HeadlessGenerator.java

@@ -20,12 +20,12 @@ package com.volmit.iris.engine.framework.headless;
 
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.pregenerator.PregenListener;
-import com.volmit.iris.util.nbt.mca.MCAUtil;
-import com.volmit.iris.util.nbt.mca.NBTWorld;
 import com.volmit.iris.engine.framework.EngineCompositeGenerator;
-import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.Position2;
+import com.volmit.iris.util.nbt.mca.MCAUtil;
+import com.volmit.iris.util.nbt.mca.NBTWorld;
+import com.volmit.iris.util.parallel.MultiBurst;
 import lombok.Data;
 
 import java.io.File;

src/main/java/com/volmit/iris/engine/framework/headless/HeadlessWorld.java

@@ -22,8 +22,8 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.core.tools.IrisWorlds;
 import com.volmit.iris.engine.framework.EngineCompositeGenerator;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.engine.object.common.IrisWorld;
+import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.util.plugin.VolmitSender;
 import lombok.Data;
 import org.bukkit.Bukkit;

src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java

@@ -19,8 +19,8 @@
 package com.volmit.iris.engine.framework.placer;
 
 import com.volmit.iris.core.project.loader.IrisData;
-import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
 import com.volmit.iris.engine.object.common.IObjectPlacer;
+import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
 import com.volmit.iris.engine.object.tile.TileData;
 import com.volmit.iris.util.math.RNG;
 import org.bukkit.block.TileState;

src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java

@@ -25,7 +25,6 @@ import com.volmit.iris.core.tools.IrisWorlds;
 import com.volmit.iris.engine.framework.EngineParallaxManager;
 import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.engine.object.basic.IrisPosition;
-import com.volmit.iris.util.interpolation.InterpolationMethod;
 import com.volmit.iris.engine.object.common.IObjectPlacer;
 import com.volmit.iris.engine.object.entity.IrisEntity;
 import com.volmit.iris.engine.object.feature.IrisFeature;
@@ -36,6 +35,7 @@ import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure;
 import com.volmit.iris.engine.object.objects.*;
 import com.volmit.iris.engine.parallax.ParallaxChunkMeta;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.interpolation.InterpolationMethod;
 import com.volmit.iris.util.math.RNG;
 import lombok.Data;
 import org.bukkit.Axis;

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

@@ -18,17 +18,17 @@
 
 package com.volmit.iris.engine.modifier;
 
-import com.volmit.iris.util.data.B;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedModifier;
-import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.util.noise.FastNoiseDouble;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.carve.IrisCaveLayer;
 import com.volmit.iris.engine.object.common.CaveResult;
-import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.data.B;
+import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.noise.FastNoiseDouble;
+import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;

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

@@ -18,15 +18,15 @@
 
 package com.volmit.iris.engine.modifier;
 
-import com.volmit.iris.util.data.B;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedModifier;
-import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.util.noise.FastNoiseDouble;
 import com.volmit.iris.engine.object.common.CaveResult;
-import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.data.B;
+import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.noise.FastNoiseDouble;
+import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import org.bukkit.block.data.BlockData;
 

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

@@ -20,12 +20,12 @@ package com.volmit.iris.engine.modifier;
 
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedModifier;
-import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.deposits.IrisDepositGenerator;
 import com.volmit.iris.engine.object.objects.IrisObject;
 import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.util.data.HeightMap;
+import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import org.bukkit.block.data.BlockData;

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

@@ -19,12 +19,12 @@
 package com.volmit.iris.engine.modifier;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.util.data.B;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedModifier;
-import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.common.CaveResult;
+import com.volmit.iris.util.data.B;
+import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import org.bukkit.Material;

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

@@ -18,16 +18,16 @@
 
 package com.volmit.iris.engine.modifier;
 
-import com.volmit.iris.util.data.B;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedModifier;
-import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.util.noise.CNG;
 import com.volmit.iris.engine.object.noise.NoiseStyle;
+import com.volmit.iris.util.data.B;
+import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.math.BlockPosition;
 import com.volmit.iris.util.math.MathHelper;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.noise.CNG;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;

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

@@ -24,11 +24,11 @@ import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.core.project.loader.IrisRegistrant;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.data.B;
-import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.IrisAccess;
+import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.block.IrisBlockDrops;
+import com.volmit.iris.engine.object.common.IRare;
 import com.volmit.iris.engine.object.decoration.IrisDecorator;
 import com.volmit.iris.engine.object.deposits.IrisDepositGenerator;
 import com.volmit.iris.engine.object.feature.IrisFeaturePotential;
@@ -41,15 +41,15 @@ import com.volmit.iris.engine.object.noise.NoiseStyle;
 import com.volmit.iris.engine.object.objects.IrisObject;
 import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
 import com.volmit.iris.engine.object.spawners.IrisSpawner;
-import com.volmit.iris.util.noise.CNG;
-import com.volmit.iris.engine.object.annotations.*;
-import com.volmit.iris.engine.object.common.IRare;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
+import com.volmit.iris.util.data.B;
+import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.util.data.VanillaBiomeMap;
 import com.volmit.iris.util.inventorygui.RandomColor;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.noise.CNG;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeGeneratorLink.java

@@ -19,10 +19,10 @@
 package com.volmit.iris.engine.object.biome;
 
 import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.data.DataProvider;
-import com.volmit.iris.util.interpolation.IrisInterpolation;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.noise.IrisGenerator;
+import com.volmit.iris.util.data.DataProvider;
+import com.volmit.iris.util.interpolation.IrisInterpolation;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeMutation.java

@@ -19,12 +19,12 @@
 package com.volmit.iris.engine.object.biome;
 
 import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.objects.IrisObject;
 import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KSet;
+import com.volmit.iris.util.data.DataProvider;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/volmit/iris/engine/object/biome/IrisBiomePaletteLayer.java

@@ -20,14 +20,14 @@ package com.volmit.iris.engine.object.biome;
 
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
+import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.block.IrisBlockData;
 import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
 import com.volmit.iris.engine.object.noise.IrisSlopeClip;
 import com.volmit.iris.engine.object.noise.NoiseStyle;
-import com.volmit.iris.util.noise.CNG;
-import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.noise.CNG;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -20,12 +20,12 @@ package com.volmit.iris.engine.object.block;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.project.loader.IrisData;
-import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.data.B;
 import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.engine.data.cache.AtomicCache;
 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;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -20,15 +20,15 @@ package com.volmit.iris.engine.object.block;
 
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
-import com.volmit.iris.engine.object.noise.NoiseStyle;
-import com.volmit.iris.util.noise.CNG;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MinNumber;
 import com.volmit.iris.engine.object.annotations.Required;
+import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
+import com.volmit.iris.engine.object.noise.NoiseStyle;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.noise.CNG;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/volmit/iris/engine/object/carve/IrisCarveLayer.java

@@ -20,17 +20,17 @@ package com.volmit.iris.engine.object.carve;
 
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.interpolation.IrisInterpolation;
-import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
-import com.volmit.iris.util.noise.CNG;
 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.util.stream.ProceduralStream;
+import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
-import com.volmit.iris.util.stream.interpolation.Interpolated;
+import com.volmit.iris.util.interpolation.IrisInterpolation;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.noise.CNG;
+import com.volmit.iris.util.stream.ProceduralStream;
+import com.volmit.iris.util.stream.interpolation.Interpolated;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/volmit/iris/engine/object/carve/IrisCaveFluid.java

@@ -20,12 +20,12 @@ package com.volmit.iris.engine.object.carve;
 
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.data.B;
-import com.volmit.iris.engine.object.block.IrisBlockData;
 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.block.IrisBlockData;
+import com.volmit.iris.util.data.B;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/volmit/iris/engine/object/carve/IrisCavernZone.java

@@ -25,8 +25,8 @@ import com.volmit.iris.engine.object.annotations.MaxNumber;
 import com.volmit.iris.engine.object.annotations.MinNumber;
 import com.volmit.iris.engine.object.common.IRare;
 import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
-import com.volmit.iris.util.stream.ProceduralStream;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.stream.ProceduralStream;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/volmit/iris/engine/object/carve/IrisCaverns.java

@@ -25,10 +25,10 @@ import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
 import com.volmit.iris.engine.object.noise.IrisInterpolator3D;
 import com.volmit.iris.engine.object.noise.NoiseStyle;
-import com.volmit.iris.util.stream.ProceduralStream;
-import com.volmit.iris.util.stream.interpolation.Interpolated;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.stream.ProceduralStream;
+import com.volmit.iris.util.stream.interpolation.Interpolated;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/volmit/iris/engine/object/compat/IrisCompat.java

@@ -20,8 +20,8 @@ package com.volmit.iris.engine.object.compat;
 
 import com.google.gson.Gson;
 import com.volmit.iris.Iris;
-import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.io.IO;
 import com.volmit.iris.util.json.JSONObject;
 import com.volmit.iris.util.scheduling.J;

src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityBlockFilter.java

@@ -20,9 +20,9 @@ package com.volmit.iris.engine.object.compat;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.data.B;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.Required;
+import com.volmit.iris.util.data.B;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityItemFilter.java

@@ -20,9 +20,9 @@ package com.volmit.iris.engine.object.compat;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.data.B;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.Required;
+import com.volmit.iris.util.data.B;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;

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

@@ -21,14 +21,14 @@ package com.volmit.iris.engine.object.decoration;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
+import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.block.IrisBlockData;
 import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
 import com.volmit.iris.engine.object.noise.NoiseStyle;
-import com.volmit.iris.util.noise.CNG;
-import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.noise.CNG;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -22,7 +22,7 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.core.project.loader.IrisRegistrant;
 import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.data.DataProvider;
+import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.biome.InferredType;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.biome.IrisBiomeCustom;
@@ -46,12 +46,12 @@ import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
 import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.engine.object.spawners.IrisSpawner;
 import com.volmit.iris.engine.object.trees.IrisTreeSettings;
-import com.volmit.iris.util.noise.CNG;
-import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.util.io.IO;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.noise.CNG;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -340,19 +340,17 @@ public class IrisDimension extends IrisRegistrant {
     private final transient AtomicCache<Boolean> featuresUsed = new AtomicCache<>();
     private final transient AtomicCache<KList<Position2>> strongholdsCache = new AtomicCache<>();
 
-    public KList<Position2> getStrongholds(long seed)
+    public KList<Position2> getStrongholds(long seed) {
-    {
         return strongholdsCache.aquire(() -> {
             KList<Position2> pos = new KList<>();
             int jump = strongholdJumpDistance;
             RNG rng = new RNG((seed * 223) + 12945);
 
-            for(int i = 0; i < maxStrongholds; i++)
+            for (int i = 0; i < maxStrongholds; i++) {
-            {
                 int m = i + 1;
                 pos.add(new Position2(
-                        (int) ((rng.i( jump * i) + (jump * i)) * (rng.b() ? -1D : 1D)),
+                        (int) ((rng.i(jump * i) + (jump * i)) * (rng.b() ? -1D : 1D)),
-                        (int) ((rng.i( jump * i) + (jump * i)) * (rng.b() ? -1D : 1D))
+                        (int) ((rng.i(jump * i) + (jump * i)) * (rng.b() ? -1D : 1D))
                 ));
             }
 

src/main/java/com/volmit/iris/engine/object/entity/IrisEntity.java

@@ -157,8 +157,7 @@ public class IrisEntity extends IrisRegistrant {
     public Entity spawn(Engine gen, Location at, RNG rng) {
         Entity e = doSpawn(at);
 
-        if(e == null)
+        if (e == null) {
-        {
             return null;
         }
 
@@ -291,13 +290,9 @@ public class IrisEntity extends IrisRegistrant {
             // Due to the structure of iris, we will call it sync and busy wait until it's done.
             AtomicReference<Entity> ae = new AtomicReference<>();
 
-            try
+            try {
-            {
                 J.s(() -> ae.set(doSpawn(at)));
-            }
+            } catch (Throwable e) {
-
-            catch(Throwable e)
-            {
                 return null;
             }
             PrecisionStopwatch p = PrecisionStopwatch.start();
@@ -305,8 +300,7 @@ public class IrisEntity extends IrisRegistrant {
             while (ae.get() == null) {
                 J.sleep(25);
 
-                if(p.getMilliseconds() > 500)
+                if (p.getMilliseconds() > 500) {
-                {
                     return null;
                 }
             }

src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java

@@ -24,14 +24,14 @@ import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineFramework;
 import com.volmit.iris.engine.modifier.IrisCaveModifier;
-import com.volmit.iris.engine.object.biome.IrisBiome;
-import com.volmit.iris.engine.object.spawners.IrisSpawner;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MinNumber;
 import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
+import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.common.CaveResult;
 import com.volmit.iris.engine.object.common.IRare;
+import com.volmit.iris.engine.object.spawners.IrisSpawner;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.math.RNG;
@@ -136,7 +136,8 @@ public class IrisEntitySpawn implements IRare {
         try {
             IrisEntity irisEntity = getRealEntity(g);
 
-            if (!irisEntity.getSurface().matches(at.clone().subtract(0, 1, 0).getBlock().getState())) return null; //Make sure it can spawn on the block
+            if (!irisEntity.getSurface().matches(at.clone().subtract(0, 1, 0).getBlock().getState()))
+                return null; //Make sure it can spawn on the block
 
             Entity e = irisEntity.spawn(g, at.add(0.5, 0, 0.5), rng.aquire(() -> new RNG(g.getTarget().getWorld().seed() + 4)));
             if (e != null) {

src/main/java/com/volmit/iris/engine/object/feature/IrisFeature.java

@@ -20,13 +20,13 @@ package com.volmit.iris.engine.object.feature;
 
 import com.google.gson.Gson;
 import com.volmit.iris.engine.data.cache.AtomicCache;
+import com.volmit.iris.engine.object.annotations.*;
+import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
+import com.volmit.iris.engine.object.spawners.IrisSpawner;
+import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.interpolation.InterpolationMethod;
 import com.volmit.iris.util.interpolation.IrisInterpolation;
-import com.volmit.iris.engine.object.biome.IrisBiome;
-import com.volmit.iris.engine.object.spawners.IrisSpawner;
-import com.volmit.iris.engine.object.annotations.*;
-import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
-import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePositional.java

@@ -21,12 +21,12 @@ package com.volmit.iris.engine.object.feature;
 import com.google.gson.Gson;
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.interpolation.IrisInterpolation;
-import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.Required;
+import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.function.NoiseProvider;
+import com.volmit.iris.util.interpolation.IrisInterpolation;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RNG;
 import lombok.Data;

src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPiece.java

@@ -19,16 +19,16 @@
 package com.volmit.iris.engine.object.jigsaw;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.engine.object.basic.IrisPosition;
 import com.volmit.iris.core.project.loader.IrisRegistrant;
-import com.volmit.iris.engine.object.objects.ObjectPlaceMode;
+import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
+import com.volmit.iris.engine.object.basic.IrisPosition;
 import com.volmit.iris.engine.object.objects.IrisObject;
 import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
+import com.volmit.iris.engine.object.objects.ObjectPlaceMode;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPieceConnector.java

@@ -18,10 +18,10 @@
 
 package com.volmit.iris.engine.object.jigsaw;
 
-import com.volmit.iris.engine.object.objects.IrisDirection;
-import com.volmit.iris.engine.object.entity.IrisEntity;
-import com.volmit.iris.engine.object.basic.IrisPosition;
 import com.volmit.iris.engine.object.annotations.*;
+import com.volmit.iris.engine.object.basic.IrisPosition;
+import com.volmit.iris.engine.object.entity.IrisEntity;
+import com.volmit.iris.engine.object.objects.IrisDirection;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawStructure.java

@@ -19,10 +19,10 @@
 package com.volmit.iris.engine.object.jigsaw;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.engine.object.feature.IrisFeature;
 import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
+import com.volmit.iris.engine.object.feature.IrisFeature;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -20,17 +20,17 @@ package com.volmit.iris.engine.object.loot;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.data.B;
+import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.meta.InventorySlotType;
 import com.volmit.iris.engine.object.meta.IrisAttributeModifier;
 import com.volmit.iris.engine.object.meta.IrisEnchantment;
 import com.volmit.iris.engine.object.noise.NoiseStyle;
-import com.volmit.iris.util.noise.CNG;
-import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.noise.CNG;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/volmit/iris/engine/object/loot/IrisLootReference.java

@@ -19,12 +19,12 @@
 package com.volmit.iris.engine.object.loot;
 
 import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MinNumber;
 import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.data.DataProvider;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/volmit/iris/engine/object/loot/IrisLootTable.java

@@ -18,12 +18,12 @@
 
 package com.volmit.iris.engine.object.loot;
 
-import com.volmit.iris.engine.object.meta.InventorySlotType;
 import com.volmit.iris.core.project.loader.IrisRegistrant;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MinNumber;
 import com.volmit.iris.engine.object.annotations.Required;
+import com.volmit.iris.engine.object.meta.InventorySlotType;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
 import lombok.AllArgsConstructor;

src/main/java/com/volmit/iris/engine/object/mods/IrisMod.java

@@ -18,12 +18,12 @@
 
 package com.volmit.iris.engine.object.mods;
 
-import com.volmit.iris.engine.object.biome.IrisBiome;
-import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.core.project.loader.IrisRegistrant;
 import com.volmit.iris.engine.object.annotations.*;
+import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.objects.IrisObject;
 import com.volmit.iris.engine.object.objects.IrisObjectReplace;
+import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeInjector.java

@@ -18,12 +18,12 @@
 
 package com.volmit.iris.engine.object.mods;
 
-import com.volmit.iris.engine.object.biome.IrisBiome;
-import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
+import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeReplacer.java

@@ -18,11 +18,11 @@
 
 package com.volmit.iris.engine.object.mods;
 
-import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
+import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/volmit/iris/engine/object/mods/IrisModNoiseStyleReplacer.java

@@ -18,13 +18,13 @@
 
 package com.volmit.iris.engine.object.mods;
 
-import com.volmit.iris.engine.object.biome.IrisBiome;
-import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
-import com.volmit.iris.engine.object.noise.NoiseStyle;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
+import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
+import com.volmit.iris.engine.object.noise.NoiseStyle;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementBiomeInjector.java

@@ -18,11 +18,11 @@
 
 package com.volmit.iris.engine.object.mods;
 
-import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
+import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;

src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementRegionInjector.java

@@ -18,12 +18,12 @@
 
 package com.volmit.iris.engine.object.mods;
 
-import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
+import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectReplacer.java

@@ -18,11 +18,11 @@
 
 package com.volmit.iris.engine.object.mods;
 
-import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
+import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.objects.IrisObject;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;

src/main/java/com/volmit/iris/engine/object/mods/IrisModRegionReplacer.java

@@ -18,11 +18,11 @@
 
 package com.volmit.iris.engine.object.mods;
 
-import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
+import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/volmit/iris/engine/object/noise/IrisExpression.java

@@ -22,15 +22,15 @@ import com.dfsek.paralithic.Expression;
 import com.dfsek.paralithic.eval.parser.Parser;
 import com.dfsek.paralithic.eval.parser.Scope;
 import com.volmit.iris.Iris;
-import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.Required;
-import com.volmit.iris.util.stream.ProceduralStream;
-import com.volmit.iris.util.stream.interpolation.Interpolated;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.stream.ProceduralStream;
+import com.volmit.iris.util.stream.interpolation.Interpolated;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/volmit/iris/engine/object/noise/IrisExpressionLoad.java

@@ -22,8 +22,8 @@ import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.Required;
-import com.volmit.iris.util.stream.ProceduralStream;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.stream.ProceduralStream;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -19,14 +19,14 @@
 package com.volmit.iris.engine.object.noise;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.interpolation.IrisInterpolation;
 import com.volmit.iris.core.project.loader.IrisRegistrant;
-import com.volmit.iris.util.noise.CellGenerator;
+import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.common.IRare;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.interpolation.IrisInterpolation;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.noise.CellGenerator;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -20,13 +20,13 @@ package com.volmit.iris.engine.object.noise;
 
 import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.noise.CNG;
-import com.volmit.iris.util.noise.ExpressionNoise;
 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.RegistryListResource;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.noise.CNG;
+import com.volmit.iris.util.noise.ExpressionNoise;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;