From 598626c6105634cb111ffe8665237f1816d8a2a6 Mon Sep 17 00:00:00 2001 From: RaphiMC <50594595+RaphiMC@users.noreply.github.com> Date: Fri, 20 Oct 2023 16:39:35 +0200 Subject: [PATCH] Updated Via* API usage --- .../viaproxy/injection/mixins/MixinChunkType1_8.java | 2 +- .../viaproxy/signature/storage/ChatSession.java | 9 +++------ .../viaproxy/signature/storage/ChatSession1_19_0.java | 5 ++--- .../viaproxy/signature/storage/ChatSession1_19_1.java | 5 ++--- .../viaproxy/signature/storage/ChatSession1_19_3.java | 5 ++--- .../proxy/external_interface/ExternalInterface.java | 8 ++++---- 6 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinChunkType1_8.java b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinChunkType1_8.java index be6d1d4..2340091 100644 --- a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinChunkType1_8.java +++ b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinChunkType1_8.java @@ -36,7 +36,7 @@ public abstract class MixinChunkType1_8 { return null; } - @Redirect(method = "read(Lio/netty/buffer/ByteBuf;Lcom/viaversion/viaversion/api/minecraft/ClientWorld;)Lcom/viaversion/viaversion/api/minecraft/chunks/Chunk;", at = @At(value = "INVOKE", target = "Lcom/viaversion/viaversion/api/type/types/chunk/ChunkType1_8;deserialize(IIZZI[B)Lcom/viaversion/viaversion/api/minecraft/chunks/Chunk;")) + @Redirect(method = "read(Lio/netty/buffer/ByteBuf;)Lcom/viaversion/viaversion/api/minecraft/chunks/Chunk;", at = @At(value = "INVOKE", target = "Lcom/viaversion/viaversion/api/type/types/chunk/ChunkType1_8;deserialize(IIZZI[B)Lcom/viaversion/viaversion/api/minecraft/chunks/Chunk;")) private Chunk fixAegis(int chunkX, int chunkZ, boolean fullChunk, boolean skyLight, int bitmask, byte[] data) { try { return deserialize(chunkX, chunkZ, fullChunk, skyLight, bitmask, data); diff --git a/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession.java b/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession.java index f95c41e..aa6bb0c 100644 --- a/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession.java +++ b/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession.java @@ -17,8 +17,7 @@ */ package net.raphimc.viaproxy.protocolhack.viaproxy.signature.storage; -import com.viaversion.viaversion.api.connection.StoredObject; -import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StorableObject; import com.viaversion.viaversion.api.minecraft.ProfileKey; import net.raphimc.viaproxy.protocolhack.viaproxy.signature.util.DataConsumer; @@ -28,16 +27,14 @@ import java.security.SignatureException; import java.util.UUID; import java.util.function.Consumer; -public class ChatSession extends StoredObject { +public class ChatSession implements StorableObject { private final UUID uuid; private final PrivateKey privateKey; private final ProfileKey profileKey; private final Signature signer; - public ChatSession(final UserConnection user, final UUID uuid, final PrivateKey privateKey, final ProfileKey profileKey) { - super(user); - + public ChatSession(final UUID uuid, final PrivateKey privateKey, final ProfileKey profileKey) { this.uuid = uuid; this.privateKey = privateKey; this.profileKey = profileKey; diff --git a/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession1_19_0.java b/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession1_19_0.java index 60cc6f6..49c67b6 100644 --- a/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession1_19_0.java +++ b/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession1_19_0.java @@ -17,7 +17,6 @@ */ package net.raphimc.viaproxy.protocolhack.viaproxy.signature.storage; -import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.ProfileKey; import net.lenni0451.mcstructs.text.serializer.TextComponentSerializer; import net.lenni0451.mcstructs.text.utils.JsonUtils; @@ -33,8 +32,8 @@ import java.util.UUID; public class ChatSession1_19_0 extends ChatSession { - public ChatSession1_19_0(UserConnection user, UUID uuid, PrivateKey privateKey, ProfileKey profileKey) { - super(user, uuid, privateKey, profileKey); + public ChatSession1_19_0(UUID uuid, PrivateKey privateKey, ProfileKey profileKey) { + super(uuid, privateKey, profileKey); } public byte[] signChatMessage(final MessageMetadata metadata, final DecoratableMessage content) throws SignatureException { diff --git a/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession1_19_1.java b/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession1_19_1.java index eb8fb18..502c0c0 100644 --- a/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession1_19_1.java +++ b/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession1_19_1.java @@ -17,7 +17,6 @@ */ package net.raphimc.viaproxy.protocolhack.viaproxy.signature.storage; -import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.PlayerMessageSignature; import com.viaversion.viaversion.api.minecraft.ProfileKey; import net.raphimc.viaproxy.protocolhack.viaproxy.signature.model.DecoratableMessage; @@ -33,8 +32,8 @@ public class ChatSession1_19_1 extends ChatSession { private byte[] precedingSignature; - public ChatSession1_19_1(UserConnection user, UUID uuid, PrivateKey privateKey, ProfileKey profileKey) { - super(user, uuid, privateKey, profileKey); + public ChatSession1_19_1(UUID uuid, PrivateKey privateKey, ProfileKey profileKey) { + super(uuid, privateKey, profileKey); } public byte[] signChatMessage(final MessageMetadata metadata, final DecoratableMessage content, final PlayerMessageSignature[] lastSeenMessages) throws SignatureException { diff --git a/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession1_19_3.java b/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession1_19_3.java index b005787..d5ca378 100644 --- a/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession1_19_3.java +++ b/src/main/java/net/raphimc/viaproxy/protocolhack/viaproxy/signature/storage/ChatSession1_19_3.java @@ -18,7 +18,6 @@ package net.raphimc.viaproxy.protocolhack.viaproxy.signature.storage; import com.google.common.primitives.Ints; -import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.PlayerMessageSignature; import com.viaversion.viaversion.api.minecraft.ProfileKey; import net.raphimc.viaproxy.protocolhack.viaproxy.signature.model.MessageMetadata; @@ -34,8 +33,8 @@ public class ChatSession1_19_3 extends ChatSession { private final UUID sessionId = UUID.randomUUID(); private MessageLink link; - public ChatSession1_19_3(UserConnection user, UUID uuid, PrivateKey privateKey, ProfileKey profileKey) { - super(user, uuid, privateKey, profileKey); + public ChatSession1_19_3(UUID uuid, PrivateKey privateKey, ProfileKey profileKey) { + super(uuid, privateKey, profileKey); this.link = new MessageLink(uuid, this.sessionId); } diff --git a/src/main/java/net/raphimc/viaproxy/proxy/external_interface/ExternalInterface.java b/src/main/java/net/raphimc/viaproxy/proxy/external_interface/ExternalInterface.java index 7963136..9fbebc3 100644 --- a/src/main/java/net/raphimc/viaproxy/proxy/external_interface/ExternalInterface.java +++ b/src/main/java/net/raphimc/viaproxy/proxy/external_interface/ExternalInterface.java @@ -81,15 +81,15 @@ public class ExternalInterface { } proxyConnection.setLoginHelloPacket(new C2SLoginHelloPacket1_20_2(proxyConnection.getGameProfile().getName(), expiresAt, publicKey, loginHelloKeySignature, proxyConnection.getGameProfile().getId())); - user.put(new ChatSession1_19_0(user, uuid, privateKey, new ProfileKey(expiresAtMillis, publicKeyBytes, playerCertificates.legacyPublicKeySignature()))); - user.put(new ChatSession1_19_1(user, uuid, privateKey, new ProfileKey(expiresAtMillis, publicKeyBytes, keySignature))); - user.put(new ChatSession1_19_3(user, uuid, privateKey, new ProfileKey(expiresAtMillis, publicKeyBytes, keySignature))); + user.put(new ChatSession1_19_0(uuid, privateKey, new ProfileKey(expiresAtMillis, publicKeyBytes, playerCertificates.legacyPublicKeySignature()))); + user.put(new ChatSession1_19_1(uuid, privateKey, new ProfileKey(expiresAtMillis, publicKeyBytes, keySignature))); + user.put(new ChatSession1_19_3(uuid, privateKey, new ProfileKey(expiresAtMillis, publicKeyBytes, keySignature))); } else if (proxyConnection.getServerVersion().equals(VersionEnum.bedrockLatest) && account instanceof BedrockAccount bedrockAccount) { final StepMCChain.MCChain mcChain = bedrockAccount.getMcChain(); final UUID deviceId = mcChain.prevResult().initialXblSession().prevResult2().id(); final String playFabId = bedrockAccount.getPlayFabToken().playFabId(); - user.put(new AuthChainData(user, mcChain.mojangJwt(), mcChain.identityJwt(), mcChain.publicKey(), mcChain.privateKey(), deviceId, playFabId)); + user.put(new AuthChainData(mcChain.mojangJwt(), mcChain.identityJwt(), mcChain.publicKey(), mcChain.privateKey(), deviceId, playFabId)); } }