diff --git a/.gitmodules b/.gitmodules index 6e8feab..967a733 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,5 +4,5 @@ branch = 3.0-proxypass [submodule "network"] path = network - url = https://github.com/Kas-tle/Network.git - branch = feature/compatibility-mode + url = https://github.com/Kas-tle/NetworkCompatible.git + branch = master diff --git a/network b/network index bcf0bbd..553e97e 160000 --- a/network +++ b/network @@ -1 +1 @@ -Subproject commit bcf0bbd66b32458b5b4af6645077484590932d4c +Subproject commit 553e97efe5bb62e9fa5877bf8e5444b0cdcd8bcf diff --git a/protocol b/protocol index 02bd001..26b1090 160000 --- a/protocol +++ b/protocol @@ -1 +1 @@ -Subproject commit 02bd001097be76f8f43104244c341a740fc8a30d +Subproject commit 26b1090960ca957db108d8642deb103ed0963160 diff --git a/src/main/java/org/cloudburstmc/proxypass/ProxyPass.java b/src/main/java/org/cloudburstmc/proxypass/ProxyPass.java index 73814c9..512fd80 100644 --- a/src/main/java/org/cloudburstmc/proxypass/ProxyPass.java +++ b/src/main/java/org/cloudburstmc/proxypass/ProxyPass.java @@ -29,7 +29,7 @@ import org.cloudburstmc.protocol.bedrock.BedrockPong; import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec; import org.cloudburstmc.protocol.bedrock.codec.BedrockCodecHelper; -import org.cloudburstmc.protocol.bedrock.codec.v729.Bedrock_v729; +import org.cloudburstmc.protocol.bedrock.codec.v748.Bedrock_v748; import org.cloudburstmc.protocol.bedrock.data.EncodingSettings; import org.cloudburstmc.protocol.bedrock.data.definitions.BlockDefinition; import org.cloudburstmc.protocol.bedrock.netty.initializer.BedrockChannelInitializer; @@ -64,8 +64,8 @@ public class ProxyPass { public static final ObjectMapper JSON_MAPPER; public static final YAMLMapper YAML_MAPPER = (YAMLMapper) new YAMLMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); public static final String MINECRAFT_VERSION; - public static final BedrockCodecHelper HELPER = Bedrock_v729.CODEC.createHelper(); - public static final BedrockCodec CODEC = Bedrock_v729.CODEC + public static final BedrockCodecHelper HELPER = Bedrock_v748.CODEC.createHelper(); + public static final BedrockCodec CODEC = Bedrock_v748.CODEC .toBuilder().helper(() -> HELPER).build(); public static final int PROTOCOL_VERSION = CODEC.getProtocolVersion(); @@ -232,6 +232,8 @@ public void newClient(InetSocketAddress socketAddress, Consumer() { @Override diff --git a/src/main/java/org/cloudburstmc/proxypass/network/bedrock/session/UpstreamPacketHandler.java b/src/main/java/org/cloudburstmc/proxypass/network/bedrock/session/UpstreamPacketHandler.java index e4bdf00..6d23eae 100644 --- a/src/main/java/org/cloudburstmc/proxypass/network/bedrock/session/UpstreamPacketHandler.java +++ b/src/main/java/org/cloudburstmc/proxypass/network/bedrock/session/UpstreamPacketHandler.java @@ -216,10 +216,10 @@ private void initializeOnlineProxySession() { downstream.setPacketHandler(new DownstreamInitialPacketHandler(downstream, proxySession, this.proxy, login)); downstream.setLogging(true); - RequestNetworkSettingsPacket packet = new RequestNetworkSettingsPacket(); - packet.setProtocolVersion(ProxyPass.PROTOCOL_VERSION); - downstream.sendPacketImmediately(packet); - this.player.logger.logPacket(this.session, packet, true); + // RequestNetworkSettingsPacket packet = new RequestNetworkSettingsPacket(); + // packet.setProtocolVersion(ProxyPass.PROTOCOL_VERSION); + // downstream.sendPacketImmediately(packet); + // this.player.logger.logPacket(this.session, packet, true); //SkinUtils.saveSkin(proxySession, this.skinData); });