diff --git a/build.gradle b/build.gradle index e083133..ee0e1c9 100644 --- a/build.gradle +++ b/build.gradle @@ -54,10 +54,10 @@ repositories { } dependencies { - include "com.viaversion:viaversion-common:5.0.0-20240517.161911-7" + include "com.viaversion:viaversion-common:5.0.0-20240517.190711-8" include "com.viaversion:viabackwards-common:5.0.0-20240515.152913-2" include "com.viaversion:viarewind-common:4.0.0-20240515.083613-2" - include "net.raphimc:ViaLegacy:3.0.0-20240517.153112-1" + include "net.raphimc:ViaLegacy:3.0.0-20240517.210413-2" include "net.raphimc:ViaAprilFools:3.0.0-20240517.172611-2" include("net.raphimc:ViaBedrock:0.0.8-20240517.153009-1") { exclude group: "io.netty" diff --git a/src/main/java/net/raphimc/viaproxy/injection/ClassicWorldHeightInjection.java b/src/main/java/net/raphimc/viaproxy/injection/ClassicWorldHeightInjection.java index 6f50b13..41f40ad 100644 --- a/src/main/java/net/raphimc/viaproxy/injection/ClassicWorldHeightInjection.java +++ b/src/main/java/net/raphimc/viaproxy/injection/ClassicWorldHeightInjection.java @@ -27,9 +27,9 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Types; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_17; import net.raphimc.vialegacy.api.LegacyProtocolVersion; -import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.model.ClassicLevel; -import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicWorldHeightProvider; -import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.storage.ClassicLevelStorage; +import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.model.ClassicLevel; +import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicWorldHeightProvider; +import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.storage.ClassicLevelStorage; import java.util.ArrayList; import java.util.BitSet; diff --git a/src/main/java/net/raphimc/viaproxy/protocoltranslator/impl/ViaProxyVLLoader.java b/src/main/java/net/raphimc/viaproxy/protocoltranslator/impl/ViaProxyVLLoader.java index 078e58e..9ab084f 100644 --- a/src/main/java/net/raphimc/viaproxy/protocoltranslator/impl/ViaProxyVLLoader.java +++ b/src/main/java/net/raphimc/viaproxy/protocoltranslator/impl/ViaProxyVLLoader.java @@ -23,12 +23,12 @@ import com.viaversion.viaversion.api.protocol.version.VersionProvider; import com.viaversion.viaversion.protocols.v1_8to1_9.provider.CompressionProvider; import com.viaversion.viaversion.protocols.v1_8to1_9.provider.HandItemProvider; import net.raphimc.viabedrock.protocol.providers.NettyPipelineProvider; -import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicCustomCommandProvider; -import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicMPPassProvider; -import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicWorldHeightProvider; -import net.raphimc.vialegacy.protocols.release.protocol1_3_1_2to1_2_4_5.providers.OldAuthProvider; -import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.providers.EncryptionProvider; -import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.providers.GameProfileFetcher; +import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicCustomCommandProvider; +import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicMPPassProvider; +import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicWorldHeightProvider; +import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.provider.OldAuthProvider; +import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.provider.EncryptionProvider; +import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher; import net.raphimc.vialoader.impl.viaversion.VLLoader; import net.raphimc.viaproxy.ViaProxy; import net.raphimc.viaproxy.plugins.events.ViaLoadingEvent; diff --git a/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyClassicCustomCommandProvider.java b/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyClassicCustomCommandProvider.java index 1fd49b5..01394c8 100644 --- a/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyClassicCustomCommandProvider.java +++ b/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyClassicCustomCommandProvider.java @@ -19,8 +19,8 @@ package net.raphimc.viaproxy.protocoltranslator.providers; import com.viaversion.viaversion.api.connection.UserConnection; import net.raphimc.vialegacy.ViaLegacy; -import net.raphimc.vialegacy.protocols.alpha.protocola1_0_17_1_0_17_4toa1_0_16_2.storage.TimeLockStorage; -import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicCustomCommandProvider; +import net.raphimc.vialegacy.protocol.alpha.a1_0_16_2toa1_0_17_1_0_17_4.storage.TimeLockStorage; +import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicCustomCommandProvider; import java.util.logging.Level; diff --git a/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyClassicMPPassProvider.java b/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyClassicMPPassProvider.java index 0b6b1d4..823fa86 100644 --- a/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyClassicMPPassProvider.java +++ b/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyClassicMPPassProvider.java @@ -21,9 +21,9 @@ import com.google.common.hash.Hashing; import com.google.common.io.Resources; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; -import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicMPPassProvider; -import net.raphimc.vialegacy.protocols.release.protocol1_3_1_2to1_2_4_5.providers.OldAuthProvider; -import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.storage.HandshakeStorage; +import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicMPPassProvider; +import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.provider.OldAuthProvider; +import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.storage.HandshakeStorage; import net.raphimc.viaproxy.ViaProxy; import net.raphimc.viaproxy.proxy.session.ProxyConnection; diff --git a/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyClassicWorldHeightProvider.java b/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyClassicWorldHeightProvider.java index 329b063..9fb2f1f 100644 --- a/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyClassicWorldHeightProvider.java +++ b/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyClassicWorldHeightProvider.java @@ -19,7 +19,7 @@ package net.raphimc.viaproxy.protocoltranslator.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; -import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicWorldHeightProvider; +import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicWorldHeightProvider; public class ViaProxyClassicWorldHeightProvider extends ClassicWorldHeightProvider { diff --git a/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyEncryptionProvider.java b/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyEncryptionProvider.java index 3c310cc..a2864a9 100644 --- a/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyEncryptionProvider.java +++ b/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyEncryptionProvider.java @@ -18,7 +18,7 @@ package net.raphimc.viaproxy.protocoltranslator.providers; import com.viaversion.viaversion.api.connection.UserConnection; -import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.providers.EncryptionProvider; +import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.provider.EncryptionProvider; import net.raphimc.viaproxy.proxy.session.ProxyConnection; public class ViaProxyEncryptionProvider extends EncryptionProvider { diff --git a/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyGameProfileFetcher.java b/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyGameProfileFetcher.java index e94fa85..7bd1a67 100644 --- a/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyGameProfileFetcher.java +++ b/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyGameProfileFetcher.java @@ -21,8 +21,8 @@ import com.mojang.authlib.Agent; import com.mojang.authlib.ProfileLookupCallback; import com.mojang.authlib.properties.Property; import com.mojang.authlib.yggdrasil.ProfileNotFoundException; -import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.model.GameProfile; -import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.providers.GameProfileFetcher; +import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.model.GameProfile; +import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher; import net.raphimc.viaproxy.proxy.external_interface.AuthLibServices; import java.util.Map; diff --git a/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyOldAuthProvider.java b/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyOldAuthProvider.java index a15f124..b3180c3 100644 --- a/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyOldAuthProvider.java +++ b/src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyOldAuthProvider.java @@ -18,7 +18,7 @@ package net.raphimc.viaproxy.protocoltranslator.providers; import com.viaversion.viaversion.api.connection.UserConnection; -import net.raphimc.vialegacy.protocols.release.protocol1_3_1_2to1_2_4_5.providers.OldAuthProvider; +import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.provider.OldAuthProvider; import net.raphimc.viaproxy.proxy.external_interface.ExternalInterface; import net.raphimc.viaproxy.proxy.session.ProxyConnection; diff --git a/src/main/java/net/raphimc/viaproxy/proxy/packethandler/LoginPacketHandler.java b/src/main/java/net/raphimc/viaproxy/proxy/packethandler/LoginPacketHandler.java index fe1a6d4..a508fc2 100644 --- a/src/main/java/net/raphimc/viaproxy/proxy/packethandler/LoginPacketHandler.java +++ b/src/main/java/net/raphimc/viaproxy/proxy/packethandler/LoginPacketHandler.java @@ -27,7 +27,7 @@ import net.raphimc.netminecraft.netty.crypto.CryptUtil; import net.raphimc.netminecraft.packet.IPacket; import net.raphimc.netminecraft.packet.impl.login.*; import net.raphimc.vialegacy.api.LegacyProtocolVersion; -import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.storage.ProtocolMetadataStorage; +import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.storage.ProtocolMetadataStorage; import net.raphimc.viaproxy.ViaProxy; import net.raphimc.viaproxy.cli.ConsoleFormatter; import net.raphimc.viaproxy.plugins.events.ClientLoggedInEvent;