*: apply the import order from SpongeAPI consistently

This mostly resolves the import order issues introduced when remapping

build.gradle.kts

@@ -291,6 +291,27 @@ allprojects {
         isPreserveFileTimestamps = false
         isReproducibleFileOrder = true
     }
+
+    spotless {
+        java {
+            toggleOffOn("@formatter:off", "@formatter:on")
+            endWithNewline()
+            indentWithSpaces(4)
+            trimTrailingWhitespace()
+            importOrderFile(rootProject.file("SpongeAPI/extra/eclipse/sponge_eclipse.importorder"))
+        }
+        if (project.name != "generator") { // removeUnusedImports parses with the javac version used by Gradle, so generator can fail to parse
+            java {
+                removeUnusedImports()
+            }
+        }
+        kotlinGradle {
+            endWithNewline()
+            indentWithSpaces(4)
+            trimTrailingWhitespace()
+        }
+    }
+
     val spongeSnapshotRepo: String? by project
     val spongeReleaseRepo: String? by project
     tasks {
@@ -418,4 +439,4 @@ publishing {
             }
         }
     }
-}
+}

forge/build.gradle.kts

@@ -530,4 +530,4 @@ fun printParents(conf: Configuration, indent: String, seen: MutableSet<Configura
         println("$indent - ${parent.name}")
         printParents(parent, indent + "  ", seen)
     }
-}*/
+}*/

forge/src/applaunch/java/org/spongepowered/forge/applaunch/loading/metadata/PluginFileConfigurable.java

@@ -32,7 +32,6 @@ import org.spongepowered.plugin.metadata.model.PluginDependency;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 

forge/src/launch/java/org/spongepowered/forge/launch/inject/SpongeForgeModule.java

@@ -42,4 +42,4 @@ public final class SpongeForgeModule extends AbstractModule {
         this.bind(SpongeCommandManager.class).to(ForgeCommandManager.class);
     }
 
-}
+}

forge/src/main/java/org/spongepowered/forge/data/SpongeLevelDataPersistence.java

@@ -29,7 +29,6 @@ import com.mojang.serialization.DynamicOps;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.world.level.storage.LevelStorageSource;
-import net.minecraft.world.level.storage.PrimaryLevelData;
 import net.minecraft.world.level.storage.WorldData;
 import net.minecraftforge.fml.WorldPersistenceHooks;
 import org.spongepowered.common.bridge.world.level.storage.PrimaryLevelDataBridge;

forge/src/mixins/java/org/spongepowered/forge/mixin/core/minecraftforge/util/ITeleporterMixin_Forge.java

@@ -30,7 +30,6 @@ import org.spongepowered.api.event.cause.entity.MovementTypes;
 import org.spongepowered.api.world.portal.PortalType;
 import org.spongepowered.api.world.portal.PortalTypes;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.common.world.portal.PortalLogic;
 
 // PortalLogic matches signatures for ITeleporter when appropriate,

forge/src/mixins/java/org/spongepowered/forge/mixin/core/server/BootstrapMixin_Forge.java

@@ -34,10 +34,8 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.common.SpongeCommon;
 import org.spongepowered.common.SpongeLifecycle;
-import org.spongepowered.common.hooks.PlatformHooks;
 import org.spongepowered.common.inject.SpongeGuice;
 import org.spongepowered.common.launch.Launch;
-import org.spongepowered.forge.hook.ForgeEventHooks;
 import org.spongepowered.forge.launch.ForgeLaunch;
 
 @Mixin(Bootstrap.class)

generator/src/main/java/org/spongepowered/vanilla/generator/TagGenerator.java

@@ -32,12 +32,13 @@ import com.squareup.javapoet.TypeName;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.Tag;
 
-import javax.lang.model.element.Modifier;
 import java.io.IOException;
 import java.util.Comparator;
 import java.util.List;
 import java.util.function.Supplier;
 
