From 1b2e1e09f9ba01ab3891a6b3dce1452252bb3da1 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Mon, 2 Oct 2023 03:36:04 +0200 Subject: [PATCH] Small changes to last PR. --- gradle.properties | 2 +- .../definition/account/ClassiCubeAccountHandler.java | 2 +- .../mixin/classic4j/MixinCCAuthenticationResponse.java | 6 +++--- .../mixin/fixes/minecraft/entity/MixinBoatEntity.java | 8 -------- .../viafabricplus/integration/Classic4JImpl.java | 2 +- .../thirdparty/classicube/ClassiCubeLoginScreen.java | 2 +- .../screen/thirdparty/classicube/ClassiCubeMFAScreen.java | 4 ++-- .../thirdparty/classicube/ClassiCubeServerListScreen.java | 4 ++-- 8 files changed, 11 insertions(+), 19 deletions(-) diff --git a/gradle.properties b/gradle.properties index fadca44e..4d228381 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=1.2.0 +classic4j_version=1.2.1 # viaversion (and required) libs viaversion_version=4.8.0 diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/account/ClassiCubeAccountHandler.java b/src/main/java/de/florianmichael/viafabricplus/definition/account/ClassiCubeAccountHandler.java index bac52a50..d20b7bdd 100644 --- a/src/main/java/de/florianmichael/viafabricplus/definition/account/ClassiCubeAccountHandler.java +++ b/src/main/java/de/florianmichael/viafabricplus/definition/account/ClassiCubeAccountHandler.java @@ -18,7 +18,7 @@ package de.florianmichael.viafabricplus.definition.account; import com.google.gson.JsonObject; -import de.florianmichael.classic4j.model.classicube.highlevel.CCAccount; +import de.florianmichael.classic4j.model.classicube.account.CCAccount; import de.florianmichael.viafabricplus.base.event.DisconnectConnectionCallback; import de.florianmichael.viafabricplus.protocolhack.provider.vialegacy.ViaFabricPlusClassicMPPassProvider; import de.florianmichael.viafabricplus.util.FileSaver; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/classic4j/MixinCCAuthenticationResponse.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/classic4j/MixinCCAuthenticationResponse.java index 5805bd1d..fe40ace4 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/classic4j/MixinCCAuthenticationResponse.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/classic4j/MixinCCAuthenticationResponse.java @@ -17,8 +17,8 @@ */ package de.florianmichael.viafabricplus.injection.mixin.classic4j; -import de.florianmichael.classic4j.model.classicube.highlevel.CCError; -import de.florianmichael.classic4j.request.classicube.auth.base.CCAuthenticationResponse; +import de.florianmichael.classic4j.model.classicube.CCAuthenticationResponse; +import de.florianmichael.classic4j.model.classicube.CCError; import de.florianmichael.viafabricplus.integration.Classic4JImpl; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -27,7 +27,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(value = CCAuthenticationResponse.class, remap = false) public class MixinCCAuthenticationResponse { - @Redirect(method = "getErrorDisplay", at = @At(value = "FIELD", target = "Lde/florianmichael/classic4j/model/classicube/highlevel/CCError;description:Ljava/lang/String;")) + @Redirect(method = "getErrorDisplay", at = @At(value = "FIELD", target = "Lde/florianmichael/classic4j/model/classicube/CCError;description:Ljava/lang/String;")) public String mapTranslations(CCError instance) { return Classic4JImpl.fromError(instance).getString(); } diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBoatEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBoatEntity.java index ce1ee927..3e410533 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBoatEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBoatEntity.java @@ -290,14 +290,6 @@ public abstract class MixinBoatEntity extends Entity implements IBoatEntity { } } - @Inject(method = "updatePassengerPosition", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;updatePassengerPosition(Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/Entity$PositionUpdater;)V", shift = At.Shift.AFTER), cancellable = true) - public void emulatePassengerOffset1_20_1(Entity passenger, PositionUpdater positionUpdater, CallbackInfo ci) { - if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_20tor1_20_1)) { - EntityHeightOffsetsPre1_20_2.clamPassengerYaw(this, passenger); - ci.cancel(); - } - } - @Inject(method = "onPassengerLookAround", at = @At("HEAD"), cancellable = true) private void onOnPassengerLookAround(Entity passenger, CallbackInfo ci) { if (this.viafabricplus_boatMovementEmulation()) { diff --git a/src/main/java/de/florianmichael/viafabricplus/integration/Classic4JImpl.java b/src/main/java/de/florianmichael/viafabricplus/integration/Classic4JImpl.java index d64c811b..877bf409 100644 --- a/src/main/java/de/florianmichael/viafabricplus/integration/Classic4JImpl.java +++ b/src/main/java/de/florianmichael/viafabricplus/integration/Classic4JImpl.java @@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.integration; import com.mojang.authlib.exceptions.AuthenticationException; import de.florianmichael.classic4j.api.JoinServerInterface; -import de.florianmichael.classic4j.model.classicube.highlevel.CCError; +import de.florianmichael.classic4j.model.classicube.CCError; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeLoginScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeLoginScreen.java index 640ad90d..fd61e0ff 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeLoginScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeLoginScreen.java @@ -20,7 +20,7 @@ package de.florianmichael.viafabricplus.screen.thirdparty.classicube; import com.mojang.blaze3d.systems.RenderSystem; import de.florianmichael.classic4j.ClassiCubeHandler; import de.florianmichael.classic4j.api.LoginProcessHandler; -import de.florianmichael.classic4j.model.classicube.highlevel.CCAccount; +import de.florianmichael.classic4j.model.classicube.account.CCAccount; import de.florianmichael.viafabricplus.screen.base.ProtocolSelectionScreen; import de.florianmichael.viafabricplus.definition.account.ClassiCubeAccountHandler; import de.florianmichael.viafabricplus.base.screen.VFPScreen; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeMFAScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeMFAScreen.java index d3f5d62e..390cf135 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeMFAScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeMFAScreen.java @@ -20,8 +20,8 @@ package de.florianmichael.viafabricplus.screen.thirdparty.classicube; import com.mojang.blaze3d.systems.RenderSystem; import de.florianmichael.classic4j.ClassiCubeHandler; import de.florianmichael.classic4j.api.LoginProcessHandler; -import de.florianmichael.classic4j.model.classicube.highlevel.CCAccount; -import de.florianmichael.classic4j.model.classicube.highlevel.CCError; +import de.florianmichael.classic4j.model.classicube.CCError; +import de.florianmichael.classic4j.model.classicube.account.CCAccount; import de.florianmichael.viafabricplus.definition.account.ClassiCubeAccountHandler; import de.florianmichael.viafabricplus.integration.Classic4JImpl; import de.florianmichael.viafabricplus.base.screen.VFPScreen; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeServerListScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeServerListScreen.java index f5c73926..dc5b6807 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeServerListScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeServerListScreen.java @@ -20,8 +20,8 @@ package de.florianmichael.viafabricplus.screen.thirdparty.classicube; import com.mojang.blaze3d.systems.RenderSystem; import de.florianmichael.classic4j.ClassiCubeHandler; import de.florianmichael.classic4j.api.LoginProcessHandler; -import de.florianmichael.classic4j.model.classicube.CCServerInfo; -import de.florianmichael.classic4j.model.classicube.highlevel.CCAccount; +import de.florianmichael.classic4j.model.classicube.account.CCAccount; +import de.florianmichael.classic4j.model.classicube.server.CCServerInfo; import de.florianmichael.viafabricplus.definition.account.ClassiCubeAccountHandler; import de.florianmichael.viafabricplus.injection.access.IServerInfo; import de.florianmichael.viafabricplus.protocolhack.provider.vialegacy.ViaFabricPlusClassicMPPassProvider;