diff --git a/src/main/java/de/florianmichael/viaforge/common/ViaForgeCommon.java b/src/main/java/de/florianmichael/viaforge/common/ViaForgeCommon.java index 3354a0c..d40aadd 100644 --- a/src/main/java/de/florianmichael/viaforge/common/ViaForgeCommon.java +++ b/src/main/java/de/florianmichael/viaforge/common/ViaForgeCommon.java @@ -24,10 +24,10 @@ import com.viaversion.viaversion.connection.UserConnectionImpl; import com.viaversion.viaversion.protocol.ProtocolPipelineImpl; import de.florianmichael.viaforge.common.platform.VFPlatform; import de.florianmichael.viaforge.common.platform.ViaForgeConfig; -import de.florianmichael.viaforge.common.protocolhack.ViaForgeVLInjector; -import de.florianmichael.viaforge.common.protocolhack.netty.VFNetworkManager; -import de.florianmichael.viaforge.common.protocolhack.netty.ViaForgeVLLegacyPipeline; -import de.florianmichael.viaforge.common.protocolhack.ViaForgeVLLoader; +import de.florianmichael.viaforge.common.protocoltranslator.ViaForgeVLInjector; +import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; +import de.florianmichael.viaforge.common.protocoltranslator.netty.ViaForgeVLLegacyPipeline; +import de.florianmichael.viaforge.common.protocoltranslator.ViaForgeVLLoader; import io.netty.channel.Channel; import io.netty.channel.socket.SocketChannel; import io.netty.util.AttributeKey; diff --git a/src/main/java/de/florianmichael/viaforge/common/protocolhack/ViaForgeVLInjector.java b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/ViaForgeVLInjector.java similarity index 95% rename from src/main/java/de/florianmichael/viaforge/common/protocolhack/ViaForgeVLInjector.java rename to src/main/java/de/florianmichael/viaforge/common/protocoltranslator/ViaForgeVLInjector.java index 108a5cd..e1cbaff 100644 --- a/src/main/java/de/florianmichael/viaforge/common/protocolhack/ViaForgeVLInjector.java +++ b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/ViaForgeVLInjector.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viaforge.common.protocolhack; +package de.florianmichael.viaforge.common.protocoltranslator; import net.raphimc.vialoader.impl.viaversion.VLInjector; import net.raphimc.vialoader.netty.VLLegacyPipeline; diff --git a/src/main/java/de/florianmichael/viaforge/common/protocolhack/ViaForgeVLLoader.java b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/ViaForgeVLLoader.java similarity index 94% rename from src/main/java/de/florianmichael/viaforge/common/protocolhack/ViaForgeVLLoader.java rename to src/main/java/de/florianmichael/viaforge/common/protocoltranslator/ViaForgeVLLoader.java index fb63d90..82a1528 100644 --- a/src/main/java/de/florianmichael/viaforge/common/protocolhack/ViaForgeVLLoader.java +++ b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/ViaForgeVLLoader.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package de.florianmichael.viaforge.common.protocolhack; +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 de.florianmichael.viaforge.common.platform.VFPlatform; -import de.florianmichael.viaforge.common.protocolhack.provider.*; +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; diff --git a/src/main/java/de/florianmichael/viaforge/common/protocolhack/netty/VFNetworkManager.java b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/netty/VFNetworkManager.java similarity index 90% rename from src/main/java/de/florianmichael/viaforge/common/protocolhack/netty/VFNetworkManager.java rename to src/main/java/de/florianmichael/viaforge/common/protocoltranslator/netty/VFNetworkManager.java index 47628cd..0953f4d 100644 --- a/src/main/java/de/florianmichael/viaforge/common/protocolhack/netty/VFNetworkManager.java +++ b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/netty/VFNetworkManager.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viaforge.common.protocolhack.netty; +package de.florianmichael.viaforge.common.protocoltranslator.netty; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; @@ -24,7 +24,7 @@ public interface VFNetworkManager { /** * API method to setup the decryption side of the pipeline. - * This method is called by the {@link de.florianmichael.viaforge.common.protocolhack.provider.ViaForgeEncryptionProvider} class. + * This method is called by the {@link de.florianmichael.viaforge.common.protocoltranslator.provider.ViaForgeEncryptionProvider} class. */ void viaForge$setupPreNettyDecryption(); diff --git a/src/main/java/de/florianmichael/viaforge/common/protocolhack/netty/ViaForgeVLLegacyPipeline.java b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/netty/ViaForgeVLLegacyPipeline.java similarity index 96% rename from src/main/java/de/florianmichael/viaforge/common/protocolhack/netty/ViaForgeVLLegacyPipeline.java rename to src/main/java/de/florianmichael/viaforge/common/protocoltranslator/netty/ViaForgeVLLegacyPipeline.java index 68061cc..0c036a3 100644 --- a/src/main/java/de/florianmichael/viaforge/common/protocolhack/netty/ViaForgeVLLegacyPipeline.java +++ b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/netty/ViaForgeVLLegacyPipeline.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viaforge.common.protocolhack.netty; +package de.florianmichael.viaforge.common.protocoltranslator.netty; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; diff --git a/src/main/java/de/florianmichael/viaforge/common/protocolhack/provider/ViaForgeClassicMPPassProvider.java b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeClassicMPPassProvider.java similarity index 98% rename from src/main/java/de/florianmichael/viaforge/common/protocolhack/provider/ViaForgeClassicMPPassProvider.java rename to src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeClassicMPPassProvider.java index c5b7cf9..9001bcd 100644 --- a/src/main/java/de/florianmichael/viaforge/common/protocolhack/provider/ViaForgeClassicMPPassProvider.java +++ b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeClassicMPPassProvider.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viaforge.common.protocolhack.provider; +package de.florianmichael.viaforge.common.protocoltranslator.provider; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; diff --git a/src/main/java/de/florianmichael/viaforge/common/protocolhack/provider/ViaForgeEncryptionProvider.java b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeEncryptionProvider.java similarity index 94% rename from src/main/java/de/florianmichael/viaforge/common/protocolhack/provider/ViaForgeEncryptionProvider.java rename to src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeEncryptionProvider.java index bef3aaf..3eab5e5 100644 --- a/src/main/java/de/florianmichael/viaforge/common/protocolhack/provider/ViaForgeEncryptionProvider.java +++ b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeEncryptionProvider.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viaforge.common.protocolhack.provider; +package de.florianmichael.viaforge.common.protocoltranslator.provider; import com.viaversion.viaversion.api.connection.UserConnection; import de.florianmichael.viaforge.common.ViaForgeCommon; diff --git a/src/main/java/de/florianmichael/viaforge/common/protocolhack/provider/ViaForgeMovementTransmitterProvider.java b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeMovementTransmitterProvider.java similarity index 94% rename from src/main/java/de/florianmichael/viaforge/common/protocolhack/provider/ViaForgeMovementTransmitterProvider.java rename to src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeMovementTransmitterProvider.java index f22341e..9d8de0b 100644 --- a/src/main/java/de/florianmichael/viaforge/common/protocolhack/provider/ViaForgeMovementTransmitterProvider.java +++ b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeMovementTransmitterProvider.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viaforge.common.protocolhack.provider; +package de.florianmichael.viaforge.common.protocoltranslator.provider; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider; diff --git a/src/main/java/de/florianmichael/viaforge/common/protocolhack/provider/ViaForgeOldAuthProvider.java b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeOldAuthProvider.java similarity index 95% rename from src/main/java/de/florianmichael/viaforge/common/protocolhack/provider/ViaForgeOldAuthProvider.java rename to src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeOldAuthProvider.java index b777cf5..a943829 100644 --- a/src/main/java/de/florianmichael/viaforge/common/protocolhack/provider/ViaForgeOldAuthProvider.java +++ b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeOldAuthProvider.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viaforge.common.protocolhack.provider; +package de.florianmichael.viaforge.common.protocoltranslator.provider; import com.viaversion.viaversion.api.connection.UserConnection; import de.florianmichael.viaforge.common.ViaForgeCommon; diff --git a/src/main/java/de/florianmichael/viaforge/common/protocolhack/provider/ViaForgeVersionProvider.java b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeVersionProvider.java similarity index 95% rename from src/main/java/de/florianmichael/viaforge/common/protocolhack/provider/ViaForgeVersionProvider.java rename to src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeVersionProvider.java index 06e6df4..e6e722c 100644 --- a/src/main/java/de/florianmichael/viaforge/common/protocolhack/provider/ViaForgeVersionProvider.java +++ b/src/main/java/de/florianmichael/viaforge/common/protocoltranslator/provider/ViaForgeVersionProvider.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viaforge.common.protocolhack.provider; +package de.florianmichael.viaforge.common.protocoltranslator.provider; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; diff --git a/viaforge-mc112/src/main/java/de/florianmichael/viaforge/mixin/impl/MixinNetworkManager.java b/viaforge-mc112/src/main/java/de/florianmichael/viaforge/mixin/impl/MixinNetworkManager.java index 2936445..bc5a8c2 100644 --- a/viaforge-mc112/src/main/java/de/florianmichael/viaforge/mixin/impl/MixinNetworkManager.java +++ b/viaforge-mc112/src/main/java/de/florianmichael/viaforge/mixin/impl/MixinNetworkManager.java @@ -19,7 +19,7 @@ package de.florianmichael.viaforge.mixin.impl; import de.florianmichael.viaforge.common.ViaForgeCommon; -import de.florianmichael.viaforge.common.protocolhack.netty.VFNetworkManager; +import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import io.netty.channel.Channel; import net.minecraft.network.NettyEncryptingDecoder; import net.minecraft.network.NettyEncryptingEncoder; diff --git a/viaforge-mc112/src/main/java/de/florianmichael/viaforge/mixin/impl/MixinNetworkManager_5.java b/viaforge-mc112/src/main/java/de/florianmichael/viaforge/mixin/impl/MixinNetworkManager_5.java index 9c4cb38..3e8e125 100644 --- a/viaforge-mc112/src/main/java/de/florianmichael/viaforge/mixin/impl/MixinNetworkManager_5.java +++ b/viaforge-mc112/src/main/java/de/florianmichael/viaforge/mixin/impl/MixinNetworkManager_5.java @@ -19,7 +19,7 @@ package de.florianmichael.viaforge.mixin.impl; import de.florianmichael.viaforge.common.ViaForgeCommon; -import de.florianmichael.viaforge.common.protocolhack.netty.VFNetworkManager; +import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import io.netty.channel.Channel; import net.minecraft.network.NetworkManager; import org.spongepowered.asm.mixin.*; diff --git a/viaforge-mc116/src/main/java/de/florianmichael/viaforge/mixin/MixinNetworkManager.java b/viaforge-mc116/src/main/java/de/florianmichael/viaforge/mixin/MixinNetworkManager.java index 2595cdc..b54aac9 100644 --- a/viaforge-mc116/src/main/java/de/florianmichael/viaforge/mixin/MixinNetworkManager.java +++ b/viaforge-mc116/src/main/java/de/florianmichael/viaforge/mixin/MixinNetworkManager.java @@ -19,12 +19,11 @@ package de.florianmichael.viaforge.mixin; import de.florianmichael.viaforge.common.ViaForgeCommon; -import de.florianmichael.viaforge.common.protocolhack.netty.VFNetworkManager; +import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import io.netty.channel.Channel; import net.minecraft.network.NettyEncryptingDecoder; import net.minecraft.network.NettyEncryptingEncoder; import net.minecraft.network.NetworkManager; -import net.minecraft.util.CryptManager; import net.minecraft.util.LazyValue; import net.minecraft.util.text.ITextComponent; import net.raphimc.vialegacy.api.LegacyProtocolVersion; @@ -40,7 +39,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; import javax.crypto.Cipher; -import javax.crypto.SecretKey; import java.net.InetAddress; @Mixin(NetworkManager.class) diff --git a/viaforge-mc116/src/main/java/de/florianmichael/viaforge/mixin/MixinNetworkManager_1.java b/viaforge-mc116/src/main/java/de/florianmichael/viaforge/mixin/MixinNetworkManager_1.java index e7cf3e6..d703544 100644 --- a/viaforge-mc116/src/main/java/de/florianmichael/viaforge/mixin/MixinNetworkManager_1.java +++ b/viaforge-mc116/src/main/java/de/florianmichael/viaforge/mixin/MixinNetworkManager_1.java @@ -19,7 +19,7 @@ package de.florianmichael.viaforge.mixin; import de.florianmichael.viaforge.common.ViaForgeCommon; -import de.florianmichael.viaforge.common.protocolhack.netty.VFNetworkManager; +import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import io.netty.channel.Channel; import net.minecraft.network.NetworkManager; import org.spongepowered.asm.mixin.Final; diff --git a/viaforge-mc117/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java b/viaforge-mc117/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java index 2c7c192..12f98b1 100644 --- a/viaforge-mc117/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java +++ b/viaforge-mc117/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java @@ -19,7 +19,7 @@ package de.florianmichael.viaforge.mixin; import de.florianmichael.viaforge.common.ViaForgeCommon; -import de.florianmichael.viaforge.common.protocolhack.netty.VFNetworkManager; +import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import io.netty.channel.Channel; import net.minecraft.network.CipherDecoder; import net.minecraft.network.CipherEncoder; diff --git a/viaforge-mc117/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java b/viaforge-mc117/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java index 9f15b2c..ccf77c4 100644 --- a/viaforge-mc117/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java +++ b/viaforge-mc117/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java @@ -19,7 +19,7 @@ package de.florianmichael.viaforge.mixin; import de.florianmichael.viaforge.common.ViaForgeCommon; -import de.florianmichael.viaforge.common.protocolhack.netty.VFNetworkManager; +import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import io.netty.channel.Channel; import net.minecraft.network.Connection; import org.spongepowered.asm.mixin.Final; diff --git a/viaforge-mc118/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java b/viaforge-mc118/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java index 2c7c192..12f98b1 100644 --- a/viaforge-mc118/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java +++ b/viaforge-mc118/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java @@ -19,7 +19,7 @@ package de.florianmichael.viaforge.mixin; import de.florianmichael.viaforge.common.ViaForgeCommon; -import de.florianmichael.viaforge.common.protocolhack.netty.VFNetworkManager; +import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import io.netty.channel.Channel; import net.minecraft.network.CipherDecoder; import net.minecraft.network.CipherEncoder; diff --git a/viaforge-mc118/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java b/viaforge-mc118/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java index 9f15b2c..ccf77c4 100644 --- a/viaforge-mc118/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java +++ b/viaforge-mc118/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java @@ -19,7 +19,7 @@ package de.florianmichael.viaforge.mixin; import de.florianmichael.viaforge.common.ViaForgeCommon; -import de.florianmichael.viaforge.common.protocolhack.netty.VFNetworkManager; +import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import io.netty.channel.Channel; import net.minecraft.network.Connection; import org.spongepowered.asm.mixin.Final; diff --git a/viaforge-mc119/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java b/viaforge-mc119/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java index 2c7c192..12f98b1 100644 --- a/viaforge-mc119/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java +++ b/viaforge-mc119/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java @@ -19,7 +19,7 @@ package de.florianmichael.viaforge.mixin; import de.florianmichael.viaforge.common.ViaForgeCommon; -import de.florianmichael.viaforge.common.protocolhack.netty.VFNetworkManager; +import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import io.netty.channel.Channel; import net.minecraft.network.CipherDecoder; import net.minecraft.network.CipherEncoder; diff --git a/viaforge-mc119/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java b/viaforge-mc119/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java index 9f15b2c..ccf77c4 100644 --- a/viaforge-mc119/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java +++ b/viaforge-mc119/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java @@ -19,7 +19,7 @@ package de.florianmichael.viaforge.mixin; import de.florianmichael.viaforge.common.ViaForgeCommon; -import de.florianmichael.viaforge.common.protocolhack.netty.VFNetworkManager; +import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import io.netty.channel.Channel; import net.minecraft.network.Connection; import org.spongepowered.asm.mixin.Final; diff --git a/viaforge-mc120/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java b/viaforge-mc120/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java index da6349a..ac14f3e 100644 --- a/viaforge-mc120/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java +++ b/viaforge-mc120/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection.java @@ -20,7 +20,7 @@ package de.florianmichael.viaforge.mixin; import de.florianmichael.viaforge.common.ViaForgeCommon; import de.florianmichael.viaforge.common.gui.ExtendedServerData; -import de.florianmichael.viaforge.common.protocolhack.netty.VFNetworkManager; +import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import io.netty.channel.Channel; import net.minecraft.client.Minecraft; import net.minecraft.network.CipherDecoder; diff --git a/viaforge-mc120/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java b/viaforge-mc120/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java index 9f15b2c..ccf77c4 100644 --- a/viaforge-mc120/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java +++ b/viaforge-mc120/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java @@ -19,7 +19,7 @@ package de.florianmichael.viaforge.mixin; import de.florianmichael.viaforge.common.ViaForgeCommon; -import de.florianmichael.viaforge.common.protocolhack.netty.VFNetworkManager; +import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import io.netty.channel.Channel; import net.minecraft.network.Connection; import org.spongepowered.asm.mixin.Final;