diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/Type.java b/api/src/main/java/com/viaversion/viaversion/api/type/Type.java
index 5fb7eed53..f8a5bcff5 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/Type.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/Type.java
@@ -22,7 +22,6 @@
  */
 package com.viaversion.viaversion.api.type;
 
-
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.google.gson.JsonElement;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
@@ -59,8 +58,29 @@ import com.viaversion.viaversion.api.type.types.VarIntArrayType;
 import com.viaversion.viaversion.api.type.types.VarIntType;
 import com.viaversion.viaversion.api.type.types.VarLongType;
 import com.viaversion.viaversion.api.type.types.VoidType;
-import com.viaversion.viaversion.api.type.types.minecraft.*;
-
+import com.viaversion.viaversion.api.type.types.minecraft.BlockChangeRecordType;
+import com.viaversion.viaversion.api.type.types.minecraft.ChunkPositionType;
+import com.viaversion.viaversion.api.type.types.minecraft.EulerAngleType;
+import com.viaversion.viaversion.api.type.types.minecraft.FlatItemArrayType;
+import com.viaversion.viaversion.api.type.types.minecraft.FlatItemType;
+import com.viaversion.viaversion.api.type.types.minecraft.FlatVarIntItemArrayType;
+import com.viaversion.viaversion.api.type.types.minecraft.FlatVarIntItemType;
+import com.viaversion.viaversion.api.type.types.minecraft.GlobalPositionType;
+import com.viaversion.viaversion.api.type.types.minecraft.Item1_20_2Type;
+import com.viaversion.viaversion.api.type.types.minecraft.ItemArrayType;
+import com.viaversion.viaversion.api.type.types.minecraft.ItemType;
+import com.viaversion.viaversion.api.type.types.minecraft.NBTType;
+import com.viaversion.viaversion.api.type.types.minecraft.NamelessNBTType;
+import com.viaversion.viaversion.api.type.types.minecraft.OptionalVarIntType;
+import com.viaversion.viaversion.api.type.types.minecraft.PlayerMessageSignatureType;
+import com.viaversion.viaversion.api.type.types.minecraft.Position1_14Type;
+import com.viaversion.viaversion.api.type.types.minecraft.PositionType;
+import com.viaversion.viaversion.api.type.types.minecraft.ProfileKeyType;
+import com.viaversion.viaversion.api.type.types.minecraft.QuaternionType;
+import com.viaversion.viaversion.api.type.types.minecraft.VarLongBlockChangeRecordType;
+import com.viaversion.viaversion.api.type.types.minecraft.Vector3fType;
+import com.viaversion.viaversion.api.type.types.minecraft.VectorType;
+import com.viaversion.viaversion.api.type.types.minecraft.VillagerDataType;
 import java.util.UUID;
 
 /**
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_20_2.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_20_2.java
index 582bf03a6..f572c7e48 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_20_2.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_20_2.java
@@ -28,12 +28,10 @@ import com.viaversion.viaversion.api.minecraft.metadata.types.MetaTypes1_20_2;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.minecraft.MetaListType;
 import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
-
 import java.util.List;
 
 public final class Types1_20_2 {
 
-
     public static final Type<BlockEntity> BLOCK_ENTITY = new BlockEntityType1_20_2();
     public static final ParticleType PARTICLE = Types1_20.PARTICLE; // Only safe to use after protocol loading
     public static final MetaTypes1_20_2 META_TYPES = new MetaTypes1_20_2(PARTICLE);
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java
index 6fd6fb716..a100e777d 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java
@@ -43,9 +43,8 @@ import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.storage.Configur
 import com.viaversion.viaversion.rewriter.SoundRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class Protocol1_20_2To1_20 extends AbstractProtocol<ClientboundPackets1_19_4, ClientboundPackets1_20_2, ServerboundPackets1_19_4, ServerboundPackets1_20_2> {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java
index bfb9cb1b2..e8f2abea6 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java
@@ -21,7 +21,6 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_19_4Types;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_20;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/ConfigurationState.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/ConfigurationState.java
index 0be45a1cd..c17af1175 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/ConfigurationState.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/ConfigurationState.java
@@ -24,10 +24,9 @@ import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.Protocol1_20_2To1_20;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.ArrayList;
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class ConfigurationState implements StorableObject {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/types/Chunk1_20_2Type.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/types/Chunk1_20_2Type.java
index fc64cd540..5e2f17458 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/types/Chunk1_20_2Type.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/types/Chunk1_20_2Type.java
@@ -28,7 +28,6 @@ import com.viaversion.viaversion.api.type.types.minecraft.BaseChunkType;
 import com.viaversion.viaversion.api.type.types.version.ChunkSectionType1_18;
 import com.viaversion.viaversion.api.type.types.version.Types1_20_2;
 import io.netty.buffer.ByteBuf;
-
 import java.util.ArrayList;
 import java.util.List;