reformat

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java

@@ -14,15 +14,12 @@ import com.dfsek.terra.api.command.exception.MalformedCommandException;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.config.PluginConfig;
 import com.dfsek.terra.api.event.EventManager;
-import com.dfsek.terra.event.EventManagerImpl;
 import com.dfsek.terra.api.handle.ItemHandle;
 import com.dfsek.terra.api.handle.WorldHandle;
 import com.dfsek.terra.api.lang.Language;
 import com.dfsek.terra.api.profiler.Profiler;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.registry.Registry;
-import com.dfsek.terra.util.logging.DebugLogger;
-import com.dfsek.terra.util.logging.JavaLogger;
 import com.dfsek.terra.api.world.TerraWorld;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.Biome;
@@ -45,11 +42,14 @@ import com.dfsek.terra.commands.TerraCommandManager;
 import com.dfsek.terra.config.GenericLoaders;
 import com.dfsek.terra.config.PluginConfigImpl;
 import com.dfsek.terra.config.lang.LangUtil;
+import com.dfsek.terra.event.EventManagerImpl;
 import com.dfsek.terra.profiler.ProfilerImpl;
 import com.dfsek.terra.registry.CheckedRegistryImpl;
 import com.dfsek.terra.registry.LockedRegistryImpl;
 import com.dfsek.terra.registry.master.AddonRegistry;
 import com.dfsek.terra.registry.master.ConfigRegistry;
+import com.dfsek.terra.util.logging.DebugLogger;
+import com.dfsek.terra.util.logging.JavaLogger;
 import com.dfsek.terra.world.TerraWorldImpl;
 import io.papermc.lib.PaperLib;
 import org.bstats.bukkit.Metrics;
@@ -68,23 +68,6 @@ import java.util.Objects;
 
 
 public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
-    private final Map<String, com.dfsek.terra.api.world.generator.TerraChunkGenerator> generatorMap = new HashMap<>();
-    private final Map<World, TerraWorld> worldMap = new HashMap<>();
-    private final Map<String, ConfigPack> worlds = new HashMap<>();
-
-    private final Profiler profiler = new ProfilerImpl();
-
-    private final ConfigRegistry registry = new ConfigRegistry();
-    private final CheckedRegistry<ConfigPack> checkedRegistry = new CheckedRegistryImpl<>(registry);
-
-    private final PluginConfig config = new PluginConfigImpl();
-    private final ItemHandle itemHandle = new BukkitItemHandle();
-    private WorldHandle handle = new BukkitWorldHandle();
-    private final GenericLoaders genericLoaders = new GenericLoaders(this);
-    private DebugLogger debugLogger;
-
-
-    private final EventManager eventManager = new EventManagerImpl(this);
     public static final BukkitVersion BUKKIT_VERSION;
 
     static {
@@ -97,9 +80,20 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
         else BUKKIT_VERSION = BukkitVersion.UNKNOWN;
     }
 
+    private final Map<String, com.dfsek.terra.api.world.generator.TerraChunkGenerator> generatorMap = new HashMap<>();
+    private final Map<World, TerraWorld> worldMap = new HashMap<>();
+    private final Map<String, ConfigPack> worlds = new HashMap<>();
+    private final Profiler profiler = new ProfilerImpl();
+    private final ConfigRegistry registry = new ConfigRegistry();
+    private final CheckedRegistry<ConfigPack> checkedRegistry = new CheckedRegistryImpl<>(registry);
+    private final PluginConfig config = new PluginConfigImpl();
+    private final ItemHandle itemHandle = new BukkitItemHandle();
+    private final GenericLoaders genericLoaders = new GenericLoaders(this);
+    private final EventManager eventManager = new EventManagerImpl(this);
     private final AddonRegistry addonRegistry = new AddonRegistry(new BukkitAddon(this), this);
     private final LockedRegistryImpl<TerraAddon> addonLockedRegistry = new LockedRegistryImpl<>(addonRegistry);
