diff --git a/src/main/java/net/Chipperfluff/chipi/ChipiMod.java b/src/main/java/net/Chipperfluff/chipi/ChipiMod.java
index fe6b3fa..62d71f3 100644
--- a/src/main/java/net/Chipperfluff/chipi/ChipiMod.java
+++ b/src/main/java/net/Chipperfluff/chipi/ChipiMod.java
@@ -1,23 +1,24 @@
 package net.Chipperfluff.chipi;
 
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
+
 import net.Chipperfluff.chipi.advancement.ModCriteria;
 import net.Chipperfluff.chipi.block.ModBlocks;
 import net.Chipperfluff.chipi.command.CommandHandler;
 import net.Chipperfluff.chipi.effect.ChipiBlessingEvents;
 import net.Chipperfluff.chipi.effect.ChipiHungerHandler;
 import net.Chipperfluff.chipi.effect.ModEffects;
-import net.Chipperfluff.chipi.entity.ModEntities;
-import net.Chipperfluff.chipi.entity.SpawnLogic;
 import net.Chipperfluff.chipi.entity.MepEntity;
+import net.Chipperfluff.chipi.entity.ModEntities;
 import net.Chipperfluff.chipi.entity.PlayerJrEntity;
+import net.Chipperfluff.chipi.entity.SpawnLogic;
 import net.Chipperfluff.chipi.item.ModItemGroups;
 import net.Chipperfluff.chipi.item.ModItems;
+import net.Chipperfluff.chipi.item.music.ModMusicDiscs;
 import net.Chipperfluff.chipi.server.ChipiServerEvents;
 import net.Chipperfluff.chipi.sound.ModSounds;
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
 import net.Chipperfluff.chipi.util.TickScheduler;
