diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java b/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java index 3b08b8a27..29df61c39 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java @@ -21,7 +21,7 @@ import com.dfsek.terra.api.command.exception.SwitchFormatException; import com.dfsek.terra.api.command.tab.TabCompleter; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.inject.InjectorImpl; +import com.dfsek.terra.inject.InjectorImpl; import com.dfsek.terra.api.injection.exception.InjectionException; import com.dfsek.terra.api.util.ReflectionUtil; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/LoaderImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/LoaderImpl.java index 389124872..575831fa6 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/LoaderImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/LoaderImpl.java @@ -4,7 +4,7 @@ import com.dfsek.tectonic.config.Configuration; import com.dfsek.tectonic.exception.ConfigException; import com.dfsek.terra.api.config.Loader; import com.dfsek.terra.api.util.function.ExceptionalConsumer; -import com.dfsek.terra.api.util.GlueList; +import com.dfsek.terra.util.GlueList; import java.io.IOException; import java.io.InputStream; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/GridSpawnLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/GridSpawnLoader.java index a990459ff..19245dab1 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/GridSpawnLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/GridSpawnLoader.java @@ -2,7 +2,7 @@ package com.dfsek.terra.config.loaders.config; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; -import com.dfsek.terra.api.math.GridSpawn; +import com.dfsek.terra.math.GridSpawn; import com.dfsek.terra.api.structure.StructureSpawn; import java.lang.reflect.Type; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/event/EventManagerImpl.java b/common/implementation/src/main/java/com/dfsek/terra/event/EventManagerImpl.java similarity index 97% rename from common/implementation/src/main/java/com/dfsek/terra/api/event/EventManagerImpl.java rename to common/implementation/src/main/java/com/dfsek/terra/event/EventManagerImpl.java index d4d281b54..43b606cfc 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/event/EventManagerImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/event/EventManagerImpl.java @@ -1,7 +1,9 @@ -package com.dfsek.terra.api.event; +package com.dfsek.terra.event; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.addon.TerraAddon; +import com.dfsek.terra.api.event.EventListener; +import com.dfsek.terra.api.event.EventManager; import com.dfsek.terra.api.event.annotations.Global; import com.dfsek.terra.api.event.annotations.Priority; import com.dfsek.terra.api.event.events.Cancellable; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/inject/InjectorImpl.java b/common/implementation/src/main/java/com/dfsek/terra/inject/InjectorImpl.java similarity index 98% rename from common/implementation/src/main/java/com/dfsek/terra/api/inject/InjectorImpl.java rename to common/implementation/src/main/java/com/dfsek/terra/inject/InjectorImpl.java index f36af83b9..25f991b52 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/inject/InjectorImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/inject/InjectorImpl.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.inject; +package com.dfsek.terra.inject; import com.dfsek.terra.api.injection.Injector; import com.dfsek.terra.api.injection.annotations.Inject; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/math/GridSpawn.java b/common/implementation/src/main/java/com/dfsek/terra/math/GridSpawn.java similarity index 94% rename from common/implementation/src/main/java/com/dfsek/terra/api/math/GridSpawn.java rename to common/implementation/src/main/java/com/dfsek/terra/math/GridSpawn.java index 110330c2c..8c3db603c 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/math/GridSpawn.java +++ b/common/implementation/src/main/java/com/dfsek/terra/math/GridSpawn.java @@ -1,7 +1,7 @@ -package com.dfsek.terra.api.math; +package com.dfsek.terra.math; -import com.dfsek.terra.api.util.FastRandom; -import com.dfsek.terra.api.util.GlueList; +import com.dfsek.terra.util.FastRandom; +import com.dfsek.terra.util.GlueList; import com.dfsek.terra.api.util.PopulationUtil; import com.dfsek.terra.api.vector.Vector3; diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java index 42ce4284c..18594d9a4 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java @@ -6,7 +6,7 @@ import com.dfsek.terra.addon.PreLoadAddon; import com.dfsek.terra.addon.exception.AddonLoadException; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.addon.TerraAddon; -import com.dfsek.terra.api.inject.InjectorImpl; +import com.dfsek.terra.inject.InjectorImpl; import com.dfsek.terra.api.injection.exception.InjectionException; import com.dfsek.terra.api.registry.exception.DuplicateEntryException; import com.dfsek.terra.registry.OpenRegistryImpl; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/transform/MapTransform.java b/common/implementation/src/main/java/com/dfsek/terra/transform/MapTransform.java similarity index 90% rename from common/implementation/src/main/java/com/dfsek/terra/api/transform/MapTransform.java rename to common/implementation/src/main/java/com/dfsek/terra/transform/MapTransform.java index 718e822e5..216fe94c6 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/transform/MapTransform.java +++ b/common/implementation/src/main/java/com/dfsek/terra/transform/MapTransform.java @@ -1,5 +1,6 @@ -package com.dfsek.terra.api.transform; +package com.dfsek.terra.transform; +import com.dfsek.terra.api.transform.Transform; import com.dfsek.terra.api.transform.exception.TransformException; import java.util.HashMap; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/transform/TransformerImpl.java b/common/implementation/src/main/java/com/dfsek/terra/transform/TransformerImpl.java similarity index 92% rename from common/implementation/src/main/java/com/dfsek/terra/api/transform/TransformerImpl.java rename to common/implementation/src/main/java/com/dfsek/terra/transform/TransformerImpl.java index 43287fc64..17bb61ec8 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/transform/TransformerImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/transform/TransformerImpl.java @@ -1,5 +1,8 @@ -package com.dfsek.terra.api.transform; +package com.dfsek.terra.transform; +import com.dfsek.terra.api.transform.Transform; +import com.dfsek.terra.api.transform.Transformer; +import com.dfsek.terra.api.transform.Validator; import com.dfsek.terra.api.transform.exception.AttemptsFailedException; import com.dfsek.terra.api.transform.exception.TransformException; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/FastRandom.java b/common/implementation/src/main/java/com/dfsek/terra/util/FastRandom.java similarity index 97% rename from common/implementation/src/main/java/com/dfsek/terra/api/util/FastRandom.java rename to common/implementation/src/main/java/com/dfsek/terra/util/FastRandom.java index c1521b6e2..044b65ad0 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/util/FastRandom.java +++ b/common/implementation/src/main/java/com/dfsek/terra/util/FastRandom.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.util; +package com.dfsek.terra.util; import org.apache.commons.rng.core.source64.XoRoShiRo128PlusPlus; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/GlueList.java b/common/implementation/src/main/java/com/dfsek/terra/util/GlueList.java similarity index 98% rename from common/implementation/src/main/java/com/dfsek/terra/api/util/GlueList.java rename to common/implementation/src/main/java/com/dfsek/terra/util/GlueList.java index 1ae19ef29..9dd85fb32 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/util/GlueList.java +++ b/common/implementation/src/main/java/com/dfsek/terra/util/GlueList.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dfsek.terra.api.util; +package com.dfsek.terra.util; +import net.jafama.FastMath; import org.jetbrains.annotations.NotNull; import java.io.IOException; @@ -709,11 +710,11 @@ public class GlueList extends AbstractList implements List, Cloneable, public Object clone() { try { - com.dfsek.terra.api.util.GlueList clone = (com.dfsek.terra.api.util.GlueList) super.clone(); + GlueList clone = (GlueList) super.clone(); clone.first = clone.last = null; - int capacity = min(MAX_ARRAY_SIZE, max(clone.size, max(clone.initialCapacity, DEFAULT_CAPACITY))); + int capacity = FastMath.min(MAX_ARRAY_SIZE, FastMath.max(clone.size, FastMath.max(clone.initialCapacity, DEFAULT_CAPACITY))); Node initNode = new Node<>(null, null, 0, capacity); @@ -902,7 +903,7 @@ public class GlueList extends AbstractList implements List, Cloneable, checkForComodification(); try { - com.dfsek.terra.api.util.GlueList.this.set(lastReturn, t); + GlueList.this.set(lastReturn, t); } catch(IndexOutOfBoundsException e) { throw new ConcurrentModificationException(); } @@ -916,7 +917,7 @@ public class GlueList extends AbstractList implements List, Cloneable, try { int temp = j; - com.dfsek.terra.api.util.GlueList.this.add(temp, t); + GlueList.this.add(temp, t); j = temp + 1; @@ -1025,7 +1026,7 @@ public class GlueList extends AbstractList implements List, Cloneable, checkForComodification(); try { - com.dfsek.terra.api.util.GlueList.this.remove(lastReturn); + GlueList.this.remove(lastReturn); j = lastReturn; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/logging/DebugLogger.java b/common/implementation/src/main/java/com/dfsek/terra/util/logging/DebugLogger.java similarity index 94% rename from common/implementation/src/main/java/com/dfsek/terra/api/util/logging/DebugLogger.java rename to common/implementation/src/main/java/com/dfsek/terra/util/logging/DebugLogger.java index fee065a77..d7d87d3d2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/util/logging/DebugLogger.java +++ b/common/implementation/src/main/java/com/dfsek/terra/util/logging/DebugLogger.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.util.logging; +package com.dfsek.terra.util.logging; import com.dfsek.terra.api.Logger; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/logging/JavaLogger.java b/common/implementation/src/main/java/com/dfsek/terra/util/logging/JavaLogger.java similarity index 92% rename from common/implementation/src/main/java/com/dfsek/terra/api/util/logging/JavaLogger.java rename to common/implementation/src/main/java/com/dfsek/terra/util/logging/JavaLogger.java index 4ee2cba24..c1095716d 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/util/logging/JavaLogger.java +++ b/common/implementation/src/main/java/com/dfsek/terra/util/logging/JavaLogger.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.util.logging; +package com.dfsek.terra.util.logging; import com.dfsek.terra.api.Logger; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java index 282400c48..9e142f520 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java @@ -14,15 +14,15 @@ import com.dfsek.terra.api.command.exception.MalformedCommandException; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.PluginConfig; import com.dfsek.terra.api.event.EventManager; -import com.dfsek.terra.api.event.EventManagerImpl; +import com.dfsek.terra.event.EventManagerImpl; import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.lang.Language; import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.Registry; -import com.dfsek.terra.api.util.logging.DebugLogger; -import com.dfsek.terra.api.util.logging.JavaLogger; +import com.dfsek.terra.util.logging.DebugLogger; +import com.dfsek.terra.util.logging.JavaLogger; import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.Biome; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java index 5aed5e708..b8ce1133d 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java @@ -2,9 +2,9 @@ package com.dfsek.terra.bukkit.listeners; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.config.WorldConfig; -import com.dfsek.terra.api.transform.MapTransform; -import com.dfsek.terra.api.transform.TransformerImpl; -import com.dfsek.terra.api.util.FastRandom; +import com.dfsek.terra.transform.MapTransform; +import com.dfsek.terra.transform.TransformerImpl; +import com.dfsek.terra.util.FastRandom; import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.api.world.World; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java index 92f704701..63b5bb71a 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java @@ -2,7 +2,7 @@ package com.dfsek.terra.bukkit.population; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.profiler.ProfileFrame; -import com.dfsek.terra.api.util.FastRandom; +import com.dfsek.terra.util.FastRandom; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.generator.Chunkified; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java index 3cc786e3e..965c4db63 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java @@ -10,8 +10,8 @@ import com.dfsek.terra.api.block.state.properties.enums.RedstoneConnection; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.inventory.ItemStack; import com.dfsek.terra.api.inventory.item.Enchantment; -import com.dfsek.terra.api.transform.MapTransform; -import com.dfsek.terra.api.transform.TransformerImpl; +import com.dfsek.terra.transform.MapTransform; +import com.dfsek.terra.transform.TransformerImpl; import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java index d7dad12e2..620058d48 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java @@ -19,7 +19,7 @@ import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.PluginConfig; import com.dfsek.terra.api.event.EventListener; import com.dfsek.terra.api.event.EventManager; -import com.dfsek.terra.api.event.EventManagerImpl; +import com.dfsek.terra.event.EventManagerImpl; import com.dfsek.terra.api.event.annotations.Global; import com.dfsek.terra.api.event.annotations.Priority; import com.dfsek.terra.api.event.events.config.ConfigPackPostLoadEvent; @@ -31,7 +31,7 @@ import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.exception.DuplicateEntryException; import com.dfsek.terra.api.util.generic.pair.Pair; -import com.dfsek.terra.api.util.logging.DebugLogger; +import com.dfsek.terra.util.logging.DebugLogger; import com.dfsek.terra.api.util.seeded.BiomeBuilder; import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.Tree; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java index 5d2c2bac1..759070aaa 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java @@ -1,7 +1,7 @@ package com.dfsek.terra.fabric.generation; import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.api.util.FastRandom; +import com.dfsek.terra.util.FastRandom; import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.generator.ChunkData; diff --git a/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java b/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java index 582daee49..fb97dca84 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java +++ b/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java @@ -7,15 +7,15 @@ import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.PluginConfig; import com.dfsek.terra.api.event.EventManager; -import com.dfsek.terra.api.event.EventManagerImpl; +import com.dfsek.terra.event.EventManagerImpl; import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.lang.Language; import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.Registry; -import com.dfsek.terra.api.util.logging.DebugLogger; -import com.dfsek.terra.api.util.logging.JavaLogger; +import com.dfsek.terra.util.logging.DebugLogger; +import com.dfsek.terra.util.logging.JavaLogger; import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.Biome; diff --git a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java index 1098c5431..977c133d3 100644 --- a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java +++ b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java @@ -6,14 +6,14 @@ import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.PluginConfig; import com.dfsek.terra.api.event.EventManager; -import com.dfsek.terra.api.event.EventManagerImpl; +import com.dfsek.terra.event.EventManagerImpl; import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.lang.Language; import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.LockedRegistry; -import com.dfsek.terra.api.util.logging.DebugLogger; +import com.dfsek.terra.util.logging.DebugLogger; import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.World; import com.dfsek.terra.config.PluginConfigImpl;