Refs

src/main/java/com/volmit/iris/util/atomics/AtomicAverage.java

@@ -16,10 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.atomics;
 
 import com.google.common.util.concurrent.AtomicDoubleArray;
 import com.volmit.iris.Iris;
+import com.volmit.iris.util.data.DoubleArrayUtils;
 
 /**
  * Provides an incredibly fast averaging object. It swaps values from a sum

src/main/java/com/volmit/iris/util/atomics/AtomicRollingSequence.java

@@ -16,7 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.atomics;
+
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.math.M;
 
 public class AtomicRollingSequence extends AtomicAverage {
     private double median;

src/main/java/com/volmit/iris/util/board/Board.java

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.board;
 
+import com.volmit.iris.util.format.C;
 import lombok.NonNull;
 import lombok.Setter;
 import org.bukkit.Bukkit;
@@ -127,8 +128,8 @@ public class Board {
             team.setSuffix(entry.getSuffix());
 
             switch (boardSettings.getScoreDirection()) {
-                case UP -> objective.getScore(team.getName()).setScore(1 + i);
+                case ScoreDirection.UP -> objective.getScore(team.getName()).setScore(1 + i);
-                case DOWN -> objective.getScore(team.getName()).setScore(15 - i);
+                case ScoreDirection.DOWN -> objective.getScore(team.getName()).setScore(15 - i);
             }
         }
     }

src/main/java/com/volmit/iris/util/board/BoardEntry.java

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.board;
 
+import com.volmit.iris.util.format.C;
 import lombok.Getter;
 import org.apache.commons.lang.StringUtils;
 

src/main/java/com/volmit/iris/util/board/BoardManager.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.board;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

src/main/java/com/volmit/iris/util/board/BoardProvider.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.board;
 
 import org.bukkit.entity.Player;
 

src/main/java/com/volmit/iris/util/board/BoardSettings.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.board;
 
 import lombok.Builder;
 import lombok.Getter;

src/main/java/com/volmit/iris/util/board/BoardUpdateTask.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.board;
 
 import lombok.RequiredArgsConstructor;
 import org.bukkit.Bukkit;

src/main/java/com/volmit/iris/util/board/ScoreDirection.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.board;
 
 /**
  * @author Missionary (missionarymc@gmail.com)

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

@@ -18,8 +18,7 @@
 
 package com.volmit.iris.util.data;
 
-import com.volmit.iris.util.Dimension;
+import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.KList;
 import com.volmit.iris.util.math.Direction;
 import org.bukkit.*;
 import org.bukkit.block.Block;

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

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.util.data;
 
-import com.volmit.iris.util.KList;
+import com.volmit.iris.util.collection.KList;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.data;
 
 /**
  * Dimensions

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.data;
 
 /**
  * Represents a dimension (coordinates not worlds)

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.data;
 
 import com.volmit.iris.Iris;
 import org.bukkit.block.Biome;

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

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.util.data;
 
-import com.volmit.iris.util.IrisMathHelper;
+import com.volmit.iris.util.math.IrisMathHelper;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.ChunkGenerator.BiomeGrid;
 

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.data;
 
 import org.bukkit.Location;
 import org.bukkit.Material;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.data;
 
 public class Shrinkwrap<T> {
     private T t;

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

@@ -1,5 +1,24 @@
-package com.volmit.iris.util;
+/*
+ * Iris is a World Generator for Minecraft Bukkit Servers
+ * Copyright (c) 2021 Arcane Arts (Volmit Software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 
+package com.volmit.iris.util.data;
+
+import com.volmit.iris.util.collection.KMap;
 import org.bukkit.block.Biome;
 import com.volmit.iris.util.inventorygui.RandomColor.*;
 

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

@@ -18,8 +18,7 @@
 
 package com.volmit.iris.util.data;
 
-import com.volmit.iris.util.KMap;
+import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.Shrinkwrap;
 
 public class WeightMap<T> extends KMap<T, Double> {
     private static final long serialVersionUID = 87558033900969389L;

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

@@ -18,8 +18,8 @@
 
 package com.volmit.iris.util.data;
 
-import com.volmit.iris.util.KList;
+import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.KeyPair;
+import com.volmit.iris.util.collection.KeyPair;
 
 import java.util.Random;
 

src/main/java/com/volmit/iris/util/fakenews/FakeEngine.java

@@ -1,4 +1,22 @@
-package com.volmit.iris.util;
+/*
+ * Iris is a World Generator for Minecraft Bukkit Servers
+ * Copyright (c) 2021 Arcane Arts (Volmit Software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.volmit.iris.util.fakenews;
 
 import com.volmit.iris.engine.IrisEngineFramework;
 import com.volmit.iris.core.IrisDataManager;

src/main/java/com/volmit/iris/util/fakenews/FakeWorld.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.fakenews;
 
 import lombok.Setter;
 import org.bukkit.HeightMap;

src/main/java/com/volmit/iris/util/fakenews/HeightedFakeWorld.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.fakenews;
 
 import org.bukkit.HeightMap;
 import org.bukkit.*;

src/main/java/com/volmit/iris/util/format/C.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.format;
 
 import com.volmit.iris.Iris;
 import org.apache.commons.lang.Validate;

src/main/java/com/volmit/iris/util/format/Form.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.format;
 
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RollingSequence;

src/main/java/com/volmit/iris/util/function/Consumer2.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 @SuppressWarnings({"hiding", "RedundantSuppression"})
 @FunctionalInterface

src/main/java/com/volmit/iris/util/function/Consumer3.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 @SuppressWarnings("ALL")
 @FunctionalInterface

src/main/java/com/volmit/iris/util/function/Consumer4.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 @FunctionalInterface
 public interface Consumer4<A, B, C, D> {

src/main/java/com/volmit/iris/util/function/Consumer5.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 @FunctionalInterface
 public interface Consumer5<A, B, C, D, E> {

src/main/java/com/volmit/iris/util/function/Consumer6.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 @FunctionalInterface
 public interface Consumer6<A, B, C, D, E, F> {

src/main/java/com/volmit/iris/util/function/Consumer7.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 @FunctionalInterface
 public interface Consumer7<A, B, C, D, E, F, G> {

src/main/java/com/volmit/iris/util/function/Consumer8.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 @FunctionalInterface
 public interface Consumer8<A, B, C, D, E, F, G, H> {

src/main/java/com/volmit/iris/util/function/Function2.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 @FunctionalInterface
 public interface Function2<A, B, R> {

src/main/java/com/volmit/iris/util/function/Function3.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 @FunctionalInterface
 public interface Function3<A, B, C, R> {

src/main/java/com/volmit/iris/util/function/Function4.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 @FunctionalInterface
 public interface Function4<A, B, C, D, R> {

src/main/java/com/volmit/iris/util/function/NastyFunction.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 public interface NastyFunction<T, R> {
     R run(T t);

src/main/java/com/volmit/iris/util/function/NastyFuture.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 public interface NastyFuture<R> {
     R run();

src/main/java/com/volmit/iris/util/function/NastyRunnable.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 public interface NastyRunnable {
     void run() throws Throwable;

src/main/java/com/volmit/iris/util/function/NoiseInjector.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 @FunctionalInterface
 public interface NoiseInjector {

src/main/java/com/volmit/iris/util/function/NoiseProvider.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 @FunctionalInterface
 public interface NoiseProvider {

src/main/java/com/volmit/iris/util/function/NoiseProvider3.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 @FunctionalInterface
 public interface NoiseProvider3 {

src/main/java/com/volmit/iris/util/function/Supplier2.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 public interface Supplier2<T, TT> {
     void get(T t, TT tt);

src/main/java/com/volmit/iris/util/function/Supplier3.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.function;
 
 public interface Supplier3<T, TT, TTT> {
     void get(T t, TT tt, TTT ttt);

src/main/java/com/volmit/iris/util/inventorygui/Element.java

@@ -16,8 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.inventorygui;
 
+import com.volmit.iris.util.scheduling.Callback;
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.data.MaterialBlock;
 import org.bukkit.inventory.ItemStack;
 
 @SuppressWarnings("ALL")

src/main/java/com/volmit/iris/util/inventorygui/ElementEvent.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.inventorygui;
 
 /**
  * Element Event.

src/main/java/com/volmit/iris/util/inventorygui/RandomColor.java

@@ -1,4 +1,22 @@
-package com.volmit.iris.util;
+/*
+ * Iris is a World Generator for Minecraft Bukkit Servers
+ * Copyright (c) 2021 Arcane Arts (Volmit Software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.volmit.iris.util.inventorygui;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/com/volmit/iris/util/inventorygui/UIElement.java

@@ -16,9 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.inventorygui;
 
 import com.volmit.iris.Iris;
+import com.volmit.iris.util.scheduling.Callback;
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.data.MaterialBlock;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;

src/main/java/com/volmit/iris/util/inventorygui/UIStaticDecorator.java

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.inventorygui;
 
+import com.volmit.iris.util.data.MaterialBlock;
 import org.bukkit.Material;
 
 @SuppressWarnings("ClassCanBeRecord")

src/main/java/com/volmit/iris/util/inventorygui/UIVoidDecorator.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.inventorygui;
 
 public class UIVoidDecorator implements WindowDecorator {
     @Override

src/main/java/com/volmit/iris/util/inventorygui/UIWindow.java

@@ -16,9 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.inventorygui;
 
 import com.volmit.iris.Iris;
+import com.volmit.iris.util.scheduling.Callback;
+import com.volmit.iris.util.scheduling.J;
+import com.volmit.iris.util.collection.KMap;
+import com.volmit.iris.util.collection.KSet;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/com/volmit/iris/util/inventorygui/Window.java

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.inventorygui;
 
+import com.volmit.iris.util.scheduling.Callback;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 

src/main/java/com/volmit/iris/util/inventorygui/WindowDecorator.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.inventorygui;
 
 public interface WindowDecorator {
     Element onDecorateBackground(Window window, int position, int row);

src/main/java/com/volmit/iris/util/inventorygui/WindowResolution.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.inventorygui;
 
 import org.bukkit.event.inventory.InventoryType;
 

src/main/java/com/volmit/iris/util/io/Converter.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.io;
 
 import java.io.File;
 

src/main/java/com/volmit/iris/util/io/CustomOutputStream.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.io;
 
 import java.io.IOException;
 import java.io.OutputStream;

src/main/java/com/volmit/iris/util/io/FileWatcher.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.io;
 
 import java.io.File;
 

src/main/java/com/volmit/iris/util/io/FolderWatcher.java

@@ -16,7 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.io;
+
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.collection.KMap;
 
 import java.io.File;
 

src/main/java/com/volmit/iris/util/io/IO.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.io;
 
 import com.volmit.iris.Iris;
 

src/main/java/com/volmit/iris/util/io/IORunnable.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.io;
 
 import java.io.IOException;
 

src/main/java/com/volmit/iris/util/io/JarScanner.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.io;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.util.collection.KSet;

src/main/java/com/volmit/iris/util/io/ReactiveFolder.java

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.io;
 
+import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.function.Consumer3;
-import com.volmit.iris.util.io.FolderWatcher;
 
 import java.io.File;
 

src/main/java/com/volmit/iris/util/io/SKConversion.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.io;
 
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;

src/main/java/com/volmit/iris/util/io/VoidOutputStream.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.io;
 
 import java.io.OutputStream;
 

src/main/java/com/volmit/iris/util/json/HTTP.java

@@ -16,12 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.json;
 
 
-import com.volmit.iris.util.json.JSONException;
-import com.volmit.iris.util.json.JSONObject;
-
 import java.util.Iterator;
 
 /**

src/main/java/com/volmit/iris/util/json/HTTPTokener.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.json;
 
 
 import com.volmit.iris.util.json.JSONException;

src/main/java/com/volmit/iris/util/json/JSONArray.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.json;
 
 
 import com.volmit.iris.Iris;

src/main/java/com/volmit/iris/util/json/JSONException.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.json;
 
 
 /**

src/main/java/com/volmit/iris/util/json/JSONML.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.json;
 
 
 import java.util.Iterator;

src/main/java/com/volmit/iris/util/json/JSONObject.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.json;
 
 import com.volmit.iris.Iris;
 

src/main/java/com/volmit/iris/util/json/JSONString.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.json;
 
 
 /**

src/main/java/com/volmit/iris/util/json/JSONStringer.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.json;
 
 
 import java.io.StringWriter;

src/main/java/com/volmit/iris/util/json/JSONTokener.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.json;
 
 
 import com.volmit.iris.Iris;

src/main/java/com/volmit/iris/util/json/JSONWriter.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.json;
 
 
 import com.volmit.iris.Iris;

src/main/java/com/volmit/iris/util/json/XML.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.json;
 
 
 import com.volmit.iris.Iris;

src/main/java/com/volmit/iris/util/json/XMLTokener.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.json;
 
 
 /**

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

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.util.math;
 
-import com.volmit.iris.util.DoubleArrayUtils;
+import com.volmit.iris.util.data.DoubleArrayUtils;
 
 /**
  * Provides an incredibly fast averaging object. It swaps values from a sum

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

@@ -19,7 +19,7 @@
 package com.volmit.iris.util.math;
 
 import com.volmit.iris.engine.object.IrisPosition;
-import com.volmit.iris.util.Cuboid;
+import com.volmit.iris.util.data.Cuboid;
 import org.bukkit.World;
 import org.bukkit.util.BlockVector;
 

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.math;
 
 public class ChunkPosition {
     private int x;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.math;
 
 import org.bukkit.util.Vector;
 

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

@@ -18,11 +18,10 @@
 
 package com.volmit.iris.util.math;
 
-import com.volmit.iris.util.Cuboid.CuboidDirection;
+import com.volmit.iris.util.data.Cuboid.CuboidDirection;
-import com.volmit.iris.util.DOP;
+import com.volmit.iris.util.collection.GBiset;
-import com.volmit.iris.util.GBiset;
+import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.KList;
+import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.KMap;
 import org.bukkit.Axis;
 import org.bukkit.block.BlockFace;
 import org.bukkit.util.Vector;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.math;
 
 import com.volmit.iris.util.scheduling.Wrapper;
 

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.math;
 
 import java.util.Random;
 import java.util.UUID;

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

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.math;
 
-import com.volmit.iris.util.math.Average;
+import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.math.M;
 
 public class RollingSequence extends Average {
     private double median;

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

@@ -18,9 +18,9 @@
 
 package com.volmit.iris.util.math;
 
-import com.volmit.iris.util.Form;
+import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.GListAdapter;
+import com.volmit.iris.util.collection.GListAdapter;
-import com.volmit.iris.util.KList;
+import com.volmit.iris.util.collection.KList;
 import org.bukkit.Axis;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

src/main/java/com/volmit/iris/util/oldnbt/ByteArrayTag.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 /**
  * The <code>TAG_Byte_Array</code> tag.

src/main/java/com/volmit/iris/util/oldnbt/ByteTag.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 /**
  * The <code>TAG_Byte</code> tag.

src/main/java/com/volmit/iris/util/oldnbt/CompoundTag.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 import java.util.Map;
 

src/main/java/com/volmit/iris/util/oldnbt/DoubleTag.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 /**
  * The <code>TAG_Double</code> tag.

src/main/java/com/volmit/iris/util/oldnbt/EndTag.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 /**
  * The <code>TAG_End</code> tag.

src/main/java/com/volmit/iris/util/oldnbt/FloatTag.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 /**
  * The <code>TAG_Float</code> tag.

src/main/java/com/volmit/iris/util/oldnbt/IntArrayTag.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 import java.util.Arrays;
 

src/main/java/com/volmit/iris/util/oldnbt/IntTag.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 /**
  * The <code>TAG_Int</code> tag.

src/main/java/com/volmit/iris/util/oldnbt/ListTag.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 import java.util.Collections;
 import java.util.List;

src/main/java/com/volmit/iris/util/oldnbt/LongTag.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 /**
  * The <code>TAG_Long</code> tag.

src/main/java/com/volmit/iris/util/oldnbt/NBTConstants.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;

src/main/java/com/volmit/iris/util/oldnbt/NBTInputStream.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 import java.io.Closeable;
 import java.io.DataInputStream;

src/main/java/com/volmit/iris/util/oldnbt/NBTOutputStream.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 import java.io.Closeable;
 import java.io.DataOutputStream;

src/main/java/com/volmit/iris/util/oldnbt/NBTUtils.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 /*
   Changes : Neil Wightman - Support 19133 Tag_Int_Array tag

src/main/java/com/volmit/iris/util/oldnbt/ShortTag.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 /**
  * The <code>TAG_Short</code> tag.

src/main/java/com/volmit/iris/util/oldnbt/StringTag.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util;
+package com.volmit.iris.util.oldnbt;
 
 /**
  * The <code>TAG_String</code> tag.