-import net.Chipperfluff.chipi.item.music.ModMusicDiscs;
 
 public class ChipiMod implements ModInitializer {
 
diff --git a/src/main/java/net/Chipperfluff/chipi/advancement/ModCriteria.java b/src/main/java/net/Chipperfluff/chipi/advancement/ModCriteria.java
index 7b8c41b..9194823 100644
--- a/src/main/java/net/Chipperfluff/chipi/advancement/ModCriteria.java
+++ b/src/main/java/net/Chipperfluff/chipi/advancement/ModCriteria.java
@@ -5,14 +5,9 @@ import net.minecraft.advancement.criterion.Criteria;
 public class ModCriteria {
 
     public static final PortalActivatedTrigger PORTAL_ACTIVATED = Criteria.register(new PortalActivatedTrigger());
-
     public static final PortalDestroyedTrigger PORTAL_DESTROYED = Criteria.register(new PortalDestroyedTrigger());
-
     public static final VoidConsumedTrigger VOID_CONSUMED_TRIGGER = Criteria.register(new VoidConsumedTrigger());
-
     public static final VoidConsumedFireTrigger VOID_CONSUMED_FIRE_TRIGGER = Criteria.register(new VoidConsumedFireTrigger());
 
-    public static void register() {
-        // classload trigger
-    }
+    public static void register() {}
 }
diff --git a/src/main/java/net/Chipperfluff/chipi/block/ChipperFrameBlock.java b/src/main/java/net/Chipperfluff/chipi/block/ChipperFrameBlock.java
index 8766e35..ca937f5 100644
--- a/src/main/java/net/Chipperfluff/chipi/block/ChipperFrameBlock.java
+++ b/src/main/java/net/Chipperfluff/chipi/block/ChipperFrameBlock.java
@@ -1,6 +1,5 @@
 package net.Chipperfluff.chipi.block;
 
-import net.Chipperfluff.chipi.advancement.ModCriteria;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.PillarBlock;
 import net.minecraft.entity.LivingEntity;
@@ -9,6 +8,8 @@ import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import net.Chipperfluff.chipi.advancement.ModCriteria;
+
 public class ChipperFrameBlock extends PillarBlock {
 
     public ChipperFrameBlock(Settings settings) {
diff --git a/src/main/java/net/Chipperfluff/chipi/block/ChipperPortalBlock.java b/src/main/java/net/Chipperfluff/chipi/block/ChipperPortalBlock.java
index 4c834ad..6612376 100644
--- a/src/main/java/net/Chipperfluff/chipi/block/ChipperPortalBlock.java
+++ b/src/main/java/net/Chipperfluff/chipi/block/ChipperPortalBlock.java
@@ -15,7 +15,6 @@ import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
-
 import java.util.EnumSet;
 
 public class ChipperPortalBlock extends Block {
@@ -71,7 +70,6 @@ public class ChipperPortalBlock extends Block {
         player.setOnGround(true);
     }
 
-
     public static BlockPos resolveSafeSpawn(ServerWorld targetWorld) {
         BlockPos spawn = DEFAULT_SPAWN;
         BlockPos under = spawn.down();
diff --git a/src/main/java/net/Chipperfluff/chipi/block/ChipperPortalShape.java b/src/main/java/net/Chipperfluff/chipi/block/ChipperPortalShape.java
index 66fdb8f..050e736 100644
--- a/src/main/java/net/Chipperfluff/chipi/block/ChipperPortalShape.java
+++ b/src/main/java/net/Chipperfluff/chipi/block/ChipperPortalShape.java
@@ -1,6 +1,5 @@
 package net.Chipperfluff.chipi.block;
 
-import net.Chipperfluff.chipi.advancement.ModCriteria;
 import net.minecraft.block.BlockState;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
@@ -8,6 +7,8 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 
+import net.Chipperfluff.chipi.advancement.ModCriteria;
+
 public class ChipperPortalShape {
 
     private final World world;
diff --git a/src/main/java/net/Chipperfluff/chipi/block/ModBlocks.java b/src/main/java/net/Chipperfluff/chipi/block/ModBlocks.java
index 1d13e33..69ed83c 100644
--- a/src/main/java/net/Chipperfluff/chipi/block/ModBlocks.java
+++ b/src/main/java/net/Chipperfluff/chipi/block/ModBlocks.java
@@ -1,6 +1,5 @@
 package net.Chipperfluff.chipi.block;
 
-import net.Chipperfluff.chipi.ChipiMod;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Block;
@@ -11,6 +10,8 @@ import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.util.Identifier;
 
+import net.Chipperfluff.chipi.ChipiMod;
+
 public class ModBlocks {
 
     public static final Block VOID_BLOCK = Registry.register(
diff --git a/src/main/java/net/Chipperfluff/chipi/block/VoidBlock.java b/src/main/java/net/Chipperfluff/chipi/block/VoidBlock.java
index 33449af..c80eb42 100644
--- a/src/main/java/net/Chipperfluff/chipi/block/VoidBlock.java
+++ b/src/main/java/net/Chipperfluff/chipi/block/VoidBlock.java
@@ -1,6 +1,5 @@
 package net.Chipperfluff.chipi.block;
 
-import net.Chipperfluff.chipi.advancement.ModCriteria;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
@@ -17,6 +16,8 @@ import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import net.Chipperfluff.chipi.advancement.ModCriteria;
+
 public class VoidBlock extends Block {
 
     public VoidBlock(Settings settings) {
diff --git a/src/main/java/net/Chipperfluff/chipi/client/ChipiClient.java b/src/main/java/net/Chipperfluff/chipi/client/ChipiClient.java
index a64e972..0de6915 100644
--- a/src/main/java/net/Chipperfluff/chipi/client/ChipiClient.java
+++ b/src/main/java/net/Chipperfluff/chipi/client/ChipiClient.java
@@ -1,12 +1,13 @@
 package net.Chipperfluff.chipi.client;
 
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
+import net.minecraft.client.render.RenderLayer;
+
 import net.Chipperfluff.chipi.block.ModBlocks;
 import net.Chipperfluff.chipi.client.entity.ModEntityRenderers;
 import net.Chipperfluff.chipi.client.hud.ChipiStatusBar;
 import net.Chipperfluff.chipi.util.ClientTickScheduler;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
-import net.minecraft.client.render.RenderLayer;
 
 public class ChipiClient implements ClientModInitializer {
 
diff --git a/src/main/java/net/Chipperfluff/chipi/client/ModTooltips.java b/src/main/java/net/Chipperfluff/chipi/client/ModTooltips.java
index bf5d0d3..397ee2a 100644
--- a/src/main/java/net/Chipperfluff/chipi/client/ModTooltips.java
+++ b/src/main/java/net/Chipperfluff/chipi/client/ModTooltips.java
@@ -1,14 +1,14 @@
 package net.Chipperfluff.chipi.client;
 
-import net.Chipperfluff.chipi.block.ModBlocks;
-import net.Chipperfluff.chipi.item.ModItems;
 import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
 import net.minecraft.text.Text;
 
+import net.Chipperfluff.chipi.block.ModBlocks;
+import net.Chipperfluff.chipi.item.ModItems;
+
 public final class ModTooltips {
 
-    private ModTooltips() {
-    }
+    private ModTooltips() {}
 
     public static void register() {
 
diff --git a/src/main/java/net/Chipperfluff/chipi/client/entity/MepRenderer.java b/src/main/java/net/Chipperfluff/chipi/client/entity/MepRenderer.java
index 842ab5b..8f260a0 100644
--- a/src/main/java/net/Chipperfluff/chipi/client/entity/MepRenderer.java
+++ b/src/main/java/net/Chipperfluff/chipi/client/entity/MepRenderer.java
@@ -1,13 +1,14 @@
 package net.Chipperfluff.chipi.client.entity;
 
-import net.Chipperfluff.chipi.ChipiMod;
-import net.Chipperfluff.chipi.entity.MepEntity;
 import net.minecraft.client.render.entity.BipedEntityRenderer;
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.render.entity.model.BipedEntityModel;
 import net.minecraft.client.render.entity.model.EntityModelLayers;
 import net.minecraft.util.Identifier;
 
+import net.Chipperfluff.chipi.ChipiMod;
+import net.Chipperfluff.chipi.entity.MepEntity;
+
 public class MepRenderer extends BipedEntityRenderer<MepEntity, BipedEntityModel<MepEntity>> {
 
     private static final Identifier TEXTURE = new Identifier(ChipiMod.MOD_ID, "textures/entity/mep.png");
diff --git a/src/main/java/net/Chipperfluff/chipi/client/entity/ModEntityRenderers.java b/src/main/java/net/Chipperfluff/chipi/client/entity/ModEntityRenderers.java
index 4be8e84..87ab9ca 100644
--- a/src/main/java/net/Chipperfluff/chipi/client/entity/ModEntityRenderers.java
+++ b/src/main/java/net/Chipperfluff/chipi/client/entity/ModEntityRenderers.java
@@ -1,8 +1,9 @@
 package net.Chipperfluff.chipi.client.entity;
 
-import net.Chipperfluff.chipi.entity.ModEntities;
 import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
 
+import net.Chipperfluff.chipi.entity.ModEntities;
+
 public class ModEntityRenderers {
 
     public static void register() {
diff --git a/src/main/java/net/Chipperfluff/chipi/client/entity/PlayerJrRenderer.java b/src/main/java/net/Chipperfluff/chipi/client/entity/PlayerJrRenderer.java
index 29381ae..a0d96a2 100644
--- a/src/main/java/net/Chipperfluff/chipi/client/entity/PlayerJrRenderer.java
+++ b/src/main/java/net/Chipperfluff/chipi/client/entity/PlayerJrRenderer.java
@@ -1,6 +1,5 @@
 package net.Chipperfluff.chipi.client.entity;
 
-import net.Chipperfluff.chipi.entity.PlayerJrEntity;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.BipedEntityRenderer;
@@ -11,6 +10,8 @@ import net.minecraft.client.util.DefaultSkinHelper;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.Identifier;
 
+import net.Chipperfluff.chipi.entity.PlayerJrEntity;
+
 public class PlayerJrRenderer
     extends BipedEntityRenderer<PlayerJrEntity, BipedEntityModel<PlayerJrEntity>> {
 
diff --git a/src/main/java/net/Chipperfluff/chipi/client/hud/ChipiStatusBar.java b/src/main/java/net/Chipperfluff/chipi/client/hud/ChipiStatusBar.java
index e4c4546..9eb9255 100644
--- a/src/main/java/net/Chipperfluff/chipi/client/hud/ChipiStatusBar.java
+++ b/src/main/java/net/Chipperfluff/chipi/client/hud/ChipiStatusBar.java
@@ -1,12 +1,13 @@
 package net.Chipperfluff.chipi.client.hud;
 
-import net.Chipperfluff.chipi.item.ModItems;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 
+import net.Chipperfluff.chipi.item.ModItems;
+
 import static net.Chipperfluff.chipi.util.ChipiTrackedData.CHIPI_ENERGY;
 
 public class ChipiStatusBar {
diff --git a/src/main/java/net/Chipperfluff/chipi/command/ChpCommand.java b/src/main/java/net/Chipperfluff/chipi/command/ChpCommand.java
index e7c5034..b3a203d 100644
--- a/src/main/java/net/Chipperfluff/chipi/command/ChpCommand.java
+++ b/src/main/java/net/Chipperfluff/chipi/command/ChpCommand.java
@@ -4,8 +4,6 @@ import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
-
-import net.Chipperfluff.chipi.world.gen.struct.ChipiStructures;
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.argument.BlockPosArgumentType;
 import net.minecraft.server.command.CommandManager;
@@ -14,6 +12,8 @@ import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.BlockPos;
 
+import net.Chipperfluff.chipi.world.gen.struct.ChipiStructures;
+
 public class ChpCommand {
 
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
diff --git a/src/main/java/net/Chipperfluff/chipi/command/CspCommand.java b/src/main/java/net/Chipperfluff/chipi/command/CspCommand.java
index a88861f..e4ea461 100644
--- a/src/main/java/net/Chipperfluff/chipi/command/CspCommand.java
+++ b/src/main/java/net/Chipperfluff/chipi/command/CspCommand.java
@@ -3,8 +3,6 @@ package net.Chipperfluff.chipi.command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
-
-import net.Chipperfluff.chipi.world.gen.struct.ChipiStructures;
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.argument.BlockPosArgumentType;
 import net.minecraft.server.command.CommandManager;
@@ -13,6 +11,8 @@ import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.BlockPos;
 
+import net.Chipperfluff.chipi.world.gen.struct.ChipiStructures;
+
 public class CspCommand {
 
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
diff --git a/src/main/java/net/Chipperfluff/chipi/command/SpawnJrCommand.java b/src/main/java/net/Chipperfluff/chipi/command/SpawnJrCommand.java
index b9ceeb8..e78aadd 100644
--- a/src/main/java/net/Chipperfluff/chipi/command/SpawnJrCommand.java
+++ b/src/main/java/net/Chipperfluff/chipi/command/SpawnJrCommand.java
@@ -2,10 +2,6 @@ package net.Chipperfluff.chipi.command;
 
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.context.CommandContext;
-
-import net.Chipperfluff.chipi.entity.ModEntities;
-import net.Chipperfluff.chipi.entity.PlayerJrEntity;
-
 import net.minecraft.command.argument.EntityArgumentType;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
@@ -14,6 +10,9 @@ import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.BlockPos;
 
+import net.Chipperfluff.chipi.entity.ModEntities;
+import net.Chipperfluff.chipi.entity.PlayerJrEntity;
+
 public final class SpawnJrCommand {
 
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
diff --git a/src/main/java/net/Chipperfluff/chipi/effect/ModEffects.java b/src/main/java/net/Chipperfluff/chipi/effect/ModEffects.java
index 12e0b3b..4a9b3f3 100644
--- a/src/main/java/net/Chipperfluff/chipi/effect/ModEffects.java
+++ b/src/main/java/net/Chipperfluff/chipi/effect/ModEffects.java
@@ -1,11 +1,12 @@
 package net.Chipperfluff.chipi.effect;
 
-import net.Chipperfluff.chipi.ChipiMod;
 import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.util.Identifier;
 
+import net.Chipperfluff.chipi.ChipiMod;
+
 public class ModEffects {
 
     public static final StatusEffect CHIPI_BLESSING = new ChipiBlessingEffect();
diff --git a/src/main/java/net/Chipperfluff/chipi/effect/PregnantEffect.java b/src/main/java/net/Chipperfluff/chipi/effect/PregnantEffect.java
index b8d0cbc..1cb8357 100644
--- a/src/main/java/net/Chipperfluff/chipi/effect/PregnantEffect.java
+++ b/src/main/java/net/Chipperfluff/chipi/effect/PregnantEffect.java
@@ -1,7 +1,5 @@
 package net.Chipperfluff.chipi.effect;
 
-import net.Chipperfluff.chipi.entity.ModEntities;
-import net.Chipperfluff.chipi.entity.PlayerJrEntity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.attribute.EntityAttributeInstance;
 import net.minecraft.entity.attribute.EntityAttributes;
@@ -11,9 +9,11 @@ import net.minecraft.entity.effect.StatusEffectCategory;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
-
 import java.util.UUID;
 
+import net.Chipperfluff.chipi.entity.ModEntities;
+import net.Chipperfluff.chipi.entity.PlayerJrEntity;
+
 public class PregnantEffect extends StatusEffect {
 
     public static final int TOTAL_DURATION = 20 * 60 * 10; // 10 min
diff --git a/src/main/java/net/Chipperfluff/chipi/entity/MepEntity.java b/src/main/java/net/Chipperfluff/chipi/entity/MepEntity.java
index 2b2cfb1..ba543fd 100644
--- a/src/main/java/net/Chipperfluff/chipi/entity/MepEntity.java
+++ b/src/main/java/net/Chipperfluff/chipi/entity/MepEntity.java
@@ -3,6 +3,7 @@ package net.Chipperfluff.chipi.entity;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.SlabBlock;
 import net.minecraft.block.StairsBlock;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.goal.*;
@@ -81,7 +82,7 @@ public class MepEntity extends PathAwareEntity {
     // === ATTACK OVERRIDE (AURA IMMUNITY) ===
 
     @Override
-    public boolean tryAttack(net.minecraft.entity.Entity target) {
+    public boolean tryAttack(Entity target) {
         if (target instanceof PlayerEntity player) {
             if (ProtectionAuraHandler.hasAura(player)) {
                 return false; // chase but never hit
diff --git a/src/main/java/net/Chipperfluff/chipi/entity/ModEntities.java b/src/main/java/net/Chipperfluff/chipi/entity/ModEntities.java
index 96fc9e3..1ae037e 100644
--- a/src/main/java/net/Chipperfluff/chipi/entity/ModEntities.java
+++ b/src/main/java/net/Chipperfluff/chipi/entity/ModEntities.java
@@ -1,12 +1,9 @@
 package net.Chipperfluff.chipi.entity;
 
-import net.Chipperfluff.chipi.entity.MepEntity;
-
 import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
-
 import net.minecraft.entity.EntityDimensions;
-import net.minecraft.entity.SpawnGroup;
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.SpawnGroup;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.util.Identifier;
@@ -33,6 +30,5 @@ public final class ModEntities {
                 .build()
     );
 
-    private ModEntities() {
-    }
+    private ModEntities() {}
 }
diff --git a/src/main/java/net/Chipperfluff/chipi/entity/PlayerJrEntity.java b/src/main/java/net/Chipperfluff/chipi/entity/PlayerJrEntity.java
index 5c94f98..95bc876 100644
--- a/src/main/java/net/Chipperfluff/chipi/entity/PlayerJrEntity.java
+++ b/src/main/java/net/Chipperfluff/chipi/entity/PlayerJrEntity.java
@@ -17,7 +17,6 @@ import net.minecraft.text.Text;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
-
 import java.util.UUID;
 
 public class PlayerJrEntity extends PathAwareEntity {
diff --git a/src/main/java/net/Chipperfluff/chipi/entity/SpawnLogic.java b/src/main/java/net/Chipperfluff/chipi/entity/SpawnLogic.java
index b802018..bd90c60 100644
--- a/src/main/java/net/Chipperfluff/chipi/entity/SpawnLogic.java
+++ b/src/main/java/net/Chipperfluff/chipi/entity/SpawnLogic.java
@@ -2,10 +2,10 @@ package net.Chipperfluff.chipi.entity;
 
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
-
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.SpawnGroup;
 import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.SpawnRestriction;
@@ -13,14 +13,12 @@ import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.random.Random;
 import net.minecraft.world.Heightmap;
 import net.minecraft.world.ServerWorldAccess;
 import net.minecraft.world.biome.Biome;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.math.Box;
-
 
 public final class SpawnLogic {
 
@@ -30,8 +28,7 @@ public final class SpawnLogic {
     private static final RegistryKey<Biome> VOID_BIOME =
         RegistryKey.of(RegistryKeys.BIOME, new Identifier("chipi", "void"));
 
-    private SpawnLogic() {
-    }
+    private SpawnLogic() {}
 
     public static void register() {
 
diff --git a/src/main/java/net/Chipperfluff/chipi/item/MepMilkItem.java b/src/main/java/net/Chipperfluff/chipi/item/MepMilkItem.java
index 7d5149b..994bf11 100644
--- a/src/main/java/net/Chipperfluff/chipi/item/MepMilkItem.java
+++ b/src/main/java/net/Chipperfluff/chipi/item/MepMilkItem.java
@@ -1,13 +1,14 @@
 package net.Chipperfluff.chipi.item;
 
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.util.UseAction;
 import net.minecraft.world.World;
-import net.minecraft.entity.effect.StatusEffectInstance;
+
 import net.Chipperfluff.chipi.effect.ModEffects;
 
 public class MepMilkItem extends Item {
diff --git a/src/main/java/net/Chipperfluff/chipi/item/ModFoodComponents.java b/src/main/java/net/Chipperfluff/chipi/item/ModFoodComponents.java
index 634320b..4a8bab1 100644
--- a/src/main/java/net/Chipperfluff/chipi/item/ModFoodComponents.java
+++ b/src/main/java/net/Chipperfluff/chipi/item/ModFoodComponents.java
@@ -20,5 +20,4 @@ public class ModFoodComponents {
         new FoodComponent.Builder()
             .alwaysEdible()
             .build();
-
 }
diff --git a/src/main/java/net/Chipperfluff/chipi/item/ModItemGroups.java b/src/main/java/net/Chipperfluff/chipi/item/ModItemGroups.java
index 9e8abb2..534e6d6 100644
--- a/src/main/java/net/Chipperfluff/chipi/item/ModItemGroups.java
+++ b/src/main/java/net/Chipperfluff/chipi/item/ModItemGroups.java
@@ -1,8 +1,5 @@
 package net.Chipperfluff.chipi.item;
 
-import net.Chipperfluff.chipi.ChipiMod;
-import net.Chipperfluff.chipi.block.ModBlocks;
-import net.Chipperfluff.chipi.item.music.ModMusicDiscs;
 import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
@@ -11,6 +8,10 @@ import net.minecraft.registry.Registry;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
+import net.Chipperfluff.chipi.ChipiMod;
+import net.Chipperfluff.chipi.block.ModBlocks;
+import net.Chipperfluff.chipi.item.music.ModMusicDiscs;
+
 public class ModItemGroups {
 
     public static final ItemGroup CHIPI_GROUP = Registry.register(
@@ -59,7 +60,5 @@ public class ModItemGroups {
             .build()
     );
 
-    public static void register() {
-        // force class load
-    }
+    public static void register() {}
 }
diff --git a/src/main/java/net/Chipperfluff/chipi/item/ModItems.java b/src/main/java/net/Chipperfluff/chipi/item/ModItems.java
index a9001cf..10ea3aa 100644
--- a/src/main/java/net/Chipperfluff/chipi/item/ModItems.java
+++ b/src/main/java/net/Chipperfluff/chipi/item/ModItems.java
@@ -1,17 +1,16 @@
 package net.Chipperfluff.chipi.item;
 
-import net.Chipperfluff.chipi.ChipiMod;
-import net.Chipperfluff.chipi.block.ModBlocks;
-import net.Chipperfluff.chipi.entity.ModEntities;
-import net.Chipperfluff.chipi.item.armor.ChipperArmorMaterial;
 import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
 import net.minecraft.item.*;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.util.Identifier;
-import net.Chipperfluff.chipi.item.tool.ChipperToolMaterial;
-import net.Chipperfluff.chipi.item.MepMilkItem;
 
+import net.Chipperfluff.chipi.ChipiMod;
+import net.Chipperfluff.chipi.block.ModBlocks;
+import net.Chipperfluff.chipi.entity.ModEntities;
+import net.Chipperfluff.chipi.item.armor.ChipperArmorMaterial;
+import net.Chipperfluff.chipi.item.tool.ChipperToolMaterial;
 
 public class ModItems {
 
diff --git a/src/main/java/net/Chipperfluff/chipi/item/PlayerMilkItem.java b/src/main/java/net/Chipperfluff/chipi/item/PlayerMilkItem.java
index 937af57..9921cc6 100644
--- a/src/main/java/net/Chipperfluff/chipi/item/PlayerMilkItem.java
+++ b/src/main/java/net/Chipperfluff/chipi/item/PlayerMilkItem.java
@@ -1,7 +1,5 @@
 package net.Chipperfluff.chipi.item;
 
-import net.Chipperfluff.chipi.effect.ModEffects;
-import net.Chipperfluff.chipi.sound.ModSounds;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.player.PlayerEntity;
@@ -10,11 +8,14 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemUsage;
 import net.minecraft.item.Items;
 import net.minecraft.sound.SoundCategory;
+import net.minecraft.text.Text;
 import net.minecraft.util.Hand;
 import net.minecraft.util.UseAction;
 import net.minecraft.util.TypedActionResult;
 import net.minecraft.world.World;
-import net.minecraft.text.Text;
+
+import net.Chipperfluff.chipi.effect.ModEffects;
+import net.Chipperfluff.chipi.sound.ModSounds;
 
 public class PlayerMilkItem extends Item {
 
diff --git a/src/main/java/net/Chipperfluff/chipi/item/armor/ChipperArmorMaterial.java b/src/main/java/net/Chipperfluff/chipi/item/armor/ChipperArmorMaterial.java
index 65976cf..1df3e3c 100644
--- a/src/main/java/net/Chipperfluff/chipi/item/armor/ChipperArmorMaterial.java
+++ b/src/main/java/net/Chipperfluff/chipi/item/armor/ChipperArmorMaterial.java
@@ -1,16 +1,16 @@
 package net.Chipperfluff.chipi.item.armor;
 
-import net.Chipperfluff.chipi.item.ModItems;
 import net.minecraft.item.ArmorItem;
 import net.minecraft.item.ArmorMaterial;
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.Util;
-
 import java.util.EnumMap;
 import java.util.Map;
 
+import net.Chipperfluff.chipi.item.ModItems;
+
 public class ChipperArmorMaterial implements ArmorMaterial {
 
     public static final ChipperArmorMaterial INSTANCE = new ChipperArmorMaterial();
diff --git a/src/main/java/net/Chipperfluff/chipi/item/armor/ProtectionAuraHandler.java b/src/main/java/net/Chipperfluff/chipi/item/armor/ProtectionAuraHandler.java
index 89be409..ee09bf1 100644
--- a/src/main/java/net/Chipperfluff/chipi/item/armor/ProtectionAuraHandler.java
+++ b/src/main/java/net/Chipperfluff/chipi/item/armor/ProtectionAuraHandler.java
@@ -1,6 +1,5 @@
 package net.Chipperfluff.chipi.armor;
 
-import net.Chipperfluff.chipi.item.ModItems;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.SlabBlock;
 import net.minecraft.block.StairsBlock;
@@ -12,8 +11,10 @@ import net.minecraft.text.Text;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import static net.Chipperfluff.chipi.util.ChipiTrackedData.CHIPI_ENERGY;
+import net.Chipperfluff.chipi.item.ModItems;
+
 import static net.Chipperfluff.chipi.server.ChipiServerEvents.CHIPI_DIMENSION_KEY;
+import static net.Chipperfluff.chipi.util.ChipiTrackedData.CHIPI_ENERGY;
 
 public final class ProtectionAuraHandler {
 
diff --git a/src/main/java/net/Chipperfluff/chipi/item/music/ModMusicDiscs.java b/src/main/java/net/Chipperfluff/chipi/item/music/ModMusicDiscs.java
index c3b839f..e5b9af2 100644
--- a/src/main/java/net/Chipperfluff/chipi/item/music/ModMusicDiscs.java
+++ b/src/main/java/net/Chipperfluff/chipi/item/music/ModMusicDiscs.java
@@ -1,16 +1,16 @@
 package net.Chipperfluff.chipi.item.music;
 
-import net.Chipperfluff.chipi.ChipiMod;
 import net.minecraft.item.Item;
 import net.minecraft.item.MusicDiscItem;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.util.Identifier;
-
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import net.Chipperfluff.chipi.ChipiMod;
+
 public class ModMusicDiscs {
 
     private static final Map<String, Item> DISCS = new LinkedHashMap<>();
@@ -30,20 +30,20 @@ public class ModMusicDiscs {
         Identifier identifier = new Identifier(ChipiMod.MOD_ID, id);
 
         SoundEvent sound = Registry.register(
-                Registries.SOUND_EVENT,
-                identifier,
-                SoundEvent.of(identifier)
+            Registries.SOUND_EVENT,
+            identifier,
+            SoundEvent.of(identifier)
         );
 
         Item item = Registry.register(
-                Registries.ITEM,
-                identifier,
-                new MusicDiscItem(
-                        def.comparatorOutput(),
-                        sound,
-                        new Item.Settings().maxCount(1),
-                        toTicks(def.minutes(), def.seconds())
-                )
+            Registries.ITEM,
+            identifier,
+            new MusicDiscItem(
+                def.comparatorOutput(),
+                sound,
+                new Item.Settings().maxCount(1),
+                toTicks(def.minutes(), def.seconds())
+            )
         );
 
         DISCS.put(def.name(), item);
diff --git a/src/main/java/net/Chipperfluff/chipi/item/music/MusicDiscDef.java b/src/main/java/net/Chipperfluff/chipi/item/music/MusicDiscDef.java
index 08495da..a19a29c 100644
--- a/src/main/java/net/Chipperfluff/chipi/item/music/MusicDiscDef.java
+++ b/src/main/java/net/Chipperfluff/chipi/item/music/MusicDiscDef.java
@@ -1,8 +1,3 @@
 package net.Chipperfluff.chipi.item.music;
 
-public record MusicDiscDef(
-        String name,
-        int comparatorOutput,
-        int minutes,
-        int seconds
-) {}
+public record MusicDiscDef(String name, int comparatorOutput, int minutes, int seconds) {}
diff --git a/src/main/java/net/Chipperfluff/chipi/item/tool/ChipperToolMaterial.java b/src/main/java/net/Chipperfluff/chipi/item/tool/ChipperToolMaterial.java
index f3b9398..25d512b 100644
--- a/src/main/java/net/Chipperfluff/chipi/item/tool/ChipperToolMaterial.java
+++ b/src/main/java/net/Chipperfluff/chipi/item/tool/ChipperToolMaterial.java
@@ -2,8 +2,8 @@ package net.Chipperfluff.chipi.item.tool;
 
 import net.minecraft.item.ToolMaterial;
 import net.minecraft.recipe.Ingredient;
-import net.Chipperfluff.chipi.item.ModItems;
 
+import net.Chipperfluff.chipi.item.ModItems;
 
 public enum ChipperToolMaterial implements ToolMaterial {
     INSTANCE;
diff --git a/src/main/java/net/Chipperfluff/chipi/mixin/DataTrackerMixin.java b/src/main/java/net/Chipperfluff/chipi/mixin/DataTrackerMixin.java
index 5589de5..48b0439 100644
--- a/src/main/java/net/Chipperfluff/chipi/mixin/DataTrackerMixin.java
+++ b/src/main/java/net/Chipperfluff/chipi/mixin/DataTrackerMixin.java
@@ -2,7 +2,6 @@ package net.Chipperfluff.chipi.mixin;
 
 import net.minecraft.entity.data.DataTracker;
 import net.minecraft.entity.data.TrackedData;
-
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/net/Chipperfluff/chipi/mixin/PlayerEntityMixin.java b/src/main/java/net/Chipperfluff/chipi/mixin/PlayerEntityMixin.java
index d715a8e..3fb34ea 100644
--- a/src/main/java/net/Chipperfluff/chipi/mixin/PlayerEntityMixin.java
+++ b/src/main/java/net/Chipperfluff/chipi/mixin/PlayerEntityMixin.java
@@ -1,9 +1,6 @@
 package net.Chipperfluff.chipi.mixin;
 
 import com.mojang.authlib.GameProfile;
-import net.Chipperfluff.chipi.effect.ModEffects;
-import net.Chipperfluff.chipi.effect.PregnantEffect;
-import net.Chipperfluff.chipi.util.ChipiTrackedData;
 import net.minecraft.entity.data.DataTracker;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.player.PlayerEntity;
@@ -16,6 +13,10 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import net.Chipperfluff.chipi.effect.ModEffects;
+import net.Chipperfluff.chipi.effect.PregnantEffect;
+import net.Chipperfluff.chipi.util.ChipiTrackedData;
+
 @Mixin(PlayerEntity.class)
 public abstract class PlayerEntityMixin {
 
diff --git a/src/main/java/net/Chipperfluff/chipi/server/ChipiServerEvents.java b/src/main/java/net/Chipperfluff/chipi/server/ChipiServerEvents.java
index aa07f67..45a9bf2 100644
--- a/src/main/java/net/Chipperfluff/chipi/server/ChipiServerEvents.java
+++ b/src/main/java/net/Chipperfluff/chipi/server/ChipiServerEvents.java
@@ -1,34 +1,35 @@
 package net.Chipperfluff.chipi.server;
 
-import net.Chipperfluff.chipi.SpawnPlacedState;
-import net.Chipperfluff.chipi.armor.ProtectionAuraHandler;
-import net.Chipperfluff.chipi.block.ChipperPortalBlock;
-import net.Chipperfluff.chipi.world.gen.ChipiDungeonGenerator;
+import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
+import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
+import net.fabricmc.fabric.api.event.player.UseEntityCallback;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.structure.StructurePlacementData;
 import net.minecraft.structure.StructureTemplate;
+import net.minecraft.util.ActionResult;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.World;
-import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
-import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
 import net.minecraft.world.gen.GenerationStep;
-import net.fabricmc.fabric.api.event.player.UseEntityCallback;
-import net.minecraft.util.ActionResult;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.sound.SoundCategory;
-import net.minecraft.sound.SoundEvents;
+
+import net.Chipperfluff.chipi.SpawnPlacedState;
+import net.Chipperfluff.chipi.armor.ProtectionAuraHandler;
+import net.Chipperfluff.chipi.block.ChipperPortalBlock;
 import net.Chipperfluff.chipi.item.ModItems;
+import net.Chipperfluff.chipi.world.gen.ChipiDungeonGenerator;
 
 
 public final class ChipiServerEvents {
diff --git a/src/main/java/net/Chipperfluff/chipi/sound/ModSounds.java b/src/main/java/net/Chipperfluff/chipi/sound/ModSounds.java
index 94150d8..9817575 100644
--- a/src/main/java/net/Chipperfluff/chipi/sound/ModSounds.java
+++ b/src/main/java/net/Chipperfluff/chipi/sound/ModSounds.java
@@ -1,11 +1,12 @@
 package net.Chipperfluff.chipi.sound;
 
-import net.Chipperfluff.chipi.ChipiMod;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.util.Identifier;
 
+import net.Chipperfluff.chipi.ChipiMod;
+
 public class ModSounds {
 
     public static final SoundEvent MEP_MILK = register("entity.mep.milk");
diff --git a/src/main/java/net/Chipperfluff/chipi/util/ChipiTrackedData.java b/src/main/java/net/Chipperfluff/chipi/util/ChipiTrackedData.java
index d4dd3ad..7663349 100644
--- a/src/main/java/net/Chipperfluff/chipi/util/ChipiTrackedData.java
+++ b/src/main/java/net/Chipperfluff/chipi/util/ChipiTrackedData.java
@@ -6,9 +6,7 @@ import net.minecraft.entity.data.TrackedDataHandlerRegistry;
 import net.minecraft.entity.player.PlayerEntity;
 
 public final class ChipiTrackedData {
-
-    public static final TrackedData<Float> CHIPI_ENERGY =
-            DataTracker.registerData(PlayerEntity.class, TrackedDataHandlerRegistry.FLOAT);
+    public static final TrackedData<Float> CHIPI_ENERGY = DataTracker.registerData(PlayerEntity.class, TrackedDataHandlerRegistry.FLOAT);
 
     private ChipiTrackedData() {}
 }
diff --git a/src/main/java/net/Chipperfluff/chipi/util/ClientTickScheduler.java b/src/main/java/net/Chipperfluff/chipi/util/ClientTickScheduler.java
index 96e1c07..f928471 100644
--- a/src/main/java/net/Chipperfluff/chipi/util/ClientTickScheduler.java
+++ b/src/main/java/net/Chipperfluff/chipi/util/ClientTickScheduler.java
@@ -2,7 +2,6 @@ package net.Chipperfluff.chipi.util;
 
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.client.MinecraftClient;
-
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
diff --git a/src/main/java/net/Chipperfluff/chipi/util/TickScheduler.java b/src/main/java/net/Chipperfluff/chipi/util/TickScheduler.java
index a0c5299..113c82c 100644
--- a/src/main/java/net/Chipperfluff/chipi/util/TickScheduler.java
+++ b/src/main/java/net/Chipperfluff/chipi/util/TickScheduler.java
@@ -2,7 +2,6 @@ package net.Chipperfluff.chipi.util;
 
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.minecraft.server.MinecraftServer;
-
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
diff --git a/src/main/java/net/Chipperfluff/chipi/world/gen/ChipiDungeonGenerator.java b/src/main/java/net/Chipperfluff/chipi/world/gen/ChipiDungeonGenerator.java
index cb132cf..a8a24de 100644
--- a/src/main/java/net/Chipperfluff/chipi/world/gen/ChipiDungeonGenerator.java
+++ b/src/main/java/net/Chipperfluff/chipi/world/gen/ChipiDungeonGenerator.java
@@ -1,11 +1,12 @@
 package net.Chipperfluff.chipi.world.gen;
 
+import net.minecraft.block.BlockState;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.math.BlockPos;
+
 import net.Chipperfluff.chipi.world.gen.struct.CorridorEWStructure;
 import net.Chipperfluff.chipi.world.gen.struct.CorridorNSStructure;
 import net.Chipperfluff.chipi.world.gen.struct.RoomBaseStructure;
-import net.minecraft.block.BlockState;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.util.math.BlockPos;
 
 public class ChipiDungeonGenerator {
 
@@ -24,13 +25,10 @@ public class ChipiDungeonGenerator {
 
     // Center-to-center step so corridors start 1 block inside the north room and end 1 block inside
     // the south room.
-    private static final int STEP_Z =
-            ROOM_EXTENT_SOUTH + CORRIDOR_LENGTH + ROOM_EXTENT_NORTH - 1; // 25
-    private static final int STEP_X =
-            ROOM_EXTENT_EAST + CORRIDOR_LENGTH + ROOM_EXTENT_WEST - 1; // 25
+    private static final int STEP_Z = ROOM_EXTENT_SOUTH + CORRIDOR_LENGTH + ROOM_EXTENT_NORTH - 1; // 25
+    private static final int STEP_X = ROOM_EXTENT_EAST + CORRIDOR_LENGTH + ROOM_EXTENT_WEST - 1; // 25
 
-    private static final int ROWS_SOUTH =
-            40; // rows of rooms south of spawn (spawn room itself is already placed)
+    private static final int ROWS_SOUTH = 40; // rows of rooms south of spawn (spawn room itself is already placed)
     private static final int COLS_EW = 40; // columns across X (split roughly evenly around center)
 
     private ChipiDungeonGenerator() {}
@@ -40,8 +38,7 @@ public class ChipiDungeonGenerator {
         // Spawn is already placed. Fixed anchors (not relative to portal):
         // first corridor origin, then the first generated room center is south of spawn.
         BlockPos firstCorridorAnchor = new BlockPos(5, CORRIDOR_Y, 11);
-        BlockPos firstGeneratedRoomCenter =
-                new BlockPos(5, ROOM_Y, 24); // explicit first floor anchor
+        BlockPos firstGeneratedRoomCenter = new BlockPos(5, ROOM_Y, 24); // explicit first floor anchor
 
         // First room/corridor use direct instances as requested.
         RoomBaseStructure firstRoom = WorldMaster.getDefaultRoom();
@@ -60,16 +57,14 @@ public class ChipiDungeonGenerator {
         // Place rooms strictly southward (Z never decreases), across X in both directions.
         for (int row = 0; row < ROWS_SOUTH; row++) {
             for (int col = minCol; col <= maxCol; col++) {
-                int gridX =
-                        col; // grid 0,0 is the first generated room; -X -> negative gridX, +X ->
-                             // positive gridX
+                int gridX = col; // grid 0,0 is the first generated room; -X -> negative gridX, +X -> positive gridX
                 int gridY = row; // gridY increases southward only
 
-                BlockPos center =
-                        new BlockPos(
-                                firstGeneratedRoomCenter.getX() + (col * STEP_X),
-                                ROOM_Y,
-                                firstGeneratedRoomCenter.getZ() + (row * STEP_Z));
+                BlockPos center = new BlockPos(
+                    firstGeneratedRoomCenter.getX() + (col * STEP_X),
+                    ROOM_Y,
+                    firstGeneratedRoomCenter.getZ() + (row * STEP_Z)
+                );
 
                 RoomBaseStructure room = WorldMaster.resolveRoom(ctx(world, gridX, gridY, center, null));
                 room.placeAt(world, center);
@@ -84,20 +79,19 @@ public class ChipiDungeonGenerator {
                 int gridX = col;
                 int gridY = row;
 
-                BlockPos currentCenter =
-                        new BlockPos(
-                                firstGeneratedRoomCenter.getX() + (col * STEP_X),
-                                ROOM_Y,
-                                firstGeneratedRoomCenter.getZ() + (row * STEP_Z));
+                BlockPos currentCenter = new BlockPos(
+                    firstGeneratedRoomCenter.getX() + (col * STEP_X),
+                    ROOM_Y,
+                    firstGeneratedRoomCenter.getZ() + (row * STEP_Z)
+                );
 
-                BlockPos anchorSouth =
-                        new BlockPos(
-                                currentCenter.getX(),
-                                CORRIDOR_Y,
-                                currentCenter.getZ() + ROOM_EXTENT_SOUTH);
+                BlockPos anchorSouth = new BlockPos(
+                    currentCenter.getX(),
+                    CORRIDOR_Y,
+                    currentCenter.getZ() + ROOM_EXTENT_SOUTH
+                );
 
-                CorridorNSStructure corridorNS =
-                        WorldMaster.resolveCorridorNS(ctx(world, gridX, gridY, anchorSouth, null));
+                CorridorNSStructure corridorNS = WorldMaster.resolveCorridorNS(ctx(world, gridX, gridY, anchorSouth, null));
                 corridorNS.placeAt(world, anchorSouth);
                 WorldMaster.afterPlaceCorridorNS(ctx(world, gridX, gridY, anchorSouth, corridorNS));
             }
@@ -109,20 +103,19 @@ public class ChipiDungeonGenerator {
                 int gridX = col;
                 int gridY = row;
 
-                BlockPos currentCenter =
-                        new BlockPos(
-                                firstGeneratedRoomCenter.getX() + (col * STEP_X),
-                                ROOM_Y,
-                                firstGeneratedRoomCenter.getZ() + (row * STEP_Z));
+                BlockPos currentCenter = new BlockPos(
+                    firstGeneratedRoomCenter.getX() + (col * STEP_X),
+                    ROOM_Y,
+                    firstGeneratedRoomCenter.getZ() + (row * STEP_Z)
+                );
 
-                BlockPos anchorEast =
-                        new BlockPos(
-                                currentCenter.getX() + ROOM_EXTENT_EAST,
-                                CORRIDOR_Y,
-                                currentCenter.getZ());
+                BlockPos anchorEast = new BlockPos(
+                    currentCenter.getX() + ROOM_EXTENT_EAST,
+                    CORRIDOR_Y,
+                    currentCenter.getZ()
+                );
 
-                CorridorEWStructure corridorEW =
-                        WorldMaster.resolveCorridorEW(ctx(world, gridX, gridY, anchorEast, null));
+                CorridorEWStructure corridorEW = WorldMaster.resolveCorridorEW(ctx(world, gridX, gridY, anchorEast, null));
                 corridorEW.placeAt(world, anchorEast);
                 WorldMaster.afterPlaceCorridorEW(ctx(world, gridX, gridY, anchorEast, corridorEW));
             }
@@ -136,18 +129,10 @@ public class ChipiDungeonGenerator {
 
         runInChipi(world, "fill 7 87 15 3 91 16 minecraft:air");
 
-        runInChipi(
-                world,
-                "setblock 4 88 15 minecraft:deepslate_tile_stairs[facing=west,waterlogged=true]");
-        runInChipi(
-                world,
-                "setblock 4 88 16 minecraft:deepslate_tile_stairs[facing=west,waterlogged=true]");
-        runInChipi(
-                world,
-                "setblock 6 88 15 minecraft:deepslate_tile_stairs[facing=east,waterlogged=true]");
-        runInChipi(
-                world,
-                "setblock 6 88 16 minecraft:deepslate_tile_stairs[facing=east,waterlogged=true]");
+        runInChipi(world, "setblock 4 88 15 minecraft:deepslate_tile_stairs[facing=west,waterlogged=true]");
+        runInChipi(world, "setblock 4 88 16 minecraft:deepslate_tile_stairs[facing=west,waterlogged=true]");
+        runInChipi(world, "setblock 6 88 15 minecraft:deepslate_tile_stairs[facing=east,waterlogged=true]");
+        runInChipi(world, "setblock 6 88 16 minecraft:deepslate_tile_stairs[facing=east,waterlogged=true]");
 
         runInChipi(world, "fill 7 88 15 7 91 16 minecraft:deepslate_tiles");
         runInChipi(world, "fill 3 88 16 3 91 15 minecraft:deepslate_tiles");
@@ -180,10 +165,11 @@ public class ChipiDungeonGenerator {
 
     private static void runInChipi(ServerWorld world, String command) {
         world.getServer()
-                .getCommandManager()
-                .executeWithPrefix(
-                        world.getServer().getCommandSource(),
-                        "execute in chipi:chipi_dimension run " + command);
+            .getCommandManager()
+            .executeWithPrefix(
+                world.getServer().getCommandSource(),
+                "execute in chipi:chipi_dimension run " + command
+            );
     }
 
     private static DungeonContext ctx(ServerWorld world, int gridX, int gridY, BlockPos origin, ChipiStructure structure) {
diff --git a/src/main/java/net/Chipperfluff/chipi/world/gen/ChipiStructure.java b/src/main/java/net/Chipperfluff/chipi/world/gen/ChipiStructure.java
index 0d3a840..c8a8955 100644
--- a/src/main/java/net/Chipperfluff/chipi/world/gen/ChipiStructure.java
+++ b/src/main/java/net/Chipperfluff/chipi/world/gen/ChipiStructure.java
@@ -1,6 +1,6 @@
 package net.Chipperfluff.chipi.world.gen;
 
-import java.util.Optional;
+import net.minecraft.block.Blocks;
 import net.minecraft.block.entity.StructureBlockBlockEntity;
 import net.minecraft.block.enums.StructureBlockMode;
 import net.minecraft.server.world.ServerWorld;
@@ -9,7 +9,7 @@ import net.minecraft.structure.StructureTemplate;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3i;
-import net.minecraft.block.Blocks;
+import java.util.Optional;
 
 public abstract class ChipiStructure {
 
diff --git a/src/main/java/net/Chipperfluff/chipi/world/gen/WorldMaster.java b/src/main/java/net/Chipperfluff/chipi/world/gen/WorldMaster.java
index 408de35..2c1b02c 100644
--- a/src/main/java/net/Chipperfluff/chipi/world/gen/WorldMaster.java
+++ b/src/main/java/net/Chipperfluff/chipi/world/gen/WorldMaster.java
@@ -1,10 +1,11 @@
 package net.Chipperfluff.chipi.world.gen;
 
+import net.minecraft.block.Blocks;
+import net.minecraft.util.math.BlockPos;
+
 import net.Chipperfluff.chipi.world.gen.struct.CorridorEWStructure;
 import net.Chipperfluff.chipi.world.gen.struct.CorridorNSStructure;
 import net.Chipperfluff.chipi.world.gen.struct.RoomBaseStructure;
-import net.minecraft.block.Blocks;
-import net.minecraft.util.math.BlockPos;
 
 public final class WorldMaster {
 
diff --git a/src/main/java/net/Chipperfluff/chipi/world/gen/struct/ChipiStructures.java b/src/main/java/net/Chipperfluff/chipi/world/gen/struct/ChipiStructures.java
index 6480115..0849b25 100644
--- a/src/main/java/net/Chipperfluff/chipi/world/gen/struct/ChipiStructures.java
+++ b/src/main/java/net/Chipperfluff/chipi/world/gen/struct/ChipiStructures.java
@@ -1,11 +1,11 @@
 package net.Chipperfluff.chipi.world.gen.struct;
 
-import net.Chipperfluff.chipi.world.gen.ChipiStructure; // <-- THIS WAS MISSING
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+import net.Chipperfluff.chipi.world.gen.ChipiStructure; // <-- THIS WAS MISSING
+
 public class ChipiStructures {
 
     private static final Map<String, ChipiStructure> REGISTRY = new HashMap<>();
diff --git a/src/main/java/net/Chipperfluff/chipi/world/gen/struct/CorridorEWStructure.java b/src/main/java/net/Chipperfluff/chipi/world/gen/struct/CorridorEWStructure.java
index c9ae40b..18a3180 100644
--- a/src/main/java/net/Chipperfluff/chipi/world/gen/struct/CorridorEWStructure.java
+++ b/src/main/java/net/Chipperfluff/chipi/world/gen/struct/CorridorEWStructure.java
@@ -1,8 +1,9 @@
 package net.Chipperfluff.chipi.world.gen.struct;
 
-import net.Chipperfluff.chipi.world.gen.ChipiStructure;
 import net.minecraft.util.Identifier;
 
+import net.Chipperfluff.chipi.world.gen.ChipiStructure;
+
 public class CorridorEWStructure extends ChipiStructure {
 
     public CorridorEWStructure() {
diff --git a/src/main/java/net/Chipperfluff/chipi/world/gen/struct/CorridorNSStructure.java b/src/main/java/net/Chipperfluff/chipi/world/gen/struct/CorridorNSStructure.java
index 4e1dd6d..0af6811 100644
--- a/src/main/java/net/Chipperfluff/chipi/world/gen/struct/CorridorNSStructure.java
+++ b/src/main/java/net/Chipperfluff/chipi/world/gen/struct/CorridorNSStructure.java
@@ -1,8 +1,9 @@
 package net.Chipperfluff.chipi.world.gen.struct;
 
-import net.Chipperfluff.chipi.world.gen.ChipiStructure;
 import net.minecraft.util.Identifier;
 
+import net.Chipperfluff.chipi.world.gen.ChipiStructure;
+
 public class CorridorNSStructure extends ChipiStructure {
 
     public CorridorNSStructure() {
diff --git a/src/main/java/net/Chipperfluff/chipi/world/gen/struct/RoomBaseStructure.java b/src/main/java/net/Chipperfluff/chipi/world/gen/struct/RoomBaseStructure.java
index 9c6e0ff..1dbf2db 100644
--- a/src/main/java/net/Chipperfluff/chipi/world/gen/struct/RoomBaseStructure.java
+++ b/src/main/java/net/Chipperfluff/chipi/world/gen/struct/RoomBaseStructure.java
@@ -1,8 +1,9 @@
 package net.Chipperfluff.chipi.world.gen.struct;
 
-import net.Chipperfluff.chipi.world.gen.ChipiStructure;
 import net.minecraft.util.Identifier;
 
+import net.Chipperfluff.chipi.world.gen.ChipiStructure;
+
 public class RoomBaseStructure extends ChipiStructure {
 
     public RoomBaseStructure() {
diff --git a/src/main/java/net/Chipperfluff/chipi/world/gen/struct/SpawnStructure.java b/src/main/java/net/Chipperfluff/chipi/world/gen/struct/SpawnStructure.java
index fdd116e..e3ae7e4 100644
--- a/src/main/java/net/Chipperfluff/chipi/world/gen/struct/SpawnStructure.java
+++ b/src/main/java/net/Chipperfluff/chipi/world/gen/struct/SpawnStructure.java
@@ -1,8 +1,9 @@
 package net.Chipperfluff.chipi.world.gen.struct;
 
-import net.Chipperfluff.chipi.world.gen.ChipiStructure;
 import net.minecraft.util.Identifier;
 
+import net.Chipperfluff.chipi.world.gen.ChipiStructure;
+
 public class SpawnStructure extends ChipiStructure {
 
     public SpawnStructure() {