diff --git a/build.gradle b/build.gradle index 64e2f5c..5f25416 100644 --- a/build.gradle +++ b/build.gradle @@ -65,21 +65,21 @@ repositories { } dependencies { - include "com.viaversion:viaversion:4.8.1" - include("com.viaversion:viabackwards-common:4.8.1") { + include "com.viaversion:viaversion:4.9.0-23w40a-SNAPSHOT" + include("com.viaversion:viabackwards-common:4.9.0-23w40a-SNAPSHOT") { exclude group: "com.viaversion", module: "viaversion" exclude group: "io.netty", module: "netty-all" exclude group: "com.google.guava", module: "guava" } include "com.viaversion:viarewind-common:3.0.0" - include "net.raphimc:ViaLegacy:2.2.20" + include "net.raphimc:ViaLegacy:2.2.21-SNAPSHOT" include "net.raphimc:ViaAprilFools:2.0.9" include("net.raphimc:ViaBedrock:0.0.3-SNAPSHOT") { exclude group: "io.netty", module: "netty-codec-http" exclude group: "io.jsonwebtoken", module: "jjwt-impl" exclude group: "io.jsonwebtoken", module: "jjwt-gson" } - include("net.raphimc:ViaLoader:2.2.10") { + include("net.raphimc:ViaLoader:2.2.11-SNAPSHOT") { exclude group: "org.slf4j", module: "slf4j-api" } diff --git a/src/main/java/net/raphimc/viaproxy/injection/ClassicWorldHeightInjection.java b/src/main/java/net/raphimc/viaproxy/injection/ClassicWorldHeightInjection.java index 2c6c851..a9330f0 100644 --- a/src/main/java/net/raphimc/viaproxy/injection/ClassicWorldHeightInjection.java +++ b/src/main/java/net/raphimc/viaproxy/injection/ClassicWorldHeightInjection.java @@ -46,10 +46,10 @@ public class ClassicWorldHeightInjection { if (wrapper.isCancelled()) return; if (VersionEnum.fromUserConnection(wrapper.user()).isOlderThanOrEqualTo(VersionEnum.c0_28toc0_30)) { - for (Tag dimension : wrapper.get(Type.NBT, 0).get("minecraft:dimension_type").get("value")) { + for (Tag dimension : wrapper.get(Type.NAMED_COMPOUND_TAG, 0).get("minecraft:dimension_type").get("value")) { changeDimensionTagHeight(wrapper.user(), ((CompoundTag) dimension).get("element")); } - changeDimensionTagHeight(wrapper.user(), wrapper.get(Type.NBT, 1)); + changeDimensionTagHeight(wrapper.user(), wrapper.get(Type.NAMED_COMPOUND_TAG, 1)); } }; } @@ -60,7 +60,7 @@ public class ClassicWorldHeightInjection { if (wrapper.isCancelled()) return; if (VersionEnum.fromUserConnection(wrapper.user()).isOlderThanOrEqualTo(VersionEnum.c0_28toc0_30)) { - changeDimensionTagHeight(wrapper.user(), wrapper.get(Type.NBT, 0)); + changeDimensionTagHeight(wrapper.user(), wrapper.get(Type.NAMED_COMPOUND_TAG, 0)); } }; } diff --git a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinProtocol1_19_3To1_19_1.java b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinProtocol1_19_3To1_19_1.java index b047ca3..2a4fcb5 100644 --- a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinProtocol1_19_3To1_19_1.java +++ b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinProtocol1_19_3To1_19_1.java @@ -23,7 +23,6 @@ import com.viaversion.viaversion.api.protocol.packet.State; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.BitSetType; -import com.viaversion.viaversion.api.type.types.ByteArrayType; import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets; import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets; import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ClientboundPackets1_19_1; @@ -49,10 +48,6 @@ import java.util.concurrent.ThreadLocalRandom; @Mixin(value = Protocol1_19_3To1_19_1.class, remap = false) public abstract class MixinProtocol1_19_3To1_19_1 extends AbstractProtocol { - @Final - @Shadow - private static ByteArrayType.OptionalByteArrayType OPTIONAL_MESSAGE_SIGNATURE_BYTES_TYPE; - @Final @Shadow private static BitSetType ACKNOWLEDGED_BIT_SET_TYPE; @@ -114,7 +109,7 @@ public abstract class MixinProtocol1_19_3To1_19_1 extends AbstractProtocol { final ChatSession1_19_1 chatSession = wrapper.user().get(ChatSession1_19_1.class); final ReceivedMessagesStorage messagesStorage = wrapper.user().get(ReceivedMessagesStorage.class);