mirror of
https://github.com/ViaVersion/ViaFabricPlus.git
synced 2024-12-22 16:48:25 +01:00
Small changes to last PR.
This commit is contained in:
parent
fd4ac7ae48
commit
1b2e1e09f9
@ -15,7 +15,7 @@ archives_base_name=viafabricplus
|
|||||||
|
|
||||||
# base lib
|
# base lib
|
||||||
raknet_transport_version=1.0.0.CR1-SNAPSHOT
|
raknet_transport_version=1.0.0.CR1-SNAPSHOT
|
||||||
classic4j_version=1.2.0
|
classic4j_version=1.2.1
|
||||||
|
|
||||||
# viaversion (and required) libs
|
# viaversion (and required) libs
|
||||||
viaversion_version=4.8.0
|
viaversion_version=4.8.0
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
package de.florianmichael.viafabricplus.definition.account;
|
package de.florianmichael.viafabricplus.definition.account;
|
||||||
|
|
||||||
import com.google.gson.JsonObject;
|
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.base.event.DisconnectConnectionCallback;
|
||||||
import de.florianmichael.viafabricplus.protocolhack.provider.vialegacy.ViaFabricPlusClassicMPPassProvider;
|
import de.florianmichael.viafabricplus.protocolhack.provider.vialegacy.ViaFabricPlusClassicMPPassProvider;
|
||||||
import de.florianmichael.viafabricplus.util.FileSaver;
|
import de.florianmichael.viafabricplus.util.FileSaver;
|
||||||
|
@ -17,8 +17,8 @@
|
|||||||
*/
|
*/
|
||||||
package de.florianmichael.viafabricplus.injection.mixin.classic4j;
|
package de.florianmichael.viafabricplus.injection.mixin.classic4j;
|
||||||
|
|
||||||
import de.florianmichael.classic4j.model.classicube.highlevel.CCError;
|
import de.florianmichael.classic4j.model.classicube.CCAuthenticationResponse;
|
||||||
import de.florianmichael.classic4j.request.classicube.auth.base.CCAuthenticationResponse;
|
import de.florianmichael.classic4j.model.classicube.CCError;
|
||||||
import de.florianmichael.viafabricplus.integration.Classic4JImpl;
|
import de.florianmichael.viafabricplus.integration.Classic4JImpl;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
@ -27,7 +27,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
|
|||||||
@Mixin(value = CCAuthenticationResponse.class, remap = false)
|
@Mixin(value = CCAuthenticationResponse.class, remap = false)
|
||||||
public class MixinCCAuthenticationResponse {
|
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) {
|
public String mapTranslations(CCError instance) {
|
||||||
return Classic4JImpl.fromError(instance).getString();
|
return Classic4JImpl.fromError(instance).getString();
|
||||||
}
|
}
|
||||||
|
@ -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)
|
@Inject(method = "onPassengerLookAround", at = @At("HEAD"), cancellable = true)
|
||||||
private void onOnPassengerLookAround(Entity passenger, CallbackInfo ci) {
|
private void onOnPassengerLookAround(Entity passenger, CallbackInfo ci) {
|
||||||
if (this.viafabricplus_boatMovementEmulation()) {
|
if (this.viafabricplus_boatMovementEmulation()) {
|
||||||
|
@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.integration;
|
|||||||
|
|
||||||
import com.mojang.authlib.exceptions.AuthenticationException;
|
import com.mojang.authlib.exceptions.AuthenticationException;
|
||||||
import de.florianmichael.classic4j.api.JoinServerInterface;
|
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.client.MinecraftClient;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ package de.florianmichael.viafabricplus.screen.thirdparty.classicube;
|
|||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
import de.florianmichael.classic4j.ClassiCubeHandler;
|
import de.florianmichael.classic4j.ClassiCubeHandler;
|
||||||
import de.florianmichael.classic4j.api.LoginProcessHandler;
|
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.screen.base.ProtocolSelectionScreen;
|
||||||
import de.florianmichael.viafabricplus.definition.account.ClassiCubeAccountHandler;
|
import de.florianmichael.viafabricplus.definition.account.ClassiCubeAccountHandler;
|
||||||
import de.florianmichael.viafabricplus.base.screen.VFPScreen;
|
import de.florianmichael.viafabricplus.base.screen.VFPScreen;
|
||||||
|
@ -20,8 +20,8 @@ package de.florianmichael.viafabricplus.screen.thirdparty.classicube;
|
|||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
import de.florianmichael.classic4j.ClassiCubeHandler;
|
import de.florianmichael.classic4j.ClassiCubeHandler;
|
||||||
import de.florianmichael.classic4j.api.LoginProcessHandler;
|
import de.florianmichael.classic4j.api.LoginProcessHandler;
|
||||||
import de.florianmichael.classic4j.model.classicube.highlevel.CCAccount;
|
import de.florianmichael.classic4j.model.classicube.CCError;
|
||||||
import de.florianmichael.classic4j.model.classicube.highlevel.CCError;
|
import de.florianmichael.classic4j.model.classicube.account.CCAccount;
|
||||||
import de.florianmichael.viafabricplus.definition.account.ClassiCubeAccountHandler;
|
import de.florianmichael.viafabricplus.definition.account.ClassiCubeAccountHandler;
|
||||||
import de.florianmichael.viafabricplus.integration.Classic4JImpl;
|
import de.florianmichael.viafabricplus.integration.Classic4JImpl;
|
||||||
import de.florianmichael.viafabricplus.base.screen.VFPScreen;
|
import de.florianmichael.viafabricplus.base.screen.VFPScreen;
|
||||||
|
@ -20,8 +20,8 @@ package de.florianmichael.viafabricplus.screen.thirdparty.classicube;
|
|||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
import de.florianmichael.classic4j.ClassiCubeHandler;
|
import de.florianmichael.classic4j.ClassiCubeHandler;
|
||||||
import de.florianmichael.classic4j.api.LoginProcessHandler;
|
import de.florianmichael.classic4j.api.LoginProcessHandler;
|
||||||
import de.florianmichael.classic4j.model.classicube.CCServerInfo;
|
import de.florianmichael.classic4j.model.classicube.account.CCAccount;
|
||||||
import de.florianmichael.classic4j.model.classicube.highlevel.CCAccount;
|
import de.florianmichael.classic4j.model.classicube.server.CCServerInfo;
|
||||||
import de.florianmichael.viafabricplus.definition.account.ClassiCubeAccountHandler;
|
import de.florianmichael.viafabricplus.definition.account.ClassiCubeAccountHandler;
|
||||||
import de.florianmichael.viafabricplus.injection.access.IServerInfo;
|
import de.florianmichael.viafabricplus.injection.access.IServerInfo;
|
||||||
import de.florianmichael.viafabricplus.protocolhack.provider.vialegacy.ViaFabricPlusClassicMPPassProvider;
|
import de.florianmichael.viafabricplus.protocolhack.provider.vialegacy.ViaFabricPlusClassicMPPassProvider;
|
||||||
|
Loading…
Reference in New Issue
Block a user