From 32b8dc46c4e20889e673b2e5179d8757f8143b77 Mon Sep 17 00:00:00 2001 From: FlorianMichael Date: Sat, 14 Oct 2023 18:49:16 +0200 Subject: [PATCH] Bump Classic4J to use maven central release. --- gradle.properties | 2 +- .../florianmichael/viafabricplus/ViaFabricPlus.java | 1 + .../ViaFabricPlusClassicMPPassProvider.java | 12 +++++++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index edd454b8..863e5be3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ archives_base_name=viafabricplus # base lib raknet_transport_version=1.0.0.CR1-SNAPSHOT -classic4j_version=2.0.1-SNAPSHOT +classic4j_version=2.0.1 # viaversion (and required) libs viaversion_version=4.9.0-23w40a-SNAPSHOT diff --git a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java index 357fe28f..3aaf38cf 100644 --- a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java +++ b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java @@ -73,6 +73,7 @@ public class ViaFabricPlus { // Load overriding jars first so other code can access the new classes ViaJarReplacer.loadOverridingJars(); + // PreLoad Callback (for example to register new protocols) PreLoadCallback.EVENT.invoker().onLoad(); // Classic Stuff diff --git a/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java index 0e052c95..30c56fe4 100644 --- a/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java @@ -19,22 +19,28 @@ package de.florianmichael.viafabricplus.protocolhack.provider.vialegacy; import com.viaversion.viaversion.api.connection.UserConnection; import de.florianmichael.classic4j.BetaCraftHandler; +import de.florianmichael.viafabricplus.ViaFabricPlus; import de.florianmichael.viafabricplus.integration.Classic4JImpl; import de.florianmichael.viafabricplus.base.settings.groups.AuthenticationSettings; import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicMPPassProvider; import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.storage.HandshakeStorage; public class ViaFabricPlusClassicMPPassProvider extends ClassicMPPassProvider { - public static String classiCubeMPPass; @Override public String getMpPass(UserConnection user) { - if (classiCubeMPPass != null) return classiCubeMPPass; + if (classiCubeMPPass != null) { + return classiCubeMPPass; + } if (AuthenticationSettings.INSTANCE.useBetaCraftAuthentication.getValue()) { final HandshakeStorage handshakeStorage = user.get(HandshakeStorage.class); - return BetaCraftHandler.requestMPPass(user.getProtocolInfo().getUsername(), handshakeStorage.getHostname(), handshakeStorage.getPort(), Classic4JImpl.JOIN_SERVER_CALL); + if (handshakeStorage == null) { + return super.getMpPass(user); + } + return BetaCraftHandler.requestMPPass(user.getProtocolInfo().getUsername(), handshakeStorage.getHostname(), handshakeStorage.getPort(), Classic4JImpl.JOIN_SERVER_CALL, throwable -> + ViaFabricPlus.LOGGER.error("Error occurred while requesting the MP-Pass to verify session", throwable)); } else { return super.getMpPass(user); }