diff --git a/api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java b/api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java
index 53491fe83..5c2f2b227 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java
@@ -22,14 +22,14 @@
*/
package com.viaversion.viaversion.api;
-import com.viaversion.viaversion.api.connection.ConnectionManager;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.boss.BossBar;
import com.viaversion.viaversion.api.boss.BossColor;
import com.viaversion.viaversion.api.boss.BossStyle;
+import com.viaversion.viaversion.api.connection.ConnectionManager;
import com.viaversion.viaversion.api.platform.ViaPlatform;
import com.viaversion.viaversion.api.protocol.ProtocolManager;
import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
+import io.netty.buffer.ByteBuf;
import java.util.SortedSet;
import java.util.UUID;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/ViaManager.java b/api/src/main/java/com/viaversion/viaversion/api/ViaManager.java
index 5c75cc596..94ec17694 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/ViaManager.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/ViaManager.java
@@ -23,12 +23,12 @@
package com.viaversion.viaversion.api;
import com.viaversion.viaversion.api.command.ViaVersionCommand;
+import com.viaversion.viaversion.api.connection.ConnectionManager;
import com.viaversion.viaversion.api.platform.ViaInjector;
import com.viaversion.viaversion.api.platform.ViaPlatform;
import com.viaversion.viaversion.api.platform.ViaPlatformLoader;
import com.viaversion.viaversion.api.platform.providers.ViaProviders;
import com.viaversion.viaversion.api.protocol.ProtocolManager;
-import com.viaversion.viaversion.api.connection.ConnectionManager;
import java.util.Set;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/configuration/ViaVersionConfig.java b/api/src/main/java/com/viaversion/viaversion/api/configuration/ViaVersionConfig.java
index 6a7ad9582..801b07a48 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/configuration/ViaVersionConfig.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/configuration/ViaVersionConfig.java
@@ -78,7 +78,7 @@ public interface ViaVersionConfig {
/**
* Whether the player can block with the shield without a delay.
- *
+ *
* This option requires {@link #isShowShieldWhenSwordInHand()} to be disabled
*
* @return {@code true} if non delayed shield blocking is enabled.
@@ -88,7 +88,7 @@ public interface ViaVersionConfig {
/**
* Puts the shield into the second hand when holding a sword.
* The shield will disappear when switching to another item.
- *
+ *
* This option requires {@link #isShieldBlocking()} to be enabled
*
* @return {@code true} if the shield should appear when holding a sword
diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/base/Protocol.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/base/Protocol.java
index 20513f627..773944f50 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/base/Protocol.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/base/Protocol.java
@@ -24,7 +24,6 @@ package com.viaversion.viaversion.api.protocol.base;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.data.MappingData;
-import com.viaversion.viaversion.api.data.MappingDataBase;
import com.viaversion.viaversion.api.platform.providers.ViaProviders;
import com.viaversion.viaversion.api.protocol.AbstractSimpleProtocol;
import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketTracker.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketTracker.java
index 4c98292ec..d33489fe9 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketTracker.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketTracker.java
@@ -22,10 +22,10 @@
*/
package com.viaversion.viaversion.api.protocol.packet;
-import com.viaversion.viaversion.api.connection.UserConnection;
-import org.checkerframework.checker.nullness.qual.Nullable;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import org.checkerframework.checker.nullness.qual.Nullable;
public class PacketTracker {
private final UserConnection connection;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueTransformer.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueTransformer.java
index 0bc9ab741..b79f677c5 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueTransformer.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueTransformer.java
@@ -22,10 +22,10 @@
*/
package com.viaversion.viaversion.api.protocol.remapper;
-import org.checkerframework.checker.nullness.qual.Nullable;
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.exception.InformativeException;
+import org.checkerframework.checker.nullness.qual.Nullable;
public abstract class ValueTransformer implements ValueWriter {
private final Type inputType;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/ArrayType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/ArrayType.java
index bde946e38..c761d0795 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/ArrayType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/ArrayType.java
@@ -22,8 +22,8 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
import java.lang.reflect.Array;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/BooleanType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/BooleanType.java
index 4f04d0acb..de30a7c04 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/BooleanType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/BooleanType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.TypeConverter;
+import io.netty.buffer.ByteBuf;
public class BooleanType extends Type implements TypeConverter {
public BooleanType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/ByteArrayType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/ByteArrayType.java
index 1a6ffc45a..08097a6ea 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/ByteArrayType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/ByteArrayType.java
@@ -23,8 +23,8 @@
package com.viaversion.viaversion.api.type.types;
import com.google.common.base.Preconditions;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class ByteArrayType extends Type {
public ByteArrayType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/ByteType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/ByteType.java
index 25419f450..4c27c8339 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/ByteType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/ByteType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.TypeConverter;
+import io.netty.buffer.ByteBuf;
public class ByteType extends Type implements TypeConverter {
public ByteType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/ComponentType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/ComponentType.java
index fe0fe8415..6540948eb 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/ComponentType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/ComponentType.java
@@ -25,9 +25,9 @@ package com.viaversion.viaversion.api.type.types;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
import com.google.gson.JsonSyntaxException;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class ComponentType extends Type {
private static final StringType STRING_TAG = new StringType(262144);
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/CustomByteType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/CustomByteType.java
index da9d485a7..42c2f23f9 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/CustomByteType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/CustomByteType.java
@@ -22,8 +22,8 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.PartialType;
+import io.netty.buffer.ByteBuf;
public class CustomByteType extends PartialType {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/DoubleType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/DoubleType.java
index dd8df2aac..541cdb54a 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/DoubleType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/DoubleType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.TypeConverter;
+import io.netty.buffer.ByteBuf;
public class DoubleType extends Type implements TypeConverter {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/FloatType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/FloatType.java
index b53ce4e32..357fe81b3 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/FloatType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/FloatType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.TypeConverter;
+import io.netty.buffer.ByteBuf;
public class FloatType extends Type implements TypeConverter {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/IntType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/IntType.java
index b18663b69..2a1ae7ba9 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/IntType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/IntType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.TypeConverter;
+import io.netty.buffer.ByteBuf;
public class IntType extends Type implements TypeConverter {
public IntType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/LongArrayType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/LongArrayType.java
index 3a081cf70..803c080ef 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/LongArrayType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/LongArrayType.java
@@ -22,8 +22,8 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class LongArrayType extends Type {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/LongType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/LongType.java
index 50c07d10d..64ad3f48f 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/LongType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/LongType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.TypeConverter;
+import io.netty.buffer.ByteBuf;
public class LongType extends Type implements TypeConverter {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/RemainingBytesType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/RemainingBytesType.java
index 828725950..203e4a3c8 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/RemainingBytesType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/RemainingBytesType.java
@@ -22,8 +22,8 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class RemainingBytesType extends Type {
public RemainingBytesType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/ShortByteArrayType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/ShortByteArrayType.java
index c15355f67..6edc0e243 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/ShortByteArrayType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/ShortByteArrayType.java
@@ -1,7 +1,7 @@
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
/**
* Byte array with a short prefix, used in 1.7
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/ShortType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/ShortType.java
index 79af7c600..8d65502fe 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/ShortType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/ShortType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.TypeConverter;
+import io.netty.buffer.ByteBuf;
public class ShortType extends Type implements TypeConverter {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/StringType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/StringType.java
index 8921cf936..e3dd6602a 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/StringType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/StringType.java
@@ -23,8 +23,8 @@
package com.viaversion.viaversion.api.type.types;
import com.google.common.base.Preconditions;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
import java.nio.charset.StandardCharsets;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/UUIDIntArrayType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/UUIDIntArrayType.java
index 96a51018d..3b705ae71 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/UUIDIntArrayType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/UUIDIntArrayType.java
@@ -22,8 +22,8 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
import java.util.UUID;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/UUIDType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/UUIDType.java
index 9e2f188c6..ef314646d 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/UUIDType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/UUIDType.java
@@ -22,8 +22,8 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
import java.util.UUID;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/UnsignedByteType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/UnsignedByteType.java
index a6b7df20d..4c3ba14e5 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/UnsignedByteType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/UnsignedByteType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.TypeConverter;
+import io.netty.buffer.ByteBuf;
public class UnsignedByteType extends Type implements TypeConverter {
public UnsignedByteType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/UnsignedShortType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/UnsignedShortType.java
index 1bfe6e7b9..2cee66590 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/UnsignedShortType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/UnsignedShortType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.TypeConverter;
+import io.netty.buffer.ByteBuf;
public class UnsignedShortType extends Type implements TypeConverter {
public UnsignedShortType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/VarIntArrayType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/VarIntArrayType.java
index 0817908f2..468d708e8 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/VarIntArrayType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/VarIntArrayType.java
@@ -23,8 +23,8 @@
package com.viaversion.viaversion.api.type.types;
import com.google.common.base.Preconditions;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class VarIntArrayType extends Type {
public VarIntArrayType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/VarIntType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/VarIntType.java
index 396a44d50..d1c40ce5b 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/VarIntType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/VarIntType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.TypeConverter;
+import io.netty.buffer.ByteBuf;
public class VarIntType extends Type implements TypeConverter {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/VarLongType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/VarLongType.java
index 21652f811..b4719ff39 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/VarLongType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/VarLongType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.TypeConverter;
+import io.netty.buffer.ByteBuf;
public class VarLongType extends Type implements TypeConverter {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/VoidType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/VoidType.java
index e5fcbbd3e..4674c729b 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/VoidType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/VoidType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.TypeConverter;
+import io.netty.buffer.ByteBuf;
public class VoidType extends Type implements TypeConverter {
public VoidType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/AbstractMetaListType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/AbstractMetaListType.java
index 926ac10bd..3493df97f 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/AbstractMetaListType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/AbstractMetaListType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.List;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/BlockChangeRecordType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/BlockChangeRecordType.java
index d3e926325..77ba63934 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/BlockChangeRecordType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/BlockChangeRecordType.java
@@ -22,10 +22,10 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_8;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class BlockChangeRecordType extends Type {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/EulerAngleType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/EulerAngleType.java
index 36f52361e..39c6afa95 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/EulerAngleType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/EulerAngleType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.EulerAngle;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class EulerAngleType extends Type {
public EulerAngleType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatItemArrayType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatItemArrayType.java
index fafbb28da..d50027261 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatItemArrayType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatItemArrayType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class FlatItemArrayType extends BaseItemArrayType {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatItemType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatItemType.java
index b7931727a..fb105c709 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatItemType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatItemType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class FlatItemType extends BaseItemType {
public FlatItemType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatVarIntItemArrayType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatVarIntItemArrayType.java
index 99d1f9e78..e622a92e5 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatVarIntItemArrayType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatVarIntItemArrayType.java
@@ -22,8 +22,8 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.item.Item;
+import io.netty.buffer.ByteBuf;
public class FlatVarIntItemArrayType extends BaseItemArrayType {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatVarIntItemType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatVarIntItemType.java
index 15b19f78f..3d58733d4 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatVarIntItemType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/FlatVarIntItemType.java
@@ -22,8 +22,8 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.item.Item;
+import io.netty.buffer.ByteBuf;
public class FlatVarIntItemType extends BaseItemType {
public FlatVarIntItemType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ItemArrayType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ItemArrayType.java
index 863353304..5910057cc 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ItemArrayType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ItemArrayType.java
@@ -22,8 +22,8 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.item.Item;
+import io.netty.buffer.ByteBuf;
public class ItemArrayType extends BaseItemArrayType {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ItemType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ItemType.java
index f2fefc5e2..1e02b3347 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ItemType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ItemType.java
@@ -22,8 +22,8 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.item.Item;
+import io.netty.buffer.ByteBuf;
public class ItemType extends BaseItemType {
public ItemType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ModernMetaListType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ModernMetaListType.java
index c982e1921..edb03d1b4 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ModernMetaListType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ModernMetaListType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public abstract class ModernMetaListType extends AbstractMetaListType {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ModernMetaType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ModernMetaType.java
index 359511265..61d13dbb9 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ModernMetaType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/ModernMetaType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
+import io.netty.buffer.ByteBuf;
public abstract class ModernMetaType extends MetaTypeTemplate {
@Override
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/NBTType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/NBTType.java
index 5733e9ada..d9b19749b 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/NBTType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/NBTType.java
@@ -25,10 +25,10 @@ package com.viaversion.viaversion.api.type.types.minecraft;
import com.github.steveice10.opennbt.NBTIO;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.google.common.base.Preconditions;
+import com.viaversion.viaversion.api.type.Type;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufInputStream;
import io.netty.buffer.ByteBufOutputStream;
-import com.viaversion.viaversion.api.type.Type;
import java.io.DataInput;
import java.io.DataOutput;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptPosition1_14Type.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptPosition1_14Type.java
index af29ed6d5..289b98e5d 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptPosition1_14Type.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptPosition1_14Type.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class OptPosition1_14Type extends Type {
public OptPosition1_14Type() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptPositionType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptPositionType.java
index 97d6fde5e..b52917c96 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptPositionType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptPositionType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class OptPositionType extends Type {
public OptPositionType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptUUIDType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptUUIDType.java
index 9adc514ee..bb959a2d5 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptUUIDType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptUUIDType.java
@@ -22,8 +22,8 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
import java.util.UUID;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptionalComponentType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptionalComponentType.java
index 5e82977e6..0d87b64fc 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptionalComponentType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptionalComponentType.java
@@ -23,8 +23,8 @@
package com.viaversion.viaversion.api.type.types.minecraft;
import com.google.gson.JsonElement;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class OptionalComponentType extends Type {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptionalVarIntType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptionalVarIntType.java
index df9801c90..e1a6ba4ae 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptionalVarIntType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/OptionalVarIntType.java
@@ -22,8 +22,8 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class OptionalVarIntType extends Type {
public OptionalVarIntType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_13Type.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_13Type.java
index 9e1d1d89b..4dfb3fc22 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_13Type.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_13Type.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.Particle;
+import io.netty.buffer.ByteBuf;
public class Particle1_13Type extends Type {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_13_2Type.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_13_2Type.java
index 9c5005d01..57d832c10 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_13_2Type.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_13_2Type.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.Particle;
+import io.netty.buffer.ByteBuf;
public class Particle1_13_2Type extends Type {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_14Type.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_14Type.java
index 1cb60887a..42130dd23 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_14Type.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_14Type.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.Particle;
+import io.netty.buffer.ByteBuf;
public class Particle1_14Type extends Type {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_17Type.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_17Type.java
index 3f2b51246..178759c61 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_17Type.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_17Type.java
@@ -22,10 +22,10 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.Particle;
+import io.netty.buffer.ByteBuf;
public class Particle1_17Type extends Type {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Position1_14Type.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Position1_14Type.java
index 8f480e648..d3c9d3522 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Position1_14Type.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Position1_14Type.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class Position1_14Type extends Type {
public Position1_14Type() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/PositionType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/PositionType.java
index b88a17bc6..81c9fb9a1 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/PositionType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/PositionType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class PositionType extends Type {
public PositionType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/VarLongBlockChangeRecordType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/VarLongBlockChangeRecordType.java
index d4a2fa9b3..49a69f4db 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/VarLongBlockChangeRecordType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/VarLongBlockChangeRecordType.java
@@ -22,10 +22,10 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_16_2;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class VarLongBlockChangeRecordType extends Type {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/VectorType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/VectorType.java
index d64725d17..d322027a1 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/VectorType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/VectorType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.Vector;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class VectorType extends Type {
public VectorType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/VillagerDataType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/VillagerDataType.java
index 2ce2b9a20..1132026e5 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/VillagerDataType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/VillagerDataType.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.minecraft;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.VillagerData;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
public class VillagerDataType extends Type {
public VillagerDataType() {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_13.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_13.java
index b4dc84781..b105daf4a 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_13.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_13.java
@@ -22,10 +22,10 @@
*/
package com.viaversion.viaversion.api.type.types.version;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.util.CompactArrayUtil;
+import io.netty.buffer.ByteBuf;
public class ChunkSectionType1_13 extends Type {
private static final int GLOBAL_PALETTE = 14;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_16.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_16.java
index 169c39093..1454eef7a 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_16.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_16.java
@@ -22,10 +22,10 @@
*/
package com.viaversion.viaversion.api.type.types.version;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.util.CompactArrayUtil;
+import io.netty.buffer.ByteBuf;
public class ChunkSectionType1_16 extends Type {
private static final int GLOBAL_PALETTE = 15;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_8.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_8.java
index 4905f18ab..d869ad903 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_8.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_8.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.api.type.types.version;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
import java.nio.ByteOrder;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_9.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_9.java
index 968c7b303..cacfd3257 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_9.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/ChunkSectionType1_9.java
@@ -22,10 +22,10 @@
*/
package com.viaversion.viaversion.api.type.types.version;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.util.CompactArrayUtil;
+import io.netty.buffer.ByteBuf;
public class ChunkSectionType1_9 extends Type {
private static final int GLOBAL_PALETTE = 13;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/Metadata1_8Type.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/Metadata1_8Type.java
index fb065e928..296030ddc 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/Metadata1_8Type.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/Metadata1_8Type.java
@@ -23,10 +23,10 @@
package com.viaversion.viaversion.api.type.types.version;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8;
import com.viaversion.viaversion.api.type.types.minecraft.MetaTypeTemplate;
+import io.netty.buffer.ByteBuf;
public class Metadata1_8Type extends MetaTypeTemplate {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/MetadataList1_8Type.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/MetadataList1_8Type.java
index cce3b5cbf..abe3ae071 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/MetadataList1_8Type.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/MetadataList1_8Type.java
@@ -22,10 +22,10 @@
*/
package com.viaversion.viaversion.api.type.types.version;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.minecraft.AbstractMetaListType;
+import io.netty.buffer.ByteBuf;
public class MetadataList1_8Type extends AbstractMetaListType {
@Override
diff --git a/api/src/main/java/com/viaversion/viaversion/exception/CancelDecoderException.java b/api/src/main/java/com/viaversion/viaversion/exception/CancelDecoderException.java
index 7abbb28a3..d66292d53 100644
--- a/api/src/main/java/com/viaversion/viaversion/exception/CancelDecoderException.java
+++ b/api/src/main/java/com/viaversion/viaversion/exception/CancelDecoderException.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.exception;
+import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.ViaManager;
import io.netty.handler.codec.DecoderException;
-import com.viaversion.viaversion.api.Via;
/**
* Thrown during packet decoding when an incoming packet should be cancelled.
diff --git a/api/src/main/java/com/viaversion/viaversion/exception/CancelEncoderException.java b/api/src/main/java/com/viaversion/viaversion/exception/CancelEncoderException.java
index 9ce2cedb9..e595f81a2 100644
--- a/api/src/main/java/com/viaversion/viaversion/exception/CancelEncoderException.java
+++ b/api/src/main/java/com/viaversion/viaversion/exception/CancelEncoderException.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.exception;
+import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.ViaManager;
import io.netty.handler.codec.EncoderException;
-import com.viaversion.viaversion.api.Via;
/**
* Thrown during packet encoding when an outgoing packet should be cancelled.
diff --git a/api/src/main/java/com/viaversion/viaversion/exception/CancelException.java b/api/src/main/java/com/viaversion/viaversion/exception/CancelException.java
index 6348e5120..bc32ee5bd 100644
--- a/api/src/main/java/com/viaversion/viaversion/exception/CancelException.java
+++ b/api/src/main/java/com/viaversion/viaversion/exception/CancelException.java
@@ -22,9 +22,9 @@
*/
package com.viaversion.viaversion.exception;
+import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.ViaManager;
import io.netty.handler.codec.CodecException;
-import com.viaversion.viaversion.api.Via;
/**
* Thrown during packet transformation to cancel the packet.
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/boss/ViaBossBar.java b/bukkit/src/main/java/com/viaversion/viaversion/boss/ViaBossBar.java
index b332d740b..3ee189166 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/boss/ViaBossBar.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/boss/ViaBossBar.java
@@ -17,10 +17,10 @@
*/
package com.viaversion.viaversion.boss;
-import org.bukkit.entity.Player;
import com.viaversion.viaversion.api.boss.BossBar;
import com.viaversion.viaversion.api.boss.BossColor;
import com.viaversion.viaversion.api.boss.BossStyle;
+import org.bukkit.entity.Player;
public class ViaBossBar extends CommonBoss {
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/BasicHandlerConstructor.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/BasicHandlerConstructor.java
index b0931bbda..c23919d2a 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/BasicHandlerConstructor.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/BasicHandlerConstructor.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.bukkit.classgenerator;
-import io.netty.handler.codec.ByteToMessageDecoder;
-import io.netty.handler.codec.MessageToByteEncoder;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.bukkit.handlers.BukkitDecodeHandler;
import com.viaversion.viaversion.bukkit.handlers.BukkitEncodeHandler;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.MessageToByteEncoder;
public class BasicHandlerConstructor implements HandlerConstructor {
@Override
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/ClassGenerator.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/ClassGenerator.java
index 47357ee33..f4be26243 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/ClassGenerator.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/ClassGenerator.java
@@ -17,7 +17,19 @@
*/
package com.viaversion.viaversion.bukkit.classgenerator;
-import javassist.*;
+import com.viaversion.viaversion.ViaVersionPlugin;
+import com.viaversion.viaversion.bukkit.handlers.BukkitDecodeHandler;
+import com.viaversion.viaversion.bukkit.handlers.BukkitEncodeHandler;
+import com.viaversion.viaversion.bukkit.util.NMSUtil;
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtField;
+import javassist.CtMethod;
+import javassist.CtNewConstructor;
+import javassist.CtNewMethod;
+import javassist.LoaderClassPath;
+import javassist.NotFoundException;
import javassist.expr.ConstructorCall;
import javassist.expr.ExprEditor;
import org.bukkit.Bukkit;
@@ -27,10 +39,6 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.plugin.EventExecutor;
import org.bukkit.plugin.Plugin;
-import com.viaversion.viaversion.ViaVersionPlugin;
-import com.viaversion.viaversion.bukkit.handlers.BukkitDecodeHandler;
-import com.viaversion.viaversion.bukkit.handlers.BukkitEncodeHandler;
-import com.viaversion.viaversion.bukkit.util.NMSUtil;
import java.lang.reflect.Method;
@@ -214,31 +222,31 @@ public class ClassGenerator {
// Bake constructor
connectListenerClazz.addConstructor(CtNewConstructor.make(
"public ProtocolSupportConnectListener (ConnectionImpl connection) {\n"
- + " this.connection = connection;\n"
- + "}", connectListenerClazz));
+ + " this.connection = connection;\n"
+ + "}", connectListenerClazz));
// Add the listening method
connectListenerClazz.addMethod(CtNewMethod.make(
// On packet receive
"public void onPacketReceiving(protocolsupport.api.Connection.PacketListener.PacketEvent event) {\n"
- // Check if we are getting handshake packet.
- + " if (event.getPacket() instanceof PacketHandshakingInSetProtocol) {\n"
- // Get protocol version.
- + " PacketHandshakingInSetProtocol packet = (PacketHandshakingInSetProtocol) event.getPacket();\n"
- + (newVersionMethod ? (
- " int protoVersion = packet.getProtocolVersion();\n"
- ) : (
- " int protoVersion = packet.b();\n"
- ))
- // ViaVersion has at this point already spoofed the connectionversion. (Since it is higher up the pipeline)
- // If via has put the protoVersion to the server we can spoof ProtocolSupport's version.
- + " if (connection.getVersion() == ProtocolVersion.MINECRAFT_FUTURE && protoVersion == com.viaversion.viaversion.api.Via.getAPI().getServerVersion().lowestSupportedVersion()) {\n"
- + " connection.setVersion(ProtocolVersion.getLatest(ProtocolType.PC));\n"
- + " }\n"
- + " }\n"
- // Id version is not serverversion viaversion will not spoof. ProtocolSupport will handle the rest.
- // In any case, remove the packet listener and wrap up.
- + " connection.removePacketListener(this);\n"
- + "}", connectListenerClazz));
+ // Check if we are getting handshake packet.
+ + " if (event.getPacket() instanceof PacketHandshakingInSetProtocol) {\n"
+ // Get protocol version.
+ + " PacketHandshakingInSetProtocol packet = (PacketHandshakingInSetProtocol) event.getPacket();\n"
+ + (newVersionMethod ? (
+ " int protoVersion = packet.getProtocolVersion();\n"
+ ) : (
+ " int protoVersion = packet.b();\n"
+ ))
+ // ViaVersion has at this point already spoofed the connectionversion. (Since it is higher up the pipeline)
+ // If via has put the protoVersion to the server we can spoof ProtocolSupport's version.
+ + " if (connection.getVersion() == ProtocolVersion.MINECRAFT_FUTURE && protoVersion == com.viaversion.viaversion.api.Via.getAPI().getServerVersion().lowestSupportedVersion()) {\n"
+ + " connection.setVersion(ProtocolVersion.getLatest(ProtocolType.PC));\n"
+ + " }\n"
+ + " }\n"
+ // Id version is not serverversion viaversion will not spoof. ProtocolSupport will handle the rest.
+ // In any case, remove the packet listener and wrap up.
+ + " connection.removePacketListener(this);\n"
+ + "}", connectListenerClazz));
return connectListenerClazz.toClass(HandlerConstructor.class.getClassLoader());
} catch (Exception e) {
e.printStackTrace();
@@ -250,7 +258,8 @@ public class ClassGenerator {
if (getPSConnectListener() != null) {
try {
Class extends Event> connectionOpenEvent = (Class extends Event>) Class.forName("protocolsupport.api.events.ConnectionOpenEvent");
- Bukkit.getPluginManager().registerEvent(connectionOpenEvent, new Listener() { }, EventPriority.HIGH, new EventExecutor() {
+ Bukkit.getPluginManager().registerEvent(connectionOpenEvent, new Listener() {
+ }, EventPriority.HIGH, new EventExecutor() {
@Override
public void execute(Listener listener, Event event) throws EventException {
try {
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/HandlerConstructor.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/HandlerConstructor.java
index a337a1bdc..5b568fd67 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/HandlerConstructor.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/HandlerConstructor.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.bukkit.classgenerator;
+import com.viaversion.viaversion.api.connection.UserConnection;
import io.netty.handler.codec.ByteToMessageDecoder;
import io.netty.handler.codec.MessageToByteEncoder;
-import com.viaversion.viaversion.api.connection.UserConnection;
public interface HandlerConstructor {
public MessageToByteEncoder newEncodeHandler(UserConnection info, MessageToByteEncoder minecraftEncoder);
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/commands/BukkitCommandHandler.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/commands/BukkitCommandHandler.java
index c79485187..458cd1e80 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/commands/BukkitCommandHandler.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/commands/BukkitCommandHandler.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.bukkit.commands;
+import com.viaversion.viaversion.commands.ViaCommandHandler;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabExecutor;
-import com.viaversion.viaversion.commands.ViaCommandHandler;
import java.util.List;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/commands/BukkitCommandSender.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/commands/BukkitCommandSender.java
index 5562523dd..4954aefd0 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/commands/BukkitCommandSender.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/commands/BukkitCommandSender.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.bukkit.commands;
+import com.viaversion.viaversion.api.command.ViaCommandSender;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import com.viaversion.viaversion.api.command.ViaCommandSender;
import java.util.UUID;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitChannelInitializer.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitChannelInitializer.java
index 7eaceee85..532b784a2 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitChannelInitializer.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitChannelInitializer.java
@@ -17,16 +17,16 @@
*/
package com.viaversion.viaversion.bukkit.handlers;
-import com.viaversion.viaversion.protocol.ProtocolPipelineImpl;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.bukkit.classgenerator.ClassGenerator;
+import com.viaversion.viaversion.bukkit.classgenerator.HandlerConstructor;
import com.viaversion.viaversion.connection.UserConnectionImpl;
+import com.viaversion.viaversion.protocol.ProtocolPipelineImpl;
import io.netty.channel.Channel;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.socket.SocketChannel;
import io.netty.handler.codec.ByteToMessageDecoder;
import io.netty.handler.codec.MessageToByteEncoder;
-import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.bukkit.classgenerator.ClassGenerator;
-import com.viaversion.viaversion.bukkit.classgenerator.HandlerConstructor;
import java.lang.reflect.Method;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitDecodeHandler.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitDecodeHandler.java
index 2c1453264..f70a0af9d 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitDecodeHandler.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitDecodeHandler.java
@@ -17,17 +17,17 @@
*/
package com.viaversion.viaversion.bukkit.handlers;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.ByteToMessageDecoder;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.bukkit.util.NMSUtil;
import com.viaversion.viaversion.exception.CancelCodecException;
import com.viaversion.viaversion.exception.CancelDecoderException;
import com.viaversion.viaversion.exception.InformativeException;
-import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.util.PipelineUtil;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageDecoder;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitEncodeHandler.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitEncodeHandler.java
index 2c0f51aa2..41ee58023 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitEncodeHandler.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitEncodeHandler.java
@@ -17,19 +17,19 @@
*/
package com.viaversion.viaversion.bukkit.handlers;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToByteEncoder;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.bukkit.util.NMSUtil;
import com.viaversion.viaversion.exception.CancelCodecException;
import com.viaversion.viaversion.exception.CancelEncoderException;
import com.viaversion.viaversion.exception.InformativeException;
import com.viaversion.viaversion.handlers.ChannelHandlerContextWrapper;
import com.viaversion.viaversion.handlers.ViaCodecHandler;
-import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.util.PipelineUtil;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitPacketHandler.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitPacketHandler.java
index 7eabf4e6b..26703ee24 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitPacketHandler.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitPacketHandler.java
@@ -17,10 +17,10 @@
*/
package com.viaversion.viaversion.bukkit.handlers;
+import com.viaversion.viaversion.api.connection.UserConnection;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageEncoder;
-import com.viaversion.viaversion.api.connection.UserConnection;
import java.util.List;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/ProtocolLibEnableListener.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/ProtocolLibEnableListener.java
index 26cd0bf4c..d0bc4d4dc 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/ProtocolLibEnableListener.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/ProtocolLibEnableListener.java
@@ -17,12 +17,12 @@
*/
package com.viaversion.viaversion.bukkit.listeners;
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.bukkit.platform.BukkitViaInjector;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.PluginEnableEvent;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.bukkit.platform.BukkitViaInjector;
public class ProtocolLibEnableListener implements Listener {
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/UpdateListener.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/UpdateListener.java
index 5270adadd..53b7640d4 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/UpdateListener.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/UpdateListener.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.bukkit.listeners;
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.update.UpdateUtil;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.update.UpdateUtil;
public class UpdateListener implements Listener {
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/multiversion/PlayerSneakListener.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/multiversion/PlayerSneakListener.java
index 683287a61..5853342f5 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/multiversion/PlayerSneakListener.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/multiversion/PlayerSneakListener.java
@@ -17,18 +17,18 @@
*/
package com.viaversion.viaversion.bukkit.listeners.multiversion;
+import com.viaversion.viaversion.ViaVersionPlugin;
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.connection.ProtocolInfo;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerToggleSneakEvent;
-import com.viaversion.viaversion.ViaVersionPlugin;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener;
-import com.viaversion.viaversion.api.connection.ProtocolInfo;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_15to1_14_4/EntityToggleGlideListener.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_15to1_14_4/EntityToggleGlideListener.java
index 368646e95..b89f2df03 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_15to1_14_4/EntityToggleGlideListener.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_15to1_14_4/EntityToggleGlideListener.java
@@ -17,19 +17,19 @@
*/
package com.viaversion.viaversion.bukkit.listeners.protocol1_15to1_14_4;
+import com.viaversion.viaversion.ViaVersionPlugin;
+import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
+import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_14;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.types.version.Types1_14;
+import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener;
+import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityToggleGlideEvent;
import org.bukkit.potion.PotionEffectType;
-import com.viaversion.viaversion.ViaVersionPlugin;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
-import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_14;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.version.Types1_14;
-import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener;
-import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4;
import java.util.Arrays;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaAPI.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaAPI.java
index b37aacdd6..98adc3259 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaAPI.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaAPI.java
@@ -17,18 +17,18 @@
*/
package com.viaversion.viaversion.bukkit.platform;
-import io.netty.buffer.ByteBuf;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
+import com.viaversion.viaversion.ViaAPIBase;
import com.viaversion.viaversion.ViaVersionPlugin;
import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.ViaAPIBase;
import com.viaversion.viaversion.api.boss.BossBar;
import com.viaversion.viaversion.api.boss.BossColor;
import com.viaversion.viaversion.api.boss.BossStyle;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.boss.ViaBossBar;
import com.viaversion.viaversion.bukkit.util.ProtocolSupportUtil;
+import io.netty.buffer.ByteBuf;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
import java.util.UUID;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaConfig.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaConfig.java
index 7b30dc9f3..98e9d0529 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaConfig.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaConfig.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.bukkit.platform;
-import org.bukkit.plugin.Plugin;
-import com.viaversion.viaversion.configuration.AbstractViaConfig;
import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.configuration.AbstractViaConfig;
+import org.bukkit.plugin.Plugin;
import java.io.File;
import java.net.URL;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaInjector.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaInjector.java
index b69043406..97f8dfa26 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaInjector.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaInjector.java
@@ -19,20 +19,20 @@ package com.viaversion.viaversion.bukkit.platform;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.socket.SocketChannel;
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.PluginDescriptionFile;
-import com.viaversion.viaversion.util.Pair;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.platform.ViaInjector;
import com.viaversion.viaversion.bukkit.handlers.BukkitChannelInitializer;
import com.viaversion.viaversion.bukkit.util.NMSUtil;
import com.viaversion.viaversion.util.ConcurrentList;
import com.viaversion.viaversion.util.ListWrapper;
+import com.viaversion.viaversion.util.Pair;
import com.viaversion.viaversion.util.ReflectionUtil;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.socket.SocketChannel;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.PluginDescriptionFile;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java
index 41ffb2b27..c3e9f0432 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java
@@ -17,11 +17,6 @@
*/
package com.viaversion.viaversion.bukkit.platform;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.bukkit.scheduler.BukkitTask;
import com.viaversion.viaversion.ViaVersionPlugin;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
@@ -47,6 +42,11 @@ import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BulkChunkTranslatorProvider;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.HandItemProvider;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.scheduler.BukkitTask;
import java.util.HashSet;
import java.util.Locale;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java
index ad5914971..7c634ae7d 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java
@@ -17,20 +17,20 @@
*/
package com.viaversion.viaversion.bukkit.providers;
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.connection.ProtocolInfo;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.bukkit.tasks.protocol1_12to1_11_1.BukkitInventoryUpdateTask;
+import com.viaversion.viaversion.bukkit.util.NMSUtil;
+import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.providers.InventoryQuickMoveProvider;
+import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.storage.ItemTransaction;
+import com.viaversion.viaversion.util.ReflectionUtil;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.ItemStack;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import com.viaversion.viaversion.bukkit.tasks.protocol1_12to1_11_1.BukkitInventoryUpdateTask;
-import com.viaversion.viaversion.bukkit.util.NMSUtil;
-import com.viaversion.viaversion.api.connection.ProtocolInfo;
-import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.providers.InventoryQuickMoveProvider;
-import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.storage.ItemTransaction;
-import com.viaversion.viaversion.util.ReflectionUtil;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitViaMovementTransmitter.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitViaMovementTransmitter.java
index 6a825fe08..e8c6d8c5a 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitViaMovementTransmitter.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitViaMovementTransmitter.java
@@ -17,13 +17,13 @@
*/
package com.viaversion.viaversion.bukkit.providers;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.bukkit.util.NMSUtil;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_12to1_11_1/BukkitInventoryUpdateTask.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_12to1_11_1/BukkitInventoryUpdateTask.java
index de063abe5..334c83ce4 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_12to1_11_1/BukkitInventoryUpdateTask.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_12to1_11_1/BukkitInventoryUpdateTask.java
@@ -17,10 +17,10 @@
*/
package com.viaversion.viaversion.bukkit.tasks.protocol1_12to1_11_1;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
import com.viaversion.viaversion.bukkit.providers.BukkitInventoryQuickMoveProvider;
import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.storage.ItemTransaction;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/commands/BungeeCommandSender.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/commands/BungeeCommandSender.java
index d466c9385..283520873 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/commands/BungeeCommandSender.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/commands/BungeeCommandSender.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.bungee.commands;
+import com.viaversion.viaversion.api.command.ViaCommandSender;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.connection.ProxiedPlayer;
-import com.viaversion.viaversion.api.command.ViaCommandSender;
import java.util.UUID;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeChannelInitializer.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeChannelInitializer.java
index ac9718d64..348c383e6 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeChannelInitializer.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeChannelInitializer.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.bungee.handlers;
-import com.viaversion.viaversion.protocol.ProtocolPipelineImpl;
+import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.connection.UserConnectionImpl;
+import com.viaversion.viaversion.protocol.ProtocolPipelineImpl;
import io.netty.channel.Channel;
import io.netty.channel.ChannelInitializer;
-import com.viaversion.viaversion.api.connection.UserConnection;
import java.lang.reflect.Method;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeDecodeHandler.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeDecodeHandler.java
index 220f3d55b..c9b83a905 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeDecodeHandler.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeDecodeHandler.java
@@ -17,13 +17,13 @@
*/
package com.viaversion.viaversion.bungee.handlers;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.exception.CancelCodecException;
+import com.viaversion.viaversion.exception.CancelDecoderException;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageDecoder;
-import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.exception.CancelCodecException;
-import com.viaversion.viaversion.exception.CancelDecoderException;
import java.util.List;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeEncodeHandler.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeEncodeHandler.java
index 382d27607..085453bac 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeEncodeHandler.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeEncodeHandler.java
@@ -17,14 +17,14 @@
*/
package com.viaversion.viaversion.bungee.handlers;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageEncoder;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.bungee.util.BungeePipelineUtil;
import com.viaversion.viaversion.exception.CancelCodecException;
import com.viaversion.viaversion.exception.CancelEncoderException;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageEncoder;
import java.util.List;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/ElytraPatch.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/ElytraPatch.java
index 5888affbd..ce1abf649 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/ElytraPatch.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/ElytraPatch.java
@@ -17,19 +17,19 @@
*/
package com.viaversion.viaversion.bungee.listeners;
-import net.md_5.bungee.api.event.ServerConnectedEvent;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.event.EventHandler;
-import net.md_5.bungee.event.EventPriority;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.version.Types1_9;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9;
+import net.md_5.bungee.api.event.ServerConnectedEvent;
+import net.md_5.bungee.api.plugin.Listener;
+import net.md_5.bungee.event.EventHandler;
+import net.md_5.bungee.event.EventPriority;
import java.util.Collections;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/UpdateListener.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/UpdateListener.java
index e688ac9b2..22469db7d 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/UpdateListener.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/UpdateListener.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.bungee.listeners;
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.update.UpdateUtil;
import net.md_5.bungee.api.event.PostLoginEvent;
import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.event.EventHandler;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.update.UpdateUtil;
public class UpdateListener implements Listener {
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeBossBar.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeBossBar.java
index 5f374a902..0844ffda5 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeBossBar.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeBossBar.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.bungee.platform;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
import com.viaversion.viaversion.api.boss.BossBar;
import com.viaversion.viaversion.api.boss.BossColor;
import com.viaversion.viaversion.api.boss.BossStyle;
import com.viaversion.viaversion.boss.CommonBoss;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
public class BungeeBossBar extends CommonBoss {
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaAPI.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaAPI.java
index 7936e254a..96715ce60 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaAPI.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaAPI.java
@@ -17,14 +17,14 @@
*/
package com.viaversion.viaversion.bungee.platform;
-import io.netty.buffer.ByteBuf;
-import net.md_5.bungee.api.config.ServerInfo;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
import com.viaversion.viaversion.ViaAPIBase;
import com.viaversion.viaversion.api.boss.BossBar;
import com.viaversion.viaversion.api.boss.BossColor;
import com.viaversion.viaversion.api.boss.BossStyle;
import com.viaversion.viaversion.bungee.service.ProtocolDetectorService;
+import io.netty.buffer.ByteBuf;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
public class BungeeViaAPI extends ViaAPIBase {
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaConfig.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaConfig.java
index 63bdfe987..3bae89682 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaConfig.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaConfig.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.bungee.platform;
-import com.viaversion.viaversion.configuration.AbstractViaConfig;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import com.viaversion.viaversion.bungee.providers.BungeeVersionProvider;
+import com.viaversion.viaversion.configuration.AbstractViaConfig;
import java.io.File;
import java.net.URL;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaInjector.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaInjector.java
index fdd2fac45..7dada5553 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaInjector.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaInjector.java
@@ -18,16 +18,16 @@
package com.viaversion.viaversion.bungee.platform;
import com.google.gson.JsonObject;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelInitializer;
-import it.unimi.dsi.fastutil.ints.IntLinkedOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSortedSet;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.platform.ViaInjector;
import com.viaversion.viaversion.bungee.handlers.BungeeChannelInitializer;
import com.viaversion.viaversion.compatibility.ForcefulFieldModifier;
import com.viaversion.viaversion.compatibility.unsafe.UnsafeBackedForcefulFieldModifier;
import com.viaversion.viaversion.util.ReflectionUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelInitializer;
+import it.unimi.dsi.fastutil.ints.IntLinkedOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSortedSet;
import java.lang.reflect.Field;
import java.util.List;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaLoader.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaLoader.java
index d3cab530c..07a60b539 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaLoader.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaLoader.java
@@ -17,13 +17,11 @@
*/
package com.viaversion.viaversion.bungee.platform;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.api.scheduler.ScheduledTask;
import com.viaversion.viaversion.BungeePlugin;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.platform.ViaPlatformLoader;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.VersionProvider;
import com.viaversion.viaversion.bungee.handlers.BungeeServerHandler;
import com.viaversion.viaversion.bungee.listeners.ElytraPatch;
import com.viaversion.viaversion.bungee.listeners.UpdateListener;
@@ -33,11 +31,13 @@ import com.viaversion.viaversion.bungee.providers.BungeeMainHandProvider;
import com.viaversion.viaversion.bungee.providers.BungeeMovementTransmitter;
import com.viaversion.viaversion.bungee.providers.BungeeVersionProvider;
import com.viaversion.viaversion.bungee.service.ProtocolDetectorService;
-import com.viaversion.viaversion.api.protocol.version.VersionProvider;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BossBarProvider;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.EntityIdProvider;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MainHandProvider;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider;
+import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.plugin.Listener;
+import net.md_5.bungee.api.scheduler.ScheduledTask;
import java.util.HashSet;
import java.util.Set;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeEntityIdProvider.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeEntityIdProvider.java
index cf76cf06c..8aba42037 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeEntityIdProvider.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeEntityIdProvider.java
@@ -17,10 +17,10 @@
*/
package com.viaversion.viaversion.bungee.providers;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.bungee.storage.BungeeStorage;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.EntityIdProvider;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.lang.reflect.Method;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMainHandProvider.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMainHandProvider.java
index 220f83f49..e307c17dd 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMainHandProvider.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMainHandProvider.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.bungee.providers;
+import com.viaversion.viaversion.api.connection.ProtocolInfo;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MainHandProvider;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.connection.ProxiedPlayer;
-import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.connection.ProtocolInfo;
-import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MainHandProvider;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMovementTransmitter.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMovementTransmitter.java
index f7a4a1310..0909bb78a 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMovementTransmitter.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMovementTransmitter.java
@@ -17,10 +17,10 @@
*/
package com.viaversion.viaversion.bungee.providers;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.packet.State;
+import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeVersionProvider.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeVersionProvider.java
index b1a032490..ba7b540b0 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeVersionProvider.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeVersionProvider.java
@@ -18,13 +18,13 @@
package com.viaversion.viaversion.bungee.providers;
import com.google.common.collect.Lists;
-import net.md_5.bungee.api.ProxyServer;
import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.connection.ProtocolInfo;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import com.viaversion.viaversion.protocols.base.BaseVersionProvider;
-import com.viaversion.viaversion.api.connection.ProtocolInfo;
import com.viaversion.viaversion.util.ReflectionUtil;
+import net.md_5.bungee.api.ProxyServer;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/service/ProtocolDetectorService.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/service/ProtocolDetectorService.java
index 709fbfc7f..bc8011745 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/service/ProtocolDetectorService.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/service/ProtocolDetectorService.java
@@ -17,13 +17,13 @@
*/
package com.viaversion.viaversion.bungee.service;
-import net.md_5.bungee.api.Callback;
-import net.md_5.bungee.api.ServerPing;
-import net.md_5.bungee.api.config.ServerInfo;
import com.viaversion.viaversion.BungeePlugin;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.bungee.platform.BungeeViaConfig;
import com.viaversion.viaversion.bungee.providers.BungeeVersionProvider;
+import net.md_5.bungee.api.Callback;
+import net.md_5.bungee.api.ServerPing;
+import net.md_5.bungee.api.config.ServerInfo;
import java.util.HashMap;
import java.util.Map;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/storage/BungeeStorage.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/storage/BungeeStorage.java
index 792d96342..c0f9486bf 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/storage/BungeeStorage.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/storage/BungeeStorage.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.bungee.storage;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
import com.viaversion.viaversion.api.connection.StoredObject;
import com.viaversion.viaversion.api.connection.UserConnection;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.lang.reflect.Field;
import java.util.Objects;
diff --git a/common/src/main/java/com/viaversion/viaversion/ViaAPIBase.java b/common/src/main/java/com/viaversion/viaversion/ViaAPIBase.java
index 98240fdea..d9c2b9923 100644
--- a/common/src/main/java/com/viaversion/viaversion/ViaAPIBase.java
+++ b/common/src/main/java/com/viaversion/viaversion/ViaAPIBase.java
@@ -19,9 +19,9 @@ package com.viaversion.viaversion;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.ViaAPI;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
+import io.netty.buffer.ByteBuf;
import java.util.SortedSet;
import java.util.TreeSet;
diff --git a/common/src/main/java/com/viaversion/viaversion/ViaListener.java b/common/src/main/java/com/viaversion/viaversion/ViaListener.java
index 84e2f39e6..8a3b1c3f2 100644
--- a/common/src/main/java/com/viaversion/viaversion/ViaListener.java
+++ b/common/src/main/java/com/viaversion/viaversion/ViaListener.java
@@ -18,9 +18,9 @@
package com.viaversion.viaversion;
import com.viaversion.viaversion.api.Via;
-import org.checkerframework.checker.nullness.qual.Nullable;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.protocol.Protocol;
+import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.UUID;
diff --git a/common/src/main/java/com/viaversion/viaversion/boss/CommonBoss.java b/common/src/main/java/com/viaversion/viaversion/boss/CommonBoss.java
index 06e5806a1..c54efd60f 100644
--- a/common/src/main/java/com/viaversion/viaversion/boss/CommonBoss.java
+++ b/common/src/main/java/com/viaversion/viaversion/boss/CommonBoss.java
@@ -18,17 +18,23 @@
package com.viaversion.viaversion.boss;
import com.google.common.base.Preconditions;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.boss.BossBar;
import com.viaversion.viaversion.api.boss.BossColor;
import com.viaversion.viaversion.api.boss.BossFlag;
import com.viaversion.viaversion.api.boss.BossStyle;
import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import java.util.WeakHashMap;
import java.util.stream.Collectors;
public abstract class CommonBoss extends BossBar {
diff --git a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/DisplayLeaksSubCmd.java b/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/DisplayLeaksSubCmd.java
index 751c38a7d..64282ab52 100644
--- a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/DisplayLeaksSubCmd.java
+++ b/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/DisplayLeaksSubCmd.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.commands.defaultsubs;
-import io.netty.util.ResourceLeakDetector;
import com.viaversion.viaversion.api.command.ViaCommandSender;
import com.viaversion.viaversion.api.command.ViaSubCommand;
+import io.netty.util.ResourceLeakDetector;
public class DisplayLeaksSubCmd extends ViaSubCommand {
@Override
diff --git a/common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java b/common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java
index dfeb385f8..b704bd689 100644
--- a/common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java
+++ b/common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java
@@ -17,10 +17,10 @@
*/
package com.viaversion.viaversion.configuration;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
import com.viaversion.viaversion.util.Config;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
import java.io.File;
diff --git a/common/src/main/java/com/viaversion/viaversion/data/EntityTracker.java b/common/src/main/java/com/viaversion/viaversion/data/EntityTracker.java
index 3438321da..82f38b679 100644
--- a/common/src/main/java/com/viaversion/viaversion/data/EntityTracker.java
+++ b/common/src/main/java/com/viaversion/viaversion/data/EntityTracker.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.data;
-import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.platform.ExternalJoinGameListener;
import com.viaversion.viaversion.api.connection.StoredObject;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.platform.ExternalJoinGameListener;
+import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java
index 81d610e52..514e89b70 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java
@@ -27,8 +27,8 @@ import com.viaversion.viaversion.api.data.MappingDataLoader;
import com.viaversion.viaversion.api.protocol.ProtocolManager;
import com.viaversion.viaversion.api.protocol.ProtocolPathEntry;
import com.viaversion.viaversion.api.protocol.ProtocolPathKey;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.base.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
import com.viaversion.viaversion.protocol.packet.PacketWrapperImpl;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_7.java b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_7.java
index 6da96a62f..3e7a89515 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_7.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_7.java
@@ -21,23 +21,23 @@ import com.google.common.base.Joiner;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
-import com.viaversion.viaversion.api.connection.ProtocolInfo;
-import com.viaversion.viaversion.api.protocol.version.VersionProvider;
-import io.netty.channel.ChannelFuture;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.protocol.ProtocolManagerImpl;
-import com.viaversion.viaversion.api.protocol.ProtocolPathEntry;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import com.viaversion.viaversion.protocol.ServerProtocolVersionSingleton;
+import com.viaversion.viaversion.api.connection.ProtocolInfo;
import com.viaversion.viaversion.api.protocol.AbstractSimpleProtocol;
+import com.viaversion.viaversion.api.protocol.ProtocolPathEntry;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.VersionProvider;
import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.protocol.packet.State;
+import com.viaversion.viaversion.protocol.ProtocolManagerImpl;
+import com.viaversion.viaversion.protocol.ServerProtocolVersionSingleton;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
import com.viaversion.viaversion.util.ChatColorUtil;
import com.viaversion.viaversion.util.GsonUtil;
+import io.netty.channel.ChannelFuture;
import java.util.List;
import java.util.UUID;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java
index 5eef43756..3d81f6771 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java
@@ -17,16 +17,16 @@
*/
package com.viaversion.viaversion.protocols.protocol1_10to1_9_3;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.version.Types1_9;
-import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.protocols.protocol1_10to1_9_3.packets.InventoryPackets;
import com.viaversion.viaversion.protocols.protocol1_10to1_9_3.storage.ResourcePackTracker;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/packets/InventoryPackets.java
index e87d01f60..c5e86b1f2 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/packets/InventoryPackets.java
@@ -18,10 +18,10 @@
package com.viaversion.viaversion.protocols.protocol1_10to1_9_3.packets;
import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.rewriter.ItemRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_10to1_9_3.Protocol1_10To1_9_3_4;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
public class InventoryPackets {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11_1to1_11/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11_1to1_11/packets/InventoryPackets.java
index 32befba2e..28c344f9c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11_1to1_11/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11_1to1_11/packets/InventoryPackets.java
@@ -18,10 +18,10 @@
package com.viaversion.viaversion.protocols.protocol1_11_1to1_11.packets;
import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.rewriter.ItemRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_11_1to1_11.Protocol1_11_1To1_11;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
public class InventoryPackets {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java
index d9b8bbf17..e640c4ed6 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java
@@ -19,19 +19,16 @@ package com.viaversion.viaversion.protocols.protocol1_11to1_10;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.StringTag;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.util.Pair;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
-import com.viaversion.viaversion.rewriter.SoundRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.version.Types1_9;
import com.viaversion.viaversion.protocols.protocol1_11to1_10.data.PotionColorMapping;
@@ -42,6 +39,9 @@ import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
+import com.viaversion.viaversion.util.Pair;
public class Protocol1_11To1_10 extends Protocol {
private static final ValueTransformer toOldByte = new ValueTransformer(Type.UNSIGNED_BYTE) {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/data/PotionColorMapping.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/data/PotionColorMapping.java
index d42d9b7b6..58f1d7afc 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/data/PotionColorMapping.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/data/PotionColorMapping.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.protocols.protocol1_11to1_10.data;
+import com.viaversion.viaversion.util.Pair;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import com.viaversion.viaversion.util.Pair;
public class PotionColorMapping {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java
index 90f107136..d69a9c1b8 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java
@@ -17,7 +17,6 @@
*/
package com.viaversion.viaversion.protocols.protocol1_11to1_10.metadata;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types;
@@ -25,11 +24,12 @@ import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types.EntityTy
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_11to1_10.EntityIdRewriter;
import com.viaversion.viaversion.protocols.protocol1_11to1_10.Protocol1_11To1_10;
import com.viaversion.viaversion.protocols.protocol1_11to1_10.storage.EntityTracker1_11;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
import java.util.List;
import java.util.Optional;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/packets/InventoryPackets.java
index 4fc0c75ae..4509e111e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/packets/InventoryPackets.java
@@ -17,16 +17,16 @@
*/
package com.viaversion.viaversion.protocols.protocol1_11to1_10.packets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.minecraft.item.Item;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.ItemRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_11to1_10.EntityIdRewriter;
import com.viaversion.viaversion.protocols.protocol1_11to1_10.Protocol1_11To1_10;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
public class InventoryPackets {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java
index 94f798837..5f2a00f1c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java
@@ -21,17 +21,15 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.IntTag;
import com.github.steveice10.opennbt.tag.builtin.StringTag;
import com.google.gson.JsonElement;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.platform.providers.ViaProviders;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
-import com.viaversion.viaversion.rewriter.SoundRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.version.Types1_12;
import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.metadata.MetadataRewriter1_12To1_11_1;
@@ -43,6 +41,8 @@ import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPac
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
public class Protocol1_12To1_11_1 extends Protocol {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/TranslateRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/TranslateRewriter.java
index 82849a105..5f5994a22 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/TranslateRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/TranslateRewriter.java
@@ -22,8 +22,8 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.rewriter.ComponentRewriter;
import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.data.AchievementTranslationMapping;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
public class TranslateRewriter {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/metadata/MetadataRewriter1_12To1_11_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/metadata/MetadataRewriter1_12To1_11_1.java
index 4c6e482cd..2a4dccc89 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/metadata/MetadataRewriter1_12To1_11_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/metadata/MetadataRewriter1_12To1_11_1.java
@@ -22,10 +22,10 @@ import com.viaversion.viaversion.api.minecraft.entities.Entity1_12Types;
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.BedRewriter;
import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.Protocol1_12To1_11_1;
import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.storage.EntityTracker1_12;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
import java.util.List;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/packets/InventoryPackets.java
index 37c505431..cb0300985 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/packets/InventoryPackets.java
@@ -17,18 +17,18 @@
*/
package com.viaversion.viaversion.protocols.protocol1_12to1_11_1.packets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.item.Item;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.ItemRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.BedRewriter;
import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.Protocol1_12To1_11_1;
import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ServerboundPackets1_12;
import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.providers.InventoryQuickMoveProvider;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
public class InventoryPackets {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/metadata/MetadataRewriter1_13_1To1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/metadata/MetadataRewriter1_13_1To1_13.java
index 6a079ddbd..ecece6e46 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/metadata/MetadataRewriter1_13_1To1_13.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/metadata/MetadataRewriter1_13_1To1_13.java
@@ -23,11 +23,11 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityType;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_13;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
import com.viaversion.viaversion.api.type.types.Particle;
import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.Protocol1_13_1To1_13;
import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.packets.InventoryPackets;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.EntityTracker1_13;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
import java.util.List;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/EntityPackets.java
index 3906a474c..394344af8 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/EntityPackets.java
@@ -17,8 +17,8 @@
*/
package com.viaversion.viaversion.protocols.protocol1_13_1to1_13.packets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/InventoryPackets.java
index 792b18bcd..4c7471cd1 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/InventoryPackets.java
@@ -17,17 +17,17 @@
*/
package com.viaversion.viaversion.protocols.protocol1_13_1to1_13.packets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.minecraft.item.Item;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.ItemRewriter;
-import com.viaversion.viaversion.rewriter.RecipeRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.Protocol1_13_1To1_13;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.RecipeRewriter1_13_2;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
+import com.viaversion.viaversion.rewriter.RecipeRewriter;
public class InventoryPackets {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/WorldPackets.java
index a348fbb9f..2b4b107b8 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/WorldPackets.java
@@ -17,17 +17,17 @@
*/
package com.viaversion.viaversion.protocols.protocol1_13_1to1_13.packets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
public class WorldPackets {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/Protocol1_13_2To1_13_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/Protocol1_13_2To1_13_1.java
index 2dc12fa2b..017578f33 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/Protocol1_13_2To1_13_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/Protocol1_13_2To1_13_1.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/InventoryPackets.java
index fba9638b3..e5ba8c972 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/InventoryPackets.java
@@ -17,8 +17,8 @@
*/
package com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.packets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/WorldPackets.java
index cdf223c01..b639badc0 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/WorldPackets.java
@@ -17,8 +17,8 @@
*/
package com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.packets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ChatRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ChatRewriter.java
index 1dc579678..21ee211ab 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ChatRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ChatRewriter.java
@@ -20,12 +20,12 @@ package com.viaversion.viaversion.protocols.protocol1_13to1_12_2;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.rewriter.ComponentRewriter;
-import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.ComponentRewriter1_13;
import com.viaversion.viaversion.libs.kyori.adventure.text.Component;
import com.viaversion.viaversion.libs.kyori.adventure.text.format.TextDecoration;
import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.ComponentRewriter1_13;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
public class ChatRewriter {
private static final ComponentRewriter COMPONENT_REWRITER = new ComponentRewriter1_13();
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java
index 9879d41fe..360e00017 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java
@@ -21,22 +21,20 @@ import com.google.common.collect.Sets;
import com.google.common.primitives.Ints;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
import com.viaversion.viaversion.api.minecraft.Position;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.platform.providers.ViaProviders;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
-import com.viaversion.viaversion.rewriter.SoundRewriter;
import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.ConnectionData;
@@ -58,6 +56,8 @@ import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockSto
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.EntityTracker1_13;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.TabCompleteTracker;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
import com.viaversion.viaversion.util.ChatColorUtil;
import com.viaversion.viaversion.util.GsonUtil;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractStempConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractStempConnectionHandler.java
index d6b30ab80..9a03076ec 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractStempConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractStempConnectionHandler.java
@@ -21,7 +21,11 @@ import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.BlockFace;
import com.viaversion.viaversion.api.minecraft.Position;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
public abstract class AbstractStempConnectionHandler extends ConnectionHandler {
private static final BlockFace[] BLOCK_FACES = {BlockFace.EAST, BlockFace.NORTH, BlockFace.SOUTH, BlockFace.WEST};
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChestConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChestConnectionHandler.java
index 104c475c4..30d0b9a27 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChestConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChestConnectionHandler.java
@@ -21,7 +21,11 @@ import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.BlockFace;
import com.viaversion.viaversion.api.minecraft.Position;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
class ChestConnectionHandler extends ConnectionHandler {
private static final Map chestFacings = new HashMap<>();
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionData.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionData.java
index 0d51c90c4..d43793ff6 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionData.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionData.java
@@ -20,23 +20,23 @@ package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnection
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.MappingDataLoader;
import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.data.MappingDataLoader;
import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_8;
import com.viaversion.viaversion.api.minecraft.BlockFace;
import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers.BlockConnectionProvider;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers.PacketBlockConnectionProvider;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/DoorConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/DoorConnectionHandler.java
index 618185016..82a49f851 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/DoorConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/DoorConnectionHandler.java
@@ -21,7 +21,11 @@ import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.BlockFace;
import com.viaversion.viaversion.api.minecraft.Position;
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
public class DoorConnectionHandler extends ConnectionHandler {
private static final Map doorDataMap = new HashMap<>();
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FlowerConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FlowerConnectionHandler.java
index 588ef4e59..9f5a8e80e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FlowerConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FlowerConnectionHandler.java
@@ -17,12 +17,12 @@
*/
package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
-import it.unimi.dsi.fastutil.ints.Int2IntMap;
-import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.BlockFace;
import com.viaversion.viaversion.api.minecraft.Position;
+import it.unimi.dsi.fastutil.ints.Int2IntMap;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import java.util.HashSet;
import java.util.Set;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/GlassConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/GlassConnectionHandler.java
index d7498b50e..828d8051c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/GlassConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/GlassConnectionHandler.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
+import com.viaversion.viaversion.api.connection.ProtocolInfo;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.Position;
-import com.viaversion.viaversion.api.connection.ProtocolInfo;
import java.util.ArrayList;
import java.util.List;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/RedstoneConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/RedstoneConnectionHandler.java
index 2fcff775e..59d23caec 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/RedstoneConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/RedstoneConnectionHandler.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
-import it.unimi.dsi.fastutil.ints.Int2IntMap;
-import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.BlockFace;
import com.viaversion.viaversion.api.minecraft.Position;
+import it.unimi.dsi.fastutil.ints.Int2IntMap;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import java.util.HashSet;
import java.util.Set;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/SnowyGrassConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/SnowyGrassConnectionHandler.java
index 37acbfbee..6779ad117 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/SnowyGrassConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/SnowyGrassConnectionHandler.java
@@ -17,10 +17,10 @@
*/
package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
-import com.viaversion.viaversion.util.Pair;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.BlockFace;
import com.viaversion.viaversion.api.minecraft.Position;
+import com.viaversion.viaversion.util.Pair;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/StairConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/StairConnectionHandler.java
index 0bebded1f..55383d9bb 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/StairConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/StairConnectionHandler.java
@@ -21,7 +21,11 @@ import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.BlockFace;
import com.viaversion.viaversion.api.minecraft.Position;
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
public class StairConnectionHandler extends ConnectionHandler {
private static final Map stairDataMap = new HashMap<>();
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/BlockIdData.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/BlockIdData.java
index 00b5f2e05..3165cc652 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/BlockIdData.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/BlockIdData.java
@@ -19,9 +19,9 @@ package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data;
import com.google.common.collect.ObjectArrays;
import com.google.gson.reflect.TypeToken;
+import com.viaversion.viaversion.util.GsonUtil;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import com.viaversion.viaversion.util.GsonUtil;
import java.io.IOException;
import java.io.InputStream;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ComponentRewriter1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ComponentRewriter1_13.java
index 43df5b190..39c9351c7 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ComponentRewriter1_13.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ComponentRewriter1_13.java
@@ -27,9 +27,9 @@ import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.minecraft.nbt.BinaryTagIO;
import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.rewriter.ComponentRewriter;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.InventoryPackets;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
import java.io.IOException;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/RecipeRewriter1_13_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/RecipeRewriter1_13_2.java
index e7f80cd01..0bb14f0d9 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/RecipeRewriter1_13_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/RecipeRewriter1_13_2.java
@@ -17,12 +17,12 @@
*/
package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.rewriter.ItemRewriter;
import com.viaversion.viaversion.rewriter.RecipeRewriter;
-import com.viaversion.viaversion.api.type.Type;
/**
* For 1.13.2, not 1.13 (1.13 reads recipe type and id in swapped order)!
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java
index 88ebd1ff4..c7b24e4b7 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java
@@ -23,7 +23,6 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityType;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_13;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
import com.viaversion.viaversion.api.type.types.Particle;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
@@ -32,6 +31,7 @@ import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.ParticleRew
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.InventoryPackets;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.WorldPackets;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.EntityTracker1_13;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
import java.util.List;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/EntityPackets.java
index 3bf8451c7..666e37fb0 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/EntityPackets.java
@@ -17,8 +17,8 @@
*/
package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
index 4e9f76a5b..debaded88 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
@@ -27,12 +27,11 @@ import com.github.steveice10.opennbt.tag.builtin.StringTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
import com.google.common.base.Joiner;
import com.google.common.primitives.Ints;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.item.Item;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.ItemRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
@@ -42,6 +41,7 @@ import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.BlockIdData
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.MappingData;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.SoundSource;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.SpawnEggRewriter;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java
index 5607f008d..7c1c57c1f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java
@@ -19,9 +19,6 @@ package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.NumberTag;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
@@ -29,6 +26,7 @@ import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
@@ -45,6 +43,8 @@ import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockSto
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type;
import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
import java.util.List;
import java.util.Optional;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/BlockEntityProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/BlockEntityProvider.java
index b640a9e6e..1ce4f7571 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/BlockEntityProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/BlockEntityProvider.java
@@ -19,11 +19,11 @@ package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.platform.providers.Provider;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities.BannerHandler;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java
index c66a1085d..f74ff4c58 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java
@@ -18,9 +18,9 @@
package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.util.Pair;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider;
+import com.viaversion.viaversion.util.Pair;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java
index 467ced332..c07471392 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java
@@ -17,7 +17,6 @@
*/
package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage;
-import com.viaversion.viaversion.util.Pair;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.StoredObject;
import com.viaversion.viaversion.api.connection.UserConnection;
@@ -25,6 +24,7 @@ import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.minecraft.chunks.NibbleArray;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.WorldPackets;
+import com.viaversion.viaversion.util.Pair;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java
index fea800930..0d0e1b93d 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
import com.viaversion.viaversion.api.connection.StoredObject;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.Position;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java
index d49840b14..170672b9e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.connection.StoredObject;
import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/types/Chunk1_13Type.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/types/Chunk1_13Type.java
index a2f840e77..86294d74e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/types/Chunk1_13Type.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/types/Chunk1_13Type.java
@@ -18,7 +18,6 @@
package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.types;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.Environment;
import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk;
@@ -29,6 +28,7 @@ import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.minecraft.BaseChunkType;
import com.viaversion.viaversion.api.type.types.version.Types1_13;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java
index c4251b172..c49efe549 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java
@@ -19,12 +19,12 @@ package com.viaversion.viaversion.protocols.protocol1_14_1to1_14;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.metadata.MetadataRewriter1_14_1To1_14;
import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.packets.EntityPackets;
import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.storage.EntityTracker1_14_1;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
public class Protocol1_14_1To1_14 extends Protocol {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/metadata/MetadataRewriter1_14_1To1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/metadata/MetadataRewriter1_14_1To1_14.java
index f46397ea9..565302558 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/metadata/MetadataRewriter1_14_1To1_14.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/metadata/MetadataRewriter1_14_1To1_14.java
@@ -21,9 +21,9 @@ import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.Protocol1_14_1To1_14;
import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.storage.EntityTracker1_14_1;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
import java.util.List;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java
index e5f44a71e..48ecae767 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java
@@ -17,8 +17,8 @@
*/
package com.viaversion.viaversion.protocols.protocol1_14_3to1_14_2;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_4to1_14_3/Protocol1_14_4To1_14_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_4to1_14_3/Protocol1_14_4To1_14_3.java
index c609b0dad..e7a730cd7 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_4to1_14_3/Protocol1_14_4To1_14_3.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_4to1_14_3/Protocol1_14_4To1_14_3.java
@@ -17,8 +17,8 @@
*/
package com.viaversion.viaversion.protocols.protocol1_14_4to1_14_3;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java
index 16a380c92..6cccc08b3 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java
@@ -17,15 +17,11 @@
*/
package com.viaversion.viaversion.protocols.protocol1_14to1_13_2;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.ComponentRewriter;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
-import com.viaversion.viaversion.rewriter.SoundRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13;
@@ -39,6 +35,10 @@ import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets.PlayerPa
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets.WorldPackets;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.storage.EntityTracker1_14;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
+import com.viaversion.viaversion.rewriter.StatisticsRewriter;
public class Protocol1_14To1_13_2 extends Protocol {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/CommandRewriter1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/CommandRewriter1_14.java
index a5ae76794..d99bc5047 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/CommandRewriter1_14.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/CommandRewriter1_14.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data;
-import org.checkerframework.checker.nullness.qual.Nullable;
import com.viaversion.viaversion.api.protocol.Protocol;
import com.viaversion.viaversion.rewriter.CommandRewriter;
+import org.checkerframework.checker.nullness.qual.Nullable;
public class CommandRewriter1_14 extends CommandRewriter {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/MappingData.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/MappingData.java
index a094b0d9c..52fa738b4 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/MappingData.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/MappingData.java
@@ -20,11 +20,11 @@ package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
+import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.data.MappingDataBase;
+import com.viaversion.viaversion.api.data.MappingDataLoader;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.MappingDataLoader;
import java.util.HashMap;
import java.util.Map;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/RecipeRewriter1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/RecipeRewriter1_14.java
index 518238863..dfd3eac6b 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/RecipeRewriter1_14.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/RecipeRewriter1_14.java
@@ -17,12 +17,12 @@
*/
package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.rewriter.ItemRewriter;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.RecipeRewriter1_13_2;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
public class RecipeRewriter1_14 extends RecipeRewriter1_13_2 {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java
index f489562ab..a2e0c39da 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java
@@ -17,22 +17,22 @@
*/
package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.metadata;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.VillagerData;
import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
-import com.viaversion.viaversion.api.minecraft.VillagerData;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_14;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.Particle;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets.InventoryPackets;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.storage.EntityTracker1_14;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
import java.util.List;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java
index 8f7b6197b..6cec2e64e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java
@@ -17,13 +17,13 @@
*/
package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
-import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_14;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java
index e629b1f09..3d7ca84a6 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java
@@ -25,15 +25,12 @@ import com.github.steveice10.opennbt.tag.builtin.Tag;
import com.google.common.collect.Sets;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.ComponentRewriter;
-import com.viaversion.viaversion.rewriter.ItemRewriter;
-import com.viaversion.viaversion.rewriter.RecipeRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
@@ -41,6 +38,9 @@ import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.RecipeRewri
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.storage.EntityTracker1_14;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
+import com.viaversion.viaversion.rewriter.RecipeRewriter;
import java.util.Set;
import java.util.concurrent.ThreadLocalRandom;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java
index a6f44d4e6..0099f5ddb 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java
@@ -20,11 +20,11 @@ package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.ListTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java
index 90f33b5ef..3582ca062 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java
@@ -19,17 +19,16 @@ package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.LongArrayTag;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
import com.viaversion.viaversion.api.minecraft.BlockFace;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.minecraft.chunks.NibbleArray;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type;
@@ -37,6 +36,7 @@ import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.Protocol1_14To1_
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.storage.EntityTracker1_14;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.types.Chunk1_14Type;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
import com.viaversion.viaversion.util.CompactArrayUtil;
import java.util.Arrays;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/storage/EntityTracker1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/storage/EntityTracker1_14.java
index 2af88263d..41cc55592 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/storage/EntityTracker1_14.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/storage/EntityTracker1_14.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.storage;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
-import com.viaversion.viaversion.data.EntityTracker;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.data.EntityTracker;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets.WorldPackets;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/types/Chunk1_14Type.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/types/Chunk1_14Type.java
index 79e3bd6a5..b0b826751 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/types/Chunk1_14Type.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/types/Chunk1_14Type.java
@@ -18,7 +18,6 @@
package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.types;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
@@ -26,6 +25,7 @@ import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.minecraft.BaseChunkType;
import com.viaversion.viaversion.api.type.types.version.Types1_13;
+import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/Protocol1_15To1_14_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/Protocol1_15To1_14_4.java
index ff07603a3..a6d0e2c95 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/Protocol1_15To1_14_4.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/Protocol1_15To1_14_4.java
@@ -20,11 +20,6 @@ package com.viaversion.viaversion.protocols.protocol1_15to1_14_4;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.protocol.Protocol;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
-import com.viaversion.viaversion.rewriter.RegistryType;
-import com.viaversion.viaversion.rewriter.SoundRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
-import com.viaversion.viaversion.rewriter.TagRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
@@ -35,6 +30,11 @@ import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets.Inventor
import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets.PlayerPackets;
import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets.WorldPackets;
import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.storage.EntityTracker1_15;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.RegistryType;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
+import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.TagRewriter;
public class Protocol1_15To1_14_4 extends Protocol {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/data/MappingData.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/data/MappingData.java
index 033395b43..ea69bdca6 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/data/MappingData.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/data/MappingData.java
@@ -20,8 +20,8 @@ package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.data;
import com.google.gson.JsonObject;
import com.viaversion.viaversion.api.data.IntArrayMappings;
import com.viaversion.viaversion.api.data.MappingDataBase;
-import org.checkerframework.checker.nullness.qual.Nullable;
import com.viaversion.viaversion.api.data.Mappings;
+import org.checkerframework.checker.nullness.qual.Nullable;
public class MappingData extends MappingDataBase {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/metadata/MetadataRewriter1_15To1_14_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/metadata/MetadataRewriter1_15To1_14_4.java
index 54a5ec4c1..0f38d4637 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/metadata/MetadataRewriter1_15To1_14_4.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/metadata/MetadataRewriter1_15To1_14_4.java
@@ -24,12 +24,12 @@ import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_13;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_14;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
import com.viaversion.viaversion.api.type.types.Particle;
import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4;
import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets.EntityPackets;
import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets.InventoryPackets;
import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.storage.EntityTracker1_15;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
import java.util.List;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java
index 086cea5ff..8ebce748c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.minecraft.entities.Entity1_15Types;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.version.Types1_14;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/InventoryPackets.java
index 83ac3f304..b0b93c508 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/InventoryPackets.java
@@ -18,12 +18,12 @@
package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets;
import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.rewriter.ItemRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data.RecipeRewriter1_14;
import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
public class InventoryPackets {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/WorldPackets.java
index 08027ff35..96216132f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/WorldPackets.java
@@ -17,17 +17,17 @@
*/
package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.types.Chunk1_14Type;
import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4;
import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.types.Chunk1_15Type;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
public class WorldPackets {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/types/Chunk1_15Type.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/types/Chunk1_15Type.java
index f3fb1b621..76e09a35f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/types/Chunk1_15Type.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/types/Chunk1_15Type.java
@@ -18,7 +18,6 @@
package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.types;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
@@ -26,6 +25,7 @@ import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.minecraft.BaseChunkType;
import com.viaversion.viaversion.api.type.types.version.Types1_13;
+import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java
index 6210cbc94..4a330ad93 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java
@@ -20,11 +20,6 @@ package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.protocol.Protocol;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
-import com.viaversion.viaversion.rewriter.RegistryType;
-import com.viaversion.viaversion.rewriter.SoundRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
-import com.viaversion.viaversion.rewriter.TagRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.data.MappingData;
import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.metadata.MetadataRewriter1_16_2To1_16_1;
@@ -34,6 +29,11 @@ import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.packets.WorldP
import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.storage.EntityTracker1_16_2;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.RegistryType;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
+import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.TagRewriter;
public class Protocol1_16_2To1_16_1 extends Protocol {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java
index 2014e2b3c..a74d64ed1 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java
@@ -24,11 +24,11 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityType;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_14;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
import com.viaversion.viaversion.api.type.types.Particle;
import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.Protocol1_16_2To1_16_1;
import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.packets.InventoryPackets;
import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.storage.EntityTracker1_16_2;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
import java.util.List;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/InventoryPackets.java
index 21b189298..16ffedcca 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/InventoryPackets.java
@@ -19,12 +19,12 @@ package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.packets;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.ItemRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.Protocol1_16_2To1_16_1;
import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.data.RecipeRewriter1_16;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
public class InventoryPackets {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/WorldPackets.java
index 06f9aa74f..32b3e7e1f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/WorldPackets.java
@@ -17,20 +17,20 @@
*/
package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.packets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_16_2;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2;
import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.Protocol1_16_2To1_16_1;
import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.types.Chunk1_16_2Type;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.types.Chunk1_16Type;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
import java.util.ArrayList;
import java.util.List;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/types/Chunk1_16_2Type.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/types/Chunk1_16_2Type.java
index ac39f847f..e4aee6497 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/types/Chunk1_16_2Type.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/types/Chunk1_16_2Type.java
@@ -18,7 +18,6 @@
package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.types;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
@@ -26,6 +25,7 @@ import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.minecraft.BaseChunkType;
import com.viaversion.viaversion.api.type.types.version.Types1_16;
+import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
index f6c658954..61ef20ae5 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
@@ -24,15 +24,9 @@ import com.google.gson.JsonObject;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.ComponentRewriter;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
-import com.viaversion.viaversion.rewriter.RegistryType;
-import com.viaversion.viaversion.rewriter.SoundRewriter;
-import com.viaversion.viaversion.rewriter.StatisticsRewriter;
-import com.viaversion.viaversion.rewriter.TagRewriter;
-import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.protocol.packet.State;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.data.MappingData;
@@ -43,6 +37,12 @@ import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets.Inventor
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets.WorldPackets;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.storage.EntityTracker1_16;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.storage.InventoryTracker1_16;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.RegistryType;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
+import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.TagRewriter;
import com.viaversion.viaversion.util.GsonUtil;
import java.nio.charset.StandardCharsets;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/RecipeRewriter1_16.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/RecipeRewriter1_16.java
index 22e1dae6a..99995d0e5 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/RecipeRewriter1_16.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/RecipeRewriter1_16.java
@@ -17,12 +17,12 @@
*/
package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.data;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.rewriter.ItemRewriter;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data.RecipeRewriter1_14;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
public class RecipeRewriter1_16 extends RecipeRewriter1_14 {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java
index a500ec54b..502f31642 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java
@@ -24,11 +24,11 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityType;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_14;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
import com.viaversion.viaversion.api.type.types.Particle;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets.InventoryPackets;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.storage.EntityTracker1_16;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
import java.util.List;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java
index 38bd0daac..4fa030af4 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java
@@ -26,7 +26,6 @@ import com.github.steveice10.opennbt.tag.builtin.StringTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.ItemRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.UUIDIntArrayType;
import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data.RecipeRewriter1_14;
@@ -34,6 +33,7 @@ import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPacke
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.storage.InventoryTracker1_16;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
import java.util.UUID;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/WorldPackets.java
index 5fe1a7768..5045f0184 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/WorldPackets.java
@@ -26,13 +26,13 @@ import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.UUIDIntArrayType;
import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15;
import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.types.Chunk1_15Type;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.types.Chunk1_16Type;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
import com.viaversion.viaversion.util.CompactArrayUtil;
import java.util.Map;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/types/Chunk1_16Type.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/types/Chunk1_16Type.java
index d15e25997..2acce968f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/types/Chunk1_16Type.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/types/Chunk1_16Type.java
@@ -18,7 +18,6 @@
package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.types;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
@@ -26,6 +25,7 @@ import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.minecraft.BaseChunkType;
import com.viaversion.viaversion.api.type.types.version.Types1_16;
+import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/metadata/MetadataRewriter1_17To1_16_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/metadata/MetadataRewriter1_17To1_16_4.java
index f52ce29e4..7619199c2 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/metadata/MetadataRewriter1_17To1_16_4.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/metadata/MetadataRewriter1_17To1_16_4.java
@@ -24,11 +24,11 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityType;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_17;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
import com.viaversion.viaversion.api.type.types.Particle;
import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.Protocol1_17To1_16_4;
import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.packets.InventoryPackets;
import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.storage.EntityTracker1_17;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
import java.util.List;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/InventoryPackets.java
index afe67abf6..e33704944 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/InventoryPackets.java
@@ -17,16 +17,16 @@
*/
package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.packets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.minecraft.item.Item;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.ItemRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2;
import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2;
import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.data.RecipeRewriter1_16;
import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.Protocol1_17To1_16_4;
import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
public class InventoryPackets {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/WorldPackets.java
index b1fef5de3..b0d6dee6b 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/WorldPackets.java
@@ -21,15 +21,14 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.IntTag;
import com.github.steveice10.opennbt.tag.builtin.ListTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types;
import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
-import com.viaversion.viaversion.rewriter.BlockRewriter;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2;
import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.types.Chunk1_16_2Type;
@@ -38,6 +37,7 @@ import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.Protocol1_17To1_
import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.storage.BiomeStorage;
import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.storage.EntityTracker1_17;
import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.types.Chunk1_17Type;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
import java.util.ArrayList;
import java.util.BitSet;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/BiomeStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/BiomeStorage.java
index 17ed2c9ec..04bb620cd 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/BiomeStorage.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/BiomeStorage.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.storage;
-import org.checkerframework.checker.nullness.qual.Nullable;
import com.viaversion.viaversion.api.connection.StoredObject;
import com.viaversion.viaversion.api.connection.UserConnection;
+import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.HashMap;
import java.util.Map;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/types/Chunk1_17Type.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/types/Chunk1_17Type.java
index a16795675..3670f2d02 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/types/Chunk1_17Type.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/types/Chunk1_17Type.java
@@ -19,7 +19,6 @@ package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.types;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.google.common.base.Preconditions;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
@@ -27,6 +26,7 @@ import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.minecraft.BaseChunkType;
import com.viaversion.viaversion.api.type.types.version.Types1_16;
+import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java
index a3c6cfa02..63de011e3 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java
@@ -18,11 +18,11 @@
package com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java
index 0cbda0dd1..b30544bda 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java
@@ -19,10 +19,10 @@ package com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.chunks;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.NumberTag;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.Position;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.Protocol1_9_1_2To1_9_3_4;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/types/Chunk1_9_3_4Type.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/types/Chunk1_9_3_4Type.java
index bb76477aa..0932401f2 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/types/Chunk1_9_3_4Type.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/types/Chunk1_9_3_4Type.java
@@ -18,7 +18,6 @@
package com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.Environment;
import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk;
@@ -29,6 +28,7 @@ import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.minecraft.BaseChunkType;
import com.viaversion.viaversion.api.type.types.version.Types1_9;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1to1_9/Protocol1_9_1To1_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1to1_9/Protocol1_9_1To1_9.java
index f8c517f44..2b0fa3c01 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1to1_9/Protocol1_9_1To1_9.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1to1_9/Protocol1_9_1To1_9.java
@@ -17,8 +17,8 @@
*/
package com.viaversion.viaversion.protocols.protocol1_9_1to1_9;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3To1_9_1_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3To1_9_1_2.java
index 4d20d3788..969299cf0 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3To1_9_1_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3To1_9_1_2.java
@@ -21,12 +21,12 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.IntTag;
import com.github.steveice10.opennbt.tag.builtin.StringTag;
import com.google.gson.JsonElement;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java
index 3c4c96062..b9abc46ae 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java
@@ -18,7 +18,6 @@
package com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.types;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.Environment;
import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk;
@@ -30,6 +29,7 @@ import com.viaversion.viaversion.api.type.types.minecraft.BaseChunkType;
import com.viaversion.viaversion.api.type.types.version.Types1_9;
import com.viaversion.viaversion.protocols.protocol1_10to1_9_3.Protocol1_10To1_9_3_4;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.BitSet;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ItemRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ItemRewriter.java
index c3c9bab30..19ec5f382 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ItemRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ItemRewriter.java
@@ -21,9 +21,9 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.ListTag;
import com.github.steveice10.opennbt.tag.builtin.StringTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
+import com.viaversion.viaversion.api.minecraft.item.Item;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
-import com.viaversion.viaversion.api.minecraft.item.Item;
import java.util.Collections;
import java.util.HashMap;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/Protocol1_9To1_8.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/Protocol1_9To1_8.java
index 0224986e9..ac55564fc 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/Protocol1_9To1_8.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/Protocol1_9To1_8.java
@@ -19,17 +19,16 @@ package com.viaversion.viaversion.protocols.protocol1_9to1_8;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.platform.providers.ViaProviders;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
import com.viaversion.viaversion.protocols.protocol1_8.ServerboundPackets1_8;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata.MetadataRewriter1_9To1_8;
@@ -50,6 +49,7 @@ import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.CommandBlock
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.InventoryTracker;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
import com.viaversion.viaversion.util.GsonUtil;
import java.util.List;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ViaIdleThread.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ViaIdleThread.java
index 7a2ff0c56..da50dc77b 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ViaIdleThread.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ViaIdleThread.java
@@ -18,8 +18,8 @@
package com.viaversion.viaversion.protocols.protocol1_9to1_8;
import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.connection.ProtocolInfo;
+import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetaIndex.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetaIndex.java
index 2026c8237..7cee4f61d 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetaIndex.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetaIndex.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata;
-import com.viaversion.viaversion.util.Pair;
import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types;
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
+import com.viaversion.viaversion.util.Pair;
import java.util.HashMap;
import java.util.Optional;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java
index 17ba10827..ead21abb3 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java
@@ -18,19 +18,19 @@
package com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata;
import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types;
-import com.viaversion.viaversion.api.minecraft.entities.EntityType;
import com.viaversion.viaversion.api.minecraft.EulerAngle;
import com.viaversion.viaversion.api.minecraft.Vector;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
-import com.viaversion.viaversion.rewriter.MetadataRewriter;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.ItemRewriter;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
import java.util.List;
import java.util.UUID;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/EntityPackets.java
index a3038bf58..5c60f4fea 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/EntityPackets.java
@@ -18,12 +18,10 @@
package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets;
import com.google.common.collect.ImmutableList;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.util.Pair;
-import com.viaversion.viaversion.util.Triple;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
@@ -36,6 +34,8 @@ import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.ServerboundPackets1_9;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata.MetadataRewriter1_9To1_8;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9;
+import com.viaversion.viaversion.util.Pair;
+import com.viaversion.viaversion.util.Triple;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/InventoryPackets.java
index 4e892673a..6208d0316 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/InventoryPackets.java
@@ -17,10 +17,10 @@
*/
package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/PlayerPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/PlayerPackets.java
index b1b2e5651..29b7f62ac 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/PlayerPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/PlayerPackets.java
@@ -18,10 +18,10 @@
package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets;
import com.google.gson.JsonObject;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types;
import com.viaversion.viaversion.api.minecraft.item.Item;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
@@ -498,7 +498,7 @@ public class PlayerPackets {
// cancel any blocking >.>
EntityTracker1_9 tracker = wrapper.user().get(EntityTracker1_9.class);
if (tracker.isBlocking()) {
- if(!Via.getConfig().isShowShieldWhenSwordInHand()) {
+ if (!Via.getConfig().isShowShieldWhenSwordInHand()) {
tracker.setSecondHand(null);
}
tracker.setBlocking(false);
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java
index 87a05822e..b33e413f4 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java
@@ -17,12 +17,12 @@
*/
package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java
index 2126203d9..db6659e78 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java
@@ -19,13 +19,12 @@ package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.StringTag;
-import io.netty.buffer.ByteBuf;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk1_8;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
@@ -41,6 +40,7 @@ import com.viaversion.viaversion.protocols.protocol1_9to1_8.sounds.SoundEffect;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.ClientChunks;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.types.Chunk1_9to1_8Type;
+import io.netty.buffer.ByteBuf;
import java.io.IOException;
import java.util.List;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java
index 838d08f4b..54576fadb 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java
@@ -17,8 +17,8 @@
*/
package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.platform.providers.Provider;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.CustomByteType;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.ClientChunks;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/CommandBlockProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/CommandBlockProvider.java
index 00e2e466e..07ce7a731 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/CommandBlockProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/CommandBlockProvider.java
@@ -18,10 +18,10 @@
package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.api.platform.providers.Provider;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.CommandBlockStorage;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MovementTransmitterProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MovementTransmitterProvider.java
index 5975b92ea..0d9b603bd 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MovementTransmitterProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MovementTransmitterProvider.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers;
-import io.netty.channel.ChannelHandlerContext;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.platform.providers.Provider;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker;
import com.viaversion.viaversion.util.PipelineUtil;
+import io.netty.channel.ChannelHandlerContext;
public abstract class MovementTransmitterProvider implements Provider {
public abstract Object getFlyingPacket();
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/CommandBlockStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/CommandBlockStorage.java
index 6acb56a88..d2c09288f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/CommandBlockStorage.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/CommandBlockStorage.java
@@ -19,10 +19,10 @@ package com.viaversion.viaversion.protocols.protocol1_9to1_8.storage;
import com.github.steveice10.opennbt.tag.builtin.ByteTag;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.util.Pair;
import com.viaversion.viaversion.api.connection.StoredObject;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.Position;
+import com.viaversion.viaversion.util.Pair;
import java.util.Map;
import java.util.Optional;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/EntityTracker1_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/EntityTracker1_9.java
index 63a433386..3d52308da 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/EntityTracker1_9.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/EntityTracker1_9.java
@@ -19,20 +19,20 @@ package com.viaversion.viaversion.protocols.protocol1_9to1_8.storage;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.Sets;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.boss.BossBar;
import com.viaversion.viaversion.api.boss.BossColor;
import com.viaversion.viaversion.api.boss.BossStyle;
import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types.EntityType;
import com.viaversion.viaversion.api.minecraft.Position;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types.EntityType;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
-import com.viaversion.viaversion.data.EntityTracker;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.version.Types1_9;
+import com.viaversion.viaversion.data.EntityTracker;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.chat.GameMode;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata.MetadataRewriter1_9To1_8;
@@ -120,6 +120,7 @@ public class EntityTracker1_9 extends EntityTracker {
/**
* Returns true if the item in the held inventory slot is a sword.
+ *
* @return player has a sword in the main hand
*/
public boolean hasSwordInHand() {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/types/Chunk1_9to1_8Type.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/types/Chunk1_9to1_8Type.java
index 9eae22988..519120727 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/types/Chunk1_9to1_8Type.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/types/Chunk1_9to1_8Type.java
@@ -18,7 +18,6 @@
package com.viaversion.viaversion.protocols.protocol1_9to1_8.types;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk1_8;
@@ -30,6 +29,7 @@ import com.viaversion.viaversion.api.type.types.version.Types1_8;
import com.viaversion.viaversion.api.type.types.version.Types1_9;
import com.viaversion.viaversion.protocols.protocol1_10to1_9_3.Protocol1_10To1_9_3_4;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.ClientChunks;
+import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.BitSet;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_9_1/Protocol1_9To1_9_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_9_1/Protocol1_9To1_9_1.java
index 588bb0b72..8b22ab54a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_9_1/Protocol1_9To1_9_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_9_1/Protocol1_9To1_9_1.java
@@ -17,8 +17,8 @@
*/
package com.viaversion.viaversion.protocols.protocol1_9to1_9_1;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/BlockRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/BlockRewriter.java
index 82b6ad04b..5465c3210 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/BlockRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/BlockRewriter.java
@@ -19,8 +19,8 @@ package com.viaversion.viaversion.rewriter;
import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
import com.viaversion.viaversion.api.minecraft.Position;
-import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/CommandRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/CommandRewriter.java
index b18bd06a3..c1e92d2df 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/CommandRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/CommandRewriter.java
@@ -17,12 +17,12 @@
*/
package com.viaversion.viaversion.rewriter;
-import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
+import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.HashMap;
import java.util.Map;
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java
index 4b06cc9a6..358942329 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java
@@ -23,8 +23,8 @@ import com.google.gson.JsonParser;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSyntaxException;
import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
index 7323dcc6e..700fecdde 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
@@ -19,8 +19,8 @@ package com.viaversion.viaversion.rewriter;
import com.viaversion.viaversion.api.data.ParticleMappings;
import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/MetadataRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/MetadataRewriter.java
index 156749c26..2b5b0da75 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/MetadataRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/MetadataRewriter.java
@@ -17,21 +17,21 @@
*/
package com.viaversion.viaversion.rewriter;
-import com.viaversion.viaversion.data.EntityTracker;
-import it.unimi.dsi.fastutil.ints.Int2IntMap;
-import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
-import org.checkerframework.checker.nullness.qual.Nullable;
import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.ParticleMappings;
import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.data.ParticleMappings;
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
-import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.Particle;
+import com.viaversion.viaversion.data.EntityTracker;
+import it.unimi.dsi.fastutil.ints.Int2IntMap;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.List;
import java.util.logging.Logger;
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/RecipeRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/RecipeRewriter.java
index 8cf9ce688..d0d195246 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/RecipeRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/RecipeRewriter.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.rewriter;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/SoundRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/SoundRewriter.java
index b53f77aa5..cf98bb591 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/SoundRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/SoundRewriter.java
@@ -17,8 +17,8 @@
*/
package com.viaversion.viaversion.rewriter;
-import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/StatisticsRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/StatisticsRewriter.java
index 4e481177d..8d625744b 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/StatisticsRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/StatisticsRewriter.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.rewriter;
-import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
+import org.checkerframework.checker.nullness.qual.Nullable;
public class StatisticsRewriter {
private final Protocol protocol;
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java
index c891db544..a90c601da 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java
@@ -18,15 +18,15 @@
package com.viaversion.viaversion.rewriter;
import com.viaversion.viaversion.api.data.MappingData;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
-import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.ArrayList;
import java.util.EnumMap;
diff --git a/common/src/main/java/com/viaversion/viaversion/update/UpdateUtil.java b/common/src/main/java/com/viaversion/viaversion/update/UpdateUtil.java
index 281cbc6e6..d5d791e8c 100644
--- a/common/src/main/java/com/viaversion/viaversion/update/UpdateUtil.java
+++ b/common/src/main/java/com/viaversion/viaversion/update/UpdateUtil.java
@@ -19,9 +19,9 @@ package com.viaversion.viaversion.update;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
-import org.checkerframework.checker.nullness.qual.Nullable;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.util.GsonUtil;
+import org.checkerframework.checker.nullness.qual.Nullable;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/common/src/main/java/com/viaversion/viaversion/util/Config.java b/common/src/main/java/com/viaversion/viaversion/util/Config.java
index 13e189812..8377477c5 100644
--- a/common/src/main/java/com/viaversion/viaversion/util/Config.java
+++ b/common/src/main/java/com/viaversion/viaversion/util/Config.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.util;
+import com.viaversion.viaversion.api.configuration.ConfigurationProvider;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.representer.Representer;
-import com.viaversion.viaversion.api.configuration.ConfigurationProvider;
import java.io.File;
import java.io.FileInputStream;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/commands/SpongeCommandHandler.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/commands/SpongeCommandHandler.java
index d508fb6ec..399d13588 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/commands/SpongeCommandHandler.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/commands/SpongeCommandHandler.java
@@ -17,6 +17,7 @@
*/
package com.viaversion.viaversion.sponge.commands;
+import com.viaversion.viaversion.commands.ViaCommandHandler;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.spongepowered.api.command.CommandCallable;
import org.spongepowered.api.command.CommandException;
@@ -25,7 +26,6 @@ import org.spongepowered.api.command.CommandSource;
import org.spongepowered.api.text.Text;
import org.spongepowered.api.world.Location;
import org.spongepowered.api.world.World;
-import com.viaversion.viaversion.commands.ViaCommandHandler;
import java.util.List;
import java.util.Optional;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/commands/SpongeCommandSender.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/commands/SpongeCommandSender.java
index b33577d5e..8798a4290 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/commands/SpongeCommandSender.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/commands/SpongeCommandSender.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.sponge.commands;
+import com.viaversion.viaversion.SpongePlugin;
+import com.viaversion.viaversion.api.command.ViaCommandSender;
import org.spongepowered.api.command.CommandSource;
import org.spongepowered.api.text.serializer.TextSerializers;
import org.spongepowered.api.util.Identifiable;
-import com.viaversion.viaversion.SpongePlugin;
-import com.viaversion.viaversion.api.command.ViaCommandSender;
import java.util.UUID;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeChannelInitializer.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeChannelInitializer.java
index fdbdf5c96..bea80d546 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeChannelInitializer.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeChannelInitializer.java
@@ -17,15 +17,15 @@
*/
package com.viaversion.viaversion.sponge.handlers;
-import com.viaversion.viaversion.protocol.ProtocolPipelineImpl;
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.connection.UserConnectionImpl;
+import com.viaversion.viaversion.protocol.ProtocolPipelineImpl;
import io.netty.channel.Channel;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.socket.SocketChannel;
import io.netty.handler.codec.ByteToMessageDecoder;
import io.netty.handler.codec.MessageToByteEncoder;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.connection.UserConnection;
import java.lang.reflect.Method;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeDecodeHandler.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeDecodeHandler.java
index e0efbc57e..0eed91e3c 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeDecodeHandler.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeDecodeHandler.java
@@ -17,13 +17,13 @@
*/
package com.viaversion.viaversion.sponge.handlers;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.exception.CancelCodecException;
+import com.viaversion.viaversion.exception.CancelDecoderException;
+import com.viaversion.viaversion.util.PipelineUtil;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;
-import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.exception.CancelDecoderException;
-import com.viaversion.viaversion.exception.CancelCodecException;
-import com.viaversion.viaversion.util.PipelineUtil;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeEncodeHandler.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeEncodeHandler.java
index 4e958e8f6..a0319145d 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeEncodeHandler.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeEncodeHandler.java
@@ -17,15 +17,15 @@
*/
package com.viaversion.viaversion.sponge.handlers;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToByteEncoder;
import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.exception.CancelEncoderException;
import com.viaversion.viaversion.exception.CancelCodecException;
+import com.viaversion.viaversion.exception.CancelEncoderException;
import com.viaversion.viaversion.handlers.ChannelHandlerContextWrapper;
import com.viaversion.viaversion.handlers.ViaCodecHandler;
import com.viaversion.viaversion.util.PipelineUtil;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
import java.lang.reflect.InvocationTargetException;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongePacketHandler.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongePacketHandler.java
index 7ae05f706..8b364c55d 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongePacketHandler.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongePacketHandler.java
@@ -17,10 +17,10 @@
*/
package com.viaversion.viaversion.sponge.handlers;
+import com.viaversion.viaversion.api.connection.UserConnection;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageEncoder;
-import com.viaversion.viaversion.api.connection.UserConnection;
import java.util.List;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/UpdateListener.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/UpdateListener.java
index 502e1b152..b00e81572 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/UpdateListener.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/UpdateListener.java
@@ -17,10 +17,10 @@
*/
package com.viaversion.viaversion.sponge.listeners;
-import org.spongepowered.api.event.Listener;
-import org.spongepowered.api.event.network.ClientConnectionEvent;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.update.UpdateUtil;
+import org.spongepowered.api.event.Listener;
+import org.spongepowered.api.event.network.ClientConnectionEvent;
public class UpdateListener {
@Listener
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/ViaSpongeListener.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/ViaSpongeListener.java
index 263cb7803..6786ce5fe 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/ViaSpongeListener.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/ViaSpongeListener.java
@@ -17,12 +17,12 @@
*/
package com.viaversion.viaversion.sponge.listeners;
+import com.viaversion.viaversion.SpongePlugin;
+import com.viaversion.viaversion.ViaListener;
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.protocol.Protocol;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.entity.living.player.Player;
-import com.viaversion.viaversion.SpongePlugin;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.ViaListener;
-import com.viaversion.viaversion.api.protocol.Protocol;
import java.lang.reflect.Field;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/BlockListener.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/BlockListener.java
index 0068a4c1e..175817b03 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/BlockListener.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/BlockListener.java
@@ -17,16 +17,16 @@
*/
package com.viaversion.viaversion.sponge.listeners.protocol1_9to1_8;
-import org.spongepowered.api.entity.living.player.Player;
-import org.spongepowered.api.event.Listener;
-import org.spongepowered.api.event.block.ChangeBlockEvent;
-import org.spongepowered.api.event.filter.cause.Root;
-import org.spongepowered.api.world.Location;
import com.viaversion.viaversion.SpongePlugin;
import com.viaversion.viaversion.api.minecraft.Position;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9;
import com.viaversion.viaversion.sponge.listeners.ViaSpongeListener;
+import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.event.Listener;
+import org.spongepowered.api.event.block.ChangeBlockEvent;
+import org.spongepowered.api.event.filter.cause.Root;
+import org.spongepowered.api.world.Location;
public class BlockListener extends ViaSpongeListener {
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/DeathListener.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/DeathListener.java
index 4dd6f4617..9270b2b36 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/DeathListener.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/DeathListener.java
@@ -17,17 +17,17 @@
*/
package com.viaversion.viaversion.sponge.listeners.protocol1_9to1_8;
+import com.viaversion.viaversion.SpongePlugin;
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
+import com.viaversion.viaversion.sponge.listeners.ViaSpongeListener;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.Order;
import org.spongepowered.api.event.entity.DestructEntityEvent;
import org.spongepowered.api.world.World;
-import com.viaversion.viaversion.SpongePlugin;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
-import com.viaversion.viaversion.sponge.listeners.ViaSpongeListener;
import java.util.Optional;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/HandItemCache.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/HandItemCache.java
index 6a51fa659..f47a0143c 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/HandItemCache.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/HandItemCache.java
@@ -17,12 +17,12 @@
*/
package com.viaversion.viaversion.sponge.listeners.protocol1_9to1_8;
-import org.spongepowered.api.Sponge;
-import org.spongepowered.api.entity.living.player.Player;
-import org.spongepowered.api.item.inventory.ItemStack;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.sponge.listeners.protocol1_9to1_8.sponge4.Sponge4ItemGrabber;
import com.viaversion.viaversion.sponge.listeners.protocol1_9to1_8.sponge5.Sponge5ItemGrabber;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.item.inventory.ItemStack;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge5/Sponge5ArmorListener.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge5/Sponge5ArmorListener.java
index fc5da12ea..69421c852 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge5/Sponge5ArmorListener.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge5/Sponge5ArmorListener.java
@@ -17,6 +17,13 @@
*/
package com.viaversion.viaversion.sponge.listeners.protocol1_9to1_8.sponge5;
+import com.viaversion.viaversion.SpongePlugin;
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.protocols.protocol1_9to1_8.ArmorType;
+import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
+import com.viaversion.viaversion.sponge.listeners.ViaSpongeListener;
import org.spongepowered.api.data.type.HandTypes;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.Listener;
@@ -28,13 +35,6 @@ import org.spongepowered.api.event.item.inventory.ClickInventoryEvent;
import org.spongepowered.api.event.network.ClientConnectionEvent;
import org.spongepowered.api.item.inventory.ItemStack;
import org.spongepowered.api.item.inventory.transaction.SlotTransaction;
-import com.viaversion.viaversion.SpongePlugin;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.protocols.protocol1_9to1_8.ArmorType;
-import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
-import com.viaversion.viaversion.sponge.listeners.ViaSpongeListener;
import java.util.Optional;
import java.util.UUID;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge5/Sponge5ItemGrabber.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge5/Sponge5ItemGrabber.java
index 764c89893..faaadbefc 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge5/Sponge5ItemGrabber.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge5/Sponge5ItemGrabber.java
@@ -17,10 +17,10 @@
*/
package com.viaversion.viaversion.sponge.listeners.protocol1_9to1_8.sponge5;
+import com.viaversion.viaversion.sponge.listeners.protocol1_9to1_8.ItemGrabber;
import org.spongepowered.api.data.type.HandTypes;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.item.inventory.ItemStack;
-import com.viaversion.viaversion.sponge.listeners.protocol1_9to1_8.ItemGrabber;
public class Sponge5ItemGrabber implements ItemGrabber {
@Override
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeBossBar.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeBossBar.java
index 77ddb61a5..c5e143c8a 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeBossBar.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeBossBar.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.sponge.platform;
-import org.spongepowered.api.entity.living.player.Player;
import com.viaversion.viaversion.api.boss.BossBar;
import com.viaversion.viaversion.api.boss.BossColor;
import com.viaversion.viaversion.api.boss.BossStyle;
import com.viaversion.viaversion.boss.CommonBoss;
+import org.spongepowered.api.entity.living.player.Player;
public class SpongeBossBar extends CommonBoss {
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeTaskId.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeTaskId.java
index da5b6d2b0..1e22ef277 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeTaskId.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeTaskId.java
@@ -17,8 +17,8 @@
*/
package com.viaversion.viaversion.sponge.platform;
-import org.spongepowered.api.scheduler.Task;
import com.viaversion.viaversion.api.platform.PlatformTask;
+import org.spongepowered.api.scheduler.Task;
public class SpongeTaskId implements PlatformTask {
private final Task task;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaAPI.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaAPI.java
index 9d7f5c00e..32a2ecd45 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaAPI.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaAPI.java
@@ -17,12 +17,12 @@
*/
package com.viaversion.viaversion.sponge.platform;
-import io.netty.buffer.ByteBuf;
-import org.spongepowered.api.entity.living.player.Player;
import com.viaversion.viaversion.ViaAPIBase;
import com.viaversion.viaversion.api.boss.BossBar;
import com.viaversion.viaversion.api.boss.BossColor;
import com.viaversion.viaversion.api.boss.BossStyle;
+import io.netty.buffer.ByteBuf;
+import org.spongepowered.api.entity.living.player.Player;
public class SpongeViaAPI extends ViaAPIBase {
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaConfig.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaConfig.java
index f99a5167c..c5bb29076 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaConfig.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaConfig.java
@@ -17,9 +17,9 @@
*/
package com.viaversion.viaversion.sponge.platform;
+import com.viaversion.viaversion.configuration.AbstractViaConfig;
import org.spongepowered.api.asset.Asset;
import org.spongepowered.api.plugin.PluginContainer;
-import com.viaversion.viaversion.configuration.AbstractViaConfig;
import java.io.File;
import java.net.URL;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaInjector.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaInjector.java
index e8fef869a..e42dd0320 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaInjector.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaInjector.java
@@ -19,18 +19,18 @@ package com.viaversion.viaversion.sponge.platform;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.platform.ViaInjector;
+import com.viaversion.viaversion.sponge.handlers.SpongeChannelInitializer;
+import com.viaversion.viaversion.util.ListWrapper;
+import com.viaversion.viaversion.util.Pair;
+import com.viaversion.viaversion.util.ReflectionUtil;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelInitializer;
import org.spongepowered.api.MinecraftVersion;
import org.spongepowered.api.Sponge;
-import com.viaversion.viaversion.util.Pair;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.platform.ViaInjector;
-import com.viaversion.viaversion.sponge.handlers.SpongeChannelInitializer;
-import com.viaversion.viaversion.util.ListWrapper;
-import com.viaversion.viaversion.util.ReflectionUtil;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaLoader.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaLoader.java
index f5d92c8fa..59962a143 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaLoader.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaLoader.java
@@ -17,7 +17,6 @@
*/
package com.viaversion.viaversion.sponge.platform;
-import org.spongepowered.api.Sponge;
import com.viaversion.viaversion.SpongePlugin;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
@@ -36,6 +35,7 @@ import com.viaversion.viaversion.sponge.listeners.protocol1_9to1_8.sponge4.Spong
import com.viaversion.viaversion.sponge.listeners.protocol1_9to1_8.sponge5.Sponge5ArmorListener;
import com.viaversion.viaversion.sponge.providers.SpongeViaBulkChunkTranslator;
import com.viaversion.viaversion.sponge.providers.SpongeViaMovementTransmitter;
+import org.spongepowered.api.Sponge;
import java.util.HashSet;
import java.util.Set;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityChannelInitializer.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityChannelInitializer.java
index b36dfbf8a..e6b43aad7 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityChannelInitializer.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityChannelInitializer.java
@@ -17,11 +17,11 @@
*/
package com.viaversion.viaversion.velocity.handlers;
-import com.viaversion.viaversion.protocol.ProtocolPipelineImpl;
+import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.connection.UserConnectionImpl;
+import com.viaversion.viaversion.protocol.ProtocolPipelineImpl;
import io.netty.channel.Channel;
import io.netty.channel.ChannelInitializer;
-import com.viaversion.viaversion.api.connection.UserConnection;
import java.lang.reflect.Method;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityDecodeHandler.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityDecodeHandler.java
index be5431adf..e7eea8168 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityDecodeHandler.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityDecodeHandler.java
@@ -17,15 +17,15 @@
*/
package com.viaversion.viaversion.velocity.handlers;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.exception.CancelCodecException;
+import com.viaversion.viaversion.exception.CancelDecoderException;
+import com.viaversion.viaversion.util.PipelineUtil;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
import io.netty.handler.codec.MessageToMessageDecoder;
-import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.exception.CancelCodecException;
-import com.viaversion.viaversion.exception.CancelDecoderException;
-import com.viaversion.viaversion.util.PipelineUtil;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityEncodeHandler.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityEncodeHandler.java
index f92a10cf4..cb3d233df 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityEncodeHandler.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityEncodeHandler.java
@@ -17,16 +17,16 @@
*/
package com.viaversion.viaversion.velocity.handlers;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.exception.CancelCodecException;
+import com.viaversion.viaversion.exception.CancelEncoderException;
+import com.viaversion.viaversion.util.PipelineUtil;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
import io.netty.handler.codec.MessageToMessageDecoder;
import io.netty.handler.codec.MessageToMessageEncoder;
-import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.exception.CancelEncoderException;
-import com.viaversion.viaversion.exception.CancelCodecException;
-import com.viaversion.viaversion.util.PipelineUtil;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityBossBar.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityBossBar.java
index dbe205a2c..cc4b67516 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityBossBar.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityBossBar.java
@@ -18,7 +18,6 @@
package com.viaversion.viaversion.velocity.platform;
import com.velocitypowered.api.proxy.Player;
-import com.viaversion.viaversion.api.boss.BossBar;
import com.viaversion.viaversion.api.boss.BossColor;
import com.viaversion.viaversion.api.boss.BossStyle;
import com.viaversion.viaversion.boss.CommonBoss;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaAPI.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaAPI.java
index 2d1c2c707..c7571a6aa 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaAPI.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaAPI.java
@@ -18,11 +18,11 @@
package com.viaversion.viaversion.velocity.platform;
import com.velocitypowered.api.proxy.Player;
-import io.netty.buffer.ByteBuf;
import com.viaversion.viaversion.ViaAPIBase;
import com.viaversion.viaversion.api.boss.BossBar;
import com.viaversion.viaversion.api.boss.BossColor;
import com.viaversion.viaversion.api.boss.BossStyle;
+import io.netty.buffer.ByteBuf;
public class VelocityViaAPI extends ViaAPIBase {
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaConfig.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaConfig.java
index 966d5213a..437e6ec95 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaConfig.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaConfig.java
@@ -17,12 +17,16 @@
*/
package com.viaversion.viaversion.velocity.platform;
-import com.viaversion.viaversion.configuration.AbstractViaConfig;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.configuration.AbstractViaConfig;
import java.io.File;
import java.net.URL;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
public class VelocityViaConfig extends AbstractViaConfig {
private static final List UNSUPPORTED = Arrays.asList("nms-player-ticking", "item-cache", "anti-xray-patch", "quick-move-action-fix", "bungee-ping-interval", "bungee-ping-save", "bungee-servers", "blockconnection-method", "change-1_9-hitbox", "change-1_14-hitbox");
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaInjector.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaInjector.java
index 801b61437..83e33d82f 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaInjector.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaInjector.java
@@ -18,15 +18,15 @@
package com.viaversion.viaversion.velocity.platform;
import com.google.gson.JsonObject;
-import io.netty.channel.ChannelInitializer;
-import it.unimi.dsi.fastutil.ints.IntLinkedOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSortedSet;
import com.viaversion.viaversion.VelocityPlugin;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.platform.ViaInjector;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import com.viaversion.viaversion.util.ReflectionUtil;
import com.viaversion.viaversion.velocity.handlers.VelocityChannelInitializer;
+import io.netty.channel.ChannelInitializer;
+import it.unimi.dsi.fastutil.ints.IntLinkedOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSortedSet;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityMovementTransmitter.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityMovementTransmitter.java
index 35827d82e..d60503a5d 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityMovementTransmitter.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityMovementTransmitter.java
@@ -17,10 +17,10 @@
*/
package com.viaversion.viaversion.velocity.providers;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.packet.State;
+import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityVersionProvider.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityVersionProvider.java
index decf06098..8652b3274 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityVersionProvider.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityVersionProvider.java
@@ -18,7 +18,6 @@
package com.viaversion.viaversion.velocity.providers;
import com.velocitypowered.api.proxy.ServerConnection;
-import io.netty.channel.ChannelHandler;
import com.viaversion.viaversion.VelocityPlugin;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.UserConnection;
@@ -26,6 +25,7 @@ import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import com.viaversion.viaversion.protocols.base.BaseVersionProvider;
import com.viaversion.viaversion.velocity.platform.VelocityViaInjector;
import com.viaversion.viaversion.velocity.service.ProtocolDetectorService;
+import io.netty.channel.ChannelHandler;
import java.lang.reflect.Method;
import java.util.Arrays;