Reformat

platforms/minestom/example/src/main/java/com/dfsek/terra/minestom/TerraMinestomExample.java

@@ -6,7 +6,6 @@ import net.minestom.server.command.builder.Command;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.entity.GameMode;
 import net.minestom.server.event.player.AsyncPlayerConfigurationEvent;
-import net.minestom.server.event.player.PlayerDisconnectEvent;
 import net.minestom.server.event.player.PlayerSpawnEvent;
 import net.minestom.server.instance.Instance;
 import net.minestom.server.instance.LightingChunk;
@@ -22,9 +21,20 @@ import com.dfsek.terra.minestom.world.TerraMinestomWorld;
 public class TerraMinestomExample {
     private static final Logger logger = LoggerFactory.getLogger(TerraMinestomExample.class);
     private final MinecraftServer server = MinecraftServer.init();
+    private final TerraMinestomPlatform platform = new TerraMinestomPlatform();
     private Instance instance;
     private TerraMinestomWorld world;
-    private final TerraMinestomPlatform platform = new TerraMinestomPlatform();
+
+    public static void main(String[] args) {
+        TerraMinestomExample example = new TerraMinestomExample();
+        example.createNewInstance();
+        example.attachTerra();
+        example.preloadWorldAndMeasure();
+        example.addScheduler();
+        example.addListeners();
+        example.addCommands();
+        example.bind();
+    }
 
     public void createNewInstance() {
         instance = MinecraftServer.getInstanceManager().createInstanceContainer();
@@ -104,16 +114,6 @@ public class TerraMinestomExample {
         server.start("localhost", 25565);
     }
 
-    public static void main(String[] args) {
-        TerraMinestomExample example = new TerraMinestomExample();
-        example.createNewInstance();
-        example.attachTerra();
-        example.preloadWorldAndMeasure();
-        example.addScheduler();
-        example.addListeners();
-        example.addCommands();
-        example.bind();
-    }
 
     public class RegenerateCommand extends Command {
         public RegenerateCommand() {

platforms/minestom/src/main/java/com/dfsek/terra/minestom/MinestomAdapter.java

@@ -1,7 +1,6 @@
 package com.dfsek.terra.minestom;
 
 import com.dfsek.seismic.type.vector.Vector3;
-
 import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
 

platforms/minestom/src/main/java/com/dfsek/terra/minestom/TerraMinestomPlatform.java

@@ -2,30 +2,6 @@ package com.dfsek.terra.minestom;
 
 import com.dfsek.tectonic.api.TypeRegistry;
 import com.dfsek.tectonic.api.loader.type.TypeLoader;
-
-import com.dfsek.terra.AbstractPlatform;
-import com.dfsek.terra.api.addon.BaseAddon;
-import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.entity.EntityType;
-import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent;
-import com.dfsek.terra.api.handle.ItemHandle;
-import com.dfsek.terra.api.handle.WorldHandle;
-import com.dfsek.terra.api.world.biome.PlatformBiome;
-import com.dfsek.terra.minestom.addon.MinestomAddon;
-import com.dfsek.terra.minestom.config.BiomeAdditionsSoundTemplate;
-import com.dfsek.terra.minestom.config.BiomeParticleConfigTemplate;
-import com.dfsek.terra.minestom.biome.MinestomBiomeLoader;
-import com.dfsek.terra.minestom.config.KeyLoader;
-import com.dfsek.terra.minestom.config.BiomeMoodSoundTemplate;
-import com.dfsek.terra.minestom.config.RGBLikeLoader;
-import com.dfsek.terra.minestom.config.SoundEventTemplate;
-import com.dfsek.terra.minestom.entity.MinestomEntityType;
-import com.dfsek.terra.minestom.item.MinestomItemHandle;
-import com.dfsek.terra.minestom.world.MinestomChunkGeneratorWrapper;
-import com.dfsek.terra.minestom.world.MinestomWorldHandle;
-
-import com.dfsek.terra.minestom.api.TerraMinestomWorldBuilder;
-
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.util.RGBLike;
 import net.minestom.server.MinecraftServer;
@@ -40,6 +16,28 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.dfsek.terra.AbstractPlatform;
+import com.dfsek.terra.api.addon.BaseAddon;
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.entity.EntityType;
+import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent;
+import com.dfsek.terra.api.handle.ItemHandle;
+import com.dfsek.terra.api.handle.WorldHandle;
+import com.dfsek.terra.api.world.biome.PlatformBiome;
+import com.dfsek.terra.minestom.addon.MinestomAddon;
+import com.dfsek.terra.minestom.api.TerraMinestomWorldBuilder;
+import com.dfsek.terra.minestom.biome.MinestomBiomeLoader;
+import com.dfsek.terra.minestom.config.BiomeAdditionsSoundTemplate;
+import com.dfsek.terra.minestom.config.BiomeMoodSoundTemplate;
+import com.dfsek.terra.minestom.config.BiomeParticleConfigTemplate;
+import com.dfsek.terra.minestom.config.KeyLoader;
+import com.dfsek.terra.minestom.config.RGBLikeLoader;
+import com.dfsek.terra.minestom.config.SoundEventTemplate;
+import com.dfsek.terra.minestom.entity.MinestomEntityType;
+import com.dfsek.terra.minestom.item.MinestomItemHandle;
+import com.dfsek.terra.minestom.world.MinestomChunkGeneratorWrapper;
+import com.dfsek.terra.minestom.world.MinestomWorldHandle;
+
 
 public final class TerraMinestomPlatform extends AbstractPlatform {
     private static final Logger LOGGER = LoggerFactory.getLogger(TerraMinestomPlatform.class);
@@ -48,7 +46,8 @@ public final class TerraMinestomPlatform extends AbstractPlatform {
     private final TypeLoader<PlatformBiome> biomeTypeLoader;
     private final ArrayList<BaseAddon> platformAddons = new ArrayList<>(List.of(new MinestomAddon(this)));
 
-    public TerraMinestomPlatform(WorldHandle worldHandle, ItemHandle itemHandle, TypeLoader<PlatformBiome> biomeTypeLoader, BaseAddon... extraAddons) {
+    public TerraMinestomPlatform(WorldHandle worldHandle, ItemHandle itemHandle, TypeLoader<PlatformBiome> biomeTypeLoader,
+                                 BaseAddon... extraAddons) {
         this.worldHandle = worldHandle;
         this.itemHandle = itemHandle;
         this.biomeTypeLoader = biomeTypeLoader;
@@ -68,8 +67,10 @@ public final class TerraMinestomPlatform extends AbstractPlatform {
             .registerLoader(PlatformBiome.class, biomeTypeLoader)
             .registerLoader(RGBLike.class, new RGBLikeLoader())
             .registerLoader(Key.class, new KeyLoader())
-            .registerLoader(EntityType.class, (TypeLoader<EntityType>) (annotatedType, o, configLoader, depthTracker) -> new MinestomEntityType((String) o))
-            .registerLoader(BlockState.class, (TypeLoader<BlockState>) (annotatedType, o, configLoader, depthTracker) -> worldHandle.createBlockState((String) o))
+            .registerLoader(EntityType.class,
+                (TypeLoader<EntityType>) (annotatedType, o, configLoader, depthTracker) -> new MinestomEntityType((String) o))
+            .registerLoader(BlockState.class,
+                (TypeLoader<BlockState>) (annotatedType, o, configLoader, depthTracker) -> worldHandle.createBlockState((String) o))
             .registerLoader(BiomeEffects.Particle.class, BiomeParticleConfigTemplate::new)
             .registerLoader(BiomeEffects.MoodSound.class, BiomeMoodSoundTemplate::new)
             .registerLoader(BiomeEffects.AdditionsSound.class, BiomeAdditionsSoundTemplate::new)

platforms/minestom/src/main/java/com/dfsek/terra/minestom/addon/MinestomAddon.java

@@ -2,20 +2,16 @@ package com.dfsek.terra.minestom.addon;
 
 import ca.solostudios.strata.Versions;
 import ca.solostudios.strata.version.Version;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.dfsek.terra.api.addon.BaseAddon;
-
 import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.world.biome.Biome;
-
 import com.dfsek.terra.minestom.TerraMinestomPlatform;
-
 import com.dfsek.terra.minestom.config.VanillaBiomeProperties;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 
 public class MinestomAddon implements BaseAddon {
     private static final Version VERSION = Versions.getVersion(1, 0, 0);

platforms/minestom/src/main/java/com/dfsek/terra/minestom/api/BlockEntityFactory.java

@@ -1,10 +1,10 @@
 package com.dfsek.terra.minestom.api;
 
-import com.dfsek.terra.api.block.entity.BlockEntity;
-
 import net.minestom.server.coordinate.BlockVec;
 import org.jetbrains.annotations.Nullable;
 
+import com.dfsek.terra.api.block.entity.BlockEntity;
+
 
 /**
  * Represents a factory interface for creating instances of BlockEntity

platforms/minestom/src/main/java/com/dfsek/terra/minestom/api/TerraMinestomWorldBuilder.java

@@ -1,20 +1,18 @@
 package com.dfsek.terra.minestom.api;
 
-import com.dfsek.terra.api.config.ConfigPack;
-
-import com.dfsek.terra.api.registry.CheckedRegistry;
-
-import com.dfsek.terra.minestom.TerraMinestomPlatform;
-import com.dfsek.terra.minestom.biome.MinestomUserDefinedBiomeFactory;
-import com.dfsek.terra.minestom.block.DefaultBlockEntityFactory;
-import com.dfsek.terra.minestom.entity.DefaultEntityFactory;
-
-import com.dfsek.terra.minestom.world.TerraMinestomWorld;
 import net.minestom.server.instance.Instance;
 
 import java.util.Random;
 import java.util.function.Function;
 
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.registry.CheckedRegistry;
+import com.dfsek.terra.minestom.TerraMinestomPlatform;
+import com.dfsek.terra.minestom.biome.MinestomUserDefinedBiomeFactory;
+import com.dfsek.terra.minestom.block.DefaultBlockEntityFactory;
+import com.dfsek.terra.minestom.entity.DefaultEntityFactory;
+import com.dfsek.terra.minestom.world.TerraMinestomWorld;
+
 
 public class TerraMinestomWorldBuilder {
     private final TerraMinestomPlatform platform;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomBiome.java

@@ -1,10 +1,10 @@
 package com.dfsek.terra.minestom.biome;
 
-import com.dfsek.terra.api.world.biome.PlatformBiome;
-
 import net.minestom.server.registry.RegistryKey;
 import net.minestom.server.world.biome.Biome;
 
+import com.dfsek.terra.api.world.biome.PlatformBiome;
+
 
 public class MinestomBiome implements PlatformBiome {
     private final RegistryKey<Biome> biome;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomBiomeLoader.java

@@ -4,9 +4,6 @@ import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
 import com.dfsek.tectonic.api.loader.type.TypeLoader;
-
-import com.dfsek.terra.api.world.biome.PlatformBiome;
-
 import net.kyori.adventure.key.Key;
 import net.minestom.server.registry.RegistryKey;
 import org.intellij.lang.annotations.Subst;
@@ -14,6 +11,9 @@ import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.AnnotatedType;
 
+import com.dfsek.terra.api.world.biome.PlatformBiome;
+
+
 public class MinestomBiomeLoader implements TypeLoader<PlatformBiome> {
     @Override
     public PlatformBiome load(@NotNull AnnotatedType annotatedType, @NotNull Object o, @NotNull ConfigLoader configLoader,

platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomUserDefinedBiomeFactory.java

@@ -1,9 +1,5 @@
 package com.dfsek.terra.minestom.biome;
 
-import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.minestom.api.BiomeFactory;
-import com.dfsek.terra.minestom.config.VanillaBiomeProperties;
-
 import net.kyori.adventure.key.Key;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.color.Color;
@@ -17,11 +13,25 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Locale;
 import java.util.Objects;
 
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.minestom.api.BiomeFactory;
+import com.dfsek.terra.minestom.config.VanillaBiomeProperties;
+
 
 public class MinestomUserDefinedBiomeFactory implements BiomeFactory {
     private final DynamicRegistry<Biome> biomeRegistry = MinecraftServer.getBiomeRegistry();
     private final @NotNull Biome plainsBiome = Objects.requireNonNull(biomeRegistry.get(Key.key("minecraft:plains")));
 
+    private static <T> T mergeNullable(T first, T second) {
+        if(first == null) return second;
+        return first;
+    }
+
+    @Subst("value")
+    protected static String createBiomeID(ConfigPack pack, String biomeId) {
+        return pack.getID().toLowerCase() + "/" + biomeId.toLowerCase(Locale.ROOT);
+    }
+
     @Override
     public UserDefinedBiome create(ConfigPack pack, com.dfsek.terra.api.world.biome.Biome source) {
         VanillaBiomeProperties properties = source.getContext().get(VanillaBiomeProperties.class);
@@ -46,7 +56,7 @@ public class MinestomUserDefinedBiomeFactory implements BiomeFactory {
             .music(parentEffects.music())
             .musicVolume(parentEffects.musicVolume());
 
-        if (effectsBuilder.build().equals(BiomeEffects.PLAINS_EFFECTS)) {
+        if(effectsBuilder.build().equals(BiomeEffects.PLAINS_EFFECTS)) {
             effectsBuilder.fogColor(new Color(0xC0D8FE)); // circumvent a minestom bug
         }
 
@@ -61,14 +71,4 @@ public class MinestomUserDefinedBiomeFactory implements BiomeFactory {
         RegistryKey<Biome> registryKey = MinecraftServer.getBiomeRegistry().register(key, target);
         return new UserDefinedBiome(key, registryKey, source.getID(), target);
     }
-
-    private static <T> T mergeNullable(T first, T second) {
-        if (first == null) return second;
-        return first;
-    }
-
-    @Subst("value")
-    protected static String createBiomeID(ConfigPack pack, String biomeId) {
-        return pack.getID().toLowerCase() + "/" + biomeId.toLowerCase(Locale.ROOT);
-    }
 }

platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomUserDefinedBiomePool.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.minestom.biome;
 
+import java.util.HashMap;
+
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.minestom.api.BiomeFactory;
 
-import java.util.HashMap;
-
 
 public class MinestomUserDefinedBiomePool {
     private final HashMap<String, UserDefinedBiome> biomes = new HashMap<>();

platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/DefaultBlockEntityFactory.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.minestom.block;
 
-import com.dfsek.terra.api.block.entity.BlockEntity;
-import com.dfsek.terra.minestom.api.BlockEntityFactory;
-
 import net.minestom.server.coordinate.BlockVec;
 import net.minestom.server.instance.Instance;
 
+import com.dfsek.terra.api.block.entity.BlockEntity;
+import com.dfsek.terra.minestom.api.BlockEntityFactory;
+
 
 public class DefaultBlockEntityFactory implements BlockEntityFactory {
     private final Instance instance;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockEntity.java

@@ -1,15 +1,13 @@
 package com.dfsek.terra.minestom.block;
 
 import com.dfsek.seismic.type.vector.Vector3;
-
-import com.dfsek.terra.api.block.entity.BlockEntity;
-
-import com.dfsek.terra.api.block.state.BlockState;
-
 import net.minestom.server.coordinate.BlockVec;
 import net.minestom.server.instance.Instance;
 import net.minestom.server.instance.block.Block;
 
+import com.dfsek.terra.api.block.entity.BlockEntity;
+import com.dfsek.terra.api.block.state.BlockState;
+
 
 public class MinestomBlockEntity implements BlockEntity {
     private final Instance instance;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockState.java

@@ -1,15 +1,15 @@
 package com.dfsek.terra.minestom.block;
 
-import com.dfsek.terra.api.block.BlockType;
-import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.block.state.properties.Property;
-
 import net.minestom.server.instance.block.Block;
 
 import java.util.HashMap;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import com.dfsek.terra.api.block.BlockType;
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.block.state.properties.Property;
+
 
 public class MinestomBlockState implements BlockState {
     private final Block block;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockType.java

@@ -1,10 +1,10 @@
 package com.dfsek.terra.minestom.block;
 
+import net.minestom.server.instance.block.Block;
+
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.block.state.BlockState;
 
-import net.minestom.server.instance.block.Block;
-
 
 public class MinestomBlockType implements BlockType {
     private final Block block;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/CachedChunk.java

@@ -1,23 +1,16 @@
 package com.dfsek.terra.minestom.chunk;
 
 
-import com.dfsek.terra.api.block.state.BlockState;
-
-import com.dfsek.terra.api.util.Column;
-import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.world.chunk.generation.ProtoChunk;
-import com.dfsek.terra.minestom.biome.MinestomBiome;
-import com.dfsek.terra.minestom.block.MinestomBlockState;
-
-import net.minestom.server.coordinate.Point;
 import net.minestom.server.instance.block.Block;
-import net.minestom.server.instance.generator.GenerationUnit;
 import net.minestom.server.instance.generator.UnitModifier;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
 
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.world.chunk.generation.ProtoChunk;
+import com.dfsek.terra.minestom.block.MinestomBlockState;
+
 
 public class CachedChunk implements ProtoChunk {
     private final int minHeight;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/GeneratedChunkCache.java

@@ -1,11 +1,5 @@
 package com.dfsek.terra.minestom.chunk;
 
-import com.dfsek.terra.api.util.generic.pair.Pair;
-
-import com.dfsek.terra.api.world.ServerWorld;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
-
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.github.benmanes.caffeine.cache.stats.CacheStats;
@@ -13,6 +7,11 @@ import net.minestom.server.world.DimensionType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.world.ServerWorld;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
+
 
 public class GeneratedChunkCache {
     private static final Logger log = LoggerFactory.getLogger(GeneratedChunkCache.class);

platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/TerraMinestomChunk.java

@@ -1,18 +1,17 @@
 package com.dfsek.terra.minestom.chunk;
 
-import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.world.ServerWorld;
-import com.dfsek.terra.api.world.chunk.Chunk;
-
-import com.dfsek.terra.minestom.block.MinestomBlockState;
-
 import net.minestom.server.instance.block.Block;
 import org.jetbrains.annotations.NotNull;
 
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.world.ServerWorld;
+import com.dfsek.terra.api.world.chunk.Chunk;
+import com.dfsek.terra.minestom.block.MinestomBlockState;
+
 
 public class TerraMinestomChunk implements Chunk {
-    private net.minestom.server.instance.Chunk delegate;
     private final ServerWorld world;
+    private net.minestom.server.instance.Chunk delegate;
 
     public TerraMinestomChunk(net.minestom.server.instance.Chunk delegate, ServerWorld world) {
         this.delegate = delegate;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/KeyLoader.java

@@ -20,7 +20,7 @@ public class KeyLoader implements TypeLoader<Key> {
         @NotNull ConfigLoader configLoader,
         DepthTracker depthTracker
     ) throws LoadException {
-        if(!(o instanceof @Subst("a:o") String stringKey)) {
+        if(!(o instanceof @Subst("a:o")String stringKey)) {
             throw new LoadException("Value is not a String", depthTracker);
         }
         try {

platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/RGBLikeLoader.java

@@ -4,8 +4,6 @@ import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
 import com.dfsek.tectonic.api.loader.type.TypeLoader;
-import net.kyori.adventure.key.InvalidKeyException;
-import net.kyori.adventure.key.Key;
 import net.kyori.adventure.util.RGBLike;
 import net.minestom.server.color.Color;
 import org.intellij.lang.annotations.Subst;
@@ -22,7 +20,7 @@ public class RGBLikeLoader implements TypeLoader<RGBLike> {
         @NotNull ConfigLoader configLoader,
         DepthTracker depthTracker
     ) throws LoadException {
-        if(!(o instanceof @Subst("a:o") Integer value)) {
+        if(!(o instanceof @Subst("a:o")Integer value)) {
             throw new LoadException("Value is not an integer", depthTracker);
         }
         return new Color(value);

platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/VanillaBiomeProperties.java

@@ -3,15 +3,14 @@ package com.dfsek.terra.minestom.config;
 import com.dfsek.tectonic.api.config.template.ConfigTemplate;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import com.dfsek.terra.api.properties.Properties;
-
 import net.kyori.adventure.util.RGBLike;
 import net.minestom.server.sound.SoundEvent;
 import net.minestom.server.world.biome.Biome.TemperatureModifier;
 import net.minestom.server.world.biome.BiomeEffects;
 import net.minestom.server.world.biome.BiomeEffects.GrassColorModifier;
 
+import com.dfsek.terra.api.properties.Properties;
+
 
 public class VanillaBiomeProperties implements ConfigTemplate, Properties {
     @Value("colors.grass")
@@ -74,9 +73,9 @@ public class VanillaBiomeProperties implements ConfigTemplate, Properties {
     @Default
     private BiomeEffects.AdditionsSound additionsSound = null;
 
-//    @Value("sound.music")
-//    @Default
-//    private MusicSound music = null;
+    //    @Value("sound.music")
+    //    @Default
+    //    private MusicSound music = null;
 
     public RGBLike getGrassColor() {
         return grassColor;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/DefaultEntityFactory.java

@@ -1,10 +1,10 @@
 package com.dfsek.terra.minestom.entity;
 
-import com.dfsek.terra.minestom.api.EntityFactory;
-
 import net.minestom.server.entity.Entity;
 import net.minestom.server.entity.EntityType;
 
+import com.dfsek.terra.minestom.api.EntityFactory;
+
 
 public class DefaultEntityFactory implements EntityFactory {
     @Override

platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/DeferredMinestomEntity.java

@@ -1,13 +1,13 @@
 package com.dfsek.terra.minestom.entity;
 
+import com.dfsek.seismic.type.vector.Vector3;
+import net.minestom.server.coordinate.Pos;
+
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;
-import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.minestom.world.TerraMinestomWorld;
 
-import net.minestom.server.coordinate.Pos;
-
 
 public class DeferredMinestomEntity implements Entity {
     private final EntityType type;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/MinestomEntity.java

@@ -1,16 +1,15 @@
 package com.dfsek.terra.minestom.entity;
 
-import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.seismic.type.vector.Vector3;
-import com.dfsek.terra.api.world.ServerWorld;
-
-import com.dfsek.terra.minestom.MinestomAdapter;
-import com.dfsek.terra.minestom.world.TerraMinestomWorld;
-
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.entity.Entity;
 import net.minestom.server.instance.Instance;
 
+import com.dfsek.terra.api.entity.EntityType;
+import com.dfsek.terra.api.world.ServerWorld;
+import com.dfsek.terra.minestom.MinestomAdapter;
+import com.dfsek.terra.minestom.world.TerraMinestomWorld;
+
 
 public class MinestomEntity implements com.dfsek.terra.api.entity.Entity {
     private final Entity delegate;
@@ -21,6 +20,13 @@ public class MinestomEntity implements com.dfsek.terra.api.entity.Entity {
         this.world = world;
     }
 
+    public static MinestomEntity spawn(double x, double y, double z, EntityType type, TerraMinestomWorld world) {
+        Instance instance = world.getHandle();
+        Entity entity = world.getEntityFactory().createEntity(((MinestomEntityType) type).getHandle());
+        entity.setInstance(instance, new Pos(x, y, z));
+        return new MinestomEntity(entity, world);
+    }
+
     @Override
     public Vector3 position() {
         return MinestomAdapter.adapt(delegate.getPosition());
@@ -45,11 +51,4 @@ public class MinestomEntity implements com.dfsek.terra.api.entity.Entity {
     public Object getHandle() {
         return delegate;
     }
-
-    public static MinestomEntity spawn(double x, double y, double z, EntityType type, TerraMinestomWorld world) {
-        Instance instance = world.getHandle();
-        Entity entity = world.getEntityFactory().createEntity(((MinestomEntityType) type).getHandle());
-        entity.setInstance(instance, new Pos(x, y, z));
-        return new MinestomEntity(entity, world);
-    }
 }

platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/MinestomEntityType.java

@@ -2,6 +2,7 @@ package com.dfsek.terra.minestom.entity;
 
 import net.minestom.server.entity.EntityType;
 
+
 public class MinestomEntityType implements com.dfsek.terra.api.entity.EntityType {
     private final EntityType delegate;
 

platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomEnchantment.java

@@ -1,8 +1,5 @@
 package com.dfsek.terra.minestom.item;
 
-import com.dfsek.terra.api.inventory.ItemStack;
-import com.dfsek.terra.api.inventory.item.Enchantment;
-
 import net.kyori.adventure.key.Key;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.item.Material;
@@ -11,6 +8,9 @@ import net.minestom.server.registry.RegistryKey;
 
 import java.util.Objects;
 
+import com.dfsek.terra.api.inventory.ItemStack;
+import com.dfsek.terra.api.inventory.item.Enchantment;
+
 
 public class MinestomEnchantment implements Enchantment {
     private final net.minestom.server.item.enchant.Enchantment delegate;
@@ -43,7 +43,7 @@ public class MinestomEnchantment implements Enchantment {
             DynamicRegistry<net.minestom.server.item.enchant.Enchantment> registry = MinecraftServer.getEnchantmentRegistry();
             RegistryKey<net.minestom.server.item.enchant.Enchantment> otherKey = registry.getKey(otherDelegate);
             return delegate.exclusiveSet().contains(otherKey);
-        } catch (Exception e) {
+        } catch(Exception e) {
             // If the key approach fails, fall back to a more basic implementation
             String otherId = ((MinestomEnchantment) other).id;
             return otherId.equals(this.id);

platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemHandle.java

@@ -1,14 +1,14 @@
 package com.dfsek.terra.minestom.item;
 
-import com.dfsek.terra.api.handle.ItemHandle;
-import com.dfsek.terra.api.inventory.Item;
-import com.dfsek.terra.api.inventory.item.Enchantment;
-
 import net.minestom.server.MinecraftServer;
 
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.dfsek.terra.api.handle.ItemHandle;
+import com.dfsek.terra.api.inventory.Item;
+import com.dfsek.terra.api.inventory.item.Enchantment;
+
 
 public class MinestomItemHandle implements ItemHandle {
     @Override

platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemMeta.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.minestom.item;
 
-import com.dfsek.terra.api.inventory.item.Enchantment;
-import com.dfsek.terra.api.inventory.item.ItemMeta;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import com.dfsek.terra.api.inventory.item.Enchantment;
+import com.dfsek.terra.api.inventory.item.ItemMeta;
+
 
 public class MinestomItemMeta implements ItemMeta {
     private final HashMap<Enchantment, Integer> enchantments;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemStack.java

@@ -1,10 +1,5 @@
 package com.dfsek.terra.minestom.item;
 
-import com.dfsek.terra.api.inventory.Item;
-
-import com.dfsek.terra.api.inventory.item.Enchantment;
-import com.dfsek.terra.api.inventory.item.ItemMeta;
-
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.component.DataComponents;
 import net.minestom.server.item.ItemStack;
@@ -16,6 +11,10 @@ import org.jetbrains.annotations.NotNull;
 import java.util.HashMap;
 import java.util.Objects;
 
+import com.dfsek.terra.api.inventory.Item;
+import com.dfsek.terra.api.inventory.item.Enchantment;
+import com.dfsek.terra.api.inventory.item.ItemMeta;
+
 
 public class MinestomItemStack implements com.dfsek.terra.api.inventory.ItemStack {
     private ItemStack base;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomMaterial.java

@@ -1,9 +1,10 @@
 package com.dfsek.terra.minestom.item;
 
+import net.minestom.server.item.Material;
+
 import com.dfsek.terra.api.inventory.Item;
 import com.dfsek.terra.api.inventory.ItemStack;
 
-import net.minestom.server.item.Material;
 
 public class MinestomMaterial implements Item {
     private final Material delegate;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomChunkGeneratorWrapper.java

@@ -1,10 +1,15 @@
 package com.dfsek.terra.minestom.world;
 
+import net.minestom.server.coordinate.Point;
+import net.minestom.server.instance.generator.GenerationUnit;
+import net.minestom.server.instance.generator.Generator;
+import net.minestom.server.instance.generator.UnitModifier;
+import org.jetbrains.annotations.NotNull;
+
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
-
 import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
 import com.dfsek.terra.api.world.chunk.generation.util.GeneratorWrapper;
 import com.dfsek.terra.minestom.biome.MinestomUserDefinedBiomePool;
@@ -12,23 +17,15 @@ import com.dfsek.terra.minestom.biome.UserDefinedBiome;
 import com.dfsek.terra.minestom.chunk.CachedChunk;
 import com.dfsek.terra.minestom.chunk.GeneratedChunkCache;
 
-import net.minestom.server.MinecraftServer;
-import net.minestom.server.coordinate.Point;
-import net.minestom.server.entity.Player;
-import net.minestom.server.instance.generator.GenerationUnit;
-import net.minestom.server.instance.generator.Generator;
-import net.minestom.server.instance.generator.UnitModifier;
-import org.jetbrains.annotations.NotNull;
-
 
 public class MinestomChunkGeneratorWrapper implements Generator, GeneratorWrapper {
     private final GeneratedChunkCache cache;
-    private ChunkGenerator generator;
     private final TerraMinestomWorld world;
     private final BiomeProvider biomeProvider;
     private final boolean doFineGrainedBiomes;
-    private ConfigPack pack;
     private final MinestomUserDefinedBiomePool biomePool;
+    private ChunkGenerator generator;
+    private ConfigPack pack;
 
     public MinestomChunkGeneratorWrapper(
         Platform platform,

platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomProtoWorld.java

@@ -1,28 +1,21 @@
 package com.dfsek.terra.minestom.world;
 
+import net.minestom.server.instance.block.Block;
+import net.minestom.server.instance.block.Block.Setter;
+
 import com.dfsek.terra.api.block.entity.BlockEntity;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;
-import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
 import com.dfsek.terra.api.world.chunk.generation.ProtoWorld;
 import com.dfsek.terra.minestom.chunk.CachedChunk;
 import com.dfsek.terra.minestom.chunk.GeneratedChunkCache;
-
 import com.dfsek.terra.minestom.entity.DeferredMinestomEntity;
 
-import net.minestom.server.instance.block.Block;
-import net.minestom.server.instance.block.Block.Setter;
-
-import java.lang.ref.WeakReference;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.WeakHashMap;
-
 
 public class MinestomProtoWorld implements ProtoWorld {
     private final GeneratedChunkCache cache;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomWorldHandle.java

@@ -1,15 +1,14 @@
 package com.dfsek.terra.minestom.world;
 
+import net.minestom.server.instance.block.Block;
+import org.jetbrains.annotations.NotNull;
+
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.api.handle.WorldHandle;
-
 import com.dfsek.terra.minestom.block.MinestomBlockState;
 import com.dfsek.terra.minestom.entity.MinestomEntityType;
 
-import net.minestom.server.instance.block.Block;
-import org.jetbrains.annotations.NotNull;
-
 
 public class MinestomWorldHandle implements WorldHandle {
     private static final MinestomBlockState AIR = new MinestomBlockState(Block.AIR);

platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/TerraMinestomWorld.java

@@ -1,27 +1,5 @@
 package com.dfsek.terra.minestom.world;
 
-import com.dfsek.terra.api.block.entity.BlockEntity;
-import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.entity.Entity;
-import com.dfsek.terra.api.entity.EntityType;
-import com.dfsek.terra.api.world.ServerWorld;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.world.chunk.Chunk;
-
-import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
-
-import com.dfsek.terra.api.world.info.WorldProperties;
-
-import com.dfsek.terra.minestom.TerraMinestomPlatform;
-import com.dfsek.terra.minestom.api.BlockEntityFactory;
-import com.dfsek.terra.minestom.api.EntityFactory;
-import com.dfsek.terra.minestom.api.BiomeFactory;
-import com.dfsek.terra.minestom.biome.MinestomUserDefinedBiomeFactory;
-import com.dfsek.terra.minestom.biome.MinestomUserDefinedBiomePool;
-import com.dfsek.terra.minestom.block.MinestomBlockState;
-import com.dfsek.terra.minestom.entity.MinestomEntity;
-
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.coordinate.BlockVec;
 import net.minestom.server.coordinate.Point;
@@ -31,6 +9,24 @@ import net.minestom.server.world.DimensionType;
 
 import java.util.function.Consumer;
 
+import com.dfsek.terra.api.block.entity.BlockEntity;
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.entity.Entity;
+import com.dfsek.terra.api.entity.EntityType;
+import com.dfsek.terra.api.world.ServerWorld;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.api.world.chunk.Chunk;
+import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
+import com.dfsek.terra.api.world.info.WorldProperties;
+import com.dfsek.terra.minestom.TerraMinestomPlatform;
+import com.dfsek.terra.minestom.api.BiomeFactory;
+import com.dfsek.terra.minestom.api.BlockEntityFactory;
+import com.dfsek.terra.minestom.api.EntityFactory;
+import com.dfsek.terra.minestom.biome.MinestomUserDefinedBiomePool;
+import com.dfsek.terra.minestom.block.MinestomBlockState;
+import com.dfsek.terra.minestom.entity.MinestomEntity;
+
 
 public final class TerraMinestomWorld implements ServerWorld, WorldProperties {
     private final Instance instance;