Reformat

platforms/allay/src/main/java/com/dfsek/terra/allay/AllayPlatform.java

@@ -21,6 +21,7 @@ import com.dfsek.terra.api.handle.ItemHandle;
 import com.dfsek.terra.api.handle.WorldHandle;
 import com.dfsek.terra.api.world.biome.PlatformBiome;
 
+
 /**
  * @author daoge_cmd
  */

platforms/allay/src/main/java/com/dfsek/terra/allay/JeBlockState.java

@@ -14,20 +14,12 @@ public class JeBlockState {
     protected final TreeMap<String, String> properties;
     protected int hash = Integer.MAX_VALUE;
 
-    public static JeBlockState fromString(String data) {
-        return new JeBlockState(data);
-    }
-
-    public static JeBlockState create(String identifier, TreeMap<String, String> properties) {
-        return new JeBlockState(identifier, properties);
-    }
-
     private JeBlockState(String data) {
         String[] strings = data.replace("[", ",").replace("]", ",").replace(" ", "").split(",");
         this.identifier = strings[0];
         this.properties = new TreeMap<>();
-        if (strings.length > 1) {
-            for (int i = 1; i < strings.length; i++) {
+        if(strings.length > 1) {
+            for(int i = 1; i < strings.length; i++) {
                 final String tmp = strings[i];
                 final int index = tmp.indexOf("=");
                 properties.put(tmp.substring(0, index), tmp.substring(index + 1));
@@ -36,6 +28,19 @@ public class JeBlockState {
         completeMissingProperties();
     }
 
+    private JeBlockState(String identifier, TreeMap<String, String> properties) {
+        this.identifier = identifier;
+        this.properties = properties;
+    }
+
+    public static JeBlockState fromString(String data) {
+        return new JeBlockState(data);
+    }
+
+    public static JeBlockState create(String identifier, TreeMap<String, String> properties) {
+        return new JeBlockState(identifier, properties);
+    }
+
     public String getPropertyValue(String key) {
         return properties.get(key);
     }
@@ -49,24 +54,19 @@ public class JeBlockState {
             entry -> properties.put(entry.getKey(), entry.getValue()));
     }
 
-    private JeBlockState(String identifier, TreeMap<String, String> properties) {
-        this.identifier = identifier;
-        this.properties = properties;
-    }
-
     public String toString(boolean includeProperties) {
         if(!includeProperties) return identifier;
         StringBuilder builder = new StringBuilder(identifier).append(";");
         properties.forEach((k, v) -> builder.append(k).append("=").append(v).append(";"));
         String str = builder.toString();
-        if (hash == Integer.MAX_VALUE) {
+        if(hash == Integer.MAX_VALUE) {
             hash = HashUtils.fnv1a_32(str.getBytes());
         }
         return str;
     }
 
     public int getHash() {
-        if (hash == Integer.MAX_VALUE) {
+        if(hash == Integer.MAX_VALUE) {
             hash = HashUtils.fnv1a_32(toString(true).getBytes());
         }
         return hash;

platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java

@@ -104,7 +104,8 @@ public final class Mapping {
                 return false;
             }
 
-            Map<String, BiomeMapping> mappings = from(stream, new TypeToken<>() {});
+            Map<String, BiomeMapping> mappings = from(stream, new TypeToken<>() {
+            });
             mappings.forEach((javaId, mapping) -> JE_BIOME_ID_TO_BE.put(javaId, mapping.bedrockId()));
         } catch(IOException e) {
             TerraAllayPlugin.INSTANCE.getPluginLogger().error("Failed to load biomes mapping", e);
@@ -120,7 +121,8 @@ public final class Mapping {
                 return false;
             }
 
-            Map<String, ItemMapping> mappings = from(stream, new TypeToken<>() {});
+            Map<String, ItemMapping> mappings = from(stream, new TypeToken<>() {
+            });
             mappings.forEach((javaId, mapping) -> {
                 ItemType<?> itemType = ItemTypeSafeGetter
                     .name(mapping.bedrockId())
@@ -142,7 +144,8 @@ public final class Mapping {
                 return false;
             }
 
-            Map<String, List<BlockMapping>> root = from(stream, new TypeToken<>() {});
+            Map<String, List<BlockMapping>> root = from(stream, new TypeToken<>() {
+            });
             List<BlockMapping> mappings = root.get("mappings");
             mappings.forEach(mapping -> {
                 JeBlockState jeState = createJeBlockState(mapping.javaState());
@@ -164,7 +167,8 @@ public final class Mapping {
                 return false;
             }
 
-            Map<String, Map<String, String>> states = from(stream, new TypeToken<>() {});
+            Map<String, Map<String, String>> states = from(stream, new TypeToken<>() {
+            });
             JE_BLOCK_DEFAULT_PROPERTIES.putAll(states);
         } catch(IOException e) {
             throw new RuntimeException(e);

platforms/allay/src/main/java/com/dfsek/terra/allay/TerraAllayPlugin.java

@@ -70,6 +70,7 @@ public class TerraAllayPlugin extends Plugin {
 
     @EventHandler
     private void onWorldUnload(WorldUnloadEvent event) {
-        AllayPlatform.GENERATOR_WRAPPERS.removeIf(wrapper -> wrapper.getAllayWorldGenerator().getDimension().getWorld() == event.getWorld());
+        AllayPlatform.GENERATOR_WRAPPERS.removeIf(
+            wrapper -> wrapper.getAllayWorldGenerator().getDimension().getWorld() == event.getWorld());
     }
 }

platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBiome.java

@@ -4,6 +4,7 @@ import org.allaymc.api.world.biome.BiomeType;
 
 import com.dfsek.terra.api.world.biome.PlatformBiome;
 
+
 /**
  * @author daoge_cmd
  */

platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBlockState.java

@@ -7,6 +7,7 @@ import com.dfsek.terra.allay.JeBlockState;
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.block.state.properties.Property;
 
+
 /**
  * @author daoge_cmd
  */
@@ -68,7 +69,7 @@ public final class AllayBlockState implements com.dfsek.terra.api.block.state.Bl
 
     public BlockState allayBlockState() { return allayBlockState; }
 
-    public boolean containsWater() { return containsWater; }
+    public boolean containsWater()      { return containsWater; }
 
     public JeBlockState jeBlockState()  { return jeBlockState; }
 }

platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBlockType.java

@@ -6,6 +6,7 @@ import org.allaymc.api.block.type.BlockType;
 import com.dfsek.terra.allay.Mapping;
 import com.dfsek.terra.api.block.state.BlockState;
 
+
 /**
  * @author daoge_cmd
  */

platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayChunk.java

@@ -10,18 +10,20 @@ import com.dfsek.terra.allay.Mapping;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.world.ServerWorld;
 
+
 /**
  * @author daoge_cmd
  */
 public record AllayChunk(ServerWorld world, Chunk allayChunk) implements com.dfsek.terra.api.world.chunk.Chunk {
 
-    private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(BlockPropertyTypes.LIQUID_DEPTH.createValue(0));
+    private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(
+        BlockPropertyTypes.LIQUID_DEPTH.createValue(0));
 
     @Override
     public void setBlock(int x, int y, int z, BlockState data, boolean physics) {
         AllayBlockState allayBlockState = (AllayBlockState) data;
         allayChunk.setBlockState(x, y, z, allayBlockState.allayBlockState());
-        if (allayBlockState.containsWater() || allayChunk.getBlockState(x, y, z).getBlockType().hasBlockTag(BlockTags.WATER)) {
+        if(allayBlockState.containsWater() || allayChunk.getBlockState(x, y, z).getBlockType().hasBlockTag(BlockTags.WATER)) {
             allayChunk.setBlockState(x, y, z, WATER, 1);
         }
     }

platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayEnchantment.java

@@ -6,18 +6,19 @@ import com.dfsek.terra.allay.Mapping;
 import com.dfsek.terra.api.inventory.ItemStack;
 import com.dfsek.terra.api.inventory.item.Enchantment;
 
+
 /**
  * @author daoge_cmd
  */
 public record AllayEnchantment(EnchantmentType allayEnchantment) implements Enchantment {
     @Override
     public boolean canEnchantItem(ItemStack itemStack) {
-        return ((AllayItemStack)itemStack).allayItemStack().checkEnchantmentCompatibility(allayEnchantment);
+        return ((AllayItemStack) itemStack).allayItemStack().checkEnchantmentCompatibility(allayEnchantment);
     }
 
     @Override
     public boolean conflictsWith(Enchantment other) {
-        return ((AllayEnchantment)other).allayEnchantment.isIncompatibleWith(allayEnchantment);
+        return ((AllayEnchantment) other).allayEnchantment.isIncompatibleWith(allayEnchantment);
     }
 
     @Override

platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayFakeEntity.java

@@ -1,9 +1,11 @@
 package com.dfsek.terra.allay.delegate;
 
-import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.seismic.type.vector.Vector3;
+
+import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.world.ServerWorld;
 
+
 /**
  * NOTICE: Entity is not supported currently, and this is a fake implementation.
  *

platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayItemMeta.java

@@ -10,6 +10,7 @@ import java.util.Map;
 import com.dfsek.terra.api.inventory.item.Enchantment;
 import com.dfsek.terra.api.inventory.item.ItemMeta;
 
+
 /**
  * @author daoge_cmd
  */
@@ -23,7 +24,7 @@ public record AllayItemMeta(ItemStack allayItemStack) implements ItemMeta {
     @Override
     public Map<Enchantment, Integer> getEnchantments() {
         Map<Enchantment, Integer> results = new HashMap<>();
-        for (EnchantmentInstance allayEnchantmentInstance : allayItemStack.getEnchantments()) {
+        for(EnchantmentInstance allayEnchantmentInstance : allayItemStack.getEnchantments()) {
             results.put(new AllayEnchantment(allayEnchantmentInstance.getType()), allayEnchantmentInstance.getLevel());
         }
         return results;

platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayItemStack.java

@@ -6,10 +6,11 @@ import org.allaymc.api.item.enchantment.EnchantmentInstance;
 import com.dfsek.terra.api.inventory.Item;
 import com.dfsek.terra.api.inventory.item.ItemMeta;
 
+
 /**
  * @author daoge_cmd
  */
-public record AllayItemStack(ItemStack allayItemStack) implements com.dfsek.terra.api.inventory.ItemStack{
+public record AllayItemStack(ItemStack allayItemStack) implements com.dfsek.terra.api.inventory.ItemStack {
     @Override
     public int getAmount() {
         return allayItemStack.getCount();
@@ -34,7 +35,7 @@ public record AllayItemStack(ItemStack allayItemStack) implements com.dfsek.terr
     public void setItemMeta(ItemMeta meta) {
         ItemStack targetItem = ((AllayItemMeta) meta).allayItemStack();
         allayItemStack.removeAllEnchantments();
-        for (EnchantmentInstance enchantment : targetItem.getEnchantments()) {
+        for(EnchantmentInstance enchantment : targetItem.getEnchantments()) {
             allayItemStack.addEnchantment(enchantment.getType(), enchantment.getLevel());
         }
         allayItemStack.setLore(targetItem.getLore());

platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoChunk.java

@@ -10,12 +10,14 @@ import com.dfsek.terra.allay.Mapping;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.world.chunk.generation.ProtoChunk;
 
+
 /**
  * @author daoge_cmd
  */
 public record AllayProtoChunk(UnsafeChunk allayChunk) implements ProtoChunk {
 
-    private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(BlockPropertyTypes.LIQUID_DEPTH.createValue(0));
+    private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(
+        BlockPropertyTypes.LIQUID_DEPTH.createValue(0));
 
     @Override
     public int getMaxHeight() {

platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoWorld.java

@@ -1,5 +1,6 @@
 package com.dfsek.terra.allay.delegate;
 
+import com.dfsek.seismic.type.vector.Vector3;
 import org.allaymc.api.block.property.type.BlockPropertyTypes;
 import org.allaymc.api.block.tag.BlockTags;
 import org.allaymc.api.block.type.BlockTypes;
@@ -11,18 +12,19 @@ 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.seismic.type.vector.Vector3;
 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;
 
+
 /**
  * @author daoge_cmd
  */
 public record AllayProtoWorld(AllayServerWorld allayServerWorld, OtherChunkAccessibleContext context) implements ProtoWorld {
 
-    private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(BlockPropertyTypes.LIQUID_DEPTH.createValue(0));
+    private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(
+        BlockPropertyTypes.LIQUID_DEPTH.createValue(0));
 
     @Override
     public int centerChunkX() {

platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayServerWorld.java

@@ -1,5 +1,6 @@
 package com.dfsek.terra.allay.delegate;
 
+import com.dfsek.seismic.type.vector.Vector3;
 import org.allaymc.api.world.Dimension;
 
 import com.dfsek.terra.allay.Mapping;
@@ -9,12 +10,12 @@ 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.seismic.type.vector.Vector3;
 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;
 
+
 /**
  * @author daoge_cmd
  */

platforms/allay/src/main/java/com/dfsek/terra/allay/generator/AllayGeneratorWrapper.java

@@ -24,6 +24,7 @@ import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
 import com.dfsek.terra.api.world.chunk.generation.util.GeneratorWrapper;
 import com.dfsek.terra.api.world.info.WorldProperties;
 
+
 /**
  * @author daoge_cmd
  */
@@ -86,6 +87,18 @@ public class AllayGeneratorWrapper implements GeneratorWrapper {
             .build();
     }
 
+    protected static ConfigPack getConfigPack(String packName) {
+        Optional<ConfigPack> byId = TerraAllayPlugin.PLATFORM.getConfigRegistry().getByID(packName);
+        return byId.orElseGet(
+            () -> TerraAllayPlugin.PLATFORM.getConfigRegistry().getByID(packName.toUpperCase(Locale.ENGLISH))
+                .orElseThrow(() -> new IllegalArgumentException("Cant find terra config pack named " + packName))
+        );
+    }
+
+    protected static ChunkGenerator createGenerator(ConfigPack configPack) {
+        return configPack.getGeneratorProvider().newInstance(configPack);
+    }
+
     @Override
     public ChunkGenerator getHandle() {
         return chunkGenerator;
@@ -112,6 +125,7 @@ public class AllayGeneratorWrapper implements GeneratorWrapper {
         return this.allayWorldGenerator;
     }
 
+
     protected class AllayNoiser implements Noiser {
 
         @Override
@@ -145,6 +159,7 @@ public class AllayGeneratorWrapper implements GeneratorWrapper {
         }
     }
 
+
     protected class AllayPopulator implements Populator {
 
         @Override
@@ -165,16 +180,4 @@ public class AllayGeneratorWrapper implements GeneratorWrapper {
             return "TERRA_POPULATOR";
         }
     }
-
-    protected static ConfigPack getConfigPack(String packName) {
-        Optional<ConfigPack> byId = TerraAllayPlugin.PLATFORM.getConfigRegistry().getByID(packName);
-        return byId.orElseGet(
-            () -> TerraAllayPlugin.PLATFORM.getConfigRegistry().getByID(packName.toUpperCase(Locale.ENGLISH))
-                .orElseThrow(() -> new IllegalArgumentException("Cant find terra config pack named " + packName))
-        );
-    }
-
-    protected static ChunkGenerator createGenerator(ConfigPack configPack) {
-        return configPack.getGeneratorProvider().newInstance(configPack);
-    }
 }

platforms/allay/src/main/java/com/dfsek/terra/allay/handle/AllayItemHandle.java

@@ -13,6 +13,7 @@ import com.dfsek.terra.api.handle.ItemHandle;
 import com.dfsek.terra.api.inventory.Item;
 import com.dfsek.terra.api.inventory.item.Enchantment;
 
+
 /**
  * @author daoge_cmd
  */

platforms/allay/src/main/java/com/dfsek/terra/allay/handle/AllayWorldHandle.java

@@ -9,6 +9,7 @@ import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.api.handle.WorldHandle;
 
+
 /**
  * @author daoge_cmd
  */
@@ -29,6 +30,7 @@ public class AllayWorldHandle implements WorldHandle {
     public @NotNull EntityType getEntity(@NotNull String id) {
         return new EntityType() {
             private final Object fakeEntityType = new Object();
+
             @Override
             public Object getHandle() {
                 return fakeEntityType;

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java

@@ -17,11 +17,11 @@
 
 package com.dfsek.terra.bukkit;
 
+import com.dfsek.seismic.type.vector.Vector3;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Location;
 
 import com.dfsek.terra.api.entity.Entity;
-import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java

@@ -17,11 +17,11 @@
 
 package com.dfsek.terra.bukkit;
 
+import com.dfsek.seismic.type.vector.Vector3;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Location;
 
 import com.dfsek.terra.api.entity.Player;
-import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java

@@ -20,9 +20,6 @@ package com.dfsek.terra.bukkit;
 import com.dfsek.tectonic.api.TypeRegistry;
 import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
-
-import com.dfsek.terra.bukkit.nms.Initializer;
-
 import org.bukkit.Bukkit;
 import org.bukkit.entity.EntityType;
 import org.jetbrains.annotations.NotNull;
@@ -42,6 +39,7 @@ import com.dfsek.terra.api.world.biome.PlatformBiome;
 import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper;
 import com.dfsek.terra.bukkit.handles.BukkitItemHandle;
 import com.dfsek.terra.bukkit.handles.BukkitWorldHandle;
+import com.dfsek.terra.bukkit.nms.Initializer;
 import com.dfsek.terra.bukkit.world.BukkitPlatformBiome;
 
 
@@ -58,7 +56,7 @@ public class PlatformImpl extends AbstractPlatform {
 
     public PlatformImpl(TerraBukkitPlugin plugin) {
         generationThreads = getMoonriseGenerationThreadsWithReflection();
-        if (generationThreads == 0) {
+        if(generationThreads == 0) {
             generationThreads = 1;
         }
         this.plugin = plugin;

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/hooks/MultiverseGeneratorPluginHook.java

@@ -1,14 +1,15 @@
 package com.dfsek.terra.bukkit.hooks;
 
-import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.registry.key.Keyed;
-
 import org.mvplugins.multiverse.core.world.generators.GeneratorPlugin;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
 import org.mvplugins.multiverse.external.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 
+import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.api.registry.key.Keyed;
+
+
 public final class MultiverseGeneratorPluginHook implements GeneratorPlugin {
 
     private final Platform platform;

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

@@ -17,9 +17,6 @@
 
 package com.dfsek.terra.bukkit.listeners;
 
-import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.bukkit.hooks.MultiverseGeneratorPluginHook;
-
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.server.PluginEnableEvent;
@@ -27,6 +24,9 @@ import org.mvplugins.multiverse.core.MultiverseCoreApi;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.bukkit.hooks.MultiverseGeneratorPluginHook;
+
 
 /**
  * Listener for events on all implementations.

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java

@@ -1,10 +1,9 @@
 package com.dfsek.terra.bukkit.nms;
 
-import com.dfsek.terra.bukkit.BukkitAddon;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.dfsek.terra.bukkit.BukkitAddon;
 import com.dfsek.terra.bukkit.PlatformImpl;
 import com.dfsek.terra.bukkit.util.VersionUtil;
 
@@ -54,7 +53,7 @@ public interface Initializer {
     private static Initializer constructInitializer() {
         try {
             String packageVersion = NMS;
-            if (NMS.equals("v1_21_5")) {
+            if(NMS.equals("v1_21_5")) {
                 packageVersion = "v1_21_6";
             }
 

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

@@ -18,6 +18,7 @@
 package com.dfsek.terra.bukkit.world;
 
 
+import com.dfsek.seismic.type.vector.Vector3;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -34,7 +35,6 @@ import com.dfsek.terra.api.command.CommandSender;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.inventory.ItemStack;
 import com.dfsek.terra.api.inventory.item.Enchantment;
-import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.api.world.chunk.Chunk;
 import com.dfsek.terra.api.world.info.WorldProperties;

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

@@ -17,14 +17,14 @@
 
 package com.dfsek.terra.bukkit.world.block;
 
-import org.bukkit.Material;
-
 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;
 
+import org.bukkit.Material;
+
 
 public class BukkitBlockTypeAndItem implements BlockType, Item {
     private final Material delegate;

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

@@ -17,13 +17,13 @@
 
 package com.dfsek.terra.bukkit.world.block.state;
 
+import com.dfsek.seismic.type.vector.Vector3;
 import org.bukkit.block.Container;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.block.Sign;
 
 import com.dfsek.terra.api.block.entity.BlockEntity;
 import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState;
 

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/AwfulBukkitHacks.java

@@ -1,7 +1,5 @@
 package com.dfsek.terra.bukkit.nms.v1_21_6;
 
-import com.dfsek.terra.bukkit.nms.v1_21_6.config.VanillaBiomeProperties;
-
 import net.minecraft.core.Holder;
 import net.minecraft.core.Holder.Reference;
 import net.minecraft.core.HolderSet;
@@ -25,6 +23,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.dfsek.terra.bukkit.nms.v1_21_6.config.VanillaBiomeProperties;
 import com.dfsek.terra.bukkit.world.BukkitPlatformBiome;
 import com.dfsek.terra.registry.master.ConfigRegistry;
 
@@ -52,7 +51,8 @@ public class AwfulBukkitHacks {
 
                     VanillaBiomeProperties vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class);
 
-                    Biome platform = NMSBiomeInjector.createBiome(biomeRegistry.get(vanillaMinecraftKey).orElseThrow().value(), vanillaBiomeProperties);
+                    Biome platform = NMSBiomeInjector.createBiome(biomeRegistry.get(vanillaMinecraftKey).orElseThrow().value(),
+                        vanillaBiomeProperties);
 
                     ResourceKey<Biome> delegateKey = ResourceKey.create(
                         Registries.BIOME,
@@ -112,39 +112,42 @@ public class AwfulBukkitHacks {
         Map<Holder.Reference<T>, List<TagKey<T>>> map = new IdentityHashMap<>();
         Reflection.MAPPED_REGISTRY.getByKey(registry).values().forEach(entry -> map.put(entry, new ArrayList<>()));
         tagEntries.forEach((tag, entries) -> {
-            for (Holder<T> holder : entries) {
-//                if (!holder.canSerializeIn(registry.asLookup())) {
-//                    throw new IllegalStateException("Can't create named set " + tag + " containing value " + holder + " from outside registry " + this);
-//                }
+            for(Holder<T> holder : entries) {
+                //                if (!holder.canSerializeIn(registry.asLookup())) {
+                //                    throw new IllegalStateException("Can't create named set " + tag + " containing value " + holder + "
+                //                    from outside registry " + this);
+                //                }
 
-                if (!(holder instanceof Holder.Reference<T> reference)) {
+                if(!(holder instanceof Holder.Reference<T> reference)) {
                     throw new IllegalStateException("Found direct holder " + holder + " value in tag " + tag);
                 }
 
                 map.get(reference).add(tag);
             }
         });
-//        Set<TagKey<T>> set = Sets.difference(registry.tags.keySet(), tagEntries.keySet());
-//        if (!set.isEmpty()) {
-//            LOGGER.warn(
-//                "Not all defined tags for registry {} are present in data pack: {}",
-//                registry.key(),
-//                set.stream().map(tag -> tag.location().toString()).sorted().collect(Collectors.joining(", "))
-//            );
-//        }
+        //        Set<TagKey<T>> set = Sets.difference(registry.tags.keySet(), tagEntries.keySet());
+        //        if (!set.isEmpty()) {
+        //            LOGGER.warn(
+        //                "Not all defined tags for registry {} are present in data pack: {}",
+        //                registry.key(),
+        //                set.stream().map(tag -> tag.location().toString()).sorted().collect(Collectors.joining(", "))
+        //            );
+        //        }
 
         Map<TagKey<T>, HolderSet.Named<T>> map2 = new IdentityHashMap<>(registry.getTags().collect(Collectors.toMap(
             Named::key,
             (named) -> named
         )));
-        tagEntries.forEach((tag, entries) -> Reflection.HOLDER_SET.invokeBind(map2.computeIfAbsent(tag, key -> Reflection.MAPPED_REGISTRY.invokeCreateTag(registry, key)), entries));
+        tagEntries.forEach((tag, entries) -> Reflection.HOLDER_SET.invokeBind(
+            map2.computeIfAbsent(tag, key -> Reflection.MAPPED_REGISTRY.invokeCreateTag(registry, key)), entries));
         map.forEach(Reflection.HOLDER_REFERENCE::invokeBindTags);
         Reflection.MAPPED_REGISTRY.setAllTags(registry, Reflection.MAPPED_REGISTRY_TAG_SET.invokeFromMap(map2));
     }
 
     private static void resetTags(MappedRegistry<?> registry) {
         registry.getTags().forEach(entryList -> Reflection.HOLDER_SET.invokeBind(entryList, List.of()));
-        Reflection.MAPPED_REGISTRY.getByKey(registry).values().forEach(entry -> Reflection.HOLDER_REFERENCE.invokeBindTags(entry, Set.of()));
+        Reflection.MAPPED_REGISTRY.getByKey(registry).values().forEach(
+            entry -> Reflection.HOLDER_REFERENCE.invokeBindTags(entry, Set.of()));
     }
 }
 

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSBiomeInjector.java

@@ -33,7 +33,8 @@ public class NMSBiomeInjector {
             .waterColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterColor(), vanilla.getWaterColor()))
             .waterFogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterFogColor(), vanilla.getWaterFogColor()))
             .skyColor(Objects.requireNonNullElse(vanillaBiomeProperties.getSkyColor(), vanilla.getSkyColor()))
-            .grassColorModifier(Objects.requireNonNullElse(vanillaBiomeProperties.getGrassColorModifier(), vanilla.getSpecialEffects().getGrassColorModifier()))
+            .grassColorModifier(Objects.requireNonNullElse(vanillaBiomeProperties.getGrassColorModifier(),
+                vanilla.getSpecialEffects().getGrassColorModifier()))
             .backgroundMusicVolume(Objects.requireNonNullElse(vanillaBiomeProperties.getMusicVolume(), vanilla.getBackgroundMusicVolume()));
 
         if(vanillaBiomeProperties.getGrassColor() == null) {
@@ -84,7 +85,8 @@ public class NMSBiomeInjector {
 
         builder.downfall(Objects.requireNonNullElse(vanillaBiomeProperties.getDownfall(), vanilla.climateSettings.downfall()));
 
-        builder.temperatureAdjustment(Objects.requireNonNullElse(vanillaBiomeProperties.getTemperatureModifier(), vanilla.climateSettings.temperatureModifier()));
+        builder.temperatureAdjustment(
+            Objects.requireNonNullElse(vanillaBiomeProperties.getTemperatureModifier(), vanilla.climateSettings.temperatureModifier()));
 
         builder.mobSpawnSettings(Objects.requireNonNullElse(vanillaBiomeProperties.getSpawnSettings(), vanilla.getMobSettings()));
 

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSInitializer.java

@@ -1,9 +1,8 @@
 package com.dfsek.terra.bukkit.nms.v1_21_6;
 
-import com.dfsek.terra.bukkit.BukkitAddon;
-
 import org.bukkit.Bukkit;
 
+import com.dfsek.terra.bukkit.BukkitAddon;
 import com.dfsek.terra.bukkit.PlatformImpl;
 import com.dfsek.terra.bukkit.nms.Initializer;
 

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/Reflection.java

@@ -68,6 +68,7 @@ public class Reflection {
         <T> HolderSet.Named<T> invokeCreateTag(MappedRegistry<T> instance, TagKey<T> tag);
     }
 
+
     @Proxies(className = "net.minecraft.core.MappedRegistry$TagSet")
     public interface MappedRegistryTagSetProxy {
         @MethodName("fromMap")
@@ -92,6 +93,7 @@ public class Reflection {
         <T> void invokeBindTags(Reference<T> instance, Collection<TagKey<T>> tags);
     }
 
+
     @Proxies(ChunkMap.class)
     public interface ChunkMapProxy {
         @FieldGetter("worldGenContext")
@@ -101,12 +103,14 @@ public class Reflection {
         void setWorldGenContext(ChunkMap instance, WorldGenContext worldGenContext);
     }
 
+
     @Proxies(Holder.Reference.class)
     public interface HolderReferenceProxy {
         @MethodName("bindTags")
         <T> void invokeBindTags(Holder.Reference<T> instance, Collection<TagKey<T>> tags);
     }
 
+
     @Proxies(HolderSet.Named.class)
     public interface HolderSetNamedProxy {
         @MethodName("bind")
@@ -116,6 +120,7 @@ public class Reflection {
         <T> List<Holder<T>> invokeContents(HolderSet.Named<T> instance);
     }
 
+
     @Proxies(Biome.class)
     public interface BiomeProxy {
         @MethodName("getGrassColorFromTexture")

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeAdditionsSoundTemplate.java

@@ -12,11 +12,11 @@ public class BiomeAdditionsSoundTemplate implements ObjectTemplate<AmbientAdditi
     @Value("sound")
     @Default
     private SoundEvent sound = null;
-    
+
     @Value("sound-chance")
     @Default
     private Double soundChance = null;
-    
+
     @Override
     public AmbientAdditionsSettings get() {
         if(sound == null || soundChance == null) {

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeMoodSoundTemplate.java

@@ -12,25 +12,26 @@ public class BiomeMoodSoundTemplate implements ObjectTemplate<AmbientMoodSetting
     @Value("sound")
     @Default
     private SoundEvent sound = null;
-    
+
     @Value("cultivation-ticks")
     @Default
     private Integer soundCultivationTicks = null;
-    
+
     @Value("spawn-range")
     @Default
     private Integer soundSpawnRange = null;
-    
+
     @Value("extra-distance")
     @Default
     private Double soundExtraDistance = null;
-    
+
     @Override
     public AmbientMoodSettings get() {
         if(sound == null || soundCultivationTicks == null || soundSpawnRange == null || soundExtraDistance == null) {
             return null;
         } else {
-            return new AmbientMoodSettings(BuiltInRegistries.SOUND_EVENT.wrapAsHolder(sound), soundCultivationTicks, soundSpawnRange, soundExtraDistance);
+            return new AmbientMoodSettings(BuiltInRegistries.SOUND_EVENT.wrapAsHolder(sound), soundCultivationTicks, soundSpawnRange,
+                soundExtraDistance);
         }
     }
 }

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeParticleConfigTemplate.java

@@ -15,17 +15,17 @@ public class BiomeParticleConfigTemplate implements ObjectTemplate<AmbientPartic
     @Value("particle")
     @Default
     private String particle = null;
-    
+
     @Value("probability")
     @Default
     private Integer probability = null;
-    
+
     @Override
     public AmbientParticleSettings get() {
         if(particle == null || probability == null) {
             return null;
         }
-        
+
         try {
             return new AmbientParticleSettings(ParticleArgument.readParticle(new StringReader(particle),
                 (Provider) BuiltInRegistries.PARTICLE_TYPE.asHolderIdMap()), probability);

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/EntityTypeTemplate.java

@@ -12,7 +12,7 @@ public class EntityTypeTemplate implements ObjectTemplate<EntityType<?>> {
     @Value("id")
     @Default
     private ResourceLocation id = null;
-    
+
     @Override
     public EntityType<?> get() {
         return BuiltInRegistries.ENTITY_TYPE.get(id).orElseThrow().value();

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/MusicSoundTemplate.java

@@ -12,19 +12,19 @@ public class MusicSoundTemplate implements ObjectTemplate<Music> {
     @Value("sound")
     @Default
     private SoundEvent sound = null;
-    
+
     @Value("min-delay")
     @Default
     private Integer minDelay = null;
-    
+
     @Value("max-delay")
     @Default
     private Integer maxDelay = null;
-    
+
     @Value("replace-current-music")
     @Default
     private Boolean replaceCurrentMusic = null;
-    
+
     @Override
     public Music get() {
         if(sound == null || minDelay == null || maxDelay == null || replaceCurrentMusic == null) {

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SoundEventTemplate.java

@@ -11,11 +11,11 @@ public class SoundEventTemplate implements ObjectTemplate<SoundEvent> {
     @Value("id")
     @Default
     private ResourceLocation id = null;
-    
+
     @Value("distance-to-travel")
     @Default
     private Float distanceToTravel = null;
-    
+
     @Override
     public SoundEvent get() {
         if(id == null) {

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnCostConfig.java

@@ -10,27 +10,27 @@ public class SpawnCostConfig implements ObjectTemplate<SpawnCostConfig> {
     @Value("type")
     @Default
     private EntityType<?> type = null;
-    
+
     @Value("mass")
     @Default
     private Double mass = null;
-    
+
     @Value("gravity")
     @Default
     private Double gravity = null;
-    
+
     public EntityType<?> getType() {
         return type;
     }
-    
+
     public Double getMass() {
         return mass;
     }
-    
+
     public Double getGravity() {
         return gravity;
     }
-    
+
     @Override
     public SpawnCostConfig get() {
         return this;

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnEntryConfig.java

@@ -11,15 +11,15 @@ public class SpawnEntryConfig implements ObjectTemplate<SpawnEntryConfig> {
     @Value("type")
     @Default
     private EntityType<?> type = null;
-    
+
     @Value("weight")
     @Default
     private Integer weight = null;
-    
+
     @Value("min-group-size")
     @Default
     private Integer minGroupSize = null;
-    
+
     @Value("max-group-size")
     @Default
     private Integer maxGroupSize = null;
@@ -31,7 +31,7 @@ public class SpawnEntryConfig implements ObjectTemplate<SpawnEntryConfig> {
     public SpawnerData getSpawnerData() {
         return new SpawnerData(type, minGroupSize, maxGroupSize);
     }
-    
+
     @Override
     public SpawnEntryConfig get() {
         return this;

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnSettingsTemplate.java

@@ -3,12 +3,13 @@ package com.dfsek.terra.bukkit.nms.v1_21_6.config;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import java.util.List;
 import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.level.biome.MobSpawnSettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 
 public class SpawnSettingsTemplate implements ObjectTemplate<MobSpawnSettings> {
 
@@ -18,15 +19,15 @@ public class SpawnSettingsTemplate implements ObjectTemplate<MobSpawnSettings> {
     @Value("spawns")
     @Default
     private List<SpawnTypeConfig> spawns = null;
-    
+
     @Value("costs")
     @Default
     private List<SpawnCostConfig> costs = null;
-    
+
     @Value("probability")
     @Default
     private Float probability = null;
-    
+
     @Override
     public MobSpawnSettings get() {
         MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder();
@@ -42,7 +43,7 @@ public class SpawnSettingsTemplate implements ObjectTemplate<MobSpawnSettings> {
         if(probability != null) {
             builder.creatureGenerationProbability(probability);
         }
-        
+
         return builder.build();
     }
 }

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnTypeConfig.java

@@ -3,9 +3,10 @@ package com.dfsek.terra.bukkit.nms.v1_21_6.config;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import java.util.List;
 import net.minecraft.world.entity.MobCategory;
 
+import java.util.List;
+
 
 public class SpawnTypeConfig implements ObjectTemplate<SpawnTypeConfig> {
     @Value("group")

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VanillaBiomeProperties.java

@@ -3,9 +3,6 @@ package com.dfsek.terra.bukkit.nms.v1_21_6.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.minecraft.sounds.Music;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.entity.npc.VillagerType;
@@ -16,6 +13,8 @@ import net.minecraft.world.level.biome.Biome.TemperatureModifier;
 import net.minecraft.world.level.biome.BiomeSpecialEffects.GrassColorModifier;
 import net.minecraft.world.level.biome.MobSpawnSettings;
 
+import com.dfsek.terra.api.properties.Properties;
+
 
 public class VanillaBiomeProperties implements ConfigTemplate, Properties {
     @Value("colors.grass")

platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VillagerTypeTemplate.java

@@ -12,7 +12,7 @@ public class VillagerTypeTemplate implements ObjectTemplate<VillagerType> {
     @Value("id")
     @Default
     private ResourceLocation id = null;
-    
+
     @Override
     public VillagerType get() {
         return BuiltInRegistries.VILLAGER_TYPE.get(id).orElseThrow().value();

platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java

@@ -1,44 +1,48 @@
 package com.dfsek.terra.cli;
 
+import com.dfsek.seismic.type.vector.Vector2Int;
 import net.querz.mca.MCAUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
 
 import java.io.IOException;
 import java.util.concurrent.Callable;
 
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent;
-import com.dfsek.seismic.type.vector.Vector2Int;
 import com.dfsek.terra.cli.world.CLIWorld;
 
-import picocli.CommandLine;
-import picocli.CommandLine.Command;
-import picocli.CommandLine.Option;
-
 
 //TODO auto pull in version
 @Command(name = "TerraCLI", mixinStandardHelpOptions = true, version = "6.6.0",
          description = "Generates a Terra World and saves it in minecraft region format.")
 public final class TerraCLI implements Callable<Integer> {
-    @Option(names = { "-s", "--size"}, description = "Number of regions to generate.")
+    @Option(names = { "-s", "--size" }, description = "Number of regions to generate.")
     private int size = 2;
 
-    @Option(names = { "-p", "--pack"}, description = "Config pack to use.")
+    @Option(names = { "-p", "--pack" }, description = "Config pack to use.")
     private String pack = "OVERWORLD";
 
-    @Option(names = { "--seed"}, description = "Seed for world generation.")
+    @Option(names = { "--seed" }, description = "Seed for world generation.")
     private long seed = 0;
 
-    @Option(names = { "--max-height"}, description = "Maximum height of the world.")
+    @Option(names = { "--max-height" }, description = "Maximum height of the world.")
     private int maxHeight = 320;
 
-    @Option(names = { "--min-height"}, description = "Minimum height of the world.")
+    @Option(names = { "--min-height" }, description = "Minimum height of the world.")
     private int minHeight = -64;
 
-    @Option(names = { "--no-save"}, description = "Don't save the world to disk.")
+    @Option(names = { "--no-save" }, description = "Don't save the world to disk.")
     private boolean noSave = false;
 
+    public static void main(String... args) {
+        int exitCode = new CommandLine(new TerraCLI()).execute(args);
+        System.exit(exitCode);
+    }
+
     @Override
     public Integer call() {
         Logger LOGGER = LoggerFactory.getLogger(TerraCLI.class);
@@ -70,9 +74,4 @@ public final class TerraCLI implements Callable<Integer> {
         LOGGER.info("Done.");
         return 0;
     }
-
-    public static void main(String... args) {
-        int exitCode = new CommandLine(new TerraCLI()).execute(args);
-        System.exit(exitCode);
-    }
 }

platforms/cli/src/main/java/com/dfsek/terra/cli/world/CLIWorld.java

@@ -1,5 +1,7 @@
 package com.dfsek.terra.cli.world;
 
+import com.dfsek.seismic.type.vector.Vector2Int;
+import com.dfsek.seismic.type.vector.Vector3;
 import com.google.common.collect.Streams;
 import net.querz.mca.MCAFile;
 import org.slf4j.Logger;
@@ -22,8 +24,6 @@ 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.seismic.type.vector.Vector2Int;
-import com.dfsek.seismic.type.vector.Vector3;
 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;
@@ -87,7 +87,7 @@ public class CLIWorld implements ServerWorld, NBTSerializable<Stream<Pair<Vector
                     try {
                         int num = amount.getAndIncrement();
                         CLIChunk chunk;
-                        if (!noSave) {
+                        if(!noSave) {
                             chunk = getChunkAt(finalX, finalZ);
                         } else {
                             chunk = new CLIChunk(Math.floorMod(finalX, 32), Math.floorMod(finalZ, 32), this);

platforms/forge/src/main/java/com/dfsek/terra/forge/util/BiomeUtil.java

@@ -83,7 +83,8 @@ public final class BiomeUtil {
                 Objects.requireNonNullElse(vanillaBiomeProperties.getVillagerType(),
                     villagerMap.getOrDefault(vanilla.getKey().orElseThrow(), VillagerType.PLAINS)));
 
-            com.dfsek.terra.mod.util.BiomeUtil.TERRA_BIOME_MAP.computeIfAbsent(vanilla.getKey().orElseThrow().getValue(), i -> new ArrayList<>()).add(
+            com.dfsek.terra.mod.util.BiomeUtil.TERRA_BIOME_MAP.computeIfAbsent(vanilla.getKey().orElseThrow().getValue(),
+                i -> new ArrayList<>()).add(
                 identifier);
         }
     }

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;

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java

@@ -67,7 +67,7 @@ public abstract class ModPlatform extends AbstractPlatform {
         });
         getRawConfigRegistry()
             .forEach(pack -> {
-                    PresetUtil.createDefault(pack, this, configPacksInMetaPack.contains(pack.getID())).apply(registerFunction);
+                PresetUtil.createDefault(pack, this, configPacksInMetaPack.contains(pack.getID())).apply(registerFunction);
             });
     }
 

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryConfig.java

@@ -8,6 +8,7 @@ import net.minecraft.world.biome.SpawnSettings.SpawnEntry;
 
 import com.dfsek.terra.api.util.range.Range;
 
+
 public class SpawnEntryConfig implements ObjectTemplate<SpawnEntry> {
     @Value("type")
     @Default

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VillagerTypeTemplate.java

@@ -3,7 +3,6 @@ package com.dfsek.terra.mod.config;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import net.minecraft.registry.Registries;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.util.Identifier;

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/TerraBiomeSource.java

@@ -21,7 +21,6 @@ import com.mojang.serialization.MapCodec;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.source.BiomeSource;
-import net.minecraft.world.biome.source.util.MultiNoiseUtil;
 import net.minecraft.world.biome.source.util.MultiNoiseUtil.MultiNoiseSampler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/generalize/ServerWorldMixin.java

@@ -1,21 +1,14 @@
 package com.dfsek.terra.mod.mixin.generalize;
 
 
-import net.minecraft.registry.DynamicRegistryManager;
-import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.WorldGenerationProgressListener;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.random.RandomSequencesState;
-import net.minecraft.util.profiler.Profiler;
-import net.minecraft.village.raid.RaidManager;
-import net.minecraft.world.MutableWorldProperties;
 import net.minecraft.world.World;
 import net.minecraft.world.dimension.DimensionOptions;
-import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.dimension.DimensionTypes;
 import net.minecraft.world.level.ServerWorldProperties;
 import net.minecraft.world.level.storage.LevelStorage;
@@ -27,13 +20,16 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 
 import java.util.List;
 import java.util.concurrent.Executor;
-import java.util.function.Supplier;
 
 
 @Mixin(ServerWorld.class)
 public abstract class ServerWorldMixin extends World {
-    public ServerWorldMixin(MinecraftServer server, Executor workerExecutor, LevelStorage.Session session, ServerWorldProperties properties, RegistryKey<World> worldKey, DimensionOptions dimensionOptions, WorldGenerationProgressListener worldGenerationProgressListener, boolean debugWorld, long seed, List<SpecialSpawner> spawners, boolean shouldTickTime, @Nullable RandomSequencesState randomSequencesState) {
-        super(properties, worldKey, server.getRegistryManager(), dimensionOptions.dimensionTypeEntry(), false, debugWorld, seed, server.getMaxChainedNeighborUpdates());
+    public ServerWorldMixin(MinecraftServer server, Executor workerExecutor, LevelStorage.Session session, ServerWorldProperties properties,
+                            RegistryKey<World> worldKey, DimensionOptions dimensionOptions,
+                            WorldGenerationProgressListener worldGenerationProgressListener, boolean debugWorld, long seed,
+                            List<SpecialSpawner> spawners, boolean shouldTickTime, @Nullable RandomSequencesState randomSequencesState) {
+        super(properties, worldKey, server.getRegistryManager(), dimensionOptions.dimensionTypeEntry(), false, debugWorld, seed,
+            server.getMaxChainedNeighborUpdates());
     }
 
     @Redirect(method = "<init>",

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/block/entity/MobSpawnerBlockEntityMixin.java

@@ -55,7 +55,8 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity {
 
     public EntityType terra$getSpawnedType() {
         return (EntityType) Registries.ENTITY_TYPE.getEntry(
-            Identifier.tryParse(((MobSpawnerLogicAccessor) getLogic()).getSpawnEntry().getNbt().getString("id").orElseThrow())).orElseThrow();
+                Identifier.tryParse(((MobSpawnerLogicAccessor) getLogic()).getSpawnEntry().getNbt().getString("id").orElseThrow()))
+            .orElseThrow();
     }
 
     public void terra$setSpawnedType(@NotNull EntityType creatureType) {

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/chunk/WorldChunkMixin.java

@@ -18,7 +18,6 @@
 package com.dfsek.terra.mod.mixin.implementations.terra.chunk;
 
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.chunk.Chunk.TickSchedulers;
 import net.minecraft.world.chunk.WorldChunk;
 import net.minecraft.world.tick.OrderedTick;
 import org.jetbrains.annotations.NotNull;

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/entity/EntityMixin.java

@@ -17,6 +17,7 @@
 
 package com.dfsek.terra.mod.mixin.implementations.terra.entity;
 
+import com.dfsek.seismic.type.vector.Vector3;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;
 import org.spongepowered.asm.mixin.Implements;
@@ -24,7 +25,6 @@ import org.spongepowered.asm.mixin.Interface;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
-import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.mod.util.MinecraftAdapter;
 

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/lifecycle/DataPackContentsMixin.java

@@ -17,17 +17,15 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import com.dfsek.terra.mod.util.MinecraftUtil;
-import com.dfsek.terra.mod.util.TagUtil;
-
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 
+import com.dfsek.terra.mod.util.MinecraftUtil;
+import com.dfsek.terra.mod.util.TagUtil;
+
 
 @Mixin(DataPackContents.class)
 public class DataPackContentsMixin {
@@ -38,7 +36,11 @@ public class DataPackContentsMixin {
     /*
      * #refresh populates all tags in the registries
      */
-    @Inject(method = "reload(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/registry/CombinedDynamicRegistries;Ljava/util/List;Lnet/minecraft/resource/featuretoggle/FeatureSet;Lnet/minecraft/server/command/CommandManager$RegistrationEnvironment;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;", at = @At("RETURN"))
+    @Inject(method = "reload(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/registry/CombinedDynamicRegistries;Ljava/util/List;" +
+                     "Lnet/minecraft/resource/featuretoggle/FeatureSet;" +
+                     "Lnet/minecraft/server/command/CommandManager$RegistrationEnvironment;ILjava/util/concurrent/Executor;" +
+                     "Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;",
+            at = @At("RETURN"))
     private static void injectReload(ResourceManager resourceManager,
                                      CombinedDynamicRegistries<ServerDynamicRegistryType> dynamicRegistries,
                                      List<PendingTagLoad<?>> pendingTagLoads, FeatureSet enabledFeatures,

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java

@@ -5,6 +5,7 @@ import net.minecraft.util.Identifier;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.Biome.Builder;
 import net.minecraft.world.biome.BiomeEffects;
+import net.minecraft.world.biome.GenerationSettings;
 
 import java.util.HashMap;
 import java.util.List;
@@ -15,9 +16,6 @@ import java.util.Objects;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.mod.config.VanillaBiomeProperties;
 import com.dfsek.terra.mod.mixin.access.BiomeAccessor;
-import com.dfsek.terra.mod.mixin.invoke.BiomeInvoker;
-
-import net.minecraft.world.biome.GenerationSettings;
 
 
 public class BiomeUtil {

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/DimensionUtil.java

@@ -51,7 +51,9 @@ public class DimensionUtil {
             : TagKey.of(RegistryKeys.BLOCK, vanillaWorldProperties.getInfiniburn()),
             vanillaWorldProperties.getEffects() == null ? defaultDimension.effects() : vanillaWorldProperties.getEffects(),
             vanillaWorldProperties.getAmbientLight() == null ? defaultDimension.ambientLight() : vanillaWorldProperties.getAmbientLight(),
-            vanillaWorldProperties.getCloudHeight() == null ? defaultDimension.cloudHeight() : vanillaWorldProperties.getCloudHeight().describeConstable(),
+            vanillaWorldProperties.getCloudHeight() == null
+            ? defaultDimension.cloudHeight()
+            : vanillaWorldProperties.getCloudHeight().describeConstable(),
             monsterSettings
         );
     }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftAdapter.java

@@ -17,13 +17,13 @@
 
 package com.dfsek.terra.mod.util;
 
+import com.dfsek.seismic.type.vector.Vector3;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.random.Random;
 import net.minecraft.world.HeightLimitView;
 
 import java.util.random.RandomGenerator;
 
-import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.info.WorldProperties;
 
 

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java

@@ -43,7 +43,7 @@ public final class MinecraftUtil {
 
     public static <T> Optional<RegistryEntry<T>> getEntry(Registry<T> registry, Identifier identifier) {
         return registry.getOptionalValue(identifier)
-                .flatMap(id -> Optional.ofNullable(registry.getEntry(id)));
+            .flatMap(id -> Optional.ofNullable(registry.getEntry(id)));
     }
 
     public static BlockEntity createState(WorldAccess worldAccess, BlockPos pos) {
@@ -79,8 +79,8 @@ public final class MinecraftUtil {
     }
 
     private static void registerFlora(com.dfsek.terra.api.world.biome.Biome biome, ConfigPack pack,
-                                     com.dfsek.terra.api.registry.key.RegistryKey id,
-                                     Registry<net.minecraft.world.biome.Biome> biomeRegistry) {
+                                      com.dfsek.terra.api.registry.key.RegistryKey id,
+                                      Registry<net.minecraft.world.biome.Biome> biomeRegistry) {
         RegistryKey<net.minecraft.world.biome.Biome> vanillaKey = ((ProtoPlatformBiome) biome.getPlatformBiome()).get(biomeRegistry);
         biomeRegistry.getOptionalValue(vanillaKey)
             .ifPresentOrElse(vanillaBiome -> {

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/PresetUtil.java

@@ -27,8 +27,8 @@ import java.util.Locale;
 
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.config.MetaPack;
-import com.dfsek.terra.api.util.range.ConstantRange;
 import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.range.ConstantRange;
 import com.dfsek.terra.mod.ModPlatform;
 import com.dfsek.terra.mod.config.VanillaWorldProperties;
 import com.dfsek.terra.mod.generation.GenerationSettings;
@@ -146,13 +146,15 @@ public class PresetUtil {
                                        Registry<MultiNoiseBiomeSourceParameterList> multiNoiseBiomeSourceParameterLists,
                                        Registry<Biome> biomeRegistry, HashMap<RegistryKey<DimensionOptions>, DimensionOptions> map) {
         if(!map.containsKey(DimensionOptions.OVERWORLD)) {
-            RegistryEntry<DimensionType> overworldDimensionType = dimensionTypeRegistry.getEntry(dimensionTypeRegistry.get(DimensionTypes.OVERWORLD));
+            RegistryEntry<DimensionType> overworldDimensionType = dimensionTypeRegistry.getEntry(
+                dimensionTypeRegistry.get(DimensionTypes.OVERWORLD));
 
             RegistryEntry<MultiNoiseBiomeSourceParameterList> overworldChunkBiomeReference =
                 multiNoiseBiomeSourceParameterLists.getEntry(multiNoiseBiomeSourceParameterLists.get(
                     MultiNoiseBiomeSourceParameterLists.OVERWORLD));
 
-            RegistryEntry<ChunkGeneratorSettings> overworldChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(chunkGeneratorSettingsRegistry.get(
+            RegistryEntry<ChunkGeneratorSettings> overworldChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(
+                chunkGeneratorSettingsRegistry.get(
                     ChunkGeneratorSettings.OVERWORLD));
 
 
@@ -161,13 +163,15 @@ public class PresetUtil {
             map.put(DimensionOptions.OVERWORLD, overworldDimensionOptions);
         }
         if(!map.containsKey(DimensionOptions.NETHER)) {
-            RegistryEntry<DimensionType> netherDimensionType = dimensionTypeRegistry.getEntry(dimensionTypeRegistry.get(DimensionTypes.THE_NETHER));
+            RegistryEntry<DimensionType> netherDimensionType = dimensionTypeRegistry.getEntry(
+                dimensionTypeRegistry.get(DimensionTypes.THE_NETHER));
 
             RegistryEntry<MultiNoiseBiomeSourceParameterList> netherChunkBiomeReference =
                 multiNoiseBiomeSourceParameterLists.getEntry(multiNoiseBiomeSourceParameterLists.get(
                     MultiNoiseBiomeSourceParameterLists.NETHER));
 
-            RegistryEntry<ChunkGeneratorSettings> netherChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(chunkGeneratorSettingsRegistry.get(
+            RegistryEntry<ChunkGeneratorSettings> netherChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(
+                chunkGeneratorSettingsRegistry.get(
                     ChunkGeneratorSettings.NETHER));
 
             DimensionOptions overworldDimensionOptions = new DimensionOptions(netherDimensionType,
@@ -175,9 +179,11 @@ public class PresetUtil {
             map.put(DimensionOptions.NETHER, overworldDimensionOptions);
         }
         if(!map.containsKey(DimensionOptions.END)) {
-            RegistryEntry<DimensionType> endDimensionType = dimensionTypeRegistry.getEntry(dimensionTypeRegistry.get(DimensionTypes.THE_END));
+            RegistryEntry<DimensionType> endDimensionType = dimensionTypeRegistry.getEntry(
+                dimensionTypeRegistry.get(DimensionTypes.THE_END));
 
-            RegistryEntry<ChunkGeneratorSettings> endChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(chunkGeneratorSettingsRegistry.get(
+            RegistryEntry<ChunkGeneratorSettings> endChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(
+                chunkGeneratorSettingsRegistry.get(
                     ChunkGeneratorSettings.END));
 
 

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java

@@ -3,9 +3,6 @@ package com.dfsek.terra.lifecycle;
 import ca.solostudios.strata.Versions;
 import ca.solostudios.strata.parser.tokenizer.ParseException;
 import ca.solostudios.strata.version.Version;
-
-import com.dfsek.terra.api.util.reflection.ReflectionUtil;
-
 import net.minecraft.MinecraftVersion;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.registry.DynamicRegistryManager;
@@ -45,10 +42,12 @@ public abstract class LifecyclePlatform extends ModPlatform {
     private int generationThreads;
 
     public LifecyclePlatform() {
-        generationThreads = getGenerationThreadsWithReflection("com.ishland.c2me.base.common.GlobalExecutors", "GLOBAL_EXECUTOR_PARALLELISM", "C2ME");
-        if (generationThreads == 0) {
+        generationThreads = getGenerationThreadsWithReflection("com.ishland.c2me.base.common.GlobalExecutors",
+            "GLOBAL_EXECUTOR_PARALLELISM", "C2ME");
+        if(generationThreads == 0) {
             generationThreads = getMoonriseGenerationThreadsWithReflection();
-        } if (generationThreads == 0) {
+        }
+        if(generationThreads == 0) {
             generationThreads = 1;
         }
         CommonPlatform.initialize(this);

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/NoiseConfigMixin.java

@@ -1,5 +1,7 @@
 package com.dfsek.terra.lifecycle.mixin;
 
+import com.dfsek.terra.mod.util.SeedHack;
+
 import net.minecraft.registry.RegistryEntryLookup;
 import net.minecraft.util.math.noise.DoublePerlinNoiseSampler;
 import net.minecraft.world.biome.source.util.MultiNoiseUtil.MultiNoiseSampler;
@@ -12,8 +14,6 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import com.dfsek.terra.mod.util.SeedHack;
-
 
 /**
  * Hack to map noise sampler to seeds

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java

@@ -1,8 +1,5 @@
 package com.dfsek.terra.lifecycle.mixin.lifecycle;
 
-import com.dfsek.terra.mod.CommonPlatform;
-import com.dfsek.terra.mod.ModPlatform;
-
 import com.mojang.datafixers.DataFixer;
 import net.minecraft.resource.ResourcePackManager;
 import net.minecraft.server.MinecraftServer;

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/RegistryLoaderMixin.java

@@ -1,16 +1,15 @@
 package com.dfsek.terra.lifecycle.mixin.lifecycle;
 
-import com.dfsek.terra.mod.CommonPlatform;
-import com.dfsek.terra.mod.ModPlatform;
-
+import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.enchantment.Enchantment;
+import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.MutableRegistry;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.RegistryLoader;
-import net.minecraft.registry.RegistryLoader.Loader;
 import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.resource.ResourceManager;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.source.MultiNoiseBiomeSourceParameterList;
 import net.minecraft.world.dimension.DimensionType;
@@ -24,57 +23,50 @@ import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Coerce;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import com.llamalad7.mixinextras.sugar.Local;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Coerce;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.minecraft.registry.DynamicRegistryManager;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.registry.RegistryLoader;
-import net.minecraft.registry.RegistryWrapper;
-import net.minecraft.resource.ResourceManager;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Consumer;
 
 import com.dfsek.terra.lifecycle.LifecyclePlatform;
 import com.dfsek.terra.lifecycle.util.LifecycleUtil;
 import com.dfsek.terra.lifecycle.util.RegistryHack;
+import com.dfsek.terra.mod.CommonPlatform;
+import com.dfsek.terra.mod.ModPlatform;
 
 
 @Mixin(RegistryLoader.class)
 public class RegistryLoaderMixin {
 
+    @Unique
+    private static final AtomicBoolean LOADING_DYNAMIC_REGISTRIES = new AtomicBoolean(false);
     @Shadow
     @Final
     private static Logger LOGGER;
 
-    @Unique
-    private static final AtomicBoolean LOADING_DYNAMIC_REGISTRIES = new AtomicBoolean(false);
-
-    @Inject(method = "loadFromResource(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Ljava/util/List;)Lnet/minecraft/registry/DynamicRegistryManager$Immutable;", at = @At("HEAD"))
-    private static void loadFromResources(ResourceManager resourceManager, List<RegistryWrapper.Impl<?>> registries, List<RegistryLoader.Entry<?>> entries, CallbackInfoReturnable<DynamicRegistryManager.Immutable> cir) {
+    @Inject(method = "loadFromResource(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Ljava/util/List;)" +
+                     "Lnet/minecraft/registry/DynamicRegistryManager$Immutable;",
+            at = @At("HEAD"))
+    private static void loadFromResources(ResourceManager resourceManager, List<RegistryWrapper.Impl<?>> registries,
+                                          List<RegistryLoader.Entry<?>> entries,
+                                          CallbackInfoReturnable<DynamicRegistryManager.Immutable> cir) {
         LOADING_DYNAMIC_REGISTRIES.set(entries.stream().anyMatch(entry -> entry.key() == RegistryKeys.BIOME));
     }
 
     @Inject(
-        method = "load(Lnet/minecraft/registry/RegistryLoader$RegistryLoadable;Ljava/util/List;Ljava/util/List;)Lnet/minecraft/registry/DynamicRegistryManager$Immutable;",
+        method = "load(Lnet/minecraft/registry/RegistryLoader$RegistryLoadable;Ljava/util/List;Ljava/util/List;)" +
+                 "Lnet/minecraft/registry/DynamicRegistryManager$Immutable;",
         at = @At(
             value = "INVOKE",
             target = "Ljava/util/List;forEach(Ljava/util/function/Consumer;)V",
             ordinal = 1
         )
     )
-    private static void beforeFreeze(@Coerce Object loadable, List<RegistryWrapper.Impl<?>> wrappers, List<RegistryLoader.Entry<?>> entries, CallbackInfoReturnable<DynamicRegistryManager.Immutable> cir, @Local(ordinal = 2) List<RegistryLoader.Loader<?>> registriesList) {
-        if (LOADING_DYNAMIC_REGISTRIES.getAndSet(false)) {
+    private static void beforeFreeze(@Coerce Object loadable, List<RegistryWrapper.Impl<?>> wrappers, List<RegistryLoader.Entry<?>> entries,
+                                     CallbackInfoReturnable<DynamicRegistryManager.Immutable> cir,
+                                     @Local(ordinal = 2) List<RegistryLoader.Loader<?>> registriesList) {
+        if(LOADING_DYNAMIC_REGISTRIES.getAndSet(false)) {
             ModPlatform platform = CommonPlatform.get();
             platform.getRawConfigRegistry().clear();
             MutableRegistry<Biome> biomes = extractRegistry(registriesList, RegistryKeys.BIOME).orElseThrow();

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/SaveLoadingMixin.java

@@ -19,10 +19,14 @@ public class SaveLoadingMixin {
                  "Ljava/util/concurrent/CompletableFuture;",
         at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/server/DataPackContents;reload(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/registry/CombinedDynamicRegistries;Ljava/util/List;Lnet/minecraft/resource/featuretoggle/FeatureSet;Lnet/minecraft/server/command/CommandManager$RegistrationEnvironment;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"),
+            target = "Lnet/minecraft/server/DataPackContents;reload(Lnet/minecraft/resource/ResourceManager;" +
+                     "Lnet/minecraft/registry/CombinedDynamicRegistries;Ljava/util/List;Lnet/minecraft/resource/featuretoggle/FeatureSet;" +
+                     "Lnet/minecraft/server/command/CommandManager$RegistrationEnvironment;ILjava/util/concurrent/Executor;" +
+                     "Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"),
         index = 1
     )
-    private static CombinedDynamicRegistries<ServerDynamicRegistryType> grabManager(CombinedDynamicRegistries<ServerDynamicRegistryType> dynamicRegistries) {
+    private static CombinedDynamicRegistries<ServerDynamicRegistryType> grabManager(
+        CombinedDynamicRegistries<ServerDynamicRegistryType> dynamicRegistries) {
         MinecraftUtil.registerFlora(dynamicRegistries.getCombinedRegistryManager().getOrThrow(RegistryKeys.BIOME));
         return dynamicRegistries;
     }

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleBiomeUtil.java

@@ -1,7 +1,5 @@
 package com.dfsek.terra.lifecycle.util;
 
-import com.dfsek.terra.mod.util.BiomeUtil;
-
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
@@ -21,6 +19,7 @@ import com.dfsek.terra.mod.config.PreLoadCompatibilityOptions;
 import com.dfsek.terra.mod.config.ProtoPlatformBiome;
 import com.dfsek.terra.mod.config.VanillaBiomeProperties;
 import com.dfsek.terra.mod.mixin.access.VillagerTypeAccessor;
+import com.dfsek.terra.mod.util.BiomeUtil;
 import com.dfsek.terra.mod.util.MinecraftUtil;
 
 
@@ -51,7 +50,7 @@ public final class LifecycleBiomeUtil {
                                       Registry<net.minecraft.world.biome.Biome> registry) {
         RegistryKey<net.minecraft.world.biome.Biome> vanilla = ((ProtoPlatformBiome) biome.getPlatformBiome()).get(registry);
 
-        if (vanilla == null) {
+        if(vanilla == null) {
             logger.error("""
                          Failed to get Vanilla Biome Regiestry key!
                          Terra Biome ID: {}
@@ -65,9 +64,9 @@ public final class LifecycleBiomeUtil {
 
 
             net.minecraft.world.biome.Biome vanilaBiome = registry.get(vanilla);
-            if (vanilaBiome == null) {
+            if(vanilaBiome == null) {
                 String vanillaBiomeName;
-                if (vanilla != null ) {
+                if(vanilla != null) {
                     vanillaBiomeName = vanilla.getValue().toString();
                 } else {
                     vanillaBiomeName = "NULL";
@@ -94,7 +93,8 @@ public final class LifecycleBiomeUtil {
                     minecraftBiome));
             }
 
-            Map<RegistryKey<net.minecraft.world.biome.Biome>, RegistryKey<VillagerType>> villagerMap = VillagerTypeAccessor.getBiomeTypeToIdMap();
+            Map<RegistryKey<net.minecraft.world.biome.Biome>, RegistryKey<VillagerType>> villagerMap =
+                VillagerTypeAccessor.getBiomeTypeToIdMap();
 
             villagerMap.put(RegistryKey.of(RegistryKeys.BIOME, identifier),
                 Objects.requireNonNullElse(vanillaBiomeProperties.getVillagerType(),

platforms/mixin-lifecycle/src/main/resources/terra.lifecycle.mixins.json

@@ -1,21 +1,21 @@
 {
-  "required": true,
-  "minVersion": "0.8",
-  "package": "com.dfsek.terra.lifecycle.mixin",
-  "compatibilityLevel": "JAVA_21",
-  "mixins": [
-    "NoiseConfigMixin",
-    "RegistryEntryReferenceInvoker",
-    "RegistryMixin",
-    "SimpleRegistryMixin",
-    "lifecycle.MinecraftServerMixin",
-    "lifecycle.RegistryLoaderMixin",
-    "lifecycle.SaveLoadingMixin"
-  ],
-  "server": [
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  },
-  "refmap": "terra.lifecycle.refmap.json"
+    "required": true,
+    "minVersion": "0.8",
+    "package": "com.dfsek.terra.lifecycle.mixin",
+    "compatibilityLevel": "JAVA_21",
+    "mixins": [
+        "NoiseConfigMixin",
+        "RegistryEntryReferenceInvoker",
+        "RegistryMixin",
+        "SimpleRegistryMixin",
+        "lifecycle.MinecraftServerMixin",
+        "lifecycle.RegistryLoaderMixin",
+        "lifecycle.SaveLoadingMixin"
+    ],
+    "server": [
+    ],
+    "injectors": {
+        "defaultRequire": 1
+    },
+    "refmap": "terra.lifecycle.refmap.json"
 }