diff --git a/api-legacy/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/api-legacy/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java new file mode 100644 index 000000000..ddfbb2a83 --- /dev/null +++ b/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 versions = new Int2ObjectOpenHashMap<>(); + private static final List 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 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 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 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); + } +} 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 7e0a281fb..3d3ec4c16 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java +++ b/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 { */ 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. * 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 c71a8338c..b4bcfeb20 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/ViaManager.java +++ b/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; diff --git a/api/src/main/java/com/viaversion/viaversion/api/boss/BossBar.java b/api/src/main/java/com/viaversion/viaversion/api/boss/BossBar.java index ffb70a4a7..b04f1da1f 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/boss/BossBar.java +++ b/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; diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/ProtocolInfo.java b/api/src/main/java/com/viaversion/viaversion/api/connection/ProtocolInfo.java similarity index 98% rename from api/src/main/java/com/viaversion/viaversion/api/protocol/connection/ProtocolInfo.java rename to api/src/main/java/com/viaversion/viaversion/api/connection/ProtocolInfo.java index 6dae01796..eeff33b04 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/ProtocolInfo.java +++ b/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; diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/StoredObject.java b/api/src/main/java/com/viaversion/viaversion/api/connection/StoredObject.java similarity index 96% rename from api/src/main/java/com/viaversion/viaversion/api/protocol/connection/StoredObject.java rename to api/src/main/java/com/viaversion/viaversion/api/connection/StoredObject.java index e343968c7..cacaf800f 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/StoredObject.java +++ b/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; diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/UserConnection.java b/api/src/main/java/com/viaversion/viaversion/api/connection/UserConnection.java similarity index 99% rename from api/src/main/java/com/viaversion/viaversion/api/protocol/connection/UserConnection.java rename to api/src/main/java/com/viaversion/viaversion/api/connection/UserConnection.java index 375bed877..5bc2f6f94 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/UserConnection.java +++ b/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; diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/ViaConnectionManager.java b/api/src/main/java/com/viaversion/viaversion/api/connection/ViaConnectionManager.java similarity index 97% rename from api/src/main/java/com/viaversion/viaversion/api/protocol/connection/ViaConnectionManager.java rename to api/src/main/java/com/viaversion/viaversion/api/connection/ViaConnectionManager.java index 052c8006b..74feb3ad5 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/ViaConnectionManager.java +++ b/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; diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/Chunk.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/Chunk.java index eba859627..98dafa73a 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/Chunk.java +++ b/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); diff --git a/api/src/main/java/com/viaversion/viaversion/api/platform/ViaPlatform.java b/api/src/main/java/com/viaversion/viaversion/api/platform/ViaPlatform.java index dabb349ee..d27f1747f 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/platform/ViaPlatform.java +++ b/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 { */ 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. diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/Protocol.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/Protocol.java index a149b8645..ad9cef7fc 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/Protocol.java +++ b/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; diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolPipeline.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolPipeline.java index 04db96b2f..724967540 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolPipeline.java +++ b/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.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.ProtocolInfo; +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; 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 d203e1243..4c98292ec 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,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; diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketWrapper.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketWrapper.java index 8f3ce855e..4d521005b 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketWrapper.java +++ b/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; diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/VersionProvider.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/VersionProvider.java index be5406f65..5c6c3a6ab 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/VersionProvider.java +++ b/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 { diff --git a/api/src/main/java/com/viaversion/viaversion/util/GsonUtil.java b/api/src/main/java/com/viaversion/viaversion/util/GsonUtil.java index c583f27ea..ab72feebe 100644 --- a/api/src/main/java/com/viaversion/viaversion/util/GsonUtil.java +++ b/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(); - } } diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/ViaBukkitListener.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/ViaBukkitListener.java index c2c11b662..cb0cd68fc 100644 --- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/ViaBukkitListener.java +++ b/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 { diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/DeathListener.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/DeathListener.java index a05de015d..6bc8cda50 100644 --- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/DeathListener.java +++ b/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; diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitBlockConnectionProvider.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitBlockConnectionProvider.java index c1ec8a5ad..0874cbede 100644 --- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitBlockConnectionProvider.java +++ b/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; 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 f3eab1d6c..b0931bbda 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 @@ -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; 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 e4ac4cb36..a337a1bdc 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 @@ -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); 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 8d62db4df..23e62fa48 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 @@ -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; 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 c6a5e0279..2c1453264 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 @@ -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; 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 8fa09d633..2c0f51aa2 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 @@ -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; 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 635d93da8..7eabf4e6b 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 @@ -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; 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 d5509ede1..683287a61 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 @@ -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; 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 b7c0ebd7c..b37aacdd6 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 @@ -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; 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 4f2422cd6..41ffb2b27 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 @@ -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; 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 0d8ad27ae..ad5914971 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 @@ -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; 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 5f3264650..6a825fe08 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 @@ -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; 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 bcebee858..8eb7156d8 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 @@ -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; 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 ead6ec73f..220f3d55b 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 @@ -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; 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 1602a113e..382d27607 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 @@ -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; diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java index f2ca25ada..39eb31c4b 100644 --- a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java +++ b/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.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +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; 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 cddcfe6e3..a8e85e0cc 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 @@ -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; diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeBossBarProvider.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeBossBarProvider.java index 762159499..504bc6512 100644 --- a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeBossBarProvider.java +++ b/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; 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 350d157f7..cf76cf06c 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 @@ -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; 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 1cb1190a2..220f83f49 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 @@ -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.protocol.connection.ProtocolInfo; +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; 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 c7bae6395..ebd39cac2 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 @@ -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; 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 733baec9e..b1a032490 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 @@ -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; 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 9af981616..792d96342 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 @@ -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.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; 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 3c562faf6..98240fdea 100644 --- a/common/src/main/java/com/viaversion/viaversion/ViaAPIBase.java +++ b/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; diff --git a/common/src/main/java/com/viaversion/viaversion/ViaListener.java b/common/src/main/java/com/viaversion/viaversion/ViaListener.java index 7284a8abf..84e2f39e6 100644 --- a/common/src/main/java/com/viaversion/viaversion/ViaListener.java +++ b/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; diff --git a/common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java b/common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java index 1adde9ee3..0c3adec94 100644 --- a/common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java +++ b/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; 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 6008ec17c..142fd82ac 100644 --- a/common/src/main/java/com/viaversion/viaversion/boss/CommonBoss.java +++ b/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; diff --git a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/PPSSubCmd.java b/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/PPSSubCmd.java index a12d1a98e..0cbb0f13e 100644 --- a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/PPSSubCmd.java +++ b/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; 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 b693e7044..839934556 100644 --- a/common/src/main/java/com/viaversion/viaversion/data/EntityTracker.java +++ b/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.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import java.util.Map; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol.java b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol.java index 23bfca30e..4a6cb79bb 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol.java +++ b/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; 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 2a7dba4e1..a97ee7d91 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,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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseVersionProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseVersionProvider.java index a6e06977b..af88b1cf6 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseVersionProvider.java +++ b/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 { 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 370808dc7..5eef43756 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 @@ -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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/storage/ResourcePackTracker.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/storage/ResourcePackTracker.java index 99f4799a8..4147fee50 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/storage/ResourcePackTracker.java +++ b/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.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; public class ResourcePackTracker extends StoredObject { private String lastHash = ""; 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 638cfa55f..d9b8bbf17 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 @@ -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; 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 d8383436f..a1714f239 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 @@ -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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/storage/EntityTracker1_11.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/storage/EntityTracker1_11.java index 38d6bcb30..68662c750 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/storage/EntityTracker1_11.java +++ b/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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ChatItemRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ChatItemRewriter.java index 5c7e34cf1..c40cfb62f 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ChatItemRewriter.java +++ b/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; 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 3b9103390..94f798837 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 @@ -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; 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 d635eaf64..82849a105 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 @@ -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; 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 273713d3b..4c6e482cd 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 @@ -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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/providers/InventoryQuickMoveProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/providers/InventoryQuickMoveProvider.java index edd30d1ac..2bf64719a 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/providers/InventoryQuickMoveProvider.java +++ b/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 { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/storage/EntityTracker1_12.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/storage/EntityTracker1_12.java index 99de47656..ee11b7610 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/storage/EntityTracker1_12.java +++ b/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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/Protocol1_13_1To1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/Protocol1_13_1To1_13.java index ffb81713c..2f95ff6c9 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/Protocol1_13_1To1_13.java +++ b/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; 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 779045cd0..6a079ddbd 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 @@ -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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/types/Particle1_13_2Type.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/types/Particle1_13_2Type.java deleted file mode 100644 index 5e0825f9e..000000000 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/types/Particle1_13_2Type.java +++ /dev/null @@ -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 . - */ -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 { - 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; - } -} 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 c233eb2e5..9879d41fe 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 @@ -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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/TabCompleteThread.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/TabCompleteThread.java index d2c487455..575307743 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/TabCompleteThread.java +++ b/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 { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractFenceConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractFenceConnectionHandler.java index 75f5edd13..b448ea948 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractFenceConnectionHandler.java +++ b/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; 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 67d332845..d6b30ab80 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 @@ -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; 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 f7f0bb39f..104c475c4 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 @@ -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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChorusPlantConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChorusPlantConnectionHandler.java index 554d1646e..47d5329d0 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChorusPlantConnectionHandler.java +++ b/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; 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 2daf089dd..87c198bfc 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 @@ -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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionHandler.java index 885ead0c9..4efcc8fb9 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionHandler.java +++ b/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; 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 51d1e193b..618185016 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 @@ -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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FireConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FireConnectionHandler.java index 049795dd2..59166187e 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FireConnectionHandler.java +++ b/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; 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 b72fc6718..588ef4e59 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 @@ -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; 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 dafd4f595..d7498b50e 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.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; 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 73e513706..2fcff775e 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 @@ -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; 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 311ea657a..37acbfbee 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 @@ -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; 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 c53a2a05a..0bebded1f 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 @@ -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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/TripwireConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/TripwireConnectionHandler.java index 59cb00789..8b9a2c6b0 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/TripwireConnectionHandler.java +++ b/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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/VineConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/VineConnectionHandler.java index 18d12c859..b38d42da9 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/VineConnectionHandler.java +++ b/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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/WallConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/WallConnectionHandler.java index 5b62fb566..e1ce8c938 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/WallConnectionHandler.java +++ b/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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/BlockConnectionProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/BlockConnectionProvider.java index 00f557539..da872d315 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/BlockConnectionProvider.java +++ b/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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/PacketBlockConnectionProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/PacketBlockConnectionProvider.java index aa4857d9e..26c83c009 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/PacketBlockConnectionProvider.java +++ b/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 { 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 438806636..88ebd1ff4 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 @@ -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; 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 ea1bc78c4..5607f008d 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 @@ -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; 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 ccc073bfb..ec4813a5b 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 @@ -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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BannerHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BannerHandler.java index 7032d5bde..a4a74a34c 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BannerHandler.java +++ b/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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BedHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BedHandler.java index d7863c038..995886551 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BedHandler.java +++ b/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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/CommandBlockHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/CommandBlockHandler.java index a72bd9c35..faa029836 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/CommandBlockHandler.java +++ b/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; 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 365548638..c66a1085d 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 @@ -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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SkullHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SkullHandler.java index 47030dd3f..f382dbbdd 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SkullHandler.java +++ b/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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SpawnerHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SpawnerHandler.java index 4bcaeb976..8dc94e8a0 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SpawnerHandler.java +++ b/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; 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 dbfd9530c..467ced332 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 @@ -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.protocol.connection.UserConnection; +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.api.minecraft.chunks.NibbleArray; 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/storage/BlockStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java index 48b4e7241..fea800930 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 @@ -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.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; import java.util.Map; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/EntityTracker1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/EntityTracker1_13.java index dd5f79bb6..ea947a4ec 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/EntityTracker1_13.java +++ b/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; 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 72a363a22..ddf8ab631 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 @@ -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.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/types/Particle1_13Type.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/types/Particle1_13Type.java deleted file mode 100644 index e3fd81ed4..000000000 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/types/Particle1_13Type.java +++ /dev/null @@ -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 . - */ -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 { - 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; - } -} 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 60b4c5375..c4251b172 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 @@ -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; 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 b3664cbbb..f46397ea9 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 @@ -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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/storage/EntityTracker1_14_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/storage/EntityTracker1_14_1.java index eddd72f69..ba1ea133e 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/storage/EntityTracker1_14_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/storage/EntityTracker1_14_1.java @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_14_1to1_14.storage; -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.data.EntityTracker; 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 242713028..16a380c92 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 @@ -18,7 +18,7 @@ package com.viaversion.viaversion.protocols.protocol1_14to1_13_2; 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.protocol.Protocol; 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/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 c4d98f02a..e9da60e95 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 @@ -19,7 +19,7 @@ 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.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.Entity1_14Types; import com.viaversion.viaversion.api.minecraft.entities.EntityType; 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 1ecf7d3f5..7da121c79 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 @@ -18,7 +18,7 @@ package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.storage; 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.entities.Entity1_14Types; import com.viaversion.viaversion.data.EntityTracker; import com.viaversion.viaversion.api.type.Type; 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 fcb493f6f..ff07603a3 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 @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_15to1_14_4; -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.PacketRemapper; import com.viaversion.viaversion.rewriter.MetadataRewriter; 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 575343a10..54a5ec4c1 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 @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.metadata; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.entities.Entity1_15Types; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.item.Item; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/storage/EntityTracker1_15.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/storage/EntityTracker1_15.java index 51739d912..687783f89 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/storage/EntityTracker1_15.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/storage/EntityTracker1_15.java @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.storage; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.entities.Entity1_15Types; import com.viaversion.viaversion.data.EntityTracker; 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 d8bd0e67c..6210cbc94 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 @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1; -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.PacketRemapper; import com.viaversion.viaversion.rewriter.MetadataRewriter; 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 2641f1bfd..2014e2b3c 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 @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_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_16Types; import com.viaversion.viaversion.api.minecraft.entities.Entity1_16_2Types; import com.viaversion.viaversion.api.minecraft.entities.EntityType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/storage/EntityTracker1_16_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/storage/EntityTracker1_16_2.java index f42f5ea88..d063f1779 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/storage/EntityTracker1_16_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/storage/EntityTracker1_16_2.java @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_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_16_2Types; import com.viaversion.viaversion.data.EntityTracker; 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 a5d5c3cbb..f6c658954 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 @@ -22,7 +22,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.api.protocol.Protocol; import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; import com.viaversion.viaversion.rewriter.ComponentRewriter; 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 c47d53c99..a500ec54b 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 @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_16to1_15_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_15Types; import com.viaversion.viaversion.api.minecraft.entities.Entity1_16Types; import com.viaversion.viaversion.api.minecraft.entities.EntityType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/EntityTracker1_16.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/EntityTracker1_16.java index e99d5755a..b15abb230 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/EntityTracker1_16.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/EntityTracker1_16.java @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_16to1_15_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_16Types; import com.viaversion.viaversion.data.EntityTracker; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/InventoryTracker1_16.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/InventoryTracker1_16.java index 14d20e23a..4539a3a1d 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/InventoryTracker1_16.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/InventoryTracker1_16.java @@ -17,8 +17,8 @@ */ package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.storage; -import com.viaversion.viaversion.api.protocol.connection.StoredObject; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; public class InventoryTracker1_16 extends StoredObject { private short inventory = -1; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java index a0ecba02c..dc84fe8e0 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java @@ -19,7 +19,7 @@ package com.viaversion.viaversion.protocols.protocol1_17to1_16_4; 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.protocol.packet.ClientboundPacketType; import com.viaversion.viaversion.api.protocol.Protocol; import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; 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 01e2a81aa..f52ce29e4 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 @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.metadata; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.entities.Entity1_16_2Types; import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types; import com.viaversion.viaversion.api.minecraft.entities.EntityType; 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 355fb8837..b1fef5de3 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 @@ -23,7 +23,7 @@ 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.protocol.connection.UserConnection; +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; 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 01b5ec320..17ed2c9ec 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 @@ -18,8 +18,8 @@ package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.storage; import org.checkerframework.checker.nullness.qual.Nullable; -import com.viaversion.viaversion.api.protocol.connection.StoredObject; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; import java.util.HashMap; import java.util.Map; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/EntityTracker1_17.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/EntityTracker1_17.java index 44d282a4a..f80336302 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/EntityTracker1_17.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/EntityTracker1_17.java @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.storage; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types; import com.viaversion.viaversion.data.EntityTracker; 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 255c08a5f..a3c6cfa02 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 @@ -19,7 +19,7 @@ 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.protocol.connection.UserConnection; +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; 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 f9510c693..f4fa57e03 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 @@ -21,7 +21,7 @@ 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.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; 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_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 958345108..4d20d3788 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 @@ -22,7 +22,7 @@ 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.protocol.connection.UserConnection; +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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/storage/ClientWorld.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/storage/ClientWorld.java index 31c309344..e4c411a09 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/storage/ClientWorld.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/storage/ClientWorld.java @@ -17,8 +17,8 @@ */ package com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage; -import com.viaversion.viaversion.api.protocol.connection.StoredObject; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Environment; /** 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 9a49e187a..75ece53fa 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 @@ -21,7 +21,7 @@ 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.protocol.connection.UserConnection; +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; 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 6750abc9c..7a2ff0c56 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.protocol.connection.UserConnection; -import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.connection.ProtocolInfo; 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/chat/ChatRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/chat/ChatRewriter.java index 7aa6f3e1e..7eb2584ae 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/chat/ChatRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/chat/ChatRewriter.java @@ -19,7 +19,7 @@ package com.viaversion.viaversion.protocols.protocol1_9to1_8.chat; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9; public class ChatRewriter { 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 06f03b2bb..17ba10827 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 @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BossBarProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BossBarProvider.java index 1031c0a5e..a87d08592 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BossBarProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BossBarProvider.java @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_9to1_8.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 java.util.UUID; 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 95616f554..563fcbd65 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 @@ -19,7 +19,7 @@ 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.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; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/EntityIdProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/EntityIdProvider.java index 8a3fc1e1a..2d48afb62 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/EntityIdProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/EntityIdProvider.java @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_9to1_8.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_9to1_8.storage.EntityTracker1_9; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/HandItemProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/HandItemProvider.java index 3c996f92e..56d88aca8 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/HandItemProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/HandItemProvider.java @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers; -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.providers.Provider; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MainHandProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MainHandProvider.java index b718b95ea..373c9e067 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MainHandProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MainHandProvider.java @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.protocols.protocol1_9to1_8.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 MainHandProvider implements Provider { 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 f8c83f4fc..5975b92ea 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 @@ -18,7 +18,7 @@ package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers; import io.netty.channel.ChannelHandlerContext; -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_9to1_8.storage.MovementTracker; import com.viaversion.viaversion.util.PipelineUtil; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/ClientChunks.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/ClientChunks.java index a4d2f1b25..c0cdf6a09 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/ClientChunks.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/ClientChunks.java @@ -19,8 +19,8 @@ package com.viaversion.viaversion.protocols.protocol1_9to1_8.storage; import com.google.common.collect.Sets; import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.protocol.connection.StoredObject; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BulkChunkTranslatorProvider; import java.util.List; 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 b1355aee9..6acb56a88 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 @@ -20,8 +20,8 @@ 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.protocol.connection.StoredObject; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; import java.util.Map; 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 322b05231..fb4e4d683 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 @@ -24,7 +24,7 @@ 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.protocol.connection.UserConnection; +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.item.Item; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/InventoryTracker.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/InventoryTracker.java index ac41b54cc..f98fe6db5 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/InventoryTracker.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/InventoryTracker.java @@ -17,8 +17,8 @@ */ package com.viaversion.viaversion.protocols.protocol1_9to1_8.storage; -import com.viaversion.viaversion.api.protocol.connection.StoredObject; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; import java.util.HashMap; import java.util.Map; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/MovementTracker.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/MovementTracker.java index 6b86bed23..259d2d0ee 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/MovementTracker.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/MovementTracker.java @@ -17,8 +17,8 @@ */ package com.viaversion.viaversion.protocols.protocol1_9to1_8.storage; -import com.viaversion.viaversion.api.protocol.connection.StoredObject; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; public class MovementTracker extends StoredObject { private static final long IDLE_PACKET_DELAY = 50L; // Update every 50ms (20tps) 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 0428b47ab..156749c26 100644 --- a/common/src/main/java/com/viaversion/viaversion/rewriter/MetadataRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/rewriter/MetadataRewriter.java @@ -23,7 +23,7 @@ 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.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; 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 42a44ce8d..ce16636e9 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 @@ -23,7 +23,7 @@ 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.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.ProtocolPipeline; 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 16882cd3f..e0efbc57e 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 @@ -20,7 +20,7 @@ package com.viaversion.viaversion.sponge.handlers; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +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; 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 99e447d3d..4e958e8f6 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 @@ -20,7 +20,7 @@ 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.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.exception.CancelEncoderException; import com.viaversion.viaversion.exception.CancelCodecException; import com.viaversion.viaversion.handlers.ChannelHandlerContextWrapper; 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 a93b4e02c..7ae05f706 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 @@ -20,7 +20,7 @@ package com.viaversion.viaversion.sponge.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; 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 dc461fba5..1e2bf77e5 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 @@ -20,7 +20,7 @@ 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.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.platform.TaskId; import com.viaversion.viaversion.api.platform.ViaPlatformLoader; 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 09e3f9656..82774a062 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 @@ -19,7 +19,7 @@ package com.viaversion.viaversion.velocity.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; 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 a1cfed598..be5431adf 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 @@ -22,7 +22,7 @@ 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.protocol.connection.UserConnection; +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; 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 62f76ed9c..f92a10cf4 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 @@ -23,7 +23,7 @@ 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.protocol.connection.UserConnection; +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; diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityBossBarProvider.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityBossBarProvider.java index e97d7b959..952c7d822 100644 --- a/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityBossBarProvider.java +++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityBossBarProvider.java @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.velocity.providers; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BossBarProvider; import com.viaversion.viaversion.velocity.storage.VelocityStorage; 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 05da2793c..3eca46565 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 @@ -18,7 +18,7 @@ package com.viaversion.viaversion.velocity.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; 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 bd230ba84..decf06098 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 @@ -21,7 +21,7 @@ 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.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.velocity.platform.VelocityViaInjector; diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/storage/VelocityStorage.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/storage/VelocityStorage.java index dad6d458e..ea2bf5a6c 100644 --- a/velocity/src/main/java/com/viaversion/viaversion/velocity/storage/VelocityStorage.java +++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/storage/VelocityStorage.java @@ -18,8 +18,8 @@ package com.viaversion.viaversion.velocity.storage; import com.velocitypowered.api.proxy.Player; -import com.viaversion.viaversion.api.protocol.connection.StoredObject; -import com.viaversion.viaversion.api.protocol.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.util.ReflectionUtil; import java.lang.reflect.InvocationTargetException;