Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-10-05 05:37:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

improved ChatSession code

Browse Source
This commit is contained in:
FlorianMichael 2023-05-28 13:24:15 +02:00
parent 09f8f53792
commit 69de7b79c5
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java
View File

@ -86,7 +86,6 @@ public class MixinConnectScreen_1 {
instance.send(new LoginHelloC2SPacket(ClassiCubeAccountHandler.INSTANCE.getAccount().username(), Optional.ofNullable(MinecraftClient.getInstance().getSession().getUuidOrNull()))); instance.send(new LoginHelloC2SPacket(ClassiCubeAccountHandler.INSTANCE.getAccount().username(), Optional.ofNullable(MinecraftClient.getInstance().getSession().getUuidOrNull())));
return; return;
} }
instance.send(packet); instance.send(packet);
} }
@ -96,9 +95,8 @@ public class MixinConnectScreen_1 {
if (connection == null || connection.channel == null) return; if (connection == null || connection.channel == null) return;
final UserConnection userConnection = connection.channel.attr(ProtocolHack.LOCAL_VIA_CONNECTION).get(); final UserConnection userConnection = connection.channel.attr(ProtocolHack.LOCAL_VIA_CONNECTION).get();
if (userConnection == null) { if (userConnection == null) return;
return;
}
final ComparableProtocolVersion targetVersion = ProtocolHack.getTargetVersion(connection.channel); final ComparableProtocolVersion targetVersion = ProtocolHack.getTargetVersion(connection.channel);
if (targetVersion.isEqualTo(BedrockProtocolVersion.bedrockLatest)) { if (targetVersion.isEqualTo(BedrockProtocolVersion.bedrockLatest)) {
@ -115,27 +113,20 @@ public class MixinConnectScreen_1 {
return; // This disables the chat session emulation for all versions <= 1.18.2 return; // This disables the chat session emulation for all versions <= 1.18.2
} }
if (targetVersion.isOlderThanOrEqualTo(ProtocolVersion.v1_19_1)) { if (targetVersion.isOlderThanOrEqualTo(ProtocolVersion.v1_19_1)) {
try { MinecraftClient.getInstance().getProfileKeys().fetchKeyPair().thenAcceptAsync(optional -> optional.ifPresentOrElse(playerKeyPair -> {
final PlayerKeyPair playerKeyPair = MinecraftClient.getInstance().getProfileKeys().fetchKeyPair().get().orElse(null); final PlayerPublicKey.PublicKeyData publicKeyData = playerKeyPair.publicKey().data();
if (playerKeyPair != null) {
final PlayerPublicKey.PublicKeyData publicKeyData = playerKeyPair.publicKey().data();
userConnection.put(new ChatSession1_19_2(userConnection, new ProfileKey(publicKeyData.expiresAt().toEpochMilli(), publicKeyData.key().getEncoded(), publicKeyData.keySignature()), playerKeyPair.privateKey())); userConnection.put(new ChatSession1_19_2(userConnection, new ProfileKey(publicKeyData.expiresAt().toEpochMilli(), publicKeyData.key().getEncoded(), publicKeyData.keySignature()), playerKeyPair.privateKey()));
if (targetVersion.isEqualTo(ProtocolVersion.v1_19)) { if (targetVersion.isEqualTo(ProtocolVersion.v1_19)) {
final byte[] legacyKey = ((IPublicKeyData) (Object) publicKeyData).viafabricplus_getV1Key().array(); final var legacyKey = ((IPublicKeyData) (Object) publicKeyData).viafabricplus_getV1Key();
if (legacyKey != null) { if (legacyKey != null) {
userConnection.put(new ChatSession1_19_0(userConnection, new ProfileKey(publicKeyData.expiresAt().toEpochMilli(), publicKeyData.key().getEncoded(), legacyKey), playerKeyPair.privateKey())); userConnection.put(new ChatSession1_19_0(userConnection, new ProfileKey(publicKeyData.expiresAt().toEpochMilli(), publicKeyData.key().getEncoded(), legacyKey.array()), playerKeyPair.privateKey()));
} else { } else {
ViaFabricPlus.LOGGER.warn("Mojang removed the legacy key"); ViaFabricPlus.LOGGER.error("Failed to get v1 key, can't setup ChatSession_0");
}
} }
} else {
ViaFabricPlus.LOGGER.warn("Failed to fetch the key pair");
} }
} catch (InterruptedException | ExecutionException e) { }, () -> ViaFabricPlus.LOGGER.error("Failed to fetch keyPair, can't setup ChatSession")));
ViaFabricPlus.LOGGER.warn("Failed to fetch the key pair");
}
} }
} }
} }