fix imports

.github/ISSUE_TEMPLATE/OTHER_ISSUES.md

@@ -8,4 +8,5 @@ assignees: ""
 ---
 
 ## Describe the issue
+
 <!-- Please describe the issue as clearly and as concisely as possible, without missing any details. -->

README.md

@@ -7,25 +7,30 @@ to your specifications, with no knowledge of Java required.
 
 * Paper+ servers (Paper, Tuinity, Purpur, etc): [SpigotMC](https://www.spigotmc.org/resources/85151/)
 * Fabric: [Modrinth](https://modrinth.com/mod/terra) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/terra-world-generator)
-* Forge **(ALPHA - NOT PRODUCTION-READY)**: [Modrinth](https://modrinth.com/mod/terra) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/terra-world-generator)
+* Forge **(ALPHA - NOT PRODUCTION-READY)**: [Modrinth](https://modrinth.com/mod/terra)
+  / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/terra-world-generator)
 
 ## Building and Running Terra
 
-To build, simply run `./gradlew build` (`gradlew.bat build` on Windows). This will build all platforms, and
+To build, simply run `./gradlew build` (`gradlew.bat build` on Windows). This will build all platforms, and produce JARs
-produce JARs in `platforms/<platform>/build/libs`
+in `platforms/<platform>/build/libs`
 
 ### Production JARs:
+
 * Bukkit: `Terra-<version>-shaded.jar`
 * Fabric: `Terra-<version>-shaded-mapped.jar`
 * Forge: `Terra-<version>-shaded.jar`
 
 ### Building a Specific Platform
+
 To build a specific platform, run `gradlew :platforms:<platform>:build`.
 
 JARs are produced in `platforms/<platform>/build/libs`.
 
 ### Running Minecraft in the IDE
+
 To run Minecraft with Terra in the IDE (for testing) use the following tasks:
+
 * Bukkit
     * `installPaper` - Install a [Paper](https://github.com/PaperMC/Paper) test server. (Only needs to be run once).
     * `installPurpur` - Install a [Purpur](https://github.com/pl3xgaming/Purpur) test server. (Only needs to be run once).
@@ -37,10 +42,12 @@ To run Minecraft with Terra in the IDE (for testing) use the following tasks:
 * Forge
     * `runClient` - Run a Minecraft Forge client with Terra installed.
     * `runServer` - Run a Minecraft Forge server with Terra installed.
+
 ## Contributing
-Contributions are welcome! If you want to see a feature in Terra, please, open an issue, or implement it yourself and
+
-submit a PR!
+Contributions are welcome! If you want to see a feature in Terra, please, open an issue, or implement it yourself and submit a PR!
 Join the discord [here](https://discord.gg/PXUEbbF) if you would like to talk more about the project!
 
 ## Beta
+
 Terra is still in beta! While it is stable, it is not feature-complete. There is a lot to be added!

buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt

@@ -1,9 +1,6 @@
 package com.dfsek.terra
 
 import org.gradle.api.Project
-import org.gradle.api.tasks.testing.Test
-import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.withType
 import java.io.ByteArrayOutputStream
 
 fun Project.configureCommon() {

buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt

@@ -4,9 +4,10 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.plugins.BasePluginConvention
-import org.gradle.api.tasks.bundling.Jar
+import org.gradle.kotlin.dsl.apply
-import org.gradle.api.tasks.javadoc.Javadoc
+import org.gradle.kotlin.dsl.get
-import org.gradle.kotlin.dsl.*
+import org.gradle.kotlin.dsl.getPlugin
+import org.gradle.kotlin.dsl.named
 import java.io.File
 import java.net.URL
 

common/api/src/main/java/com/dfsek/terra/api/block/Block.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.block;
 
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.Handle;
 import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.vector.Location;
 
 public interface Block extends Handle {
     void setBlockData(BlockData data, boolean physics);

common/api/src/main/java/com/dfsek/terra/api/block/BlockFace.java

@@ -1,6 +1,5 @@
 package com.dfsek.terra.api.block;
 
-import com.dfsek.terra.api.vector.Vector3;
 import org.jetbrains.annotations.NotNull;
 
 public enum BlockFace {

common/api/src/main/java/com/dfsek/terra/api/block/data/AnaloguePowerable.java

@@ -4,6 +4,8 @@ import com.dfsek.terra.api.block.BlockData;
 
 public interface AnaloguePowerable extends BlockData {
     int getMaximumPower();
+
     int getPower();
+
     void setPower(int power);
 }

common/api/src/main/java/com/dfsek/terra/api/block/data/RedstoneWire.java

@@ -7,8 +7,11 @@ import java.util.Set;
 
 public interface RedstoneWire extends BlockData, AnaloguePowerable {
     Set<BlockFace> getAllowedFaces();
+
     Connection getFace(BlockFace face);
+
     void setFace(BlockFace face, Connection connection);
+
     enum Connection {
         NONE, SIDE, UP
     }

common/api/src/main/java/com/dfsek/terra/api/block/data/Wall.java

@@ -5,8 +5,11 @@ import com.dfsek.terra.api.block.BlockFace;
 
 public interface Wall extends BlockData, Waterlogged {
     boolean isUp();
+
     void setHeight(BlockFace face, Height height);
+
     Height getHeight(BlockFace face);
+
     void setUp(boolean up);
 
     enum Height {

common/api/src/main/java/com/dfsek/terra/api/config/WorldConfig.java

@@ -1,13 +1,11 @@
 package com.dfsek.terra.api.config;
 
 import com.dfsek.terra.api.registry.Registry;
-import com.dfsek.terra.api.util.ProbabilityCollection;
 import com.dfsek.terra.api.world.TerraWorld;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.generator.SamplerCache;
 
 import java.util.Map;
-import java.util.Set;
 
 public interface WorldConfig {
     @SuppressWarnings("unchecked")

common/api/src/main/java/com/dfsek/terra/api/entity/Entity.java

@@ -1,6 +1,5 @@
 package com.dfsek.terra.api.entity;
 
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.Handle;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;

common/api/src/main/java/com/dfsek/terra/api/event/annotations/Priority.java

@@ -31,6 +31,7 @@ public @interface Priority {
      * Low Priority.
      */
     int LOW = -1;
+
     /**
      * @return Priority of this event. Events are executed from lowest to highest priorities.
      */

common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/EntitySpawnEvent.java

@@ -1,10 +1,8 @@
 package com.dfsek.terra.api.event.events.world.generation;
 
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.event.events.PackEvent;
 import com.dfsek.terra.api.entity.Entity;
-import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.event.events.PackEvent;
-import com.dfsek.terra.api.vector.Vector3;
 
 /**
  * Called when an entity is spawned.

common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.api.event.events.world.generation;
 
+import com.dfsek.terra.api.block.Block;
+import com.dfsek.terra.api.block.state.Container;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.events.AbstractCancellable;
 import com.dfsek.terra.api.event.events.Cancellable;
 import com.dfsek.terra.api.event.events.PackEvent;
-import com.dfsek.terra.api.block.Block;
-import com.dfsek.terra.api.block.state.Container;
 import com.dfsek.terra.api.structure.LootTable;
 import com.dfsek.terra.api.structure.Structure;
 import org.jetbrains.annotations.NotNull;
@@ -53,6 +53,7 @@ public class LootPopulateEvent extends AbstractCancellable implements PackEvent,
 
     /**
      * Get the loot table to be populated.
+     *
      * @return Loot table.
      */
     public LootTable getTable() {

common/api/src/main/java/com/dfsek/terra/api/lang/Message.java

@@ -8,6 +8,8 @@ import java.util.logging.Logger;
 
 public interface Message {
     void log(Logger logger, Level level, String... args);
+
     void send(CommandSender sender, String... args);
+
     boolean isEmpty();
 }

common/api/src/main/java/com/dfsek/terra/api/util/MathUtil.java

@@ -4,7 +4,6 @@ import com.dfsek.terra.api.world.generator.Sampler;
 import net.jafama.FastMath;
 
 import java.util.List;
-import java.util.Random;
 
 /**
  * Utility class for mathematical functions.

common/api/src/main/java/com/dfsek/terra/api/world/Flora.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.world;
 
+import com.dfsek.terra.api.block.Block;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.api.block.Block;
 
 import java.util.List;
 

common/api/src/main/java/com/dfsek/terra/api/world/World.java

@@ -1,10 +1,10 @@
 package com.dfsek.terra.api.world;
 
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.Handle;
 import com.dfsek.terra.api.block.Block;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;
+import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.world.generator.ChunkGenerator;
 import com.dfsek.terra.api.world.generator.GeneratorWrapper;
 import com.dfsek.terra.api.world.generator.TerraChunkGenerator;

common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/pipeline/BiomeMutator.java

@@ -1,7 +1,6 @@
 package com.dfsek.terra.api.world.biome.generation.pipeline;
 
 import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder;
 
 public interface BiomeMutator {
     TerraBiome mutate(ViewPoint viewPoint, double x, double z);

common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/pipeline/Stage.java

@@ -1,7 +1,5 @@
 package com.dfsek.terra.api.world.biome.generation.pipeline;
 
-import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder;
-
 public interface Stage {
     boolean isExpansion();
 

common/implementation/src/main/java/com/dfsek/terra/api/command/TerraCommandManager.java

@@ -17,10 +17,10 @@ import com.dfsek.terra.api.command.exception.InvalidArgumentsException;
 import com.dfsek.terra.api.command.exception.MalformedCommandException;
 import com.dfsek.terra.api.command.exception.SwitchFormatException;
 import com.dfsek.terra.api.command.tab.TabCompleter;
-import com.dfsek.terra.api.inject.InjectorImpl;
-import com.dfsek.terra.api.injection.exception.InjectionException;
 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.api.injection.exception.InjectionException;
 import com.dfsek.terra.api.util.ReflectionUtil;
 import net.jafama.FastMath;
 

common/implementation/src/main/java/com/dfsek/terra/api/math/GridSpawn.java

@@ -1,10 +1,10 @@
 package com.dfsek.terra.api.math;
 
+import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.util.PopulationUtil;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.vector.Vector3Impl;
-import com.dfsek.terra.api.util.FastRandom;
-import com.dfsek.terra.api.util.GlueList;
 
 import java.util.List;
 import java.util.Random;

common/implementation/src/main/java/com/dfsek/terra/api/math/paralithic/noise/NoiseFunction2.java

@@ -4,7 +4,6 @@ import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.hash.HashMapDoubleDouble;
 
 
-
 public class NoiseFunction2 implements NoiseFunction {
     private final NoiseSampler gen;
     private final Cache cache = new Cache();

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java

@@ -1,12 +1,12 @@
 package com.dfsek.terra.api.structures.script;
 
 import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.profiler.ProfileFrame;
+import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.structure.LootTable;
 import com.dfsek.terra.api.structure.Structure;
-import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.structure.buffer.Buffer;
-import com.dfsek.terra.vector.LocationImpl;
+import com.dfsek.terra.api.structure.rotation.Rotation;
-import com.dfsek.terra.api.world.Chunk;
-import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.structures.parser.Parser;
 import com.dfsek.terra.api.structures.parser.exceptions.ParseException;
 import com.dfsek.terra.api.structures.parser.lang.Block;
@@ -30,11 +30,10 @@ import com.dfsek.terra.api.structures.script.builders.UnaryBooleanFunctionBuilde
 import com.dfsek.terra.api.structures.script.builders.UnaryNumberFunctionBuilder;
 import com.dfsek.terra.api.structures.script.builders.UnaryStringFunctionBuilder;
 import com.dfsek.terra.api.structures.script.builders.ZeroArgFunctionBuilder;
-import com.dfsek.terra.api.structure.rotation.Rotation;
-import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.structures.structure.buffer.DirectBuffer;
 import com.dfsek.terra.api.structures.structure.buffer.StructureBuffer;
-import com.dfsek.terra.api.profiler.ProfileFrame;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.world.Chunk;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import net.jafama.FastMath;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/TerraImplementationArguments.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.structures.script;
 
-import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
-import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.structure.buffer.Buffer;
+import com.dfsek.terra.api.structure.rotation.Rotation;
+import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
 
 import java.util.Random;
 

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/AbstractBlockFunction.java

@@ -1,18 +1,18 @@
 package com.dfsek.terra.api.structures.script.functions;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.vector.Vector2Impl;
-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.structures.structure.buffer.items.BufferedBlock;
 import com.dfsek.terra.api.structures.tokenizer.Position;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.vector.Vector2Impl;
+import com.dfsek.terra.vector.Vector3Impl;
 import net.jafama.FastMath;
 
 import java.util.Map;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BiomeFunction.java

@@ -1,18 +1,18 @@
 package com.dfsek.terra.api.structures.script.functions;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.vector.Vector2Impl;
-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.structures.tokenizer.Position;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.vector.Vector2Impl;
+import com.dfsek.terra.vector.Vector3Impl;
 import net.jafama.FastMath;
 
 import java.util.Map;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckBlockFunction.java

@@ -1,15 +1,15 @@
 package com.dfsek.terra.api.structures.script.functions;
 
-import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.vector.Vector2Impl;
-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.structures.tokenizer.Position;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.vector.Vector2Impl;
+import com.dfsek.terra.vector.Vector3Impl;
 import net.jafama.FastMath;
 
 import java.util.Map;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckFunction.java

@@ -1,24 +1,23 @@
 package com.dfsek.terra.api.structures.script.functions;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.api.world.generator.SamplerCache;
-import com.dfsek.terra.vector.LocationImpl;
-import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.api.world.TerraWorld;
-import com.dfsek.terra.vector.Vector2Impl;
-import com.dfsek.terra.vector.Vector3Impl;
-import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.structures.tokenizer.Position;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.api.world.TerraWorld;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.api.world.generator.SamplerCache;
 import com.dfsek.terra.config.templates.BiomeTemplate;
+import com.dfsek.terra.vector.Vector2Impl;
+import com.dfsek.terra.vector.Vector3Impl;
 import net.jafama.FastMath;
 
 import java.util.Map;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/EntityFunction.java

@@ -1,9 +1,6 @@
 package com.dfsek.terra.api.structures.script.functions;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.vector.Vector2Impl;
-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.api.structures.parser.exceptions.ParseException;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
@@ -12,9 +9,12 @@ import com.dfsek.terra.api.structures.parser.lang.constants.ConstantExpression;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.structures.structure.buffer.items.BufferedEntity;
 import com.dfsek.terra.api.structures.tokenizer.Position;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.vector.Vector2Impl;
+import com.dfsek.terra.vector.Vector3Impl;
 
 import java.util.Map;
 

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/GetMarkFunction.java

@@ -1,15 +1,15 @@
 package com.dfsek.terra.api.structures.script.functions;
 
-import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.vector.Vector2Impl;
-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.structures.tokenizer.Position;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.vector.Vector2Impl;
+import com.dfsek.terra.vector.Vector3Impl;
 import net.jafama.FastMath;
 
 import java.util.Map;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/LootFunction.java

@@ -1,21 +1,20 @@
 package com.dfsek.terra.api.structures.script.functions;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.structure.LootTable;
-import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.vector.Vector2Impl;
-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.registry.Registry;
-import com.dfsek.terra.api.structures.loot.LootTableImpl;
+import com.dfsek.terra.api.structure.LootTable;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.StructureScript;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.structures.structure.buffer.items.BufferedLootApplication;
 import com.dfsek.terra.api.structures.tokenizer.Position;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.vector.Vector2Impl;
+import com.dfsek.terra.vector.Vector3Impl;
 import net.jafama.FastMath;
 
 import java.util.Map;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/PullFunction.java

@@ -1,9 +1,6 @@
 package com.dfsek.terra.api.structures.script.functions;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.vector.Vector2Impl;
-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.structures.parser.exceptions.ParseException;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
@@ -12,9 +9,12 @@ import com.dfsek.terra.api.structures.parser.lang.constants.ConstantExpression;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.structures.structure.buffer.items.BufferedPulledBlock;
 import com.dfsek.terra.api.structures.tokenizer.Position;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.vector.Vector2Impl;
+import com.dfsek.terra.vector.Vector3Impl;
 import net.jafama.FastMath;
 
 import java.util.Map;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/SetMarkFunction.java

@@ -1,15 +1,15 @@
 package com.dfsek.terra.api.structures.script.functions;
 
-import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.vector.Vector2Impl;
-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.structures.tokenizer.Position;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.vector.Vector2Impl;
+import com.dfsek.terra.vector.Vector3Impl;
 import net.jafama.FastMath;
 
 import java.util.Map;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StateFunction.java

@@ -1,17 +1,17 @@
 package com.dfsek.terra.api.structures.script.functions;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.vector.Vector2Impl;
-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.structures.structure.buffer.items.BufferedStateManipulator;
 import com.dfsek.terra.api.structures.tokenizer.Position;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.vector.Vector2Impl;
+import com.dfsek.terra.vector.Vector3Impl;
 import net.jafama.FastMath;
 
 import java.util.Map;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StructureFunction.java

@@ -1,21 +1,21 @@
 package com.dfsek.terra.api.structures.script.functions;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.structure.Structure;
-import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.vector.Vector2Impl;
-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.structure.Structure;
+import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.structure.rotation.Rotation;
-import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.structures.structure.buffer.IntermediateBuffer;
 import com.dfsek.terra.api.structures.tokenizer.Position;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.vector.Vector2Impl;
+import com.dfsek.terra.vector.Vector3Impl;
 import net.jafama.FastMath;
 
 import java.util.List;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Cell.java

@@ -1,9 +1,8 @@
 package com.dfsek.terra.api.structures.structure.buffer;
 
-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.util.GlueList;
+import com.dfsek.terra.api.vector.Location;
 
 import java.util.List;
 

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/DirectBuffer.java

@@ -1,9 +1,8 @@
 package com.dfsek.terra.api.structures.structure.buffer;
 
 import com.dfsek.terra.api.structure.buffer.Buffer;
-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
+import com.dfsek.terra.api.vector.Location;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/IntermediateBuffer.java

@@ -1,10 +1,9 @@
 package com.dfsek.terra.api.structures.structure.buffer;
 
 import com.dfsek.terra.api.structure.buffer.Buffer;
-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
-import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.vector.Vector3;
 
 public class IntermediateBuffer implements Buffer {
     private final Buffer original;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/StructureBuffer.java

@@ -1,10 +1,9 @@
 package com.dfsek.terra.api.structures.structure.buffer;
 
 import com.dfsek.terra.api.structure.buffer.Buffer;
-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
-import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.world.Chunk;
 import net.jafama.FastMath;
 
 import java.util.LinkedHashMap;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedBlock.java

@@ -1,12 +1,11 @@
 package com.dfsek.terra.api.structures.structure.buffer.items;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.block.Block;
 import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.block.data.Waterlogged;
+import com.dfsek.terra.api.structure.buffer.BufferedItem;
+import com.dfsek.terra.api.vector.Location;
 
 public class BufferedBlock implements BufferedItem {
     private final BlockData data;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.api.structures.structure.buffer.items;
 
 import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.entity.Entity;
+import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.api.event.events.world.generation.EntitySpawnEvent;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.api.entity.Entity;
-import com.dfsek.terra.api.entity.EntityType;
 
 public class BufferedEntity implements BufferedItem {
 

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java

@@ -1,17 +1,15 @@
 package com.dfsek.terra.api.structures.structure.buffer.items;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.event.events.world.generation.LootPopulateEvent;
-import com.dfsek.terra.api.structure.LootTable;
-import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.block.Block;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.state.Container;
-import com.dfsek.terra.api.structures.loot.LootTableImpl;
+import com.dfsek.terra.api.event.events.world.generation.LootPopulateEvent;
+import com.dfsek.terra.api.structure.LootTable;
+import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.structures.script.StructureScript;
 import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.api.vector.Location;
 
 public class BufferedLootApplication implements BufferedItem {
     private final LootTable table;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedPulledBlock.java

@@ -1,11 +1,10 @@
 package com.dfsek.terra.api.structures.structure.buffer.items;
 
-import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.block.Block;
 import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.structure.buffer.BufferedItem;
+import com.dfsek.terra.api.vector.Location;
 
 public class BufferedPulledBlock implements BufferedItem {
     private final BlockData data;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedStateManipulator.java

@@ -1,10 +1,9 @@
 package com.dfsek.terra.api.structures.structure.buffer.items;
 
 import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
-import com.dfsek.terra.api.block.state.BlockState;
 
 public class BufferedStateManipulator implements BufferedItem {
     private final TerraPlugin main;

common/implementation/src/main/java/com/dfsek/terra/api/util/GlueList.java

@@ -65,18 +65,17 @@ import static net.jafama.FastMath.*;
  * Remove O(n*m)<br>
  * Search O(m)<br>
  * Access O(m)
- *
+ * <p>
  * version v1.0
- *
+ * <p>
  * Date: 03.11.2015
  *
- *
+ * @param <T> the type of elements held in this collection
  * @author Ertuğrul Çetin ~ ertu.ctn@gmail.com
  * @see Collection
  * @see List
  * @see LinkedList
  * @see ArrayList
- * @param <T> the type of elements held in this collection
  */
 @SuppressWarnings({"ManualMinMaxCalculation", "ConstantConditions", "ManualArrayToCollectionCopy"})
 public class GlueList<T> extends AbstractList<T> implements List<T>, Cloneable, Serializable {

common/implementation/src/main/java/com/dfsek/terra/api/util/PaletteUtil.java

@@ -1,10 +1,9 @@
 package com.dfsek.terra.api.util;
 
-import com.dfsek.terra.api.util.MathUtil;
 import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.generator.Sampler;
 import com.dfsek.terra.api.world.palette.slant.SlantHolder;
 import com.dfsek.terra.config.templates.BiomeTemplate;
-import com.dfsek.terra.api.world.generator.Sampler;
 
 public final class PaletteUtil {
     public static Palette getPalette(int x, int y, int z, BiomeTemplate c, Sampler sampler) {

common/implementation/src/main/java/com/dfsek/terra/api/util/RotationUtil.java

@@ -1,7 +1,5 @@
 package com.dfsek.terra.api.util;
 
-import com.dfsek.terra.api.structure.rotation.Rotation;
-import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.block.Axis;
 import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.block.BlockFace;
@@ -12,6 +10,8 @@ import com.dfsek.terra.api.block.data.Rail;
 import com.dfsek.terra.api.block.data.RedstoneWire;
 import com.dfsek.terra.api.block.data.Rotatable;
 import com.dfsek.terra.api.block.data.Wall;
+import com.dfsek.terra.api.structure.rotation.Rotation;
+import com.dfsek.terra.api.vector.Vector2;
 import com.google.common.collect.Sets;
 import net.jafama.FastMath;
 

common/implementation/src/main/java/com/dfsek/terra/api/util/collections/ProbabilityCollectionImpl.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.util.collections;
 
-import com.dfsek.terra.api.util.MathUtil;
 import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.MathUtil;
 import com.dfsek.terra.api.util.ProbabilityCollection;
 import com.dfsek.terra.api.util.mutable.MutableInteger;
 import org.jetbrains.annotations.NotNull;

common/implementation/src/main/java/com/dfsek/terra/api/world/biome/UserDefinedBiome.java

@@ -2,7 +2,6 @@ package com.dfsek.terra.api.world.biome;
 
 import com.dfsek.terra.api.util.ProbabilityCollection;
 import com.dfsek.terra.api.world.World;
-import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import com.dfsek.terra.config.templates.BiomeTemplate;
 import com.dfsek.terra.world.generation.WorldGenerator;
 

common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/BiomeHolderImpl.java

@@ -2,8 +2,8 @@ package com.dfsek.terra.api.world.biome.pipeline;
 
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeExpander;
+import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource;
 

common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/BiomePipelineImpl.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.api.world.biome.pipeline;
 
-import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder;
-import com.dfsek.terra.vector.Vector2Impl;
 import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.util.seeded.StageSeeded;
+import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource;
 import com.dfsek.terra.api.world.biome.generation.pipeline.Stage;
+import com.dfsek.terra.vector.Vector2Impl;
 
 import java.util.List;
 import java.util.stream.Collectors;

common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/expand/FractalExpander.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.world.biome.pipeline.expand;
 
-import com.dfsek.terra.api.util.MathUtil;
 import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.MathUtil;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeExpander;
 

common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/BorderListMutator.java

@@ -2,7 +2,6 @@ package com.dfsek.terra.api.world.biome.pipeline.mutator;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.ProbabilityCollection;
-import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator;
 

common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/BorderMutator.java

@@ -2,7 +2,6 @@ package com.dfsek.terra.api.world.biome.pipeline.mutator;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.ProbabilityCollection;
-import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator;
 

common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/ReplaceListMutator.java

@@ -2,7 +2,6 @@ package com.dfsek.terra.api.world.biome.pipeline.mutator;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.ProbabilityCollection;
-import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator;
 

common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/ReplaceMutator.java

@@ -2,7 +2,6 @@ package com.dfsek.terra.api.world.biome.pipeline.mutator;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.ProbabilityCollection;
-import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator;
 

common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/SmoothMutator.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.world.biome.pipeline.mutator;
 
-import com.dfsek.terra.api.util.MathUtil;
 import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.MathUtil;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator;
 

common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/source/RandomSource.java

@@ -2,7 +2,6 @@ package com.dfsek.terra.api.world.biome.pipeline.source;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.ProbabilityCollection;
-import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource;
 

common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/stages/ExpanderStage.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.world.biome.pipeline.stages;
 
+import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeExpander;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder;
 import com.dfsek.terra.api.world.biome.generation.pipeline.Stage;
-import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeExpander;
 
 public class ExpanderStage implements Stage {
     private final BiomeExpander expander;

common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/stages/MutatorStage.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.world.biome.pipeline.stages;
 
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder;
-import com.dfsek.terra.api.world.biome.generation.pipeline.Stage;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator;
+import com.dfsek.terra.api.world.biome.generation.pipeline.Stage;
 
 public class MutatorStage implements Stage {
     private final BiomeMutator mutator;

common/implementation/src/main/java/com/dfsek/terra/api/world/biome/provider/StandardBiomeProvider.java

@@ -3,11 +3,11 @@ package com.dfsek.terra.api.world.biome.provider;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.vector.Vector2Impl;
 import com.dfsek.terra.api.world.biome.TerraBiome;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder;
 import com.dfsek.terra.api.world.biome.pipeline.BiomePipelineImpl;
+import com.dfsek.terra.vector.Vector2Impl;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;

common/implementation/src/main/java/com/dfsek/terra/api/world/carving/Worm.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.world.carving;
 
 import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.world.World;
+import com.dfsek.terra.vector.Vector3Impl;
 import net.jafama.FastMath;
 
 import java.util.Random;

common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncBiomeFinder.java

@@ -2,7 +2,6 @@ package com.dfsek.terra.api.world.locate;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncFeatureFinder.java

@@ -2,11 +2,10 @@ package com.dfsek.terra.api.world.locate;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.vector.Vector3Impl;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Consumer;

common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncStructureFinder.java

@@ -1,12 +1,11 @@
 package com.dfsek.terra.api.world.locate;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.util.PopulationUtil;
-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
-import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.api.util.PopulationUtil;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.world.population.items.TerraStructure;

common/implementation/src/main/java/com/dfsek/terra/api/world/palette/NoisePalette.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.world.palette;
 
-import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.noise.NoiseSampler;
 
 import java.util.List;
 

common/implementation/src/main/java/com/dfsek/terra/api/world/palette/PaletteImpl.java

@@ -1,10 +1,9 @@
 package com.dfsek.terra.api.world.palette;
 
-import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.util.ProbabilityCollection;
-import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import com.dfsek.terra.api.world.generator.Palette;
 
 import java.util.List;

common/implementation/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteLayerHolder.java

@@ -1,9 +1,8 @@
 package com.dfsek.terra.api.world.palette.holder;
 
-import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.ProbabilityCollection;
-import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import org.jetbrains.annotations.NotNull;
 
 public class PaletteLayerHolder {

common/implementation/src/main/java/com/dfsek/terra/carving/CarverCache.java

@@ -1,16 +1,16 @@
 package com.dfsek.terra.carving;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.util.MathUtil;
-import com.dfsek.terra.api.util.PopulationUtil;
-import com.dfsek.terra.vector.Vector3Impl;
-import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.util.GlueList;
+import com.dfsek.terra.api.util.MathUtil;
+import com.dfsek.terra.api.util.PopulationUtil;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.carving.Worm;
+import com.dfsek.terra.vector.Vector3Impl;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;

common/implementation/src/main/java/com/dfsek/terra/carving/CarverPalette.java

@@ -4,7 +4,6 @@ import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.util.ProbabilityCollection;
 import com.dfsek.terra.api.util.collections.MaterialSet;
-import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import net.jafama.FastMath;
 
 import java.util.Map;

common/implementation/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java

@@ -5,22 +5,22 @@ import com.dfsek.paralithic.eval.parser.Parser;
 import com.dfsek.paralithic.eval.parser.Scope;
 import com.dfsek.paralithic.eval.tokenizer.ParseException;
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.math.range.ConstantRange;
 import com.dfsek.terra.api.math.paralithic.defined.UserDefinedFunction;
 import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction2;
 import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction3;
-import com.dfsek.terra.api.util.Range;
+import com.dfsek.terra.api.math.range.ConstantRange;
-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.vector.Vector3Impl;
-import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
+import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.carving.Carver;
 import com.dfsek.terra.api.world.carving.Worm;
 import com.dfsek.terra.config.loaders.config.function.FunctionTemplate;
 import com.dfsek.terra.config.templates.BiomeTemplate;
 import com.dfsek.terra.config.templates.CarverTemplate;
+import com.dfsek.terra.vector.Vector3Impl;
 import net.jafama.FastMath;
 
 import java.util.List;

common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java

@@ -3,8 +3,8 @@ package com.dfsek.terra.commands;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.api.injection.annotations.Inject;
 
 @Command(
         usage = "/terra addons"

common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java

@@ -6,9 +6,9 @@ import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.type.DebugCommand;
 import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
 import com.dfsek.terra.api.command.annotation.type.WorldCommand;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
 
 @WorldCommand
 @DebugCommand

common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java

@@ -4,11 +4,10 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.config.lang.LangUtil;
-import com.dfsek.terra.config.pack.ConfigPackTemplate;
 
 @Command(
         usage = "/terra packs"

common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java

@@ -3,8 +3,8 @@ package com.dfsek.terra.commands;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.config.lang.LangUtil;
 
 @Command(

common/implementation/src/main/java/com/dfsek/terra/commands/VersionCommand.java

@@ -3,8 +3,8 @@ package com.dfsek.terra.commands;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.config.lang.LangUtil;
 
 @Command(

common/implementation/src/main/java/com/dfsek/terra/commands/biome/BiomeCommand.java

@@ -6,9 +6,9 @@ import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.Subcommand;
 import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
 import com.dfsek.terra.api.command.annotation.type.WorldCommand;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.config.lang.LangUtil;

common/implementation/src/main/java/com/dfsek/terra/commands/biome/BiomeLocateCommand.java

@@ -10,16 +10,15 @@ import com.dfsek.terra.api.command.annotation.inject.SwitchTarget;
 import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
 import com.dfsek.terra.api.command.annotation.type.WorldCommand;
 import com.dfsek.terra.api.command.arg.IntegerArgumentParser;
-import com.dfsek.terra.api.injection.annotations.Inject;
-import com.dfsek.terra.vector.LocationImpl;
-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.locate.AsyncBiomeFinder;
 import com.dfsek.terra.commands.biome.arg.BiomeArgumentParser;
 import com.dfsek.terra.commands.biome.tab.BiomeTabCompleter;
 import com.dfsek.terra.config.lang.LangUtil;
+import com.dfsek.terra.vector.Vector3Impl;
 
 import java.util.Locale;
 

common/implementation/src/main/java/com/dfsek/terra/commands/biome/arg/BiomeArgumentParser.java

@@ -2,9 +2,9 @@ package com.dfsek.terra.commands.biome.arg;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.arg.ArgumentParser;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 
 public class BiomeArgumentParser implements ArgumentParser<TerraBiome> {

common/implementation/src/main/java/com/dfsek/terra/commands/biome/tab/BiomeTabCompleter.java

@@ -2,9 +2,9 @@ package com.dfsek.terra.commands.biome.tab;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.tab.TabCompleter;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 
 import java.util.List;

common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java

@@ -4,8 +4,8 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.type.DebugCommand;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.api.injection.annotations.Inject;
 
 @Command
 @DebugCommand

common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java

@@ -4,8 +4,8 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.type.DebugCommand;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.api.injection.annotations.Inject;
 
 @Command
 @DebugCommand

common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java

@@ -4,8 +4,8 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.type.DebugCommand;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.api.injection.annotations.Inject;
 
 @Command
 @DebugCommand

common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java

@@ -4,8 +4,8 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.type.DebugCommand;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.api.injection.annotations.Inject;
 
 @Command
 @DebugCommand

common/implementation/src/main/java/com/dfsek/terra/commands/structure/SpawnCommand.java

@@ -6,19 +6,18 @@ import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.type.DebugCommand;
 import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
 import com.dfsek.terra.api.command.annotation.type.WorldCommand;
-import com.dfsek.terra.api.injection.annotations.Inject;
-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.structures.parser.lang.constants.NumericConstant;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
 import com.dfsek.terra.api.structures.script.functions.CheckFunction;
-import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.structures.structure.buffer.StructureBuffer;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.vector.LocationImpl;
 
 import java.util.HashMap;
 

common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureExportCommand.java

@@ -1,6 +1,10 @@
 package com.dfsek.terra.commands.structure;
 
 import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.block.Block;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.block.state.Sign;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Argument;
 import com.dfsek.terra.api.command.annotation.Command;
@@ -8,16 +12,12 @@ import com.dfsek.terra.api.command.annotation.inject.ArgumentTarget;
 import com.dfsek.terra.api.command.annotation.type.DebugCommand;
 import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
 import com.dfsek.terra.api.command.annotation.type.WorldCommand;
+import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.api.entity.Player;
 import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.vector.LocationImpl;
-import com.dfsek.terra.api.entity.CommandSender;
-import com.dfsek.terra.api.block.Block;
-import com.dfsek.terra.api.block.BlockData;
-import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.block.state.Sign;
-import com.dfsek.terra.api.entity.Player;
-import com.dfsek.terra.api.util.generic.pair.Pair;
 
 import java.io.BufferedWriter;
 import java.io.File;

common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLoadCommand.java

@@ -11,9 +11,9 @@ import com.dfsek.terra.api.command.annotation.type.DebugCommand;
 import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
 import com.dfsek.terra.api.command.annotation.type.WorldCommand;
 import com.dfsek.terra.api.command.arg.IntegerArgumentParser;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.util.FastRandom;

common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLocateCommand.java

@@ -10,15 +10,14 @@ import com.dfsek.terra.api.command.annotation.inject.SwitchTarget;
 import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
 import com.dfsek.terra.api.command.annotation.type.WorldCommand;
 import com.dfsek.terra.api.command.arg.IntegerArgumentParser;
-import com.dfsek.terra.api.injection.annotations.Inject;
-import com.dfsek.terra.vector.LocationImpl;
-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.world.locate.AsyncStructureFinder;
 import com.dfsek.terra.commands.structure.argument.StructureArgumentParser;
 import com.dfsek.terra.commands.structure.completer.StructureCompleter;
 import com.dfsek.terra.config.lang.LangUtil;
+import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.world.population.items.TerraStructure;
 
 import java.util.Locale;

common/implementation/src/main/java/com/dfsek/terra/commands/structure/argument/ScriptArgumentParser.java

@@ -2,9 +2,9 @@ package com.dfsek.terra.commands.structure.argument;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.arg.ArgumentParser;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structures.script.StructureScript;
 

common/implementation/src/main/java/com/dfsek/terra/commands/structure/argument/StructureArgumentParser.java

@@ -2,9 +2,9 @@ package com.dfsek.terra.commands.structure.argument;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.arg.ArgumentParser;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.world.population.items.TerraStructure;
 
 public class StructureArgumentParser implements ArgumentParser<TerraStructure> {

common/implementation/src/main/java/com/dfsek/terra/commands/structure/completer/ScriptCompleter.java

@@ -2,9 +2,9 @@ package com.dfsek.terra.commands.structure.completer;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.tab.TabCompleter;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structures.script.StructureScript;
 

common/implementation/src/main/java/com/dfsek/terra/commands/structure/completer/StructureCompleter.java

@@ -2,9 +2,9 @@ package com.dfsek.terra.commands.structure.completer;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.tab.TabCompleter;
-import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.world.population.items.TerraStructure;
 
 import java.util.ArrayList;

common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java

@@ -5,9 +5,9 @@ import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ConfigTemplate;
 import com.dfsek.tectonic.exception.ConfigException;
 import com.dfsek.tectonic.loading.ConfigLoader;
+import com.dfsek.terra.api.Logger;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.util.JarUtil;
-import com.dfsek.terra.api.Logger;
 
 import java.io.File;
 import java.io.FileInputStream;

common/implementation/src/main/java/com/dfsek/terra/config/builder/BiomeBuilder.java

@@ -1,9 +1,8 @@
 package com.dfsek.terra.config.builder;
 
 import com.dfsek.terra.api.util.ProbabilityCollection;
-import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import com.dfsek.terra.api.util.seeded.SeededBuilder;
+import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.config.templates.BiomeTemplate;
 

common/implementation/src/main/java/com/dfsek/terra/config/builder/UserDefinedBiomeBuilder.java

@@ -4,15 +4,14 @@ import com.dfsek.paralithic.eval.parser.Scope;
 import com.dfsek.paralithic.eval.tokenizer.ParseException;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.ProbabilityCollection;
-import com.dfsek.terra.noise.samplers.ExpressionSampler;
-import com.dfsek.terra.noise.samplers.noise.ConstantSampler;
-import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
+import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.config.loaders.config.function.FunctionTemplate;
 import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.config.templates.BiomeTemplate;
+import com.dfsek.terra.noise.samplers.ExpressionSampler;
+import com.dfsek.terra.noise.samplers.noise.ConstantSampler;
 import com.dfsek.terra.world.generation.WorldGenerator;
 
 import java.util.LinkedHashMap;

common/implementation/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java

@@ -1,10 +1,9 @@
 package com.dfsek.terra.config.dummy;
 
-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.block.Block;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;
+import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.generator.ChunkGenerator;

common/implementation/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java

@@ -1,12 +1,12 @@
 package com.dfsek.terra.config.factories;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler;
 import com.dfsek.terra.api.world.Flora;
 import com.dfsek.terra.api.world.palette.NoisePalette;
 import com.dfsek.terra.api.world.palette.PaletteImpl;
 import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder;
 import com.dfsek.terra.config.templates.FloraTemplate;
+import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler;
 import com.dfsek.terra.world.population.items.flora.TerraFlora;
 
 public class FloraFactory implements ConfigFactory<FloraTemplate, Flora> {

common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.config.lang;
 
+import com.dfsek.terra.api.Logger;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.entity.CommandSender;
-import com.dfsek.terra.api.Logger;
 import com.dfsek.terra.api.lang.Language;
 
 import java.io.File;

common/implementation/src/main/java/com/dfsek/terra/config/lang/LanguageImpl.java

@@ -14,9 +14,11 @@ import java.util.logging.Logger;
 
 public class LanguageImpl implements com.dfsek.terra.api.lang.Language {
     private final Configuration configuration;
+
     public LanguageImpl(File file) throws IOException {
         configuration = new Configuration(new FileInputStream(file));
     }
+
     @Override
     @SuppressWarnings("unchecked")
     public Message getMessage(String id) {
@@ -33,10 +35,12 @@ public class LanguageImpl implements com.dfsek.terra.api.lang.Language {
         if(temp == null || temp.isEmpty()) return new SingleLineMessage("message:" + id + ":translation_undefined");
         return temp;
     }
+
     @Override
     public void log(String messageID, Level level, Logger logger, String... args) {
         getMessage(messageID).log(logger, level, args);
     }
+
     @Override
     public void send(String messageID, CommandSender sender, String... args) {
         getMessage(messageID).send(sender, args);