-
+    private WorldHandle handle = new BukkitWorldHandle();
+    private DebugLogger debugLogger;
 
     public boolean reload() {
         config.load(this);

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java

@@ -2,13 +2,13 @@ package com.dfsek.terra.bukkit.listeners;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.config.WorldConfig;
-import com.dfsek.terra.transform.MapTransform;
-import com.dfsek.terra.transform.TransformerImpl;
-import com.dfsek.terra.util.FastRandom;
 import com.dfsek.terra.api.world.TerraWorld;
 import com.dfsek.terra.api.world.Tree;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
+import com.dfsek.terra.transform.MapTransform;
+import com.dfsek.terra.transform.TransformerImpl;
+import com.dfsek.terra.util.FastRandom;
 import org.bukkit.Material;
 import org.bukkit.TreeType;
 import org.bukkit.block.Block;
@@ -22,12 +22,6 @@ import org.bukkit.event.world.StructureGrowEvent;
  * Listener for events on all implementations.
  */
 public class CommonListener implements Listener {
-    private final TerraPlugin main;
-
-    public CommonListener(TerraPlugin main) {
-        this.main = main;
-    }
-
     private static final TransformerImpl<TreeType, String> TREE_TYPE_STRING_TRANSFORMER = new TransformerImpl.Builder<TreeType, String>()
             .addTransform(new MapTransform<TreeType, String>()
                     .add(TreeType.COCOA_TREE, "JUNGLE_COCOA")
@@ -38,6 +32,11 @@ public class CommonListener implements Listener {
                     .add(TreeType.MEGA_REDWOOD, "MEGA_SPRUCE")
                     .add(TreeType.SWAMP, "SWAMP_OAK"))
             .addTransform(TreeType::toString).build();
+    private final TerraPlugin main;
+
+    public CommonListener(TerraPlugin main) {
+        this.main = main;
+    }
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onSaplingGrow(StructureGrowEvent e) {

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java

@@ -2,7 +2,6 @@ package com.dfsek.terra.bukkit.population;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.profiler.ProfileFrame;
-import com.dfsek.terra.util.FastRandom;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.generator.Chunkified;
@@ -10,6 +9,7 @@ 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.bukkit.world.BukkitWorld;
+import com.dfsek.terra.util.FastRandom;
 import org.bukkit.generator.BlockPopulator;
 import org.jetbrains.annotations.NotNull;
 
@@ -31,6 +31,12 @@ public class PopulationManager extends BlockPopulator {
         this.main = main;
     }
 
+    public static File getDataFolder(World w) {
+        File f = new File(((BukkitWorld) w).getWorldFolder(), "gaea");
+        f.mkdirs();
+        return f;
+    }
+
     @SuppressWarnings("unchecked")
     public synchronized void saveBlocks(World w) throws IOException {
         File f = new File(getDataFolder(w), "chunks.bin");
@@ -44,13 +50,6 @@ public class PopulationManager extends BlockPopulator {
         needsPop.addAll((HashSet<ChunkCoordinate>) SerializationUtil.fromFile(f));
     }
 
-    public static File getDataFolder(World w) {
-        File f = new File(((BukkitWorld) w).getWorldFolder(), "gaea");
-        f.mkdirs();
-        return f;
-    }
-
-
     // Synchronize to prevent chunks from being queued for population multiple times.
     public synchronized void checkNeighbors(int x, int z, World world) {
         BukkitWorld w = (BukkitWorld) world;

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java

@@ -1,17 +1,15 @@
 package com.dfsek.terra.bukkit.world;
 
 
+import com.dfsek.terra.api.block.BlockType;
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.block.state.properties.enums.Axis;
 import com.dfsek.terra.api.block.state.properties.enums.Half;
 import com.dfsek.terra.api.block.state.properties.enums.RailShape;
-import com.dfsek.terra.api.block.state.properties.enums.Axis;
-import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.block.state.properties.enums.RedstoneConnection;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.inventory.ItemStack;
 import com.dfsek.terra.api.inventory.item.Enchantment;
-import com.dfsek.terra.transform.MapTransform;
-import com.dfsek.terra.transform.TransformerImpl;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
@@ -22,6 +20,8 @@ import com.dfsek.terra.bukkit.world.block.BukkitBlockTypeAndItem;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState;
 import com.dfsek.terra.bukkit.world.inventory.BukkitItemStack;
 import com.dfsek.terra.bukkit.world.inventory.meta.BukkitEnchantment;
+import com.dfsek.terra.transform.MapTransform;
+import com.dfsek.terra.transform.TransformerImpl;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.TreeType;

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world;
 
-import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.entity.BlockEntity;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.api.vector.Vector3;

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockTypeAndItem.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block;
 
-import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockType;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.inventory.Item;
 import com.dfsek.terra.api.inventory.ItemStack;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitBlockState.java

@@ -1,21 +1,9 @@
 package com.dfsek.terra.bukkit.world.block.data;
 
-import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockType;
-import com.dfsek.terra.bukkit.TerraBukkitPlugin;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import org.bukkit.Material;
-import org.bukkit.block.data.AnaloguePowerable;
-import org.bukkit.block.data.Directional;
-import org.bukkit.block.data.MultipleFacing;
-import org.bukkit.block.data.Orientable;
-import org.bukkit.block.data.Rail;
-import org.bukkit.block.data.Rotatable;
-import org.bukkit.block.data.Waterlogged;
-import org.bukkit.block.data.type.RedstoneWire;
-import org.bukkit.block.data.type.Slab;
-import org.bukkit.block.data.type.Stairs;
-import org.bukkit.block.data.type.Wall;
 
 public class BukkitBlockState implements BlockState {
     private org.bukkit.block.data.BlockData delegate;

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockEntity.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block.state;
 
-import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.entity.BlockEntity;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState;