fix imports

2026-06-17 14:21:08 +00:00 · 2021-06-24 00:19:18 -07:00
parent c0b55c3e4e
commit 4bac67b8d7
213 changed files with 510 additions and 571 deletions
@@ -4,7 +4,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import java.net.URL
 import java.nio.channels.Channels
 import java.nio.file.Files
-import java.nio.file.Paths
 import java.nio.file.StandardCopyOption

 plugins {
@@ -55,7 +54,7 @@ fun downloadPaperclip(url: String, dir: String) {

 fun copyTerra(dir: String) {
    file("$testDir/$dir").walk().forEach {
-        if(it.name.startsWith("Terra-") && it.name.endsWith(".jar")) it.delete() // Delete old Terra jar(s)
+        if (it.name.startsWith("Terra-") && it.name.endsWith(".jar")) it.delete() // Delete old Terra jar(s)
    }
    copy {
        from("$buildDir/libs/Terra-bukkit-$version-shaded.jar")
@@ -87,11 +86,11 @@ fun installServer(dir: String) {
 }

 fun deleteFolder(folder: File) {
-    if(folder.exists()) folder.deleteRecursively()
+    if (folder.exists()) folder.deleteRecursively()
 }

 fun deleteFile(file: File) {
-    if(file.exists()) file.delete()
+    if (file.exists()) file.delete()
 }

 tasks.create("cleanWorlds") {
@@ -1,8 +1,7 @@
 package com.dfsek.terra.bukkit;

-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.entity.Entity;
+import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import org.bukkit.Location;
@@ -1,8 +1,7 @@
 package com.dfsek.terra.bukkit;

-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.vector.Vector3Impl;
@@ -1,11 +1,13 @@
 package com.dfsek.terra.bukkit;

 import com.dfsek.tectonic.loading.TypeRegistry;
+import com.dfsek.terra.api.Logger;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.addon.TerraAddon;
 import com.dfsek.terra.api.addon.annotations.Addon;
 import com.dfsek.terra.api.addon.annotations.Author;
 import com.dfsek.terra.api.addon.annotations.Version;
+import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.command.CommandManager;
 import com.dfsek.terra.api.command.TerraCommandManager;
 import com.dfsek.terra.api.command.exception.MalformedCommandException;
@@ -13,18 +15,17 @@ 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.api.block.BlockData;
 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.registry.Registry;
-import com.dfsek.terra.api.world.TerraWorld;
-import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.world.World;
+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.api.Logger;
+import com.dfsek.terra.api.world.TerraWorld;
+import com.dfsek.terra.api.world.World;
+import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.generator.TerraChunkGenerator;
 import com.dfsek.terra.bukkit.command.BukkitCommandAdapter;
 import com.dfsek.terra.bukkit.command.FixChunkCommand;
@@ -43,7 +44,6 @@ import com.dfsek.terra.commands.CommandUtil;
 import com.dfsek.terra.config.GenericLoaders;
 import com.dfsek.terra.config.PluginConfigImpl;
 import com.dfsek.terra.config.lang.LangUtil;
-import com.dfsek.terra.api.profiler.Profiler;
 import com.dfsek.terra.profiler.ProfilerImpl;
 import com.dfsek.terra.registry.CheckedRegistryImpl;
 import com.dfsek.terra.registry.LockedRegistryImpl;
@@ -100,7 +100,6 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
    private final LockedRegistryImpl<TerraAddon> addonLockedRegistry = new LockedRegistryImpl<>(addonRegistry);


-
    public boolean reload() {
        config.load(this);
        LangUtil.load(config.getLanguage(), this); // Load language.
@@ -1,12 +1,11 @@
 package com.dfsek.terra.bukkit.handles;

-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.api.entity.Player;
 import com.dfsek.terra.api.handle.WorldHandle;
 import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.bukkit.structure.WorldEditUtil;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
@@ -2,15 +2,14 @@ package com.dfsek.terra.bukkit.listeners;

 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.config.WorldConfig;
-import com.dfsek.terra.vector.LocationImpl;
-import com.dfsek.terra.api.world.TerraWorld;
-import com.dfsek.terra.api.world.Tree;
-import com.dfsek.terra.api.world.World;
 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.api.world.TerraWorld;
+import com.dfsek.terra.api.world.Tree;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
-import com.dfsek.terra.config.pack.WorldConfigImpl;
+import com.dfsek.terra.vector.LocationImpl;
 import org.bukkit.Material;
 import org.bukkit.TreeType;
 import org.bukkit.block.Block;
@@ -55,6 +54,7 @@ public class CommonListener implements Listener {
        block.setType(Material.AIR);
        Tree tree = c.getRegistry(Tree.class).get(TREE_TYPE_STRING_TRANSFORMER.translate(e.getSpecies()));
        org.bukkit.Location location = e.getLocation();
-        if(!tree.plant(new LocationImpl(bukkit, location.getX(), location.getY(), location.getZ()), new FastRandom())) block.setBlockData(data);
+        if(!tree.plant(new LocationImpl(bukkit, location.getX(), location.getY(), location.getZ()), new FastRandom()))
+            block.setBlockData(data);
    }
 }
@@ -5,10 +5,10 @@ import com.dfsek.terra.api.event.EventListener;
 import com.dfsek.terra.api.event.annotations.Global;
 import com.dfsek.terra.api.event.annotations.Priority;
 import com.dfsek.terra.api.event.events.config.ConfigPackPreLoadEvent;
+import com.dfsek.terra.api.registry.DuplicateEntryException;
 import com.dfsek.terra.api.world.Tree;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.BukkitTree;
-import com.dfsek.terra.api.registry.DuplicateEntryException;
 import org.bukkit.TreeType;

 public class TerraListener implements EventListener {
@@ -1,14 +1,14 @@
 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.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
-import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.generator.Chunkified;
 import com.dfsek.terra.api.world.generator.TerraChunkGenerator;
 import com.dfsek.terra.bukkit.TerraBukkitPlugin;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
-import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.bukkit.world.BukkitWorld;
 import org.bukkit.generator.BlockPopulator;
 import org.jetbrains.annotations.NotNull;
@@ -1,10 +1,6 @@
 package com.dfsek.terra.bukkit.world;


-import com.dfsek.terra.vector.LocationImpl;
-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.vector.Vector3Impl;
-import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.block.Axis;
 import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.block.BlockFace;
@@ -14,12 +10,14 @@ import com.dfsek.terra.api.block.data.Rail;
 import com.dfsek.terra.api.block.data.RedstoneWire;
 import com.dfsek.terra.api.block.data.Slab;
 import com.dfsek.terra.api.block.data.Stairs;
+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.world.Chunk;
-import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.transform.MapTransform;
 import com.dfsek.terra.api.transform.TransformerImpl;
+import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.world.Chunk;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
 import com.dfsek.terra.bukkit.BukkitEntity;
 import com.dfsek.terra.bukkit.BukkitPlayer;
@@ -27,6 +25,8 @@ import com.dfsek.terra.bukkit.world.block.BukkitBlockTypeAndItem;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
 import com.dfsek.terra.bukkit.world.inventory.BukkitItemStack;
 import com.dfsek.terra.bukkit.world.inventory.meta.BukkitEnchantment;
+import com.dfsek.terra.vector.LocationImpl;
+import com.dfsek.terra.vector.Vector3Impl;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.TreeType;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world;

-import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.BiomeGrid;
+import com.dfsek.terra.api.world.biome.Biome;
 import org.bukkit.generator.ChunkGenerator;
 import org.jetbrains.annotations.NotNull;

@@ -1,12 +1,11 @@
 package com.dfsek.terra.bukkit.world;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.handle.WorldHandle;
-import com.dfsek.terra.api.world.Tree;
-import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.api.profiler.ProfileFrame;
+import com.dfsek.terra.api.util.collections.MaterialSet;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.world.Tree;
 import org.bukkit.TreeType;

 import java.util.Locale;
@@ -1,10 +1,9 @@
 package com.dfsek.terra.bukkit.world;

-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;
@@ -1,6 +1,5 @@
 package com.dfsek.terra.bukkit.world.block;

-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;
@@ -9,6 +8,7 @@ import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
 import com.dfsek.terra.bukkit.world.block.state.BukkitBlockState;
+import com.dfsek.terra.vector.LocationImpl;

 public class BukkitBlock implements Block {
    private final org.bukkit.block.Block delegate;
@@ -3,11 +3,13 @@ package com.dfsek.terra.fabric;
 import com.dfsek.tectonic.exception.ConfigException;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.TypeRegistry;
+import com.dfsek.terra.api.Logger;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.addon.TerraAddon;
 import com.dfsek.terra.api.addon.annotations.Addon;
 import com.dfsek.terra.api.addon.annotations.Author;
 import com.dfsek.terra.api.addon.annotations.Version;
+import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.command.CommandManager;
 import com.dfsek.terra.api.command.TerraCommandManager;
 import com.dfsek.terra.api.command.exception.MalformedCommandException;
@@ -20,38 +22,36 @@ 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;
 import com.dfsek.terra.api.event.events.config.ConfigPackPreLoadEvent;
-import com.dfsek.terra.api.block.BlockData;
 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.world.TerraWorld;
-import com.dfsek.terra.api.world.Tree;
-import com.dfsek.terra.api.world.World;
+import com.dfsek.terra.api.profiler.Profiler;
 import com.dfsek.terra.api.registry.CheckedRegistry;
+import com.dfsek.terra.api.registry.DuplicateEntryException;
 import com.dfsek.terra.api.transform.TransformerImpl;
 import com.dfsek.terra.api.transform.Validator;
 import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.api.util.logging.DebugLogger;
-import com.dfsek.terra.api.Logger;
+import com.dfsek.terra.api.world.TerraWorld;
+import com.dfsek.terra.api.world.Tree;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.commands.CommandUtil;
 import com.dfsek.terra.config.GenericLoaders;
 import com.dfsek.terra.config.PluginConfigImpl;
 import com.dfsek.terra.config.builder.BiomeBuilder;
 import com.dfsek.terra.config.lang.LangUtil;
-import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
-import com.dfsek.terra.fabric.generation.PopulatorFeature;
-import com.dfsek.terra.fabric.generation.TerraBiomeSource;
 import com.dfsek.terra.fabric.config.PostLoadCompatibilityOptions;
 import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions;
 import com.dfsek.terra.fabric.event.BiomeRegistrationEvent;
 import com.dfsek.terra.fabric.event.GameInitializationEvent;
+import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
+import com.dfsek.terra.fabric.generation.PopulatorFeature;
+import com.dfsek.terra.fabric.generation.TerraBiomeSource;
 import com.dfsek.terra.fabric.handle.FabricItemHandle;
 import com.dfsek.terra.fabric.handle.FabricWorldHandle;
 import com.dfsek.terra.fabric.util.FabricUtil;
 import com.dfsek.terra.fabric.util.ProtoBiome;
-import com.dfsek.terra.api.profiler.Profiler;
 import com.dfsek.terra.profiler.ProfilerImpl;
-import com.dfsek.terra.api.registry.DuplicateEntryException;
 import com.dfsek.terra.registry.CheckedRegistryImpl;
 import com.dfsek.terra.registry.LockedRegistryImpl;
 import com.dfsek.terra.registry.master.AddonRegistry;
@@ -1,12 +1,11 @@
 package com.dfsek.terra.fabric.block;

-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.block.BlockType;
 import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.block.FluidBlock;
@@ -1,15 +1,14 @@
 package com.dfsek.terra.fabric.generation;

 import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.TerraWorld;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.generator.ChunkData;
-import com.dfsek.terra.api.world.generator.GeneratorWrapper;
-import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.generator.Chunkified;
+import com.dfsek.terra.api.world.generator.GeneratorWrapper;
 import com.dfsek.terra.api.world.generator.TerraChunkGenerator;
 import com.dfsek.terra.api.world.locate.AsyncStructureFinder;
-import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.block.FabricBlockData;
 import com.dfsek.terra.fabric.mixin.StructureAccessorAccessor;
@@ -3,7 +3,6 @@ package com.dfsek.terra.fabric.generation;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.util.FabricUtil;
 import com.mojang.serialization.Codec;
@@ -1,7 +1,6 @@
 package com.dfsek.terra.fabric.generation;

 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.event.BiomeRegistrationEvent;
 import net.fabricmc.api.EnvType;
@@ -1,11 +1,10 @@
 package com.dfsek.terra.fabric.handle;

-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.api.entity.Player;
 import com.dfsek.terra.api.handle.WorldHandle;
 import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.fabric.block.FabricBlockData;
 import com.dfsek.terra.fabric.util.FabricAdapter;
 import com.dfsek.terra.fabric.util.WorldEditUtil;
@@ -1,11 +1,8 @@
 package com.dfsek.terra.fabric.mixin.implementations.entity;

-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.world.World;
 import com.dfsek.terra.fabric.util.FabricAdapter;
-import com.dfsek.terra.vector.Vector3Impl;
 import net.minecraft.entity.Entity;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
@@ -1,10 +1,9 @@
 package com.dfsek.terra.fabric.mixin.implementations.world;

-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;
@@ -1,10 +1,9 @@
 package com.dfsek.terra.fabric.mixin.implementations.world;

-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;
@@ -1,11 +1,10 @@
 package com.dfsek.terra.fabric.mixin.lifecycle.server;

 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.event.BiomeRegistrationEvent;
-import com.dfsek.terra.fabric.generation.TerraBiomeSource;
 import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
+import com.dfsek.terra.fabric.generation.TerraBiomeSource;
 import com.google.common.base.MoreObjects;
 import net.minecraft.util.registry.DynamicRegistryManager;
 import net.minecraft.util.registry.Registry;
@@ -1,7 +1,5 @@
 package com.dfsek.terra.fabric.util;

-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.block.Axis;
 import com.dfsek.terra.api.block.BlockFace;
 import com.dfsek.terra.api.block.data.Bisected;
@@ -10,6 +8,7 @@ import com.dfsek.terra.api.block.data.Stairs;
 import com.dfsek.terra.api.block.state.Container;
 import com.dfsek.terra.api.block.state.MobSpawner;
 import com.dfsek.terra.api.block.state.Sign;
+import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.fabric.block.FabricBlockData;
 import com.dfsek.terra.fabric.block.data.FabricDirectional;
 import com.dfsek.terra.fabric.block.data.FabricMultipleFacing;
@@ -18,6 +17,7 @@ import com.dfsek.terra.fabric.block.data.FabricRotatable;
 import com.dfsek.terra.fabric.block.data.FabricSlab;
 import com.dfsek.terra.fabric.block.data.FabricStairs;
 import com.dfsek.terra.fabric.block.data.FabricWaterlogged;
+import com.dfsek.terra.vector.Vector3Impl;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.LootableContainerBlockEntity;
@@ -3,7 +3,6 @@ package com.dfsek.terra.fabric.util;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.config.builder.BiomeBuilder;
-import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.config.templates.BiomeTemplate;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.config.PostLoadCompatibilityOptions;
@@ -37,8 +36,8 @@ public final class FabricUtil {
    /**
     * Clones a Vanilla biome and injects Terra data to create a Terra-vanilla biome delegate.
     *
-     * @param biome       The Terra BiomeBuilder.
-     * @param pack        The ConfigPack this biome belongs to.
+     * @param biome The Terra BiomeBuilder.
+     * @param pack  The ConfigPack this biome belongs to.
     * @return The Minecraft delegate biome.
     */
    public static Biome createBiome(BiomeBuilder biome, ConfigPack pack, DynamicRegistryManager registryManager) {
@@ -1,9 +1,9 @@
 package com.dfsek.terra.fabric.util;

-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.entity.Player;
 import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.vector.LocationImpl;
 import com.sk89q.worldedit.IncompleteRegionException;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.math.BlockVector3;
@@ -4,9 +4,9 @@
  "package": "com.dfsek.terra.fabric.mixin",
  "compatibilityLevel": "JAVA_16",
  "mixins": [
-    "StructureAccessorAccessor",
    "CommandManagerMixin",
    "ServerWorldMixin",
+    "StructureAccessorAccessor",
    "access.BiomeEffectsAccessor",
    "access.MobSpawnerLogicAccessor",
    "access.StateAccessor",
@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
 public class ForgeBlockData implements BlockData {
    private static final Function<Map.Entry<Property<?>, Comparable<?>>, String> PROPERTY_MAPPER = new Function<Map.Entry<Property<?>, Comparable<?>>, String>() {
        public String apply(@Nullable Map.Entry<Property<?>, Comparable<?>> entry) {
-            if (entry == null) {
+            if(entry == null) {
                return "<NULL>";
            } else {
                Property<?> property = entry.getKey();
@@ -26,7 +26,7 @@ public class ForgeBlockData implements BlockData {

        @SuppressWarnings("unchecked")
        private <T extends Comparable<T>> String getName(Property<T> property, Comparable<?> comparable) {
-            return property.getName((T)comparable);
+            return property.getName((T) comparable);
        }
    };

@@ -80,12 +80,14 @@ public class ForgeChunkGeneratorWrapper extends ChunkGenerator implements Genera
    }

    @Override
-    protected @NotNull Codec<? extends ChunkGenerator> codec() {
+    protected @NotNull
+    Codec<? extends ChunkGenerator> codec() {
        return CODEC;
    }

    @Override
-    public @NotNull ChunkGenerator withSeed(long seed) {
+    public @NotNull
+    ChunkGenerator withSeed(long seed) {
        return new ForgeChunkGeneratorWrapper((TerraBiomeSource) this.biomeSource.withSeed(seed), seed, pack);
    }

@@ -153,7 +155,8 @@ public class ForgeChunkGeneratorWrapper extends ChunkGenerator implements Genera
    }

    @Override
-    public @NotNull IBlockReader getBaseColumn(int x, int z) {
+    public @NotNull
+    IBlockReader getBaseColumn(int x, int z) {
        TerraWorld world = TerraForgePlugin.getInstance().getWorld(dimensionType);
        int height = getBaseHeight(x, z, Heightmap.Type.WORLD_SURFACE);
        BlockState[] array = new BlockState[256];
@@ -40,7 +40,8 @@ public class TerraBiomeSource extends net.minecraft.world.biome.provider.BiomePr
    }

    @Override
-    protected @NotNull Codec<? extends net.minecraft.world.biome.provider.BiomeProvider> codec() {
+    protected @NotNull
+    Codec<? extends net.minecraft.world.biome.provider.BiomeProvider> codec() {
        return CODEC;
    }

@@ -50,7 +51,8 @@ public class TerraBiomeSource extends net.minecraft.world.biome.provider.BiomePr
    }

    @Override
-    public @NotNull Biome getNoiseBiome(int biomeX, int biomeY, int biomeZ) {
+    public @NotNull
+    Biome getNoiseBiome(int biomeX, int biomeY, int biomeZ) {
        UserDefinedBiome biome = (UserDefinedBiome) grid.getBiome(biomeX << 2, biomeZ << 2);
        return Objects.requireNonNull(biomeRegistry.get(new ResourceLocation("terra", ForgeUtil.createBiomeID(pack, biome.getID()))));
    }
@@ -18,7 +18,8 @@ public class TerraGeneratorType extends BiomeGeneratorTypeScreens {
    }

    @Override
-    protected @NotNull ChunkGenerator generator(@NotNull Registry<Biome> biomeRegistry, @NotNull Registry<DimensionSettings> chunkGeneratorSettingsRegistry, long seed) {
+    protected @NotNull
+    ChunkGenerator generator(@NotNull Registry<Biome> biomeRegistry, @NotNull Registry<DimensionSettings> chunkGeneratorSettingsRegistry, long seed) {
        return new ForgeChunkGeneratorWrapper(new TerraBiomeSource(biomeRegistry, seed, pack), seed, pack);
    }
 }
@@ -22,7 +22,8 @@ public abstract class SignTileEntityMixin {
    @Shadow
    public abstract void setMessage(int p_212365_1_, ITextComponent p_212365_2_);

-    public @NotNull String[] terra$getLines() {
+    public @NotNull
+    String[] terra$getLines() {
        String[] lines = new String[messages.length];
        for(int i = 0; i < messages.length; i++) {
            lines[i] = messages[i].getString();
@@ -30,7 +31,8 @@ public abstract class SignTileEntityMixin {
        return lines;
    }

-    public @NotNull String terra$getLine(int index) throws IndexOutOfBoundsException {
+    public @NotNull
+    String terra$getLine(int index) throws IndexOutOfBoundsException {

        return messages[index].getString();
    }
@@ -40,7 +40,8 @@ public abstract class ChunkMixin {
        return new ForgeBlock(pos, level);
    }

-    public @NotNull BlockData terra$getBlockData(int x, int y, int z) {
+    public @NotNull
+    BlockData terra$getBlockData(int x, int y, int z) {
        return terra$getBlock(x, y, z).getBlockData();
    }

@@ -43,7 +43,8 @@ public abstract class WorldGenRegionMixin {
        return new ForgeBlock(pos, (WorldGenRegion) (Object) this);
    }

-    public @NotNull BlockData terra$getBlockData(int x, int y, int z) {
+    public @NotNull
+    BlockData terra$getBlockData(int x, int y, int z) {
        return terra$getBlock(x, y, z).getBlockData();
    }

@@ -19,7 +19,8 @@ public abstract class ChunkPrimerMixin {
    @Shadow
    public abstract BlockState getBlockState(BlockPos pos);

-    public @NotNull BlockData terra$getBlockData(int x, int y, int z) {
+    public @NotNull
+    BlockData terra$getBlockData(int x, int y, int z) {
        return new ForgeBlockData(getBlockState(new BlockPos(x, y, z)));
    }

@@ -3,28 +3,28 @@ package com.dfsek.terra;
 import com.dfsek.tectonic.loading.TypeRegistry;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.addon.TerraAddon;
+import com.dfsek.terra.api.block.BlockData;
 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.api.block.BlockData;
 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.world.TerraWorld;
-import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.world.World;
+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.api.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;
 import com.dfsek.terra.config.GenericLoaders;
 import com.dfsek.terra.config.PluginConfigImpl;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.config.lang.LanguageImpl;
 import com.dfsek.terra.platform.RawBiome;
 import com.dfsek.terra.platform.RawWorldHandle;
-import com.dfsek.terra.api.profiler.Profiler;
 import com.dfsek.terra.profiler.ProfilerImpl;
 import com.dfsek.terra.registry.master.AddonRegistry;
 import com.dfsek.terra.registry.master.ConfigRegistry;
@@ -1,12 +1,12 @@
 package com.dfsek.terra.platform;

-import com.dfsek.terra.vector.LocationImpl;
-import com.dfsek.terra.api.vector.Vector3;
 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.block.BlockType;
 import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.vector.LocationImpl;
 import net.jafama.FastMath;

 public class DirectBlock implements Block {
@@ -1,10 +1,10 @@
 package com.dfsek.terra.platform;

-import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.block.Block;
 import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.generator.ChunkData;
+import com.dfsek.terra.vector.Vector3Impl;
 import net.querz.mca.Chunk;
 import net.querz.nbt.tag.CompoundTag;
 import org.jetbrains.annotations.NotNull;
@@ -1,14 +1,14 @@
 package com.dfsek.terra.platform;

 import com.dfsek.terra.DirectUtils;
-import com.dfsek.terra.vector.LocationImpl;
-import com.dfsek.terra.vector.Vector3Impl;
 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.world.Chunk;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.generator.ChunkGenerator;
+import com.dfsek.terra.vector.LocationImpl;
+import com.dfsek.terra.vector.Vector3Impl;
 import net.jafama.FastMath;
 import net.querz.mca.MCAFile;
 import net.querz.mca.MCAUtil;
@@ -1,8 +1,8 @@
 package com.dfsek.terra.platform;

-import com.dfsek.terra.vector.LocationImpl;
-import com.dfsek.terra.api.world.Tree;
 import com.dfsek.terra.api.util.collections.MaterialSet;
+import com.dfsek.terra.api.world.Tree;
+import com.dfsek.terra.vector.LocationImpl;

 import java.util.Random;

@@ -1,7 +1,6 @@
 package com.dfsek.terra.region;

 import com.dfsek.terra.StandalonePlugin;
-import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.platform.DirectChunkData;
 import com.dfsek.terra.platform.DirectWorld;
 import com.dfsek.terra.platform.GenWrapper;
@@ -70,7 +69,6 @@ public class Generator {
        }


-
        System.out.println("Saving...");

        for(Map.Entry<Long, MCAFile> entry : world.getFiles().entrySet()) {
@@ -10,14 +10,14 @@ import com.dfsek.terra.api.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.world.TerraWorld;
-import com.dfsek.terra.api.world.World;
+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.api.world.TerraWorld;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.config.PluginConfigImpl;
 import com.dfsek.terra.config.lang.LanguageImpl;
-import com.dfsek.terra.api.profiler.Profiler;
 import com.dfsek.terra.registry.master.AddonRegistry;
 import com.dfsek.terra.registry.master.ConfigRegistry;
 import com.dfsek.terra.sponge.world.SpongeWorldHandle;