diff --git a/src/main/java/com/volmit/iris/util/atomics/AtomicAverage.java b/src/main/java/com/volmit/iris/util/atomics/AtomicAverage.java index 80a018695..e5a2572e9 100644 --- a/src/main/java/com/volmit/iris/util/atomics/AtomicAverage.java +++ b/src/main/java/com/volmit/iris/util/atomics/AtomicAverage.java @@ -16,10 +16,11 @@ * along with this program. If not, see . */ -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 diff --git a/src/main/java/com/volmit/iris/util/atomics/AtomicRollingSequence.java b/src/main/java/com/volmit/iris/util/atomics/AtomicRollingSequence.java index 91f30d39c..790eb94d2 100644 --- a/src/main/java/com/volmit/iris/util/atomics/AtomicRollingSequence.java +++ b/src/main/java/com/volmit/iris/util/atomics/AtomicRollingSequence.java @@ -16,7 +16,10 @@ * along with this program. If not, see . */ -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; diff --git a/src/main/java/com/volmit/iris/util/board/Board.java b/src/main/java/com/volmit/iris/util/board/Board.java index 14f9b94b4..01aab86f0 100644 --- a/src/main/java/com/volmit/iris/util/board/Board.java +++ b/src/main/java/com/volmit/iris/util/board/Board.java @@ -16,8 +16,9 @@ * along with this program. If not, see . */ -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 DOWN -> objective.getScore(team.getName()).setScore(15 - i); + case ScoreDirection.UP -> objective.getScore(team.getName()).setScore(1 + i); + case ScoreDirection.DOWN -> objective.getScore(team.getName()).setScore(15 - i); } } } diff --git a/src/main/java/com/volmit/iris/util/board/BoardEntry.java b/src/main/java/com/volmit/iris/util/board/BoardEntry.java index c19000269..d066eaf0b 100644 --- a/src/main/java/com/volmit/iris/util/board/BoardEntry.java +++ b/src/main/java/com/volmit/iris/util/board/BoardEntry.java @@ -16,8 +16,9 @@ * along with this program. If not, see . */ -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; diff --git a/src/main/java/com/volmit/iris/util/board/BoardManager.java b/src/main/java/com/volmit/iris/util/board/BoardManager.java index 496eb62cc..d4d55aaab 100644 --- a/src/main/java/com/volmit/iris/util/board/BoardManager.java +++ b/src/main/java/com/volmit/iris/util/board/BoardManager.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.board; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/com/volmit/iris/util/board/BoardProvider.java b/src/main/java/com/volmit/iris/util/board/BoardProvider.java index d33a437c8..be61e7bbb 100644 --- a/src/main/java/com/volmit/iris/util/board/BoardProvider.java +++ b/src/main/java/com/volmit/iris/util/board/BoardProvider.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.board; import org.bukkit.entity.Player; diff --git a/src/main/java/com/volmit/iris/util/board/BoardSettings.java b/src/main/java/com/volmit/iris/util/board/BoardSettings.java index ca0e0abeb..62bf578df 100644 --- a/src/main/java/com/volmit/iris/util/board/BoardSettings.java +++ b/src/main/java/com/volmit/iris/util/board/BoardSettings.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.board; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/volmit/iris/util/board/BoardUpdateTask.java b/src/main/java/com/volmit/iris/util/board/BoardUpdateTask.java index 3d421c726..e4dd5ee98 100644 --- a/src/main/java/com/volmit/iris/util/board/BoardUpdateTask.java +++ b/src/main/java/com/volmit/iris/util/board/BoardUpdateTask.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.board; import lombok.RequiredArgsConstructor; import org.bukkit.Bukkit; diff --git a/src/main/java/com/volmit/iris/util/board/ScoreDirection.java b/src/main/java/com/volmit/iris/util/board/ScoreDirection.java index df1576159..253155ca5 100644 --- a/src/main/java/com/volmit/iris/util/board/ScoreDirection.java +++ b/src/main/java/com/volmit/iris/util/board/ScoreDirection.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.board; /** * @author Missionary (missionarymc@gmail.com) diff --git a/src/main/java/com/volmit/iris/util/data/Cuboid.java b/src/main/java/com/volmit/iris/util/data/Cuboid.java index 32ae1c93a..9ba445bfc 100644 --- a/src/main/java/com/volmit/iris/util/data/Cuboid.java +++ b/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.KList; +import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.Direction; import org.bukkit.*; import org.bukkit.block.Block; diff --git a/src/main/java/com/volmit/iris/util/data/DataPalette.java b/src/main/java/com/volmit/iris/util/data/DataPalette.java index 19599faee..8d4ebf435 100644 --- a/src/main/java/com/volmit/iris/util/data/DataPalette.java +++ b/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; diff --git a/src/main/java/com/volmit/iris/util/data/Dimension.java b/src/main/java/com/volmit/iris/util/data/Dimension.java index 7b30f3654..2a25e6aaf 100644 --- a/src/main/java/com/volmit/iris/util/data/Dimension.java +++ b/src/main/java/com/volmit/iris/util/data/Dimension.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.data; /** * Dimensions diff --git a/src/main/java/com/volmit/iris/util/data/DimensionFace.java b/src/main/java/com/volmit/iris/util/data/DimensionFace.java index ba232d0a4..a9e6f0cf7 100644 --- a/src/main/java/com/volmit/iris/util/data/DimensionFace.java +++ b/src/main/java/com/volmit/iris/util/data/DimensionFace.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.data; /** * Represents a dimension (coordinates not worlds) diff --git a/src/main/java/com/volmit/iris/util/data/InvertedBiomeGrid.java b/src/main/java/com/volmit/iris/util/data/InvertedBiomeGrid.java index 4cfb64cab..5e58fdefb 100644 --- a/src/main/java/com/volmit/iris/util/data/InvertedBiomeGrid.java +++ b/src/main/java/com/volmit/iris/util/data/InvertedBiomeGrid.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.data; import com.volmit.iris.Iris; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/util/data/IrisBiomeStorage.java b/src/main/java/com/volmit/iris/util/data/IrisBiomeStorage.java index ca2c31009..63c2c4ac3 100644 --- a/src/main/java/com/volmit/iris/util/data/IrisBiomeStorage.java +++ b/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; diff --git a/src/main/java/com/volmit/iris/util/data/MaterialBlock.java b/src/main/java/com/volmit/iris/util/data/MaterialBlock.java index bc85e43ec..d22e0d7c2 100644 --- a/src/main/java/com/volmit/iris/util/data/MaterialBlock.java +++ b/src/main/java/com/volmit/iris/util/data/MaterialBlock.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.data; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/util/data/Shrinkwrap.java b/src/main/java/com/volmit/iris/util/data/Shrinkwrap.java index 0b09de1cb..4ef17c7b2 100644 --- a/src/main/java/com/volmit/iris/util/data/Shrinkwrap.java +++ b/src/main/java/com/volmit/iris/util/data/Shrinkwrap.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.data; public class Shrinkwrap { private T t; diff --git a/src/main/java/com/volmit/iris/util/data/VanillaBiomeMap.java b/src/main/java/com/volmit/iris/util/data/VanillaBiomeMap.java index d4f8af683..e2466bcb9 100644 --- a/src/main/java/com/volmit/iris/util/data/VanillaBiomeMap.java +++ b/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 . + */ +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.*; diff --git a/src/main/java/com/volmit/iris/util/data/WeightMap.java b/src/main/java/com/volmit/iris/util/data/WeightMap.java index 7479e1354..5f4db9e6a 100644 --- a/src/main/java/com/volmit/iris/util/data/WeightMap.java +++ b/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.Shrinkwrap; +import com.volmit.iris.util.collection.KMap; public class WeightMap extends KMap { private static final long serialVersionUID = 87558033900969389L; diff --git a/src/main/java/com/volmit/iris/util/data/WeightedRandom.java b/src/main/java/com/volmit/iris/util/data/WeightedRandom.java index a621293b3..35d7f2d90 100644 --- a/src/main/java/com/volmit/iris/util/data/WeightedRandom.java +++ b/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.KeyPair; +import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.collection.KeyPair; import java.util.Random; diff --git a/src/main/java/com/volmit/iris/util/fakenews/FakeEngine.java b/src/main/java/com/volmit/iris/util/fakenews/FakeEngine.java index 5c3291bbe..d5e3f9d80 100644 --- a/src/main/java/com/volmit/iris/util/fakenews/FakeEngine.java +++ b/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 . + */ + +package com.volmit.iris.util.fakenews; import com.volmit.iris.engine.IrisEngineFramework; import com.volmit.iris.core.IrisDataManager; diff --git a/src/main/java/com/volmit/iris/util/fakenews/FakeWorld.java b/src/main/java/com/volmit/iris/util/fakenews/FakeWorld.java index df1d94994..a3403c53e 100644 --- a/src/main/java/com/volmit/iris/util/fakenews/FakeWorld.java +++ b/src/main/java/com/volmit/iris/util/fakenews/FakeWorld.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.fakenews; import lombok.Setter; import org.bukkit.HeightMap; diff --git a/src/main/java/com/volmit/iris/util/fakenews/HeightedFakeWorld.java b/src/main/java/com/volmit/iris/util/fakenews/HeightedFakeWorld.java index 2d02b0d4c..a91786e06 100644 --- a/src/main/java/com/volmit/iris/util/fakenews/HeightedFakeWorld.java +++ b/src/main/java/com/volmit/iris/util/fakenews/HeightedFakeWorld.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.fakenews; import org.bukkit.HeightMap; import org.bukkit.*; diff --git a/src/main/java/com/volmit/iris/util/format/C.java b/src/main/java/com/volmit/iris/util/format/C.java index 05529a53d..dd1e06f4c 100644 --- a/src/main/java/com/volmit/iris/util/format/C.java +++ b/src/main/java/com/volmit/iris/util/format/C.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.format; import com.volmit.iris.Iris; import org.apache.commons.lang.Validate; diff --git a/src/main/java/com/volmit/iris/util/format/Form.java b/src/main/java/com/volmit/iris/util/format/Form.java index 2f83a084f..1bf71be8b 100644 --- a/src/main/java/com/volmit/iris/util/format/Form.java +++ b/src/main/java/com/volmit/iris/util/format/Form.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -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; diff --git a/src/main/java/com/volmit/iris/util/function/Consumer2.java b/src/main/java/com/volmit/iris/util/function/Consumer2.java index f911d4f18..e74078a09 100644 --- a/src/main/java/com/volmit/iris/util/function/Consumer2.java +++ b/src/main/java/com/volmit/iris/util/function/Consumer2.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; @SuppressWarnings({"hiding", "RedundantSuppression"}) @FunctionalInterface diff --git a/src/main/java/com/volmit/iris/util/function/Consumer3.java b/src/main/java/com/volmit/iris/util/function/Consumer3.java index 36d36021e..094ae10d9 100644 --- a/src/main/java/com/volmit/iris/util/function/Consumer3.java +++ b/src/main/java/com/volmit/iris/util/function/Consumer3.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; @SuppressWarnings("ALL") @FunctionalInterface diff --git a/src/main/java/com/volmit/iris/util/function/Consumer4.java b/src/main/java/com/volmit/iris/util/function/Consumer4.java index b80c64c67..04cccf1e7 100644 --- a/src/main/java/com/volmit/iris/util/function/Consumer4.java +++ b/src/main/java/com/volmit/iris/util/function/Consumer4.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; @FunctionalInterface public interface Consumer4 { diff --git a/src/main/java/com/volmit/iris/util/function/Consumer5.java b/src/main/java/com/volmit/iris/util/function/Consumer5.java index fa23c0055..3db8a551b 100644 --- a/src/main/java/com/volmit/iris/util/function/Consumer5.java +++ b/src/main/java/com/volmit/iris/util/function/Consumer5.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; @FunctionalInterface public interface Consumer5 { diff --git a/src/main/java/com/volmit/iris/util/function/Consumer6.java b/src/main/java/com/volmit/iris/util/function/Consumer6.java index 8a75d353d..265cbb0e0 100644 --- a/src/main/java/com/volmit/iris/util/function/Consumer6.java +++ b/src/main/java/com/volmit/iris/util/function/Consumer6.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; @FunctionalInterface public interface Consumer6 { diff --git a/src/main/java/com/volmit/iris/util/function/Consumer7.java b/src/main/java/com/volmit/iris/util/function/Consumer7.java index a1f216a9f..5071142af 100644 --- a/src/main/java/com/volmit/iris/util/function/Consumer7.java +++ b/src/main/java/com/volmit/iris/util/function/Consumer7.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; @FunctionalInterface public interface Consumer7 { diff --git a/src/main/java/com/volmit/iris/util/function/Consumer8.java b/src/main/java/com/volmit/iris/util/function/Consumer8.java index 6c95faf19..3c1f8e959 100644 --- a/src/main/java/com/volmit/iris/util/function/Consumer8.java +++ b/src/main/java/com/volmit/iris/util/function/Consumer8.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; @FunctionalInterface public interface Consumer8 { diff --git a/src/main/java/com/volmit/iris/util/function/Function2.java b/src/main/java/com/volmit/iris/util/function/Function2.java index 4bae100b5..acc5c1344 100644 --- a/src/main/java/com/volmit/iris/util/function/Function2.java +++ b/src/main/java/com/volmit/iris/util/function/Function2.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; @FunctionalInterface public interface Function2 { diff --git a/src/main/java/com/volmit/iris/util/function/Function3.java b/src/main/java/com/volmit/iris/util/function/Function3.java index 927026d22..fb4c3fb84 100644 --- a/src/main/java/com/volmit/iris/util/function/Function3.java +++ b/src/main/java/com/volmit/iris/util/function/Function3.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; @FunctionalInterface public interface Function3 { diff --git a/src/main/java/com/volmit/iris/util/function/Function4.java b/src/main/java/com/volmit/iris/util/function/Function4.java index a931736d7..99240e03a 100644 --- a/src/main/java/com/volmit/iris/util/function/Function4.java +++ b/src/main/java/com/volmit/iris/util/function/Function4.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; @FunctionalInterface public interface Function4 { diff --git a/src/main/java/com/volmit/iris/util/function/NastyFunction.java b/src/main/java/com/volmit/iris/util/function/NastyFunction.java index c62568d3e..489343cf1 100644 --- a/src/main/java/com/volmit/iris/util/function/NastyFunction.java +++ b/src/main/java/com/volmit/iris/util/function/NastyFunction.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; public interface NastyFunction { R run(T t); diff --git a/src/main/java/com/volmit/iris/util/function/NastyFuture.java b/src/main/java/com/volmit/iris/util/function/NastyFuture.java index 77ae7ccd6..58910d7ce 100644 --- a/src/main/java/com/volmit/iris/util/function/NastyFuture.java +++ b/src/main/java/com/volmit/iris/util/function/NastyFuture.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; public interface NastyFuture { R run(); diff --git a/src/main/java/com/volmit/iris/util/function/NastyRunnable.java b/src/main/java/com/volmit/iris/util/function/NastyRunnable.java index 178bfb9c5..5d9c92351 100644 --- a/src/main/java/com/volmit/iris/util/function/NastyRunnable.java +++ b/src/main/java/com/volmit/iris/util/function/NastyRunnable.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; public interface NastyRunnable { void run() throws Throwable; diff --git a/src/main/java/com/volmit/iris/util/function/NoiseInjector.java b/src/main/java/com/volmit/iris/util/function/NoiseInjector.java index 332bc1032..01e62945e 100644 --- a/src/main/java/com/volmit/iris/util/function/NoiseInjector.java +++ b/src/main/java/com/volmit/iris/util/function/NoiseInjector.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; @FunctionalInterface public interface NoiseInjector { diff --git a/src/main/java/com/volmit/iris/util/function/NoiseProvider.java b/src/main/java/com/volmit/iris/util/function/NoiseProvider.java index 8a1910d0f..d9852a261 100644 --- a/src/main/java/com/volmit/iris/util/function/NoiseProvider.java +++ b/src/main/java/com/volmit/iris/util/function/NoiseProvider.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; @FunctionalInterface public interface NoiseProvider { diff --git a/src/main/java/com/volmit/iris/util/function/NoiseProvider3.java b/src/main/java/com/volmit/iris/util/function/NoiseProvider3.java index ac27c3423..d0fd1b9ad 100644 --- a/src/main/java/com/volmit/iris/util/function/NoiseProvider3.java +++ b/src/main/java/com/volmit/iris/util/function/NoiseProvider3.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; @FunctionalInterface public interface NoiseProvider3 { diff --git a/src/main/java/com/volmit/iris/util/function/Supplier2.java b/src/main/java/com/volmit/iris/util/function/Supplier2.java index 693d5238f..27b80628e 100644 --- a/src/main/java/com/volmit/iris/util/function/Supplier2.java +++ b/src/main/java/com/volmit/iris/util/function/Supplier2.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; public interface Supplier2 { void get(T t, TT tt); diff --git a/src/main/java/com/volmit/iris/util/function/Supplier3.java b/src/main/java/com/volmit/iris/util/function/Supplier3.java index e259ebb3d..70c1e775b 100644 --- a/src/main/java/com/volmit/iris/util/function/Supplier3.java +++ b/src/main/java/com/volmit/iris/util/function/Supplier3.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.function; public interface Supplier3 { void get(T t, TT tt, TTT ttt); diff --git a/src/main/java/com/volmit/iris/util/inventorygui/Element.java b/src/main/java/com/volmit/iris/util/inventorygui/Element.java index 1f0a8fc78..52cb0afe5 100644 --- a/src/main/java/com/volmit/iris/util/inventorygui/Element.java +++ b/src/main/java/com/volmit/iris/util/inventorygui/Element.java @@ -16,8 +16,11 @@ * along with this program. If not, see . */ -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") diff --git a/src/main/java/com/volmit/iris/util/inventorygui/ElementEvent.java b/src/main/java/com/volmit/iris/util/inventorygui/ElementEvent.java index 2de71bbb9..003dcd2d8 100644 --- a/src/main/java/com/volmit/iris/util/inventorygui/ElementEvent.java +++ b/src/main/java/com/volmit/iris/util/inventorygui/ElementEvent.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.inventorygui; /** * Element Event. diff --git a/src/main/java/com/volmit/iris/util/inventorygui/RandomColor.java b/src/main/java/com/volmit/iris/util/inventorygui/RandomColor.java index be0ec0b78..25984d367 100644 --- a/src/main/java/com/volmit/iris/util/inventorygui/RandomColor.java +++ b/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 . + */ + +package com.volmit.iris.util.inventorygui; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/volmit/iris/util/inventorygui/UIElement.java b/src/main/java/com/volmit/iris/util/inventorygui/UIElement.java index 0263e445f..33326cd90 100644 --- a/src/main/java/com/volmit/iris/util/inventorygui/UIElement.java +++ b/src/main/java/com/volmit/iris/util/inventorygui/UIElement.java @@ -16,9 +16,12 @@ * along with this program. If not, see . */ -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; diff --git a/src/main/java/com/volmit/iris/util/inventorygui/UIStaticDecorator.java b/src/main/java/com/volmit/iris/util/inventorygui/UIStaticDecorator.java index edfd1707c..8f1ac3705 100644 --- a/src/main/java/com/volmit/iris/util/inventorygui/UIStaticDecorator.java +++ b/src/main/java/com/volmit/iris/util/inventorygui/UIStaticDecorator.java @@ -16,8 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.inventorygui; +import com.volmit.iris.util.data.MaterialBlock; import org.bukkit.Material; @SuppressWarnings("ClassCanBeRecord") diff --git a/src/main/java/com/volmit/iris/util/inventorygui/UIVoidDecorator.java b/src/main/java/com/volmit/iris/util/inventorygui/UIVoidDecorator.java index 4ed155247..475de8b0d 100644 --- a/src/main/java/com/volmit/iris/util/inventorygui/UIVoidDecorator.java +++ b/src/main/java/com/volmit/iris/util/inventorygui/UIVoidDecorator.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.inventorygui; public class UIVoidDecorator implements WindowDecorator { @Override diff --git a/src/main/java/com/volmit/iris/util/inventorygui/UIWindow.java b/src/main/java/com/volmit/iris/util/inventorygui/UIWindow.java index d879ee38f..5fe90731c 100644 --- a/src/main/java/com/volmit/iris/util/inventorygui/UIWindow.java +++ b/src/main/java/com/volmit/iris/util/inventorygui/UIWindow.java @@ -16,9 +16,13 @@ * along with this program. If not, see . */ -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; diff --git a/src/main/java/com/volmit/iris/util/inventorygui/Window.java b/src/main/java/com/volmit/iris/util/inventorygui/Window.java index a86298286..e279e9f36 100644 --- a/src/main/java/com/volmit/iris/util/inventorygui/Window.java +++ b/src/main/java/com/volmit/iris/util/inventorygui/Window.java @@ -16,8 +16,9 @@ * along with this program. If not, see . */ -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; diff --git a/src/main/java/com/volmit/iris/util/inventorygui/WindowDecorator.java b/src/main/java/com/volmit/iris/util/inventorygui/WindowDecorator.java index 34a7fa2f7..fb7f64450 100644 --- a/src/main/java/com/volmit/iris/util/inventorygui/WindowDecorator.java +++ b/src/main/java/com/volmit/iris/util/inventorygui/WindowDecorator.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.inventorygui; public interface WindowDecorator { Element onDecorateBackground(Window window, int position, int row); diff --git a/src/main/java/com/volmit/iris/util/inventorygui/WindowResolution.java b/src/main/java/com/volmit/iris/util/inventorygui/WindowResolution.java index 4b370aaeb..a1374d714 100644 --- a/src/main/java/com/volmit/iris/util/inventorygui/WindowResolution.java +++ b/src/main/java/com/volmit/iris/util/inventorygui/WindowResolution.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.inventorygui; import org.bukkit.event.inventory.InventoryType; diff --git a/src/main/java/com/volmit/iris/util/io/Converter.java b/src/main/java/com/volmit/iris/util/io/Converter.java index 6f0779cdd..94776cee7 100644 --- a/src/main/java/com/volmit/iris/util/io/Converter.java +++ b/src/main/java/com/volmit/iris/util/io/Converter.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.io; import java.io.File; diff --git a/src/main/java/com/volmit/iris/util/io/CustomOutputStream.java b/src/main/java/com/volmit/iris/util/io/CustomOutputStream.java index 217fb6f4e..6d8f0d37f 100644 --- a/src/main/java/com/volmit/iris/util/io/CustomOutputStream.java +++ b/src/main/java/com/volmit/iris/util/io/CustomOutputStream.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.io; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/com/volmit/iris/util/io/FileWatcher.java b/src/main/java/com/volmit/iris/util/io/FileWatcher.java index 47a65f55d..79f90f8b5 100644 --- a/src/main/java/com/volmit/iris/util/io/FileWatcher.java +++ b/src/main/java/com/volmit/iris/util/io/FileWatcher.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.io; import java.io.File; diff --git a/src/main/java/com/volmit/iris/util/io/FolderWatcher.java b/src/main/java/com/volmit/iris/util/io/FolderWatcher.java index 7d85908a4..6c2c8ae41 100644 --- a/src/main/java/com/volmit/iris/util/io/FolderWatcher.java +++ b/src/main/java/com/volmit/iris/util/io/FolderWatcher.java @@ -16,7 +16,10 @@ * along with this program. If not, see . */ -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; diff --git a/src/main/java/com/volmit/iris/util/io/IO.java b/src/main/java/com/volmit/iris/util/io/IO.java index 302248641..a4544e8fe 100644 --- a/src/main/java/com/volmit/iris/util/io/IO.java +++ b/src/main/java/com/volmit/iris/util/io/IO.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.io; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/util/io/IORunnable.java b/src/main/java/com/volmit/iris/util/io/IORunnable.java index 79893a3b5..e1f38f5b5 100644 --- a/src/main/java/com/volmit/iris/util/io/IORunnable.java +++ b/src/main/java/com/volmit/iris/util/io/IORunnable.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.io; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/util/io/JarScanner.java b/src/main/java/com/volmit/iris/util/io/JarScanner.java index dccd7934f..44b146188 100644 --- a/src/main/java/com/volmit/iris/util/io/JarScanner.java +++ b/src/main/java/com/volmit/iris/util/io/JarScanner.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.io; import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KSet; diff --git a/src/main/java/com/volmit/iris/util/io/ReactiveFolder.java b/src/main/java/com/volmit/iris/util/io/ReactiveFolder.java index 16c376a98..a8303c11a 100644 --- a/src/main/java/com/volmit/iris/util/io/ReactiveFolder.java +++ b/src/main/java/com/volmit/iris/util/io/ReactiveFolder.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -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; diff --git a/src/main/java/com/volmit/iris/util/io/SKConversion.java b/src/main/java/com/volmit/iris/util/io/SKConversion.java index d4ca9ac27..91af58579 100644 --- a/src/main/java/com/volmit/iris/util/io/SKConversion.java +++ b/src/main/java/com/volmit/iris/util/io/SKConversion.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.io; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.extent.clipboard.Clipboard; diff --git a/src/main/java/com/volmit/iris/util/io/VoidOutputStream.java b/src/main/java/com/volmit/iris/util/io/VoidOutputStream.java index 05b2bd0be..72f0c82b7 100644 --- a/src/main/java/com/volmit/iris/util/io/VoidOutputStream.java +++ b/src/main/java/com/volmit/iris/util/io/VoidOutputStream.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.io; import java.io.OutputStream; diff --git a/src/main/java/com/volmit/iris/util/json/HTTP.java b/src/main/java/com/volmit/iris/util/json/HTTP.java index 65ccd72c3..f4ec8ad70 100644 --- a/src/main/java/com/volmit/iris/util/json/HTTP.java +++ b/src/main/java/com/volmit/iris/util/json/HTTP.java @@ -16,12 +16,9 @@ * along with this program. If not, see . */ -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; /** diff --git a/src/main/java/com/volmit/iris/util/json/HTTPTokener.java b/src/main/java/com/volmit/iris/util/json/HTTPTokener.java index dc706dde0..77e17074d 100644 --- a/src/main/java/com/volmit/iris/util/json/HTTPTokener.java +++ b/src/main/java/com/volmit/iris/util/json/HTTPTokener.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.json; import com.volmit.iris.util.json.JSONException; diff --git a/src/main/java/com/volmit/iris/util/json/JSONArray.java b/src/main/java/com/volmit/iris/util/json/JSONArray.java index ed14644e1..3ab5a1f8b 100644 --- a/src/main/java/com/volmit/iris/util/json/JSONArray.java +++ b/src/main/java/com/volmit/iris/util/json/JSONArray.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.json; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/util/json/JSONException.java b/src/main/java/com/volmit/iris/util/json/JSONException.java index aab6db342..bde53e98c 100644 --- a/src/main/java/com/volmit/iris/util/json/JSONException.java +++ b/src/main/java/com/volmit/iris/util/json/JSONException.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.json; /** diff --git a/src/main/java/com/volmit/iris/util/json/JSONML.java b/src/main/java/com/volmit/iris/util/json/JSONML.java index 0372ed510..339c0434c 100644 --- a/src/main/java/com/volmit/iris/util/json/JSONML.java +++ b/src/main/java/com/volmit/iris/util/json/JSONML.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.json; import java.util.Iterator; diff --git a/src/main/java/com/volmit/iris/util/json/JSONObject.java b/src/main/java/com/volmit/iris/util/json/JSONObject.java index d286fa5c0..1b5dd1b48 100644 --- a/src/main/java/com/volmit/iris/util/json/JSONObject.java +++ b/src/main/java/com/volmit/iris/util/json/JSONObject.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.json; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/util/json/JSONString.java b/src/main/java/com/volmit/iris/util/json/JSONString.java index 2e54883af..9e717b779 100644 --- a/src/main/java/com/volmit/iris/util/json/JSONString.java +++ b/src/main/java/com/volmit/iris/util/json/JSONString.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.json; /** diff --git a/src/main/java/com/volmit/iris/util/json/JSONStringer.java b/src/main/java/com/volmit/iris/util/json/JSONStringer.java index e3f5e9c19..8c1160875 100644 --- a/src/main/java/com/volmit/iris/util/json/JSONStringer.java +++ b/src/main/java/com/volmit/iris/util/json/JSONStringer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.json; import java.io.StringWriter; diff --git a/src/main/java/com/volmit/iris/util/json/JSONTokener.java b/src/main/java/com/volmit/iris/util/json/JSONTokener.java index 6606cc55f..08549e1cf 100644 --- a/src/main/java/com/volmit/iris/util/json/JSONTokener.java +++ b/src/main/java/com/volmit/iris/util/json/JSONTokener.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.json; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/util/json/JSONWriter.java b/src/main/java/com/volmit/iris/util/json/JSONWriter.java index c81162bbe..39d454ba9 100644 --- a/src/main/java/com/volmit/iris/util/json/JSONWriter.java +++ b/src/main/java/com/volmit/iris/util/json/JSONWriter.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.json; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/util/json/XML.java b/src/main/java/com/volmit/iris/util/json/XML.java index 3113b616f..4202a8d63 100644 --- a/src/main/java/com/volmit/iris/util/json/XML.java +++ b/src/main/java/com/volmit/iris/util/json/XML.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.json; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/util/json/XMLTokener.java b/src/main/java/com/volmit/iris/util/json/XMLTokener.java index 02cb2e735..31fd117fe 100644 --- a/src/main/java/com/volmit/iris/util/json/XMLTokener.java +++ b/src/main/java/com/volmit/iris/util/json/XMLTokener.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.json; /** diff --git a/src/main/java/com/volmit/iris/util/math/Average.java b/src/main/java/com/volmit/iris/util/math/Average.java index 10ea8c991..545bdf654 100644 --- a/src/main/java/com/volmit/iris/util/math/Average.java +++ b/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 diff --git a/src/main/java/com/volmit/iris/util/math/AxisAlignedBB.java b/src/main/java/com/volmit/iris/util/math/AxisAlignedBB.java index 7d12e5a74..10603e5ac 100644 --- a/src/main/java/com/volmit/iris/util/math/AxisAlignedBB.java +++ b/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; diff --git a/src/main/java/com/volmit/iris/util/math/ChunkPosition.java b/src/main/java/com/volmit/iris/util/math/ChunkPosition.java index f3b4935aa..65098093f 100644 --- a/src/main/java/com/volmit/iris/util/math/ChunkPosition.java +++ b/src/main/java/com/volmit/iris/util/math/ChunkPosition.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.math; public class ChunkPosition { private int x; diff --git a/src/main/java/com/volmit/iris/util/math/DOP.java b/src/main/java/com/volmit/iris/util/math/DOP.java index cbeacb41f..615d83d28 100644 --- a/src/main/java/com/volmit/iris/util/math/DOP.java +++ b/src/main/java/com/volmit/iris/util/math/DOP.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.math; import org.bukkit.util.Vector; diff --git a/src/main/java/com/volmit/iris/util/math/Direction.java b/src/main/java/com/volmit/iris/util/math/Direction.java index dbd73a61a..2368501d7 100644 --- a/src/main/java/com/volmit/iris/util/math/Direction.java +++ b/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.DOP; -import com.volmit.iris.util.GBiset; -import com.volmit.iris.util.KList; -import com.volmit.iris.util.KMap; +import com.volmit.iris.util.data.Cuboid.CuboidDirection; +import com.volmit.iris.util.collection.GBiset; +import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.collection.KMap; import org.bukkit.Axis; import org.bukkit.block.BlockFace; import org.bukkit.util.Vector; diff --git a/src/main/java/com/volmit/iris/util/math/FinalInteger.java b/src/main/java/com/volmit/iris/util/math/FinalInteger.java index 689eb80a3..59da2d41f 100644 --- a/src/main/java/com/volmit/iris/util/math/FinalInteger.java +++ b/src/main/java/com/volmit/iris/util/math/FinalInteger.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.math; import com.volmit.iris.util.scheduling.Wrapper; diff --git a/src/main/java/com/volmit/iris/util/math/IrisMathHelper.java b/src/main/java/com/volmit/iris/util/math/IrisMathHelper.java index ccc32dc03..0944313bd 100644 --- a/src/main/java/com/volmit/iris/util/math/IrisMathHelper.java +++ b/src/main/java/com/volmit/iris/util/math/IrisMathHelper.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.math; import java.util.Random; import java.util.UUID; diff --git a/src/main/java/com/volmit/iris/util/math/RollingSequence.java b/src/main/java/com/volmit/iris/util/math/RollingSequence.java index 624cd7358..a4f2e5a0d 100644 --- a/src/main/java/com/volmit/iris/util/math/RollingSequence.java +++ b/src/main/java/com/volmit/iris/util/math/RollingSequence.java @@ -16,10 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.math; -import com.volmit.iris.util.math.Average; -import com.volmit.iris.util.math.M; +import com.volmit.iris.util.collection.KList; public class RollingSequence extends Average { private double median; diff --git a/src/main/java/com/volmit/iris/util/math/VectorMath.java b/src/main/java/com/volmit/iris/util/math/VectorMath.java index ca3f58a50..84c27836f 100644 --- a/src/main/java/com/volmit/iris/util/math/VectorMath.java +++ b/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.GListAdapter; -import com.volmit.iris.util.KList; +import com.volmit.iris.util.format.Form; +import com.volmit.iris.util.collection.GListAdapter; +import com.volmit.iris.util.collection.KList; import org.bukkit.Axis; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/util/oldnbt/ByteArrayTag.java b/src/main/java/com/volmit/iris/util/oldnbt/ByteArrayTag.java index 06bf09734..38ef3ff90 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/ByteArrayTag.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/ByteArrayTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; /** * The TAG_Byte_Array tag. diff --git a/src/main/java/com/volmit/iris/util/oldnbt/ByteTag.java b/src/main/java/com/volmit/iris/util/oldnbt/ByteTag.java index 5eb9f5a3c..edb4bf2b6 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/ByteTag.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/ByteTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; /** * The TAG_Byte tag. diff --git a/src/main/java/com/volmit/iris/util/oldnbt/CompoundTag.java b/src/main/java/com/volmit/iris/util/oldnbt/CompoundTag.java index 4b5cce527..61d61d606 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/CompoundTag.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/CompoundTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; import java.util.Map; diff --git a/src/main/java/com/volmit/iris/util/oldnbt/DoubleTag.java b/src/main/java/com/volmit/iris/util/oldnbt/DoubleTag.java index f92794c48..c7d0eaa7b 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/DoubleTag.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/DoubleTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; /** * The TAG_Double tag. diff --git a/src/main/java/com/volmit/iris/util/oldnbt/EndTag.java b/src/main/java/com/volmit/iris/util/oldnbt/EndTag.java index e022d61b8..4488e18ec 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/EndTag.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/EndTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; /** * The TAG_End tag. diff --git a/src/main/java/com/volmit/iris/util/oldnbt/FloatTag.java b/src/main/java/com/volmit/iris/util/oldnbt/FloatTag.java index cfa05db10..17833b557 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/FloatTag.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/FloatTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; /** * The TAG_Float tag. diff --git a/src/main/java/com/volmit/iris/util/oldnbt/IntArrayTag.java b/src/main/java/com/volmit/iris/util/oldnbt/IntArrayTag.java index a7a2c415b..a2e9ebef4 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/IntArrayTag.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/IntArrayTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; import java.util.Arrays; diff --git a/src/main/java/com/volmit/iris/util/oldnbt/IntTag.java b/src/main/java/com/volmit/iris/util/oldnbt/IntTag.java index e5d8b25d1..7f2537249 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/IntTag.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/IntTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; /** * The TAG_Int tag. diff --git a/src/main/java/com/volmit/iris/util/oldnbt/ListTag.java b/src/main/java/com/volmit/iris/util/oldnbt/ListTag.java index 7b48d0e9f..71d144d75 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/ListTag.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/ListTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/volmit/iris/util/oldnbt/LongTag.java b/src/main/java/com/volmit/iris/util/oldnbt/LongTag.java index be131aed0..59671da6d 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/LongTag.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/LongTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; /** * The TAG_Long tag. diff --git a/src/main/java/com/volmit/iris/util/oldnbt/NBTConstants.java b/src/main/java/com/volmit/iris/util/oldnbt/NBTConstants.java index 0e8300f5b..690bf1514 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/NBTConstants.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/NBTConstants.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/com/volmit/iris/util/oldnbt/NBTInputStream.java b/src/main/java/com/volmit/iris/util/oldnbt/NBTInputStream.java index 95e4d2fab..55d6b35f1 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/NBTInputStream.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/NBTInputStream.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; import java.io.Closeable; import java.io.DataInputStream; diff --git a/src/main/java/com/volmit/iris/util/oldnbt/NBTOutputStream.java b/src/main/java/com/volmit/iris/util/oldnbt/NBTOutputStream.java index 8ca1d05b7..d2f05da65 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/NBTOutputStream.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/NBTOutputStream.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; import java.io.Closeable; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/util/oldnbt/NBTUtils.java b/src/main/java/com/volmit/iris/util/oldnbt/NBTUtils.java index 08ff8d664..3062584a7 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/NBTUtils.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/NBTUtils.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; /* Changes : Neil Wightman - Support 19133 Tag_Int_Array tag diff --git a/src/main/java/com/volmit/iris/util/oldnbt/ShortTag.java b/src/main/java/com/volmit/iris/util/oldnbt/ShortTag.java index 0e7702883..e1239e016 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/ShortTag.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/ShortTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; /** * The TAG_Short tag. diff --git a/src/main/java/com/volmit/iris/util/oldnbt/StringTag.java b/src/main/java/com/volmit/iris/util/oldnbt/StringTag.java index df518463a..54ddce7da 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/StringTag.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/StringTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; /** * The TAG_String tag. diff --git a/src/main/java/com/volmit/iris/util/oldnbt/Tag.java b/src/main/java/com/volmit/iris/util/oldnbt/Tag.java index 4b76dd6bb..d5fdac4ab 100644 --- a/src/main/java/com/volmit/iris/util/oldnbt/Tag.java +++ b/src/main/java/com/volmit/iris/util/oldnbt/Tag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.oldnbt; /** * Represents a single NBT tag. diff --git a/src/main/java/com/volmit/iris/util/particle/FastParticle.java b/src/main/java/com/volmit/iris/util/particle/FastParticle.java index a7c34129b..bf39a5c0e 100644 --- a/src/main/java/com/volmit/iris/util/particle/FastParticle.java +++ b/src/main/java/com/volmit/iris/util/particle/FastParticle.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.particle; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/util/particle/FastReflection.java b/src/main/java/com/volmit/iris/util/particle/FastReflection.java index a9b93fce4..86327de4b 100644 --- a/src/main/java/com/volmit/iris/util/particle/FastReflection.java +++ b/src/main/java/com/volmit/iris/util/particle/FastReflection.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.particle; import com.volmit.iris.Iris; import org.bukkit.Bukkit; diff --git a/src/main/java/com/volmit/iris/util/particle/ParticleSender.java b/src/main/java/com/volmit/iris/util/particle/ParticleSender.java index 0764e12be..70c2a2183 100644 --- a/src/main/java/com/volmit/iris/util/particle/ParticleSender.java +++ b/src/main/java/com/volmit/iris/util/particle/ParticleSender.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.particle; import com.volmit.iris.Iris; import org.bukkit.Bukkit; diff --git a/src/main/java/com/volmit/iris/util/particle/ParticleSenderLegacy.java b/src/main/java/com/volmit/iris/util/particle/ParticleSenderLegacy.java index 98175e531..d7eec3c84 100644 --- a/src/main/java/com/volmit/iris/util/particle/ParticleSenderLegacy.java +++ b/src/main/java/com/volmit/iris/util/particle/ParticleSenderLegacy.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.particle; import com.volmit.iris.Iris; import org.bukkit.Color; diff --git a/src/main/java/com/volmit/iris/util/particle/ParticleType.java b/src/main/java/com/volmit/iris/util/particle/ParticleType.java index 5b0268d6b..ecc16ca1a 100644 --- a/src/main/java/com/volmit/iris/util/particle/ParticleType.java +++ b/src/main/java/com/volmit/iris/util/particle/ParticleType.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.particle; import com.volmit.iris.Iris; import org.bukkit.Color; diff --git a/src/main/java/com/volmit/iris/util/plugin/CancellableTask.java b/src/main/java/com/volmit/iris/util/plugin/CancellableTask.java index cde8aaf13..b2a6a3453 100644 --- a/src/main/java/com/volmit/iris/util/plugin/CancellableTask.java +++ b/src/main/java/com/volmit/iris/util/plugin/CancellableTask.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; public interface CancellableTask { void cancel(); diff --git a/src/main/java/com/volmit/iris/util/plugin/Command.java b/src/main/java/com/volmit/iris/util/plugin/Command.java index b242ffed1..10cdb95c9 100644 --- a/src/main/java/com/volmit/iris/util/plugin/Command.java +++ b/src/main/java/com/volmit/iris/util/plugin/Command.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/src/main/java/com/volmit/iris/util/plugin/Control.java b/src/main/java/com/volmit/iris/util/plugin/Control.java index 142253578..bd919f4a2 100644 --- a/src/main/java/com/volmit/iris/util/plugin/Control.java +++ b/src/main/java/com/volmit/iris/util/plugin/Control.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/src/main/java/com/volmit/iris/util/plugin/Controller.java b/src/main/java/com/volmit/iris/util/plugin/Controller.java index e651b0874..5630c59f9 100644 --- a/src/main/java/com/volmit/iris/util/plugin/Controller.java +++ b/src/main/java/com/volmit/iris/util/plugin/Controller.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/util/plugin/IActivator.java b/src/main/java/com/volmit/iris/util/plugin/IActivator.java index 3d485cc8b..6f8a8ac42 100644 --- a/src/main/java/com/volmit/iris/util/plugin/IActivator.java +++ b/src/main/java/com/volmit/iris/util/plugin/IActivator.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; public interface IActivator { diff --git a/src/main/java/com/volmit/iris/util/plugin/ICommand.java b/src/main/java/com/volmit/iris/util/plugin/ICommand.java index 15e237af7..645afca35 100644 --- a/src/main/java/com/volmit/iris/util/plugin/ICommand.java +++ b/src/main/java/com/volmit/iris/util/plugin/ICommand.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.collection.KList; /** * Represents a pawn command diff --git a/src/main/java/com/volmit/iris/util/plugin/IController.java b/src/main/java/com/volmit/iris/util/plugin/IController.java index fb59649b3..5ac1f3e29 100644 --- a/src/main/java/com/volmit/iris/util/plugin/IController.java +++ b/src/main/java/com/volmit/iris/util/plugin/IController.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; import org.bukkit.event.Listener; diff --git a/src/main/java/com/volmit/iris/util/plugin/Instance.java b/src/main/java/com/volmit/iris/util/plugin/Instance.java index f3c59deb6..c7ee8b138 100644 --- a/src/main/java/com/volmit/iris/util/plugin/Instance.java +++ b/src/main/java/com/volmit/iris/util/plugin/Instance.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/src/main/java/com/volmit/iris/util/plugin/Metrics.java b/src/main/java/com/volmit/iris/util/plugin/Metrics.java index 7e1e97f24..915f96a87 100644 --- a/src/main/java/com/volmit/iris/util/plugin/Metrics.java +++ b/src/main/java/com/volmit/iris/util/plugin/Metrics.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/src/main/java/com/volmit/iris/util/plugin/MetricsLite.java b/src/main/java/com/volmit/iris/util/plugin/MetricsLite.java index 98c07c3f0..0d8fd9d2c 100644 --- a/src/main/java/com/volmit/iris/util/plugin/MetricsLite.java +++ b/src/main/java/com/volmit/iris/util/plugin/MetricsLite.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java b/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java index d921c203a..41a8ba1d3 100644 --- a/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java +++ b/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java @@ -16,10 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; +import com.volmit.iris.util.format.C; +import com.volmit.iris.util.collection.KList; import org.bukkit.Sound; import java.lang.reflect.Field; diff --git a/src/main/java/com/volmit/iris/util/plugin/MortarPermission.java b/src/main/java/com/volmit/iris/util/plugin/MortarPermission.java index b8137efd7..1ed6b2f7f 100644 --- a/src/main/java/com/volmit/iris/util/plugin/MortarPermission.java +++ b/src/main/java/com/volmit/iris/util/plugin/MortarPermission.java @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; import com.volmit.iris.Iris; +import com.volmit.iris.util.collection.KList; import org.bukkit.command.CommandSender; import java.lang.reflect.Field; diff --git a/src/main/java/com/volmit/iris/util/plugin/MortarSender.java b/src/main/java/com/volmit/iris/util/plugin/MortarSender.java index 470ea9541..962c71eb9 100644 --- a/src/main/java/com/volmit/iris/util/plugin/MortarSender.java +++ b/src/main/java/com/volmit/iris/util/plugin/MortarSender.java @@ -16,8 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; +import com.volmit.iris.util.format.C; import lombok.Getter; import lombok.Setter; import org.bukkit.Server; diff --git a/src/main/java/com/volmit/iris/util/plugin/Permission.java b/src/main/java/com/volmit/iris/util/plugin/Permission.java index 4f728dacd..309b36f6a 100644 --- a/src/main/java/com/volmit/iris/util/plugin/Permission.java +++ b/src/main/java/com/volmit/iris/util/plugin/Permission.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/src/main/java/com/volmit/iris/util/plugin/RouterCommand.java b/src/main/java/com/volmit/iris/util/plugin/RouterCommand.java index df4fa1eb0..ab1f2e733 100644 --- a/src/main/java/com/volmit/iris/util/plugin/RouterCommand.java +++ b/src/main/java/com/volmit/iris/util/plugin/RouterCommand.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java b/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java index e3c437891..28c205f87 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java +++ b/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java @@ -16,11 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.format.C; +import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.reflect.V; import org.bukkit.Bukkit; import org.bukkit.Sound; diff --git a/src/main/java/com/volmit/iris/util/plugin/VolmitPlugin.java b/src/main/java/com/volmit/iris/util/plugin/VolmitPlugin.java index 181e02181..0af3900aa 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VolmitPlugin.java +++ b/src/main/java/com/volmit/iris/util/plugin/VolmitPlugin.java @@ -16,10 +16,15 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.plugin; import com.volmit.iris.Iris; +import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.collection.KMap; +import com.volmit.iris.util.io.IO; import com.volmit.iris.util.math.M; +import com.volmit.iris.util.reflect.V; +import com.volmit.iris.util.scheduling.J; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.*; @@ -468,11 +473,11 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { commandCache = new KList<>(); for (Field i : getClass().getDeclaredFields()) { - if (i.isAnnotationPresent(com.volmit.iris.util.Command.class)) { + if (i.isAnnotationPresent(com.volmit.iris.util.plugin.Command.class)) { try { i.setAccessible(true); MortarCommand pc = (MortarCommand) i.getType().getConstructor().newInstance(); - com.volmit.iris.util.Command c = i.getAnnotation(com.volmit.iris.util.Command.class); + com.volmit.iris.util.plugin.Command c = i.getAnnotation(com.volmit.iris.util.plugin.Command.class); registerCommand(pc, c.value()); commandCache.add(pc); v("Registered Commands /" + pc.getNode() + " (" + i.getName() + ")"); @@ -556,7 +561,7 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { } else { RouterCommand r = new RouterCommand(cmd, this); r.setUsage(getName() + ":" + getClass().toString()); - ((CommandMap) new com.volmit.iris.util.V(Bukkit.getServer()).get("commandMap")).register("", r); + ((CommandMap) new V(Bukkit.getServer()).get("commandMap")).register("", r); } } @@ -565,9 +570,9 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { return; } try { - SimpleCommandMap m = new com.volmit.iris.util.V(Bukkit.getServer()).get("commandMap"); + SimpleCommandMap m = new V(Bukkit.getServer()).get("commandMap"); - Map k = new com.volmit.iris.util.V(m).get("knownCommands"); + Map k = new V(m).get("knownCommands"); for (Iterator> it = k.entrySet().iterator(); it.hasNext(); ) { Map.Entry entry = it.next(); diff --git a/src/main/java/com/volmit/iris/util/reflect/V.java b/src/main/java/com/volmit/iris/util/reflect/V.java index c00e406be..ee606311d 100644 --- a/src/main/java/com/volmit/iris/util/reflect/V.java +++ b/src/main/java/com/volmit/iris/util/reflect/V.java @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.reflect; import com.volmit.iris.Iris; +import com.volmit.iris.util.collection.KList; import java.lang.annotation.Annotation; diff --git a/src/main/java/com/volmit/iris/util/reflect/Violator.java b/src/main/java/com/volmit/iris/util/reflect/Violator.java index e60748129..fb47f4099 100644 --- a/src/main/java/com/volmit/iris/util/reflect/Violator.java +++ b/src/main/java/com/volmit/iris/util/reflect/Violator.java @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.reflect; import com.volmit.iris.Iris; +import com.volmit.iris.util.collection.KList; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; diff --git a/src/main/java/com/volmit/iris/util/scheduling/AR.java b/src/main/java/com/volmit/iris/util/scheduling/AR.java index 94ecc4d97..db7bb7b53 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/AR.java +++ b/src/main/java/com/volmit/iris/util/scheduling/AR.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; import com.volmit.iris.util.plugin.CancellableTask; diff --git a/src/main/java/com/volmit/iris/util/scheduling/Callback.java b/src/main/java/com/volmit/iris/util/scheduling/Callback.java index 93ec71017..9677ea5f3 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/Callback.java +++ b/src/main/java/com/volmit/iris/util/scheduling/Callback.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; /** * Callback for async workers diff --git a/src/main/java/com/volmit/iris/util/scheduling/CallbackCV.java b/src/main/java/com/volmit/iris/util/scheduling/CallbackCV.java index 715e13c91..07c42b723 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/CallbackCV.java +++ b/src/main/java/com/volmit/iris/util/scheduling/CallbackCV.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; public interface CallbackCV { void run(T t); diff --git a/src/main/java/com/volmit/iris/util/scheduling/ChronoLatch.java b/src/main/java/com/volmit/iris/util/scheduling/ChronoLatch.java index d1e30d121..ef8d75e5a 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/ChronoLatch.java +++ b/src/main/java/com/volmit/iris/util/scheduling/ChronoLatch.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; public class ChronoLatch { private final long interval; diff --git a/src/main/java/com/volmit/iris/util/scheduling/Chunker.java b/src/main/java/com/volmit/iris/util/scheduling/Chunker.java index b821d730d..eadd2ed29 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/Chunker.java +++ b/src/main/java/com/volmit/iris/util/scheduling/Chunker.java @@ -16,11 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; -import com.volmit.iris.util.scheduling.Callback; -import com.volmit.iris.util.scheduling.ChronoLatch; -import com.volmit.iris.util.scheduling.Contained; +import com.volmit.iris.util.collection.KList; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/src/main/java/com/volmit/iris/util/scheduling/Contained.java b/src/main/java/com/volmit/iris/util/scheduling/Contained.java index af19a67f3..09cf4ac81 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/Contained.java +++ b/src/main/java/com/volmit/iris/util/scheduling/Contained.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; import java.util.function.Function; diff --git a/src/main/java/com/volmit/iris/util/scheduling/GroupedExecutor.java b/src/main/java/com/volmit/iris/util/scheduling/GroupedExecutor.java index d2e124dbf..9454c442f 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/GroupedExecutor.java +++ b/src/main/java/com/volmit/iris/util/scheduling/GroupedExecutor.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KMap; diff --git a/src/main/java/com/volmit/iris/util/scheduling/IrisLock.java b/src/main/java/com/volmit/iris/util/scheduling/IrisLock.java index 8ecad9389..bfc1cf36a 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/IrisLock.java +++ b/src/main/java/com/volmit/iris/util/scheduling/IrisLock.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; import com.volmit.iris.Iris; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/util/scheduling/J.java b/src/main/java/com/volmit/iris/util/scheduling/J.java index b2ff8dabd..1da415b8e 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/J.java +++ b/src/main/java/com/volmit/iris/util/scheduling/J.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; import com.volmit.iris.Iris; +import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.NastyFunction; import com.volmit.iris.util.function.NastyFuture; import com.volmit.iris.util.function.NastyRunnable; -import com.volmit.iris.util.scheduling.AR; -import com.volmit.iris.util.scheduling.SR; +import com.volmit.iris.util.math.FinalInteger; import org.bukkit.Bukkit; import java.util.concurrent.*; diff --git a/src/main/java/com/volmit/iris/util/scheduling/Looper.java b/src/main/java/com/volmit/iris/util/scheduling/Looper.java index 9754822af..d41dff4bf 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/Looper.java +++ b/src/main/java/com/volmit/iris/util/scheduling/Looper.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/util/scheduling/O.java b/src/main/java/com/volmit/iris/util/scheduling/O.java index e2e2f9974..843270fc7 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/O.java +++ b/src/main/java/com/volmit/iris/util/scheduling/O.java @@ -16,7 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; + +import com.volmit.iris.util.collection.KList; public class O implements Observable { private T t = null; diff --git a/src/main/java/com/volmit/iris/util/scheduling/Observable.java b/src/main/java/com/volmit/iris/util/scheduling/Observable.java index 439f00bd4..5d207312b 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/Observable.java +++ b/src/main/java/com/volmit/iris/util/scheduling/Observable.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; public interface Observable { T get(); diff --git a/src/main/java/com/volmit/iris/util/scheduling/Observer.java b/src/main/java/com/volmit/iris/util/scheduling/Observer.java index 8b986a909..bbdfe5acd 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/Observer.java +++ b/src/main/java/com/volmit/iris/util/scheduling/Observer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; @FunctionalInterface public interface Observer { diff --git a/src/main/java/com/volmit/iris/util/scheduling/PrecisionStopwatch.java b/src/main/java/com/volmit/iris/util/scheduling/PrecisionStopwatch.java index 2fcaa0dc4..e90b2159b 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/PrecisionStopwatch.java +++ b/src/main/java/com/volmit/iris/util/scheduling/PrecisionStopwatch.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; public class PrecisionStopwatch { private long nanos; diff --git a/src/main/java/com/volmit/iris/util/scheduling/Queue.java b/src/main/java/com/volmit/iris/util/scheduling/Queue.java index 17310f457..e473594ca 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/Queue.java +++ b/src/main/java/com/volmit/iris/util/scheduling/Queue.java @@ -16,7 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; + +import com.volmit.iris.util.collection.KList; @SuppressWarnings("ALL") public interface Queue { diff --git a/src/main/java/com/volmit/iris/util/scheduling/QueueExecutor.java b/src/main/java/com/volmit/iris/util/scheduling/QueueExecutor.java index e29adc674..fd4dd8e9e 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/QueueExecutor.java +++ b/src/main/java/com/volmit/iris/util/scheduling/QueueExecutor.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/util/scheduling/S.java b/src/main/java/com/volmit/iris/util/scheduling/S.java index 42e51a322..2491b2766 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/S.java +++ b/src/main/java/com/volmit/iris/util/scheduling/S.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; public abstract class S implements Runnable { public S() { diff --git a/src/main/java/com/volmit/iris/util/scheduling/SR.java b/src/main/java/com/volmit/iris/util/scheduling/SR.java index 666ea91d8..40cf5485b 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/SR.java +++ b/src/main/java/com/volmit/iris/util/scheduling/SR.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; import com.volmit.iris.util.plugin.CancellableTask; diff --git a/src/main/java/com/volmit/iris/util/scheduling/ShurikenQueue.java b/src/main/java/com/volmit/iris/util/scheduling/ShurikenQueue.java index ce0589b13..4519c27ac 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/ShurikenQueue.java +++ b/src/main/java/com/volmit/iris/util/scheduling/ShurikenQueue.java @@ -16,7 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; + +import com.volmit.iris.util.collection.KList; public class ShurikenQueue implements Queue { private KList queue; diff --git a/src/main/java/com/volmit/iris/util/scheduling/Switch.java b/src/main/java/com/volmit/iris/util/scheduling/Switch.java index fc18e56f0..c3860341b 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/Switch.java +++ b/src/main/java/com/volmit/iris/util/scheduling/Switch.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; public class Switch { private volatile boolean b; diff --git a/src/main/java/com/volmit/iris/util/scheduling/TaskExecutor.java b/src/main/java/com/volmit/iris/util/scheduling/TaskExecutor.java index 58e676829..9edf13cde 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/TaskExecutor.java +++ b/src/main/java/com/volmit/iris/util/scheduling/TaskExecutor.java @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; import com.volmit.iris.Iris; +import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.NastyRunnable; import com.volmit.iris.util.math.M; import lombok.Getter; diff --git a/src/main/java/com/volmit/iris/util/scheduling/ThreadMonitor.java b/src/main/java/com/volmit/iris/util/scheduling/ThreadMonitor.java index b80b2a66c..71418d58e 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/ThreadMonitor.java +++ b/src/main/java/com/volmit/iris/util/scheduling/ThreadMonitor.java @@ -16,9 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; import com.volmit.iris.Iris; +import com.volmit.iris.util.format.Form; +import com.volmit.iris.util.math.RollingSequence; /** * Not particularly efficient or perfectly accurate but is great at fast thread diff --git a/src/main/java/com/volmit/iris/util/scheduling/Wrapper.java b/src/main/java/com/volmit/iris/util/scheduling/Wrapper.java index 7cc405a75..ad8804941 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/Wrapper.java +++ b/src/main/java/com/volmit/iris/util/scheduling/Wrapper.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.util; +package com.volmit.iris.util.scheduling; public class Wrapper { private T t;