Add ProtocolVersion to legacy api

api-legacy/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java

@@ -0,0 +1,244 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2021 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package us.myles.ViaVersion.api.protocol;
+
+import com.google.common.base.Preconditions;
+import com.viaversion.viaversion.api.protocol.version.VersionRange;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @deprecated will no longer be updated and may be removed at some point, use {@link com.viaversion.viaversion.api.protocol.version.ProtocolVersion}
+ */
+@Deprecated
+public class ProtocolVersion {
+    private static final Int2ObjectMap<ProtocolVersion> versions = new Int2ObjectOpenHashMap<>();
+    private static final List<ProtocolVersion> versionList = new ArrayList<>();
+
+    public static final ProtocolVersion v1_4_6 = register(51, "1.4.6/7", new VersionRange("1.4", 6, 7));
+    public static final ProtocolVersion v1_5_1 = register(60, "1.5.1");
+    public static final ProtocolVersion v1_5_2 = register(61, "1.5.2");
+    public static final ProtocolVersion v_1_6_1 = register(73, "1.6.1");
+    public static final ProtocolVersion v_1_6_2 = register(74, "1.6.2");
+    public static final ProtocolVersion v_1_6_3 = register(77, "1.6.3");
+    public static final ProtocolVersion v_1_6_4 = register(78, "1.6.4");
+    public static final ProtocolVersion v1_7_1 = register(4, "1.7-1.7.5", new VersionRange("1.7", 0, 5));
+    public static final ProtocolVersion v1_7_6 = register(5, "1.7.6-1.7.10", new VersionRange("1.7", 6, 10));
+    public static final ProtocolVersion v1_8 = register(47, "1.8.x");
+    public static final ProtocolVersion v1_9 = register(107, "1.9");
+    public static final ProtocolVersion v1_9_1 = register(108, "1.9.1");
+    public static final ProtocolVersion v1_9_2 = register(109, "1.9.2");
+    public static final ProtocolVersion v1_9_3 = register(110, "1.9.3/4", new VersionRange("1.9", 3, 4));
+    public static final ProtocolVersion v1_10 = register(210, "1.10.x");
+    public static final ProtocolVersion v1_11 = register(315, "1.11");
+    public static final ProtocolVersion v1_11_1 = register(316, "1.11.1/2", new VersionRange("1.11", 1, 2));
+    public static final ProtocolVersion v1_12 = register(335, "1.12");
+    public static final ProtocolVersion v1_12_1 = register(338, "1.12.1");
+    public static final ProtocolVersion v1_12_2 = register(340, "1.12.2");
+    public static final ProtocolVersion v1_13 = register(393, "1.13");
+    public static final ProtocolVersion v1_13_1 = register(401, "1.13.1");
+    public static final ProtocolVersion v1_13_2 = register(404, "1.13.2");
+    public static final ProtocolVersion v1_14 = register(477, "1.14");
+    public static final ProtocolVersion v1_14_1 = register(480, "1.14.1");
+    public static final ProtocolVersion v1_14_2 = register(485, "1.14.2");
+    public static final ProtocolVersion v1_14_3 = register(490, "1.14.3");
+    public static final ProtocolVersion v1_14_4 = register(498, "1.14.4");
+    public static final ProtocolVersion v1_15 = register(573, "1.15");
+    public static final ProtocolVersion v1_15_1 = register(575, "1.15.1");
+    public static final ProtocolVersion v1_15_2 = register(578, "1.15.2");
+    public static final ProtocolVersion v1_16 = register(735, "1.16");
+    public static final ProtocolVersion v1_16_1 = register(736, "1.16.1");
+    public static final ProtocolVersion v1_16_2 = register(751, "1.16.2");
+    public static final ProtocolVersion v1_16_3 = register(753, "1.16.3");
+    public static final ProtocolVersion v1_16_4 = register(754, "1.16.4/5", new VersionRange("1.16", 4, 5));
+    public static final ProtocolVersion unknown = register(-1, "UNKNOWN");
+
+    public static ProtocolVersion register(int version, String name) {
+        return register(version, -1, name);
+    }
+
+    public static ProtocolVersion register(int version, int snapshotVersion, String name) {
+        return register(version, snapshotVersion, name, null);
+    }
+
+    public static ProtocolVersion register(int version, String name, @Nullable VersionRange versionRange) {
+        return register(version, -1, name, versionRange);
+    }
+
+    public static ProtocolVersion register(int version, int snapshotVersion, String name, @Nullable VersionRange versionRange) {
+        ProtocolVersion protocol = new ProtocolVersion(version, snapshotVersion, name, versionRange);
+        versionList.add(protocol);
+        versions.put(protocol.getVersion(), protocol);
+        if (protocol.isSnapshot()) {
+            versions.put(protocol.getFullSnapshotVersion(), protocol);
+        }
+        return protocol;
+    }
+
+    public static boolean isRegistered(int id) {
+        return versions.containsKey(id);
+    }
+
+    public static @NonNull ProtocolVersion getProtocol(int id) {
+        ProtocolVersion protocolVersion = versions.get(id);
+        if (protocolVersion != null) {
+            return protocolVersion;
+        } else {
+            return new ProtocolVersion(id, "Unknown (" + id + ")");
+        }
+    }
+
+    public static int getIndex(ProtocolVersion version) {
+        return versionList.indexOf(version);
+    }
+
+    public static List<ProtocolVersion> getProtocols() {
+        return Collections.unmodifiableList(new ArrayList<>(versions.values()));
+    }
+
+    public static @Nullable ProtocolVersion getClosest(String protocol) {
+        for (ProtocolVersion version : versions.values()) {
+            String name = version.getName();
+            if (name.equals(protocol)) {
+                return version;
+            }
+
+            if (version.isVersionWildcard()) {
+                // Test against the major version with and without a minor version
+                String majorVersion = name.substring(0, name.length() - 2);
+                if (majorVersion.equals(protocol) || (protocol.startsWith(name.substring(0, name.length() - 1)))) {
+                    return version;
+                }
+            } else if (version.isRange()) {
+                if (version.getIncludedVersions().contains(protocol)) {
+                    return version;
+                }
+            }
+        }
+        return null;
+    }
+
+    private final int version;
+    private final int snapshotVersion;
+    private final String name;
+    private final boolean versionWildcard;
+    private final Set<String> includedVersions;
+
+    public ProtocolVersion(int version, String name) {
+        this(version, -1, name, null);
+    }
+
+    public ProtocolVersion(int version, int snapshotVersion, String name, @Nullable VersionRange versionRange) {
+        this.version = version;
+        this.snapshotVersion = snapshotVersion;
+        this.name = name;
+        this.versionWildcard = name.endsWith(".x");
+
+        Preconditions.checkArgument(!versionWildcard || versionRange == null, "A version cannot be a wildcard and a range at the same time!");
+        if (versionRange != null) {
+            includedVersions = new LinkedHashSet<>();
+            for (int i = versionRange.getRangeFrom(); i <= versionRange.getRangeTo(); i++) {
+                if (i == 0) {
+                    includedVersions.add(versionRange.getBaseVersion()); // Keep both the base version and with ".0" appended
+                }
+
+                includedVersions.add(versionRange.getBaseVersion() + "." + i);
+            }
+        } else {
+            includedVersions = Collections.singleton(name);
+        }
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    public int getSnapshotVersion() {
+        Preconditions.checkArgument(isSnapshot());
+        return snapshotVersion;
+    }
+
+    public int getFullSnapshotVersion() {
+        Preconditions.checkArgument(isSnapshot());
+        return (1 << 30) | snapshotVersion; // Bit indicating snapshot versions
+    }
+
+    public int getOriginalVersion() {
+        return snapshotVersion == -1 ? version : ((1 << 30) | snapshotVersion);
+    }
+
+    public boolean isKnown() {
+        return version != -1;
+    }
+
+    public boolean isRange() {
+        return includedVersions.size() != 1;
+    }
+
+    public Set<String> getIncludedVersions() {
+        return Collections.unmodifiableSet(includedVersions);
+    }
+
+    public boolean isVersionWildcard() {
+        return versionWildcard;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public boolean isSnapshot() {
+        return snapshotVersion != -1;
+    }
+
+    public int getId() {
+        return version;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ProtocolVersion that = (ProtocolVersion) o;
+        return version == that.version;
+    }
+
+    @Override
+    public int hashCode() {
+        return version;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%s (%d)", this.name, this.version);
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java

@@ -22,7 +22,7 @@
  */
 package com.viaversion.viaversion.api;
 
-import com.viaversion.viaversion.api.protocol.connection.ViaConnectionManager;
+import com.viaversion.viaversion.api.connection.ViaConnectionManager;
 import io.netty.buffer.ByteBuf;
 import com.viaversion.viaversion.api.boss.BossBar;
 import com.viaversion.viaversion.api.boss.BossColor;
@@ -69,19 +69,6 @@ public interface ViaAPI<T> {
      */
     int getPlayerVersion(UUID uuid);
 
-    /**
-     * Returns if the player is ported by Via.
-     *
-     * @param playerUUID UUID of a player
-     * @return true if Via has a cached userconnection for this player
-     * @see #isInjected(UUID)
-     * @deprecated use {@link #isInjected(UUID)}
-     */
-    @Deprecated
-    default boolean isPorted(UUID playerUUID) {
-        return isInjected(playerUUID);
-    }
-
     /**
      * Returns if Via injected into this player connection.
      *

api/src/main/java/com/viaversion/viaversion/api/ViaManager.java

@@ -28,7 +28,7 @@ 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.protocol.connection.ViaConnectionManager;
+import com.viaversion.viaversion.api.connection.ViaConnectionManager;
 
 import java.util.Set;
 

api/src/main/java/com/viaversion/viaversion/api/boss/BossBar.java

@@ -23,7 +23,7 @@
 package com.viaversion.viaversion.api.boss;
 
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 
 import java.util.Set;
 import java.util.UUID;

api/src/main/java/com/viaversion/viaversion/api/connection/ProtocolInfo.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.protocol.connection;
+package com.viaversion.viaversion.api.connection;
 
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;

api/src/main/java/com/viaversion/viaversion/api/connection/StoredObject.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.protocol.connection;
+package com.viaversion.viaversion.api.connection;
 
 public class StoredObject {
     private final UserConnection user;

api/src/main/java/com/viaversion/viaversion/api/connection/UserConnection.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.protocol.connection;
+package com.viaversion.viaversion.api.connection;
 
 import com.google.common.cache.CacheBuilder;
 import com.viaversion.viaversion.api.protocol.packet.PacketTracker;

api/src/main/java/com/viaversion/viaversion/api/connection/ViaConnectionManager.java

@@ -20,12 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.protocol.connection;
+package com.viaversion.viaversion.api.connection;
 
 import com.viaversion.viaversion.api.Via;
 import io.netty.channel.ChannelFutureListener;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 
 import java.util.Collections;
 import java.util.Map;

api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/Chunk.java

@@ -48,11 +48,6 @@ public interface Chunk {
      */
     boolean isFullChunk();
 
-    @Deprecated
-    default boolean isGroundUp() {
-        return isFullChunk();
-    }
-
     boolean isIgnoreOldLightData();
 
     void setIgnoreOldLightData(boolean ignoreOldLightData);

api/src/main/java/com/viaversion/viaversion/api/platform/ViaPlatform.java

@@ -23,14 +23,11 @@
 package com.viaversion.viaversion.api.platform;
 
 import com.google.gson.JsonObject;
-import com.viaversion.viaversion.api.protocol.connection.ViaConnectionManager;
-import com.viaversion.viaversion.api.ViaManager;
-import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.ViaAPI;
-import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
 import com.viaversion.viaversion.api.command.ViaCommandSender;
 import com.viaversion.viaversion.api.configuration.ConfigurationProvider;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
+import com.viaversion.viaversion.api.connection.UserConnection;
 
 import java.io.File;
 import java.util.Collection;
@@ -219,14 +216,6 @@ public interface ViaPlatform<T> {
      */
     boolean isOldClientsAllowed();
 
-    /**
-     * @deprecated use {@link ViaManager#getConnectionManager()}
-     */
-    @Deprecated
-    default ViaConnectionManager getConnectionManager() {
-        return Via.getManager().getConnectionManager();
-    }
-
     /**
      * Returns an immutable collection of classes to be checked as unsupported software with their software name.
      * If any of the classes exist at runtime, a warning about their potential instability will be given to the console.

api/src/main/java/com/viaversion/viaversion/api/protocol/Protocol.java

@@ -32,7 +32,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.data.MappingData;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.ViaProviders;
 import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.exception.CancelException;

api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolPipeline.java

@@ -25,8 +25,8 @@ package com.viaversion.viaversion.api.protocol;
 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.protocol.connection.ProtocolInfo;
+import com.viaversion.viaversion.api.connection.ProtocolInfo;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.ViaPlatform;
 import com.viaversion.viaversion.api.protocol.packet.Direction;
 import com.viaversion.viaversion.api.protocol.packet.State;

api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketTracker.java

@@ -22,7 +22,7 @@
  */
 package com.viaversion.viaversion.api.protocol.packet;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+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;

api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketWrapper.java

@@ -27,7 +27,7 @@ import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.util.Pair;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelFuture;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
 import com.viaversion.viaversion.api.type.Type;

api/src/main/java/com/viaversion/viaversion/api/protocol/version/VersionProvider.java

@@ -22,7 +22,7 @@
  */
 package com.viaversion.viaversion.api.protocol.version;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 
 public interface VersionProvider extends Provider {

api/src/main/java/com/viaversion/viaversion/util/GsonUtil.java

@@ -24,7 +24,6 @@ package com.viaversion.viaversion.util;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonParser;
 
 public final class GsonUtil {
     private static final Gson GSON = new GsonBuilder().create();
@@ -37,14 +36,4 @@ public final class GsonUtil {
     public static Gson getGson() {
         return GSON;
     }
-
-    @Deprecated
-    public static GsonBuilder getGsonBuilder() {
-        return new GsonBuilder();
-    }
-
-    @Deprecated
-    public static JsonParser getJsonParser() {
-        return new JsonParser();
-    }
 }

bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/ViaBukkitListener.java

@@ -21,7 +21,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.Plugin;
 import com.viaversion.viaversion.ViaListener;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.Protocol;
 
 public class ViaBukkitListener extends ViaListener implements Listener {

bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/DeathListener.java

@@ -25,7 +25,7 @@ import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.plugin.Plugin;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;

bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitBlockConnectionProvider.java

@@ -22,7 +22,7 @@ import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers.BlockConnectionProvider;
 
 import java.util.UUID;

bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/BasicHandlerConstructor.java

@@ -19,7 +19,7 @@ package com.viaversion.viaversion.bukkit.classgenerator;
 
 import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.MessageToByteEncoder;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.bukkit.handlers.BukkitDecodeHandler;
 import com.viaversion.viaversion.bukkit.handlers.BukkitEncodeHandler;
 

bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/HandlerConstructor.java

@@ -19,7 +19,7 @@ package com.viaversion.viaversion.bukkit.classgenerator;
 
 import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.MessageToByteEncoder;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 
 public interface HandlerConstructor {
     public MessageToByteEncoder newEncodeHandler(UserConnection info, MessageToByteEncoder minecraftEncoder);

bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitChannelInitializer.java

@@ -22,7 +22,7 @@ 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.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
 import com.viaversion.viaversion.bukkit.classgenerator.ClassGenerator;
 import com.viaversion.viaversion.bukkit.classgenerator.HandlerConstructor;

bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitDecodeHandler.java

@@ -21,7 +21,7 @@ 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.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.bukkit.util.NMSUtil;
 import com.viaversion.viaversion.exception.CancelCodecException;
 import com.viaversion.viaversion.exception.CancelDecoderException;

bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitEncodeHandler.java

@@ -21,7 +21,7 @@ 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.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.bukkit.util.NMSUtil;
 import com.viaversion.viaversion.exception.CancelCodecException;
 import com.viaversion.viaversion.exception.CancelEncoderException;

bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitPacketHandler.java

@@ -20,7 +20,7 @@ package com.viaversion.viaversion.bukkit.handlers;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageEncoder;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 
 import java.util.List;
 

bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/multiversion/PlayerSneakListener.java

@@ -25,10 +25,10 @@ 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.protocol.connection.UserConnection;
+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.protocol.connection.ProtocolInfo;
+import com.viaversion.viaversion.api.connection.ProtocolInfo;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaAPI.java

@@ -26,7 +26,7 @@ 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.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.boss.ViaBossBar;
 import com.viaversion.viaversion.bukkit.util.ProtocolSupportUtil;
 

bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java

@@ -24,7 +24,7 @@ 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.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.platform.ViaPlatformLoader;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;

bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java

@@ -23,11 +23,11 @@ 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.protocol.connection.UserConnection;
+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.protocol.connection.ProtocolInfo;
+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;

bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitViaMovementTransmitter.java

@@ -20,7 +20,7 @@ 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.protocol.connection.UserConnection;
+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;

bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeChannelInitializer.java

@@ -19,7 +19,7 @@ package com.viaversion.viaversion.bungee.handlers;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
 
 import java.lang.reflect.Method;

bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeDecodeHandler.java

@@ -21,7 +21,7 @@ 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.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.exception.CancelCodecException;
 import com.viaversion.viaversion.exception.CancelDecoderException;
 

bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeEncodeHandler.java

@@ -21,7 +21,7 @@ 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.protocol.connection.UserConnection;
+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;

bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java

@@ -28,8 +28,8 @@ import net.md_5.bungee.protocol.packet.PluginMessage;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.data.ExternalJoinGameListener;
-import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.ProtocolPathEntry;
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
@@ -37,7 +37,7 @@ import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.bungee.service.ProtocolDetectorService;
 import com.viaversion.viaversion.bungee.storage.BungeeStorage;
-import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo;
+import com.viaversion.viaversion.api.connection.ProtocolInfo;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.InventoryPackets;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.EntityIdProvider;

bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/ElytraPatch.java

@@ -23,7 +23,7 @@ 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.protocol.connection.UserConnection;
+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.type.Type;

bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeBossBarProvider.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.bungee.providers;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.bungee.storage.BungeeStorage;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BossBarProvider;
 

bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeEntityIdProvider.java

@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.bungee.providers;
 
 import net.md_5.bungee.api.connection.ProxiedPlayer;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.bungee.storage.BungeeStorage;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.EntityIdProvider;
 

bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMainHandProvider.java

@@ -19,8 +19,8 @@ package com.viaversion.viaversion.bungee.providers;
 
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo;
+import com.viaversion.viaversion.api.connection.ProtocolInfo;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MainHandProvider;
 
 import java.lang.reflect.InvocationTargetException;

bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMovementTransmitter.java

@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.bungee.providers;
 
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;

bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeVersionProvider.java

@@ -20,10 +20,10 @@ 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.protocol.connection.UserConnection;
+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.protocol.connection.ProtocolInfo;
+import com.viaversion.viaversion.api.connection.ProtocolInfo;
 import com.viaversion.viaversion.util.ReflectionUtil;
 
 import java.util.ArrayList;

bungee/src/main/java/com/viaversion/viaversion/bungee/storage/BungeeStorage.java

@@ -18,8 +18,8 @@
 package com.viaversion.viaversion.bungee.storage;
 
 import net.md_5.bungee.api.connection.ProxiedPlayer;
-import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 
 import java.lang.reflect.Field;
 import java.util.Objects;

common/src/main/java/com/viaversion/viaversion/ViaAPIBase.java

@@ -20,7 +20,7 @@ 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.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
 
 import java.util.SortedSet;

common/src/main/java/com/viaversion/viaversion/ViaListener.java

@@ -19,7 +19,7 @@ package com.viaversion.viaversion;
 
 import com.viaversion.viaversion.api.Via;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.Protocol;
 
 import java.util.UUID;

common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java

@@ -21,7 +21,7 @@ import com.viaversion.viaversion.api.ViaManager;
 import it.unimi.dsi.fastutil.ints.IntSortedSet;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.platform.TaskId;
-import com.viaversion.viaversion.api.protocol.connection.ViaConnectionManager;
+import com.viaversion.viaversion.api.connection.ViaConnectionManager;
 import com.viaversion.viaversion.api.platform.ViaInjector;
 import com.viaversion.viaversion.api.platform.ViaPlatform;
 import com.viaversion.viaversion.api.platform.ViaPlatformLoader;

common/src/main/java/com/viaversion/viaversion/boss/CommonBoss.java

@@ -24,7 +24,7 @@ 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.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
 

common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/PPSSubCmd.java

@@ -20,7 +20,7 @@ package com.viaversion.viaversion.commands.defaultsubs;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.command.ViaCommandSender;
 import com.viaversion.viaversion.api.command.ViaSubCommand;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 
 import java.util.HashMap;

common/src/main/java/com/viaversion/viaversion/data/EntityTracker.java

@@ -19,8 +19,8 @@ package com.viaversion.viaversion.data;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import com.viaversion.viaversion.api.data.ExternalJoinGameListener;
-import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 
 import java.util.Map;

common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol.java

@@ -19,10 +19,10 @@ package com.viaversion.viaversion.protocols.base;
 
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.ViaProviders;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo;
+import com.viaversion.viaversion.api.connection.ProtocolInfo;
 import com.viaversion.viaversion.api.protocol.ProtocolPathEntry;
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;

common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_7.java

@@ -21,7 +21,7 @@ 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.protocol.connection.ProtocolInfo;
+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;

common/src/main/java/com/viaversion/viaversion/protocols/base/BaseVersionProvider.java

@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.protocols.base;
 
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.version.VersionProvider;
 
 public class BaseVersionProvider implements VersionProvider {

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java

@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.protocols.protocol1_10to1_9_3;
 
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+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.remapper.PacketHandler;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/storage/ResourcePackTracker.java

@@ -17,8 +17,8 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_10to1_9_3.storage;
 
-import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 
 public class ResourcePackTracker extends StoredObject {
     private String lastHash = "";

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java

@@ -22,7 +22,7 @@ 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.protocol.connection.UserConnection;
+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.protocol.Protocol;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java

@@ -19,7 +19,7 @@ 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.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types.EntityType;
 import com.viaversion.viaversion.api.minecraft.item.Item;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/storage/EntityTracker1_11.java

@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.protocols.protocol1_11to1_10.storage;
 
 import com.google.common.collect.Sets;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types.EntityType;
 import com.viaversion.viaversion.data.EntityTracker;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ChatItemRewriter.java

@@ -21,7 +21,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 
 import java.util.regex.Pattern;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java

@@ -23,7 +23,7 @@ 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.protocol.connection.UserConnection;
+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;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/TranslateRewriter.java

@@ -21,7 +21,7 @@ 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.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.data.AchievementTranslationMapping;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/metadata/MetadataRewriter1_12To1_11_1.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_12to1_11_1.metadata;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 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;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/providers/InventoryQuickMoveProvider.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_12to1_11_1.providers;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 
 public class InventoryQuickMoveProvider implements Provider {

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/storage/EntityTracker1_12.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_12to1_11_1.storage;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_12Types.EntityType;
 import com.viaversion.viaversion.data.EntityTracker;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/Protocol1_13_1To1_13.java

@@ -19,7 +19,7 @@ package com.viaversion.viaversion.protocols.protocol1_13_1to1_13;
 
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.data.MappingData;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/metadata/MetadataRewriter1_13_1To1_13.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13_1to1_13.metadata;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.item.Item;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/types/Particle1_13_2Type.java

@@ -1,62 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.types;
-
-import io.netty.buffer.ByteBuf;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.Particle;
-
-@Deprecated
-public class Particle1_13_2Type extends Type<Particle> {
-    public Particle1_13_2Type() {
-        super("Particle", Particle.class);
-    }
-
-    @Override
-    public void write(ByteBuf buffer, Particle object) throws Exception {
-        Type.VAR_INT.writePrimitive(buffer, object.getId());
-        for (Particle.ParticleData data : object.getArguments())
-            data.getType().write(buffer, data.getValue());
-    }
-
-    @Override
-    public Particle read(ByteBuf buffer) throws Exception {
-        int type = Type.VAR_INT.readPrimitive(buffer);
-        Particle particle = new Particle(type);
-
-        switch (type) {
-            // Block / Falling Dust /
-            case 3:
-            case 20:
-                particle.getArguments().add(new Particle.ParticleData(Type.VAR_INT, Type.VAR_INT.readPrimitive(buffer))); // Flat Block
-                break;
-            // Dust
-            case 11:
-                particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Red 0 - 1
-                particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Green 0 - 1
-                particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Blue 0 - 1
-                particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer)));// Scale 0.01 - 4
-                break;
-            // Item
-            case 27:
-                particle.getArguments().add(new Particle.ParticleData(Type.FLAT_VAR_INT_ITEM, Type.FLAT_VAR_INT_ITEM.read(buffer))); // Flat item
-                break;
-        }
-        return particle;
-    }
-}

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java

@@ -23,7 +23,7 @@ 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.protocol.connection.UserConnection;
+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.item.Item;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/TabCompleteThread.java

@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2;
 
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.TabCompleteTracker;
 
 public class TabCompleteThread implements Runnable {

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractFenceConnectionHandler.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+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.api.protocol.version.ProtocolVersion;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractStempConnectionHandler.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChestConnectionHandler.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChorusPlantConnectionHandler.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionData.java

@@ -27,7 +27,7 @@ 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.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_8;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionHandler.java

@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers.BlockConnectionProvider;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/DoorConnectionHandler.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FireConnectionHandler.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FlowerConnectionHandler.java

@@ -20,7 +20,7 @@ package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnection
 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.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 

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.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
-import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo;
+import com.viaversion.viaversion.api.connection.ProtocolInfo;
 
 import java.util.ArrayList;
 import java.util.List;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/RedstoneConnectionHandler.java

@@ -19,7 +19,7 @@ package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnection
 
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/SnowyGrassConnectionHandler.java

@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
 import com.viaversion.viaversion.util.Pair;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/StairConnectionHandler.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/TripwireConnectionHandler.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/VineConnectionHandler.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/WallConnectionHandler.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/BlockConnectionProvider.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/PacketBlockConnectionProvider.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockConnectionStorage;
 
 public class PacketBlockConnectionProvider extends BlockConnectionProvider {

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.metadata;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.item.Item;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java

@@ -23,7 +23,7 @@ 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.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/BlockEntityProvider.java

@@ -21,7 +21,7 @@ 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.protocol.connection.UserConnection;
+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.type.Type;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BannerHandler.java

@@ -24,7 +24,7 @@ import com.github.steveice10.opennbt.tag.builtin.NumberTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BedHandler.java

@@ -21,7 +21,7 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.NumberTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockStorage;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/CommandBlockHandler.java

@@ -22,7 +22,7 @@ import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java

@@ -19,7 +19,7 @@ package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.block
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.util.Pair;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider;
 
 import java.util.Map;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SkullHandler.java

@@ -21,7 +21,7 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.NumberTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockStorage;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SpawnerHandler.java

@@ -19,7 +19,7 @@ package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.block
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.EntityNameRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java

@@ -19,8 +19,8 @@ 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.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 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;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java

@@ -19,8 +19,8 @@ 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.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 
 import java.util.Map;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/EntityTracker1_13.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types.EntityType;
 import com.viaversion.viaversion.data.EntityTracker;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java

@@ -18,8 +18,8 @@
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage;
 
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
 

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/types/Particle1_13Type.java

@@ -1,62 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.types;
-
-import io.netty.buffer.ByteBuf;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.Particle;
-
-@Deprecated
-public class Particle1_13Type extends Type<Particle> {
-    public Particle1_13Type() {
-        super("Particle", Particle.class);
-    }
-
-    @Override
-    public void write(ByteBuf buffer, Particle object) throws Exception {
-        Type.VAR_INT.writePrimitive(buffer, object.getId());
-        for (Particle.ParticleData data : object.getArguments())
-            data.getType().write(buffer, data.getValue());
-    }
-
-    @Override
-    public Particle read(ByteBuf buffer) throws Exception {
-        int type = Type.VAR_INT.readPrimitive(buffer);
-        Particle particle = new Particle(type);
-
-        switch (type) {
-            // Block / Falling Dust /
-            case 3:
-            case 20:
-                particle.getArguments().add(new Particle.ParticleData(Type.VAR_INT, Type.VAR_INT.readPrimitive(buffer))); // Flat Block
-                break;
-            // Dust
-            case 11:
-                particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Red 0 - 1
-                particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Green 0 - 1
-                particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Blue 0 - 1
-                particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer)));// Scale 0.01 - 4
-                break;
-            // Item
-            case 27:
-                particle.getArguments().add(new Particle.ParticleData(Type.FLAT_ITEM, Type.FLAT_ITEM.read(buffer))); // Flat item
-                break;
-        }
-        return particle;
-    }
-}

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_14_1to1_14;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+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;

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/metadata/MetadataRewriter1_14_1To1_14.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_14_1to1_14.metadata;
 
-import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+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;