+import javax.lang.model.element.Modifier;
+
 public final class TagGenerator implements Generator {
 
     private static final RegistryScope SCOPE = RegistryScope.GAME;

settings.gradle.kts

@@ -42,8 +42,8 @@ extensions.configure(MinecraftRepositoryExtension::class) {
 
 if (!file("SpongeAPI/gradle.properties").exists()) {
     throw InvalidUserDataException("""
-        The SpongeAPI submodule required to build does not appear to be set up. 
-        
+        The SpongeAPI submodule required to build does not appear to be set up.
+
         To correct this, run
             git submodule update --init --recursive
         from the project's checkout directory.

src/accessors/java/org/spongepowered/common/accessor/ChatFormattingAccessor.java

@@ -24,12 +24,11 @@
  */
 package org.spongepowered.common.accessor;
 
+import net.minecraft.ChatFormatting;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-import net.minecraft.ChatFormatting;
-
 @Mixin(ChatFormatting.class)
 public interface ChatFormattingAccessor {
 

src/accessors/java/org/spongepowered/common/accessor/commands/arguments/selector/options/EntitySelectorOptionsAccessor.java

@@ -24,12 +24,12 @@
  */
 package org.spongepowered.common.accessor.commands.arguments.selector.options;
 
+import net.minecraft.commands.arguments.selector.options.EntitySelectorOptions;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.common.UntransformedAccessorError;
 
 import java.util.Map;
-import net.minecraft.commands.arguments.selector.options.EntitySelectorOptions;
 
 @Mixin(EntitySelectorOptions.class)
 public interface EntitySelectorOptionsAccessor {

src/accessors/java/org/spongepowered/common/accessor/commands/arguments/selector/options/EntitySelectorOptions_OptionAccessor.java

@@ -24,12 +24,12 @@
  */
 package org.spongepowered.common.accessor.commands.arguments.selector.options;
 
+import net.minecraft.commands.arguments.selector.EntitySelectorParser;
+import net.minecraft.commands.arguments.selector.options.EntitySelectorOptions;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.function.Predicate;
-import net.minecraft.commands.arguments.selector.EntitySelectorParser;
-import net.minecraft.commands.arguments.selector.options.EntitySelectorOptions;
 
 @Mixin(targets = "net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$Option")
 public interface EntitySelectorOptions_OptionAccessor {

src/accessors/java/org/spongepowered/common/accessor/commands/synchronization/ArgumentTypesAccessor.java

@@ -24,13 +24,13 @@
  */
 package org.spongepowered.common.accessor.commands.synchronization;
 
+import net.minecraft.commands.synchronization.ArgumentTypes;
+import net.minecraft.resources.ResourceLocation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.common.UntransformedAccessorError;
 
 import java.util.Map;
-import net.minecraft.commands.synchronization.ArgumentTypes;
-import net.minecraft.resources.ResourceLocation;
 
 @Mixin(ArgumentTypes.class)
 public interface ArgumentTypesAccessor {

src/accessors/java/org/spongepowered/common/accessor/commands/synchronization/EmptyArgumentSerializerAccessor.java

@@ -25,11 +25,11 @@
 package org.spongepowered.common.accessor.commands.synchronization;
 
 import com.mojang.brigadier.arguments.ArgumentType;
+import net.minecraft.commands.synchronization.EmptyArgumentSerializer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.function.Supplier;
-import net.minecraft.commands.synchronization.EmptyArgumentSerializer;
 
 @Mixin(EmptyArgumentSerializer.class)
 public interface EmptyArgumentSerializerAccessor<T extends ArgumentType<?>> {

src/accessors/java/org/spongepowered/common/accessor/core/RegistryAccessAccessor.java

@@ -24,14 +24,14 @@
  */
 package org.spongepowered.common.accessor.core;
 
+import net.minecraft.core.Registry;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.resources.ResourceKey;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.common.UntransformedAccessorError;
 
 import java.util.Map;
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.resources.ResourceKey;
 
 @Mixin(RegistryAccess.class)
 public interface RegistryAccessAccessor {

src/accessors/java/org/spongepowered/common/accessor/network/ConnectionAccessor.java

@@ -25,11 +25,11 @@
 package org.spongepowered.common.accessor.network;
 
 import io.netty.channel.Channel;
+import net.minecraft.network.Connection;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.net.SocketAddress;
-import net.minecraft.network.Connection;
 
 @Mixin(Connection.class)
 public interface ConnectionAccessor {

src/accessors/java/org/spongepowered/common/accessor/network/protocol/game/ClientboundAddPlayerPacketAccessor.java

@@ -24,11 +24,11 @@
  */
 package org.spongepowered.common.accessor.network.protocol.game;
 
+import net.minecraft.network.protocol.game.ClientboundAddPlayerPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.UUID;
-import net.minecraft.network.protocol.game.ClientboundAddPlayerPacket;
 
 @Mixin(ClientboundAddPlayerPacket.class)
 public interface ClientboundAddPlayerPacketAccessor {

src/accessors/java/org/spongepowered/common/accessor/network/protocol/game/ClientboundPlayerInfoPacketAccessor.java

@@ -24,11 +24,11 @@
  */
 package org.spongepowered.common.accessor.network.protocol.game;
 
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.List;
-import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket;
 
 @Mixin(ClientboundPlayerInfoPacket.class)
 public interface ClientboundPlayerInfoPacketAccessor {

src/accessors/java/org/spongepowered/common/accessor/server/level/ChunkMap_TrackedEntityAccessor.java

@@ -25,14 +25,13 @@
 package org.spongepowered.common.accessor.server.level;
 
 import net.minecraft.server.level.ServerEntity;
+import net.minecraft.server.level.ServerPlayer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.util.List;
-import java.util.Set;
-import net.minecraft.server.level.ServerPlayer;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
+import java.util.Set;
+
 @Mixin(targets = "net/minecraft/server/level/ChunkMap$TrackedEntity")
 public interface ChunkMap_TrackedEntityAccessor {
 

src/accessors/java/org/spongepowered/common/accessor/server/level/ServerLevelAccessor.java

@@ -25,6 +25,9 @@
 package org.spongepowered.common.accessor.server.level;
 
 import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.BlockEventData;
 import org.apache.logging.log4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -32,9 +35,6 @@ import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.common.UntransformedAccessorError;
 
 import java.util.Queue;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.BlockEventData;
 
 @Mixin(ServerLevel.class)
 public interface ServerLevelAccessor {

src/accessors/java/org/spongepowered/common/accessor/server/players/IpBanListAccessor.java

@@ -24,11 +24,11 @@
  */
 package org.spongepowered.common.accessor.server.players;
 
+import net.minecraft.server.players.IpBanList;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
 import java.net.SocketAddress;
-import net.minecraft.server.players.IpBanList;
 
 @Mixin(IpBanList.class)
 public interface IpBanListAccessor {

src/accessors/java/org/spongepowered/common/accessor/server/players/StoredUserListAccessor.java

@@ -24,6 +24,8 @@
  */
 package org.spongepowered.common.accessor.server.players;
 
+import net.minecraft.server.players.StoredUserEntry;
+import net.minecraft.server.players.StoredUserList;
 import org.apache.logging.log4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -31,8 +33,6 @@ import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.common.UntransformedAccessorError;
 
 import java.util.Map;
-import net.minecraft.server.players.StoredUserEntry;
-import net.minecraft.server.players.StoredUserList;
 
 @Mixin(StoredUserList.class)
 public interface StoredUserListAccessor<K, V extends StoredUserEntry<K>> {

src/accessors/java/org/spongepowered/common/accessor/tags/ItemTagsAccessor.java

@@ -27,7 +27,6 @@ package org.spongepowered.common.accessor.tags;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.StaticTagHelper;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.common.UntransformedAccessorError;

src/accessors/java/org/spongepowered/common/accessor/world/damagesource/CombatEntryAccessor.java

@@ -24,13 +24,12 @@
  */
 package org.spongepowered.common.accessor.world.damagesource;
 
+import net.minecraft.world.damagesource.CombatEntry;
+import net.minecraft.world.damagesource.DamageSource;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-import net.minecraft.world.damagesource.CombatEntry;
-import net.minecraft.world.damagesource.DamageSource;
-
 @Mixin(CombatEntry.class)
 public interface CombatEntryAccessor {
 

src/accessors/java/org/spongepowered/common/accessor/world/entity/AreaEffectCloudAccessor.java

@@ -24,13 +24,13 @@
  */
 package org.spongepowered.common.accessor.world.entity;
 
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.entity.AreaEffectCloud;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.List;
-import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.world.entity.AreaEffectCloud;
 
 @Mixin(AreaEffectCloud.class)
 public interface AreaEffectCloudAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/entity/LivingEntityAccessor.java

@@ -24,6 +24,12 @@
  */
 package org.spongepowered.common.accessor.world.entity;
 
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -31,12 +37,6 @@ import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.common.UntransformedAccessorError;
 
 import java.util.Optional;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.syncher.EntityDataAccessor;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
 
 @Mixin(LivingEntity.class)
 public interface LivingEntityAccessor {
@@ -83,7 +83,7 @@ public interface LivingEntityAccessor {
     @Accessor("lastHurt") void accessor$lastHurt(final float lastHurt);
 
     @Accessor("lastHurtByMob") @Nullable LivingEntity accessor$lastHurtByMob();
-    
+
     @Accessor("autoSpinAttackTicks") int accessor$autoSpinAttackTicks();
 
     @Accessor("useItem") void accessor$useItem(final ItemStack useItem);

src/accessors/java/org/spongepowered/common/accessor/world/entity/ai/targeting/TargetingConditionsAccessor.java

@@ -24,12 +24,12 @@
  */
 package org.spongepowered.common.accessor.world.entity.ai.targeting;
 
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ai.targeting.TargetingConditions;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.function.Predicate;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.ai.targeting.TargetingConditions;
 
 @Mixin(TargetingConditions.class)
 public interface TargetingConditionsAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/entity/animal/AnimalAccessor.java

@@ -24,11 +24,11 @@
  */
 package org.spongepowered.common.accessor.world.entity.animal;
 
+import net.minecraft.world.entity.animal.Animal;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.UUID;
-import net.minecraft.world.entity.animal.Animal;
 
 @Mixin(Animal.class)
 public interface AnimalAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/entity/animal/FoxAccessor.java

@@ -24,6 +24,8 @@
  */
 package org.spongepowered.common.accessor.world.entity.animal;
 
+import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.entity.animal.Fox;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
@@ -31,8 +33,6 @@ import org.spongepowered.common.UntransformedAccessorError;
 
 import java.util.Optional;
 import java.util.UUID;
-import net.minecraft.network.syncher.EntityDataAccessor;
-import net.minecraft.world.entity.animal.Fox;
 
 @Mixin(Fox.class)
 public interface FoxAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/entity/animal/SheepAccessor.java

@@ -24,15 +24,15 @@
  */
 package org.spongepowered.common.accessor.world.entity.animal;
 
+import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.entity.animal.Sheep;
+import net.minecraft.world.item.DyeColor;
+import net.minecraft.world.level.ItemLike;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.common.UntransformedAccessorError;
 
 import java.util.Map;
-import net.minecraft.network.syncher.EntityDataAccessor;
-import net.minecraft.world.entity.animal.Sheep;
-import net.minecraft.world.item.DyeColor;
-import net.minecraft.world.level.ItemLike;
 
 @Mixin(Sheep.class)
 public interface SheepAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/entity/projectile/ArrowAccessor.java

@@ -24,12 +24,12 @@
  */
 package org.spongepowered.common.accessor.world.entity.projectile;
 
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.entity.projectile.Arrow;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.Set;
-import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.world.entity.projectile.Arrow;
 
 @Mixin(Arrow.class)
 public interface ArrowAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/entity/projectile/ProjectileAccessor.java

@@ -24,11 +24,11 @@
  */
 package org.spongepowered.common.accessor.world.entity.projectile;
 
+import net.minecraft.world.entity.projectile.Projectile;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.UUID;
-import net.minecraft.world.entity.projectile.Projectile;
 
 @Mixin(Projectile.class)
 public interface ProjectileAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/entity/raid/RaidsAccessor.java

@@ -24,12 +24,12 @@
  */
 package org.spongepowered.common.accessor.world.entity.raid;
 
+import net.minecraft.world.entity.raid.Raid;
+import net.minecraft.world.entity.raid.Raids;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.Map;
-import net.minecraft.world.entity.raid.Raid;
-import net.minecraft.world.entity.raid.Raids;
 
 @Mixin(Raids.class)
 public interface RaidsAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/gen/DimensionGeneratorSettingsAccessor.java

@@ -24,6 +24,9 @@
  */
 package org.spongepowered.common.accessor.world.gen;
 
+import net.minecraft.core.MappedRegistry;
+import net.minecraft.world.level.dimension.LevelStem;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -31,9 +34,6 @@ import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.common.UntransformedInvokerError;
 
 import java.util.Optional;
-import net.minecraft.core.MappedRegistry;
-import net.minecraft.world.level.dimension.LevelStem;
-import net.minecraft.world.level.levelgen.WorldGenSettings;
 
 @Mixin(WorldGenSettings.class)
 public interface DimensionGeneratorSettingsAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/inventory/AbstractContainerMenuAccessor.java

@@ -24,15 +24,15 @@
  */
 package org.spongepowered.common.accessor.world.inventory;
 
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.util.List;
 import net.minecraft.core.NonNullList;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.ContainerListener;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.List;
 
 @Mixin(AbstractContainerMenu.class)
 public interface AbstractContainerMenuAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/item/DiggerItemAccessor.java

@@ -24,12 +24,12 @@
  */
 package org.spongepowered.common.accessor.world.item;
 
+import net.minecraft.world.item.DiggerItem;
+import net.minecraft.world.level.block.Block;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.Set;
-import net.minecraft.world.item.DiggerItem;
-import net.minecraft.world.level.block.Block;
 
 @Mixin(DiggerItem.class)
 public interface DiggerItemAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/item/crafting/IngredientAccessor.java

@@ -25,12 +25,12 @@
 package org.spongepowered.common.accessor.world.item.crafting;
 
 import com.google.gson.JsonObject;
+import net.minecraft.world.item.crafting.Ingredient;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.common.UntransformedInvokerError;
 
 import java.util.stream.Stream;
-import net.minecraft.world.item.crafting.Ingredient;
 
 @Mixin(Ingredient.class)
 public interface IngredientAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/item/crafting/ShapedRecipeAccessor.java

@@ -25,15 +25,15 @@
 package org.spongepowered.common.accessor.world.item.crafting;
 
 import com.google.gson.JsonArray;
+import net.minecraft.core.NonNullList;
+import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.item.crafting.ShapedRecipe;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.common.UntransformedInvokerError;
 
 import java.util.Map;
-import net.minecraft.core.NonNullList;
-import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.item.crafting.ShapedRecipe;
 
 @Mixin(ShapedRecipe.class)
 public interface ShapedRecipeAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/level/BaseSpawnerAccessor.java

@@ -24,12 +24,12 @@
  */
 package org.spongepowered.common.accessor.world.level;
 
+import net.minecraft.world.level.BaseSpawner;
+import net.minecraft.world.level.SpawnData;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.List;
-import net.minecraft.world.level.BaseSpawner;
-import net.minecraft.world.level.SpawnData;
 
 @Mixin(BaseSpawner.class)
 public interface BaseSpawnerAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/level/GameRulesAccessor.java

@@ -24,12 +24,12 @@
  */
 package org.spongepowered.common.accessor.world.level;
 
+import net.minecraft.world.level.GameRules;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.common.UntransformedAccessorError;
 
 import java.util.Map;
-import net.minecraft.world.level.GameRules;
-import org.spongepowered.common.UntransformedAccessorError;
 
 @Mixin(GameRules.class)
 public interface GameRulesAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/level/biome/BiomeSourceAccessor.java

@@ -24,13 +24,13 @@
  */
 package org.spongepowered.common.accessor.world.level.biome;
 
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.BiomeSource;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.List;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.BiomeSource;
 
 @Mixin(BiomeSource.class)
 public interface BiomeSourceAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/level/biome/MultiNoiseBiomeSourceAccessor.java

@@ -25,6 +25,9 @@
 package org.spongepowered.common.accessor.world.level.biome;
 
 import com.mojang.datafixers.util.Pair;
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.MultiNoiseBiomeSource;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
@@ -34,9 +37,6 @@ import org.spongepowered.common.UntransformedInvokerError;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Supplier;
-import net.minecraft.core.Registry;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.MultiNoiseBiomeSource;
 
 @Mixin(MultiNoiseBiomeSource.class)
 public interface MultiNoiseBiomeSourceAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/level/block/DispenserBlockAccessor.java

@@ -24,14 +24,14 @@
  */
 package org.spongepowered.common.accessor.world.level.block;
 
+import net.minecraft.core.dispenser.DispenseItemBehavior;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.DispenserBlock;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.common.UntransformedAccessorError;
 
 import java.util.Map;
-import net.minecraft.core.dispenser.DispenseItemBehavior;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.DispenserBlock;
 
 @Mixin(DispenserBlock.class)
 public interface DispenserBlockAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/level/block/entity/BeaconBlockEntityAccessor.java

@@ -24,14 +24,14 @@
  */
 package org.spongepowered.common.accessor.world.level.block.entity;
 
+import net.minecraft.world.effect.MobEffect;
+import net.minecraft.world.level.block.entity.BeaconBlockEntity;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.common.UntransformedAccessorError;
 
 import java.util.Set;
-import net.minecraft.world.effect.MobEffect;
-import net.minecraft.world.level.block.entity.BeaconBlockEntity;
 
 @Mixin(BeaconBlockEntity.class)
 public interface BeaconBlockEntityAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/level/block/entity/StructureBlockEntityAccessor.java

@@ -56,5 +56,5 @@ public interface StructureBlockEntityAccessor {
     @Accessor("integrity") float accessor$integrity();
 
     @Accessor("seed") long accessor$seed();
-    
+
 }

src/accessors/java/org/spongepowered/common/accessor/world/level/block/state/StateHolderAccessor.java

@@ -24,12 +24,12 @@
  */
 package org.spongepowered.common.accessor.world.level.block.state;
 
+import net.minecraft.world.level.block.state.StateHolder;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.common.UntransformedInvokerError;
 
 import java.util.Collection;
-import net.minecraft.world.level.block.state.StateHolder;
 
 @Mixin(StateHolder.class)
 public interface StateHolderAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/level/border/WorldBorderAccessor.java

@@ -24,12 +24,12 @@
  */
 package org.spongepowered.common.accessor.world.level.border;
 
+import net.minecraft.world.level.border.BorderChangeListener;
+import net.minecraft.world.level.border.WorldBorder;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.List;
-import net.minecraft.world.level.border.BorderChangeListener;
-import net.minecraft.world.level.border.WorldBorder;
 
 @Mixin(WorldBorder.class)
 public interface WorldBorderAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/level/chunk/LevelChunkAccessor.java

@@ -24,12 +24,12 @@
  */
 package org.spongepowered.common.accessor.world.level.chunk;
 
+import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.level.levelgen.Heightmap;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.util.Map;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.levelgen.Heightmap;
 
 @Mixin(LevelChunk.class)
 public interface LevelChunkAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/level/dimension/DimensionTypeAccessor.java

@@ -24,13 +24,6 @@
  */
 package org.spongepowered.common.accessor.world.level.dimension;
 
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-import org.spongepowered.asm.mixin.gen.Invoker;
-import org.spongepowered.common.UntransformedAccessorError;
-import org.spongepowered.common.UntransformedInvokerError;
-
-import java.util.OptionalLong;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.biome.Biome;
@@ -38,6 +31,13 @@ import net.minecraft.world.level.biome.BiomeZoomer;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
+import org.spongepowered.common.UntransformedAccessorError;
+import org.spongepowered.common.UntransformedInvokerError;
+
+import java.util.OptionalLong;
 
 @Mixin(DimensionType.class)
 public interface DimensionTypeAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/level/storage/LevelStorageSource_LevelStorageAccessAccessor.java

@@ -24,11 +24,11 @@
  */
 package org.spongepowered.common.accessor.world.level.storage;
 
+import net.minecraft.world.level.storage.LevelStorageSource;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.nio.file.Path;
-import net.minecraft.world.level.storage.LevelStorageSource;
 
 @Mixin(LevelStorageSource.LevelStorageAccess.class)
 public interface LevelStorageSource_LevelStorageAccessAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/level/storage/PlayerDataStorageAccessor.java

@@ -24,11 +24,11 @@
  */
 package org.spongepowered.common.accessor.world.level.storage;
 
+import net.minecraft.world.level.storage.PlayerDataStorage;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import java.io.File;
-import net.minecraft.world.level.storage.PlayerDataStorage;
 
 @Mixin(PlayerDataStorage.class)
 public interface PlayerDataStorageAccessor {

src/accessors/java/org/spongepowered/common/accessor/world/scores/ScoreboardAccessor.java

@@ -24,18 +24,18 @@
  */
 package org.spongepowered.common.accessor.world.scores;
 
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.util.List;
-import java.util.Map;
 import net.minecraft.world.scores.Objective;
 import net.minecraft.world.scores.PlayerTeam;
 import net.minecraft.world.scores.Score;
 import net.minecraft.world.scores.Scoreboard;
 import net.minecraft.world.scores.criteria.ObjectiveCriteria;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.common.UntransformedAccessorError;
 
+import java.util.List;
+import java.util.Map;
+
 @Mixin(Scoreboard.class)
 public interface ScoreboardAccessor {
 

src/applaunch/java/org/spongepowered/common/applaunch/config/common/CommandsCategory.java

@@ -24,9 +24,9 @@
  */
 package org.spongepowered.common.applaunch.config.common;
 
+import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
-import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 import java.util.HashMap;
 import java.util.Map;

src/applaunch/java/org/spongepowered/common/applaunch/config/common/CommandsHiddenCategory.java

@@ -24,9 +24,9 @@
  */
 package org.spongepowered.common.applaunch.config.common;
 
+import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
-import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 @ConfigSerializable
 public final class CommandsHiddenCategory {

src/applaunch/java/org/spongepowered/common/applaunch/config/common/CommonConfig.java

@@ -24,11 +24,11 @@
  */
 package org.spongepowered.common.applaunch.config.common;
 
+import org.spongepowered.common.applaunch.config.core.Config;
+import org.spongepowered.common.applaunch.config.core.IpSet;
 import org.spongepowered.configurate.NodePath;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
-import org.spongepowered.common.applaunch.config.core.Config;
-import org.spongepowered.common.applaunch.config.core.IpSet;
 import org.spongepowered.configurate.transformation.ConfigurationTransformation;
 import org.spongepowered.configurate.transformation.TransformAction;
 

src/applaunch/java/org/spongepowered/common/applaunch/config/common/DebugCategory.java

@@ -24,9 +24,9 @@
  */
 package org.spongepowered.common.applaunch.config.common;
 
+import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
-import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 @ConfigSerializable
 public class DebugCategory {

src/applaunch/java/org/spongepowered/common/applaunch/config/common/EigenRedstoneCategory.java

@@ -24,9 +24,9 @@
  */
 package org.spongepowered.common.applaunch.config.common;
 
+import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
-import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 @ConfigSerializable
 public class EigenRedstoneCategory {

src/applaunch/java/org/spongepowered/common/applaunch/config/common/ExploitCategory.java

@@ -24,9 +24,9 @@
  */
 package org.spongepowered.common.applaunch.config.common;
 
+import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
-import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 @ConfigSerializable
 public final class ExploitCategory {

src/applaunch/java/org/spongepowered/common/applaunch/config/common/GeneralCategory.java

@@ -24,10 +24,10 @@
  */
 package org.spongepowered.common.applaunch.config.common;
 
+import org.spongepowered.common.applaunch.config.core.TokenHoldingString;
+import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
-import org.spongepowered.configurate.objectmapping.ConfigSerializable;
-import org.spongepowered.common.applaunch.config.core.TokenHoldingString;
 
 @ConfigSerializable
 public final class GeneralCategory {

src/applaunch/java/org/spongepowered/common/applaunch/config/common/ModuleCategory.java

@@ -24,9 +24,9 @@
  */
 package org.spongepowered.common.applaunch.config.common;
 
+import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
-import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 @ConfigSerializable
 public final class ModuleCategory {

src/applaunch/java/org/spongepowered/common/applaunch/config/common/OptimizationCategory.java

@@ -25,10 +25,9 @@
 package org.spongepowered.common.applaunch.config.common;
 
 import org.spongepowered.common.applaunch.AppLaunch;
+import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
-import org.spongepowered.configurate.objectmapping.ConfigSerializable;
-import org.spongepowered.common.applaunch.config.core.SpongeConfigs;
 
 @ConfigSerializable
 public final class OptimizationCategory {

src/applaunch/java/org/spongepowered/common/applaunch/config/common/PermissionCategory.java

@@ -24,9 +24,9 @@
  */
 package org.spongepowered.common.applaunch.config.common;
 
+import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
-import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 @ConfigSerializable
 public final class PermissionCategory {

src/applaunch/java/org/spongepowered/common/applaunch/config/common/PhaseTrackerCategory.java

@@ -25,10 +25,9 @@
 package org.spongepowered.common.applaunch.config.common;
 
 import org.spongepowered.common.applaunch.AppLaunch;
+import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
-import org.spongepowered.configurate.objectmapping.ConfigSerializable;
-import org.spongepowered.common.applaunch.config.core.SpongeConfigs;
 
 import java.util.HashMap;
 import java.util.Map;

src/applaunch/java/org/spongepowered/common/applaunch/config/common/SqlCategory.java

@@ -24,9 +24,9 @@
  */
 package org.spongepowered.common.applaunch.config.common;
 
+import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
-import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 import java.util.HashMap;
 import java.util.Map;

src/applaunch/java/org/spongepowered/common/applaunch/config/common/TeleportHelperCategory.java

@@ -24,9 +24,9 @@
  */
 package org.spongepowered.common.applaunch.config.common;
 
+import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
-import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 import java.util.ArrayList;
 import java.util.List;

src/applaunch/java/org/spongepowered/common/applaunch/config/common/WorldCategory.java

@@ -24,9 +24,9 @@
  */
 package org.spongepowered.common.applaunch.config.common;
 
+import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
-import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 import java.util.ArrayList;
 import java.util.List;

src/applaunch/java/org/spongepowered/common/applaunch/config/core/FileMovingConfigurationTransformation.java

@@ -25,12 +25,12 @@
 package org.spongepowered.common.applaunch.config.core;
 
 import com.google.common.collect.ImmutableSet;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.NodePath;
 import org.spongepowered.configurate.loader.ConfigurationLoader;
 import org.spongepowered.configurate.transformation.ConfigurationTransformation;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Set;
 

src/launch/java/org/spongepowered/common/launch/mapping/SpongeMappingManager.java

@@ -31,9 +31,9 @@ package org.spongepowered.common.launch.mapping;
  * mapping.
  */
 public interface SpongeMappingManager {
-	String toRuntimeClassName(String srcName);
+    String toRuntimeClassName(String srcName);
 
-	String toRuntimeFieldName(Class<?> owner, String srcName);
+    String toRuntimeFieldName(Class<?> owner, String srcName);
 
-	String toRuntimeMethodName(Class<?> owner, String srcName, Class<?> ...params);
+    String toRuntimeMethodName(Class<?> owner, String srcName, Class<?> ...params);
 }

src/launch/java/org/spongepowered/common/util/PrettyPrinter.java

@@ -38,6 +38,7 @@ import org.spongepowered.common.util.PrettyPrinter.IVariableWidthEntry;
 import org.spongepowered.common.util.PrettyPrinter.KeyValue;
 import org.spongepowered.common.util.PrettyPrinter.Row;
 import org.spongepowered.common.util.PrettyPrinter.Table;
+
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -389,7 +390,7 @@ public class PrettyPrinter {
     }
 
     /**
-     * Minimum allowed width 
+     * Minimum allowed width
      */
     private static final int MIN_WIDTH = 40;
 
@@ -413,7 +414,7 @@ public class PrettyPrinter {
     private final List<Object> lines = new ArrayList<Object>();
 
     /**
-     * Table 
+     * Table
      */
     private Table table;
 
@@ -626,7 +627,7 @@ public class PrettyPrinter {
     /**
      * Add elements of the array to the output, one per line
      *
-     * @param array Array of objects to print 
+     * @param array Array of objects to print
      * @return fluent interface
      */
     public PrettyPrinter add(final Object[] array) {

src/main/java/org/spongepowered/common/SpongeMinecraftVersion.java

@@ -27,7 +27,6 @@ package org.spongepowered.common;
 import com.google.common.base.MoreObjects;
 import net.minecraft.SharedConstants;
 import org.spongepowered.api.MinecraftVersion;
-import org.spongepowered.common.util.Constants;
 
 import java.util.OptionalInt;
 

src/main/java/org/spongepowered/common/SpongeServer.java

@@ -37,7 +37,7 @@ public interface SpongeServer extends SpongeEngine, Server {
 
     @Override
     ServerScheduler scheduler();
-    
+
     @Override
     SpongeWorldManager worldManager();
 

src/main/java/org/spongepowered/common/advancement/SpongeCriterionTrigger.java

@@ -26,17 +26,21 @@ package org.spongepowered.common.advancement;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import io.leangen.geantyref.TypeToken;
 import com.google.gson.JsonObject;
+import io.leangen.geantyref.TypeToken;
+import net.minecraft.advancements.CriterionTrigger;
+import net.minecraft.advancements.critereon.DeserializationContext;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.PlayerAdvancements;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.advancement.Advancement;
 import org.spongepowered.api.advancement.criteria.AdvancementCriterion;
 import org.spongepowered.api.advancement.criteria.trigger.FilteredTrigger;
 import org.spongepowered.api.advancement.criteria.trigger.FilteredTriggerConfiguration;
 import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import org.spongepowered.api.event.Cause;
 import org.spongepowered.api.event.SpongeEventFactory;
 import org.spongepowered.api.event.advancement.CriterionEvent;
-import org.spongepowered.api.event.Cause;
 import org.spongepowered.common.SpongeCommon;
 import org.spongepowered.common.accessor.advancements.CriterionTrigger_ListenerAccessor;
 import org.spongepowered.common.bridge.advancements.CriterionTriggerBridge;
@@ -47,11 +51,6 @@ import java.util.ArrayList;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import net.minecraft.advancements.CriterionTrigger;
-import net.minecraft.advancements.critereon.DeserializationContext;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.PlayerAdvancements;
-
 @SuppressWarnings("rawtypes")
 public class SpongeCriterionTrigger implements CriterionTrigger<SpongeFilteredTrigger>, CriterionTriggerBridge {
 

src/main/java/org/spongepowered/common/advancement/SpongeFilteredTrigger.java

@@ -26,6 +26,9 @@ package org.spongepowered.common.advancement;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+import net.minecraft.advancements.CriterionTriggerInstance;
+import net.minecraft.advancements.critereon.SerializationContext;
+import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.spongepowered.api.advancement.criteria.trigger.FilteredTrigger;
@@ -36,9 +39,6 @@ import org.spongepowered.api.data.persistence.DataFormats;
 import org.spongepowered.api.data.persistence.DataSerializable;
 
 import java.io.IOException;
-import net.minecraft.advancements.CriterionTriggerInstance;
-import net.minecraft.advancements.critereon.SerializationContext;
-import net.minecraft.resources.ResourceLocation;
 
 @SuppressWarnings("rawtypes")
 public final class SpongeFilteredTrigger implements CriterionTriggerInstance, FilteredTrigger {

src/main/java/org/spongepowered/common/advancement/SpongeTriggerBuilder.java

@@ -31,6 +31,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import io.leangen.geantyref.TypeToken;
+import net.minecraft.resources.ResourceLocation;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.advancement.criteria.trigger.FilteredTriggerConfiguration;
@@ -56,8 +57,6 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
 
-import net.minecraft.resources.ResourceLocation;
-
 @SuppressWarnings("unchecked")
 public final class SpongeTriggerBuilder<C extends FilteredTriggerConfiguration> extends AbstractResourceKeyedBuilder<Trigger<C>,
         Trigger.Builder<C>> implements Trigger.Builder<C> {

src/main/java/org/spongepowered/common/advancement/criterion/SpongeScoreCriterionProgress.java

@@ -26,23 +26,23 @@ package org.spongepowered.common.advancement.criterion;
 
 import static com.google.common.base.Preconditions.checkState;
 
+import net.minecraft.util.Mth;
 import org.spongepowered.api.advancement.Advancement;
 import org.spongepowered.api.advancement.AdvancementProgress;
 import org.spongepowered.api.advancement.criteria.AdvancementCriterion;
 import org.spongepowered.api.advancement.criteria.ScoreAdvancementCriterion;
 import org.spongepowered.api.advancement.criteria.ScoreCriterionProgress;
 import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import org.spongepowered.api.event.Cause;
 import org.spongepowered.api.event.SpongeEventFactory;
 import org.spongepowered.api.event.advancement.CriterionEvent;
-import org.spongepowered.api.event.Cause;
 import org.spongepowered.common.SpongeCommon;
-import org.spongepowered.common.bridge.server.PlayerAdvancementsBridge;
 import org.spongepowered.common.bridge.advancements.AdvancementProgressBridge;
+import org.spongepowered.common.bridge.server.PlayerAdvancementsBridge;
 import org.spongepowered.common.event.tracking.PhaseTracker;
 
 import java.time.Instant;
 import java.util.Optional;
-import net.minecraft.util.Mth;
 
 public class SpongeScoreCriterionProgress implements ScoreCriterionProgress, ImplementationBackedCriterionProgress {
 

src/main/java/org/spongepowered/common/adventure/ComponentFlattenerProvider.java

@@ -24,10 +24,6 @@
  */
 package org.spongepowered.common.adventure;
 
-import java.util.List;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.KeybindComponent;
 import net.kyori.adventure.text.TranslatableComponent;
@@ -42,6 +38,11 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import org.spongepowered.common.accessor.client.KeyMappingAccessor;
 import org.spongepowered.common.launch.Launch;
 
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 final class ComponentFlattenerProvider {
     private static final Pattern LOCALIZATION_PATTERN = Pattern.compile("%(?:(\\d+)\\$)?s");
     static final ComponentFlattener INSTANCE;

src/main/java/org/spongepowered/common/adventure/GsonComponentSerializerProviderImpl.java

@@ -24,10 +24,11 @@
  */
 package org.spongepowered.common.adventure;
 
-import java.util.function.Consumer;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
+import java.util.function.Consumer;
+
 @SuppressWarnings("UnstableApiUsage") // permitted provider
 public final class GsonComponentSerializerProviderImpl implements GsonComponentSerializer.Provider {
     @Override

src/main/java/org/spongepowered/common/adventure/NativeComponentRenderer.java

@@ -35,6 +35,7 @@ import net.minecraft.network.chat.TranslatableComponent;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.common.adventure.NativeComponentRenderer.SiblingConsumer;
+
 import java.text.AttributedCharacterIterator;
 import java.text.MessageFormat;
 import java.util.List;

src/main/java/org/spongepowered/common/adventure/VanillaBossBarListener.java

@@ -24,7 +24,6 @@
  */
 package org.spongepowered.common.adventure;
 
-import java.util.Set;
 import net.kyori.adventure.bossbar.BossBar;
 import net.kyori.adventure.text.Component;
 import net.minecraft.network.protocol.game.ClientboundBossEventPacket;
@@ -32,6 +31,8 @@ import net.minecraft.server.level.ServerBossEvent;
 import net.minecraft.server.level.ServerPlayer;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
+import java.util.Set;
+
 public final class VanillaBossBarListener implements BossBar.Listener {
     private final ServerBossEvent vanilla;
 

src/main/java/org/spongepowered/common/ban/SpongeBanBuilder.java

@@ -33,7 +33,6 @@ import org.spongepowered.api.profile.GameProfile;
 import org.spongepowered.api.service.ban.Ban;
 import org.spongepowered.api.service.ban.BanType;
 import org.spongepowered.api.service.ban.BanTypes;
-import org.spongepowered.common.adventure.SpongeAdventure;
 import org.spongepowered.common.profile.SpongeGameProfile;
 import org.spongepowered.common.util.BanUtil;
 

src/main/java/org/spongepowered/common/block/BlockStateSerializerDeserializer.java

@@ -26,13 +26,13 @@ package org.spongepowered.common.block;
 
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.minecraft.commands.arguments.blocks.BlockStateArgument;
+import net.minecraft.commands.arguments.blocks.BlockStateParser;
 import org.spongepowered.api.block.BlockState;
 
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
-import net.minecraft.commands.arguments.blocks.BlockStateArgument;
-import net.minecraft.commands.arguments.blocks.BlockStateParser;
 
 public final class BlockStateSerializerDeserializer {
 

src/main/java/org/spongepowered/common/block/SpongeBlockStateBuilder.java

@@ -32,8 +32,8 @@ import org.spongepowered.api.data.persistence.AbstractDataBuilder;
 import org.spongepowered.api.data.persistence.DataView;
 import org.spongepowered.api.data.persistence.InvalidDataException;
 import org.spongepowered.api.data.value.Value;
-import org.spongepowered.common.util.DataUtil;
 import org.spongepowered.common.util.Constants;
+import org.spongepowered.common.util.DataUtil;
 
 import java.util.Objects;
 import java.util.Optional;

src/main/java/org/spongepowered/common/block/package-info.java

@@ -26,4 +26,4 @@
 package org.spongepowered.common.block;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.framework.qual.DefaultQualifier;
+import org.checkerframework.framework.qual.DefaultQualifier;

src/main/java/org/spongepowered/common/bridge/CreatorTrackedBridge.java

@@ -24,6 +24,8 @@
  */
 package org.spongepowered.common.bridge;
 
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.block.entity.BlockEntity;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.entity.living.player.User;
 import org.spongepowered.common.applaunch.config.common.ModuleCategory;
@@ -32,8 +34,6 @@ import org.spongepowered.common.event.tracking.PhaseTracker;
 
 import java.util.Optional;
 import java.util.UUID;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.block.entity.BlockEntity;
 
 /**
  * An optionally implemented interface to bridge getting the

src/main/java/org/spongepowered/common/bridge/advancements/AdvancementBridge.java

@@ -27,8 +27,6 @@ package org.spongepowered.common.bridge.advancements;
 import net.kyori.adventure.text.Component;
 import net.minecraft.advancements.Advancement;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import org.spongepowered.api.ResourceKey;
-import org.spongepowered.api.advancement.AdvancementTree;
 import org.spongepowered.api.advancement.criteria.AdvancementCriterion;
 
 import java.util.List;

src/main/java/org/spongepowered/common/bridge/advancements/AdvancementProgressBridge.java

@@ -24,13 +24,12 @@
  */
 package org.spongepowered.common.bridge.advancements;
 
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.PlayerAdvancements;
 import org.spongepowered.api.advancement.Advancement;
-import org.spongepowered.api.advancement.criteria.AdvancementCriterion;
 import org.spongepowered.common.advancement.criterion.ImplementationBackedCriterionProgress;
 
 import java.util.Map;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.PlayerAdvancements;
 
 public interface AdvancementProgressBridge {
 

src/main/java/org/spongepowered/common/bridge/block/BlockBridge.java

@@ -24,6 +24,7 @@
  */
 package org.spongepowered.common.bridge.block;
 
+import net.minecraft.world.level.block.Block;
 import org.spongepowered.api.block.BlockState;
 import org.spongepowered.api.data.DataManipulator.Immutable;
 import org.spongepowered.api.data.Key;
@@ -34,7 +35,6 @@ import org.spongepowered.common.bridge.server.level.ServerLevelBridge;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.BiConsumer;
-import net.minecraft.world.level.block.Block;
 
 /**
  * A quasi interface to mix into every possible {@link Block} such that their

src/main/java/org/spongepowered/common/bridge/client/MinecraftBridge.java

@@ -30,7 +30,7 @@ import org.spongepowered.common.entity.player.ClientType;
 public interface MinecraftBridge {
 
     IntegratedServer bridge$getTemporaryIntegratedServer();
-    
+
     void bridge$setTemporaryIntegratedServer(IntegratedServer server);
 
     ClientType bridge$getClientType();

src/main/java/org/spongepowered/common/bridge/commands/CommandSourceStackBridge.java

@@ -24,13 +24,13 @@
  */
 package org.spongepowered.common.bridge.commands;
 
+import net.minecraft.commands.CommandSource;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.command.CommandCause;
 import org.spongepowered.api.event.Cause;
 import org.spongepowered.api.event.CauseStackManager;
 
 import java.util.function.Supplier;
-import net.minecraft.commands.CommandSource;
 
 public interface CommandSourceStackBridge {
 

src/main/java/org/spongepowered/common/bridge/core/WritableRegistryBridge.java

@@ -25,11 +25,10 @@
 package org.spongepowered.common.bridge.core;
 
 import com.mojang.serialization.Lifecycle;
+import net.minecraft.resources.ResourceKey;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.registry.RegistryEntry;
 
-import net.minecraft.resources.ResourceKey;
-
 public interface WritableRegistryBridge<T> {
 
     boolean bridge$isDynamic();

src/main/java/org/spongepowered/common/bridge/data/DataCompoundHolder.java

@@ -26,7 +26,6 @@ package org.spongepowered.common.bridge.data;
 
 import net.minecraft.nbt.CompoundTag;
 import org.spongepowered.common.data.provider.nbt.NBTDataType;
-import org.spongepowered.common.util.Constants;
 
 public interface DataCompoundHolder {
 

src/main/java/org/spongepowered/common/bridge/explosives/ExplosiveBridge.java

@@ -24,9 +24,10 @@
  */
 package org.spongepowered.common.bridge.explosives;
 
-import java.util.Optional;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import java.util.Optional;
+
 
 public interface ExplosiveBridge {
 

src/main/java/org/spongepowered/common/bridge/network/ConnectionBridge_IpForward.java

@@ -26,7 +26,6 @@ package org.spongepowered.common.bridge.network;
 
 import com.mojang.authlib.properties.Property;
 
-import java.net.SocketAddress;
 import java.util.UUID;
 
 public interface ConnectionBridge_IpForward {

src/main/java/org/spongepowered/common/bridge/server/level/ServerPlayerEntityHealthScaleBridge.java

@@ -24,9 +24,10 @@
  */
 package org.spongepowered.common.bridge.server.level;
 
-import java.util.Collection;
 import net.minecraft.world.entity.ai.attributes.AttributeInstance;
 
+import java.util.Collection;
+
 public interface ServerPlayerEntityHealthScaleBridge {
 
     boolean bridge$setHealthScale(double scale);

src/main/java/org/spongepowered/common/bridge/world/TrackedWorldBridge.java

@@ -24,6 +24,13 @@
  */
 package org.spongepowered.common.bridge.world;
 
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.block.EntityBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.chunk.LevelChunk;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.block.BlockSnapshot;
 import org.spongepowered.api.world.BlockChangeFlag;
@@ -38,13 +45,6 @@ import org.spongepowered.common.event.tracking.context.transaction.pipeline.Worl
 
 import java.util.Optional;
 import java.util.function.Function;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.block.EntityBlock;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.chunk.LevelChunk;
 
 /**
  * A specialized {@link LevelBridge} or {@link ServerLevelBridge}

src/main/java/org/spongepowered/common/bridge/world/entity/EntityBridge.java

@@ -35,10 +35,6 @@ import org.spongepowered.common.event.tracking.phase.tick.EntityTickContext;
 import org.spongepowered.common.world.portal.PortalLogic;
 import org.spongepowered.math.vector.Vector3d;
 
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.Entity;
-
 public interface EntityBridge {
 
     boolean bridge$isConstructing();

src/main/java/org/spongepowered/common/bridge/world/inventory/container/ContainerBridge.java

@@ -24,16 +24,14 @@
  */
 package org.spongepowered.common.bridge.world.inventory.container;
 
+import net.minecraft.world.Container;
+import net.minecraft.world.entity.player.Player;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.world.server.ServerLocation;
 
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Set;
 import java.util.function.Predicate;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.Container;
-import net.minecraft.world.entity.player.Player;
 
 public interface ContainerBridge {
 

src/main/java/org/spongepowered/common/bridge/world/item/ItemBridge.java

@@ -24,10 +24,10 @@
  */
 package org.spongepowered.common.bridge.world.item;
 
+import net.minecraft.world.item.ItemStack;
 import org.spongepowered.api.data.DataManipulator.Mutable;
 
 import java.util.List;
-import net.minecraft.world.item.ItemStack;
 
 public interface ItemBridge {
 

src/main/java/org/spongepowered/common/bridge/world/level/chunk/LevelChunkBridge.java

@@ -24,6 +24,10 @@
  */
 package org.spongepowered.common.bridge.world.level.chunk;
 
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.level.chunk.ProtoChunk;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.util.Direction;
@@ -33,10 +37,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.chunk.ProtoChunk;
 
 public interface LevelChunkBridge {
 

src/main/java/org/spongepowered/common/bridge/world/level/chunk/storage/AnvilChunkLoaderBridge.java

@@ -24,9 +24,10 @@
  */
 package org.spongepowered.common.bridge.world.level.chunk.storage;
 
-import java.nio.file.Path;
 import net.minecraft.world.level.Level;
 
+import java.nio.file.Path;
+
 public interface AnvilChunkLoaderBridge {
 
     // Forge method