From d7f7fa0bce0d779d27d19e8d530aa882369cc31d Mon Sep 17 00:00:00 2001 From: FlorianMichael Date: Mon, 3 Jun 2024 20:58:55 +0200 Subject: [PATCH] Port sources to upstream changes --- gradle.properties | 12 ++++++------ .../viaforge/common/ViaForgeCommon.java | 3 ++- .../viaforge/common/platform/VFPlatform.java | 4 ++-- .../viaforge/common/platform/ViaForgeConfig.java | 5 +++-- .../common/protocoltranslator/ViaForgeVLLoader.java | 10 +++++----- .../provider/ViaForgeClassicMPPassProvider.java | 6 +++--- .../provider/ViaForgeEncryptionProvider.java | 2 +- .../ViaForgeMovementTransmitterProvider.java | 2 +- .../provider/ViaForgeOldAuthProvider.java | 2 +- .../provider/ViaForgeVersionProvider.java | 2 +- .../de/florianmichael/viaforge/ViaForge1122.java | 2 +- .../impl/connect/MixinNetHandlerLoginClient.java | 2 +- .../provider/ViaForgeGameProfileFetcher.java | 4 ++-- .../de/florianmichael/viaforge/ViaForge1165.java | 2 +- .../mixin/connect/MixinClientLoginNetHandler.java | 2 +- .../provider/ViaForgeGameProfileFetcher.java | 4 ++-- .../de/florianmichael/viaforge/ViaForge1171.java | 2 +- .../MixinClientHandshakePacketListenerImpl.java | 2 +- .../provider/ViaForgeGameProfileFetcher.java | 4 ++-- .../de/florianmichael/viaforge/ViaForge1182.java | 2 +- .../MixinClientHandshakePacketListenerImpl.java | 2 +- .../provider/ViaForgeGameProfileFetcher.java | 4 ++-- .../de/florianmichael/viaforge/ViaForge1194.java | 2 +- .../MixinClientHandshakePacketListenerImpl.java | 2 +- .../provider/ViaForgeGameProfileFetcher.java | 4 ++-- .../de/florianmichael/viaforge/ViaForge1204.java | 2 +- .../MixinClientHandshakePacketListenerImpl.java | 2 +- .../provider/ViaForgeGameProfileFetcher.java | 4 ++-- 28 files changed, 49 insertions(+), 47 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9e014b9..1f6bf82 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,12 +7,12 @@ maven_version=3.6.1-SNAPSHOT maven_group=de.florianmichael # ViaVersion -viaversion_version=4.10.1 -viabackwards_version=4.10.1 -viarewind_version=3.1.1 -vialegacy_version=2.2.23-SNAPSHOT -viaaprilfools_version=2.0.13-SNAPSHOT -vialoader_version=2.2.14-SNAPSHOT +viaversion_version=5.0.0-SNAPSHOT +viabackwards_version=5.0.0-SNAPSHOT +viarewind_version=4.0.0-SNAPSHOT +vialegacy_version=3.0.0-SNAPSHOT +viaaprilfools_version=3.0.0-SNAPSHOT +vialoader_version=3.0.0-SNAPSHOT snake_yml_version=2.2 diff --git a/src/main/java/de/florianmichael/viaforge/common/ViaForgeCommon.java b/src/main/java/de/florianmichael/viaforge/common/ViaForgeCommon.java index 9e2bb92..85874c5 100644 --- a/src/main/java/de/florianmichael/viaforge/common/ViaForgeCommon.java +++ b/src/main/java/de/florianmichael/viaforge/common/ViaForgeCommon.java @@ -18,6 +18,7 @@ package de.florianmichael.viaforge.common; +import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import com.viaversion.viaversion.connection.UserConnectionImpl; @@ -73,7 +74,7 @@ public class ViaForgeCommon { final File mainFolder = new File(platform.getLeadingDirectory(), "ViaForge"); ViaLoader.init(new ViaVersionPlatformImpl(mainFolder), new ViaForgeVLLoader(platform), new ViaForgeVLInjector(), null, ViaBackwardsPlatformImpl::new, ViaRewindPlatformImpl::new, ViaLegacyPlatformImpl::new, ViaAprilFoolsPlatformImpl::new); - manager.config = new ViaForgeConfig(new File(mainFolder, "viaforge.yml")); + manager.config = new ViaForgeConfig(new File(mainFolder, "viaforge.yml"), Via.getPlatform().getLogger()); final ProtocolVersion configVersion = ProtocolVersion.getClosest(manager.config.getClientSideVersion()); if (configVersion != null) { diff --git a/src/main/java/de/florianmichael/viaforge/common/platform/VFPlatform.java b/src/main/java/de/florianmichael/viaforge/common/platform/VFPlatform.java index 8033289..a8c17c7 100644 --- a/src/main/java/de/florianmichael/viaforge/common/platform/VFPlatform.java +++ b/src/main/java/de/florianmichael/viaforge/common/platform/VFPlatform.java @@ -18,13 +18,13 @@ package de.florianmichael.viaforge.common.platform; -import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.providers.GameProfileFetcher; +import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher; import java.io.File; import java.util.function.Supplier; /** - * This interface is used to access platform specific fields. + * This interface is used to access platform-specific fields. */ public interface VFPlatform { diff --git a/src/main/java/de/florianmichael/viaforge/common/platform/ViaForgeConfig.java b/src/main/java/de/florianmichael/viaforge/common/platform/ViaForgeConfig.java index 8982939..201380d 100644 --- a/src/main/java/de/florianmichael/viaforge/common/platform/ViaForgeConfig.java +++ b/src/main/java/de/florianmichael/viaforge/common/platform/ViaForgeConfig.java @@ -27,6 +27,7 @@ import java.net.URL; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.logging.Logger; public class ViaForgeConfig extends Config { @@ -46,8 +47,8 @@ public class ViaForgeConfig extends Config { /** * @param configFile The location of where the config is loaded/saved. */ - public ViaForgeConfig(File configFile) { - super(configFile); + public ViaForgeConfig(File configFile, Logger logger) { + super(configFile, logger); reload(); } diff --git a/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/ViaForgeVLLoader.java b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/ViaForgeVLLoader.java index 82a1528..2d2f042 100644 --- a/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/ViaForgeVLLoader.java +++ b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/ViaForgeVLLoader.java @@ -21,13 +21,13 @@ package de.florianmichael.viaforge.common.protocoltranslator; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.platform.providers.ViaProviders; import com.viaversion.viaversion.api.protocol.version.VersionProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.provider.MovementTransmitterProvider; import de.florianmichael.viaforge.common.platform.VFPlatform; import de.florianmichael.viaforge.common.protocoltranslator.provider.*; -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.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.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.provider.EncryptionProvider; +import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher; import net.raphimc.vialoader.impl.viaversion.VLLoader; public class ViaForgeVLLoader extends VLLoader { diff --git a/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeClassicMPPassProvider.java b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeClassicMPPassProvider.java index 9001bcd..67fd9bf 100644 --- a/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeClassicMPPassProvider.java +++ b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeClassicMPPassProvider.java @@ -21,9 +21,9 @@ package de.florianmichael.viaforge.common.protocoltranslator.provider; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import de.florianmichael.viaforge.common.ViaForgeCommon; -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 java.io.InputStream; import java.net.InetAddress; diff --git a/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeEncryptionProvider.java b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeEncryptionProvider.java index 3eab5e5..b1ee81b 100644 --- a/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeEncryptionProvider.java +++ b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeEncryptionProvider.java @@ -20,7 +20,7 @@ package de.florianmichael.viaforge.common.protocoltranslator.provider; import com.viaversion.viaversion.api.connection.UserConnection; import de.florianmichael.viaforge.common.ViaForgeCommon; -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; public class ViaForgeEncryptionProvider extends EncryptionProvider { diff --git a/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeMovementTransmitterProvider.java b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeMovementTransmitterProvider.java index 9d8de0b..908df33 100644 --- a/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeMovementTransmitterProvider.java +++ b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeMovementTransmitterProvider.java @@ -19,7 +19,7 @@ package de.florianmichael.viaforge.common.protocoltranslator.provider; import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.provider.MovementTransmitterProvider; public class ViaForgeMovementTransmitterProvider extends MovementTransmitterProvider { diff --git a/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeOldAuthProvider.java b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeOldAuthProvider.java index a943829..ebbab8d 100644 --- a/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeOldAuthProvider.java +++ b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeOldAuthProvider.java @@ -20,7 +20,7 @@ package de.florianmichael.viaforge.common.protocoltranslator.provider; import com.viaversion.viaversion.api.connection.UserConnection; import de.florianmichael.viaforge.common.ViaForgeCommon; -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; public class ViaForgeOldAuthProvider extends OldAuthProvider { diff --git a/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeVersionProvider.java b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeVersionProvider.java index e6e722c..4dd60aa 100644 --- a/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeVersionProvider.java +++ b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeVersionProvider.java @@ -20,7 +20,7 @@ package de.florianmichael.viaforge.common.protocoltranslator.provider; 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.protocol.version.BaseVersionProvider; import de.florianmichael.viaforge.common.ViaForgeCommon; public class ViaForgeVersionProvider extends BaseVersionProvider { diff --git a/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/ViaForge1122.java b/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/ViaForge1122.java index f0e3145..6a49440 100644 --- a/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/ViaForge1122.java +++ b/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/ViaForge1122.java @@ -26,7 +26,7 @@ import net.minecraft.realms.RealmsSharedConstants; import net.minecraft.util.Session; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.providers.GameProfileFetcher; +import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher; import java.io.File; import java.util.function.Supplier; diff --git a/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/mixin/impl/connect/MixinNetHandlerLoginClient.java b/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/mixin/impl/connect/MixinNetHandlerLoginClient.java index 2a6cd63..9af9d4c 100644 --- a/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/mixin/impl/connect/MixinNetHandlerLoginClient.java +++ b/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/mixin/impl/connect/MixinNetHandlerLoginClient.java @@ -27,7 +27,7 @@ import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManag import net.minecraft.client.network.NetHandlerLoginClient; import net.minecraft.network.NetworkManager; 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 org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java b/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java index 3368662..c80a076 100644 --- a/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java +++ b/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java @@ -26,8 +26,8 @@ import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.properties.Property; import com.mojang.authlib.yggdrasil.ProfileNotFoundException; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; -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 java.net.Proxy; import java.util.UUID; diff --git a/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/ViaForge1165.java b/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/ViaForge1165.java index 499b427..3bacf3e 100644 --- a/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/ViaForge1165.java +++ b/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/ViaForge1165.java @@ -27,7 +27,7 @@ import net.minecraft.util.SharedConstants; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.providers.GameProfileFetcher; +import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher; import java.io.File; import java.util.function.Supplier; diff --git a/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientLoginNetHandler.java b/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientLoginNetHandler.java index 6bfd5a9..e8bc69e 100644 --- a/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientLoginNetHandler.java +++ b/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientLoginNetHandler.java @@ -27,7 +27,7 @@ import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManag import net.minecraft.client.network.login.ClientLoginNetHandler; import net.minecraft.network.NetworkManager; 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 org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java b/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java index 4932b97..bc74826 100644 --- a/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java +++ b/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java @@ -26,8 +26,8 @@ import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.properties.Property; import com.mojang.authlib.yggdrasil.ProfileNotFoundException; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; -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.provider.GameProfileFetcher; +import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.model.GameProfile; import java.net.Proxy; import java.util.UUID; diff --git a/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/ViaForge1171.java b/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/ViaForge1171.java index 871e038..6f3190d 100644 --- a/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/ViaForge1171.java +++ b/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/ViaForge1171.java @@ -27,7 +27,7 @@ import net.minecraft.client.User; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.providers.GameProfileFetcher; +import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher; import java.io.File; import java.util.function.Supplier; diff --git a/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java b/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java index dfd8e88..4149b2b 100644 --- a/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java +++ b/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java @@ -27,7 +27,7 @@ import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManag import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl; import net.minecraft.network.Connection; 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 org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java b/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java index 4932b97..74fb6a3 100644 --- a/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java +++ b/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java @@ -26,8 +26,8 @@ import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.properties.Property; import com.mojang.authlib.yggdrasil.ProfileNotFoundException; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; -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 java.net.Proxy; import java.util.UUID; diff --git a/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/ViaForge1182.java b/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/ViaForge1182.java index 6d74066..3c9c983 100644 --- a/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/ViaForge1182.java +++ b/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/ViaForge1182.java @@ -27,7 +27,7 @@ import net.minecraft.client.User; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.providers.GameProfileFetcher; +import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher; import java.io.File; import java.util.function.Supplier; diff --git a/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java b/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java index dfd8e88..4149b2b 100644 --- a/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java +++ b/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java @@ -27,7 +27,7 @@ import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManag import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl; import net.minecraft.network.Connection; 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 org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java b/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java index 4932b97..74fb6a3 100644 --- a/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java +++ b/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java @@ -26,8 +26,8 @@ import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.properties.Property; import com.mojang.authlib.yggdrasil.ProfileNotFoundException; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; -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 java.net.Proxy; import java.util.UUID; diff --git a/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/ViaForge1194.java b/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/ViaForge1194.java index c40e436..3d68f3e 100644 --- a/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/ViaForge1194.java +++ b/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/ViaForge1194.java @@ -27,7 +27,7 @@ import net.minecraft.client.User; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.providers.GameProfileFetcher; +import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher; import java.io.File; import java.util.function.Supplier; diff --git a/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java b/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java index dfd8e88..4149b2b 100644 --- a/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java +++ b/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java @@ -27,7 +27,7 @@ import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManag import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl; import net.minecraft.network.Connection; 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 org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java b/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java index 4932b97..74fb6a3 100644 --- a/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java +++ b/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java @@ -26,8 +26,8 @@ import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.properties.Property; import com.mojang.authlib.yggdrasil.ProfileNotFoundException; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; -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 java.net.Proxy; import java.util.UUID; diff --git a/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/ViaForge1204.java b/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/ViaForge1204.java index d1f28c7..812931a 100644 --- a/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/ViaForge1204.java +++ b/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/ViaForge1204.java @@ -27,7 +27,7 @@ import net.minecraft.client.User; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.providers.GameProfileFetcher; +import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher; import java.io.File; import java.util.function.Supplier; diff --git a/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java b/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java index 1b54048..f228dc5 100644 --- a/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java +++ b/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/mixin/connect/MixinClientHandshakePacketListenerImpl.java @@ -26,7 +26,7 @@ import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManag import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl; import net.minecraft.network.Connection; 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 org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java b/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java index 617fc19..8a8009b 100644 --- a/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java +++ b/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java @@ -25,8 +25,8 @@ import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.properties.Property; import com.mojang.authlib.yggdrasil.ProfileNotFoundException; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; -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 java.net.Proxy; import java.util.UUID;