From 900b282d973247eef416d61fcfeb447897299bf0 Mon Sep 17 00:00:00 2001 From: Essential CI Date: Thu, 8 Aug 2024 18:44:07 +0000 Subject: [PATCH] Version 1.3.3.2 --- changelog/release-1.3.3.2.md | 5 +++++ gradle.properties | 2 +- .../network/Mixin_RedirectToLocalConnection.java | 10 ++++++++++ src/main/resources/assets/essential/commit.txt | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 changelog/release-1.3.3.2.md diff --git a/changelog/release-1.3.3.2.md b/changelog/release-1.3.3.2.md new file mode 100644 index 0000000..b969903 --- /dev/null +++ b/changelog/release-1.3.3.2.md @@ -0,0 +1,5 @@ +Title: Bug Patch +Summary: Minor bug fixes + +## Bug Fixes +- Fixed error when joining a hosted world on Forge 1.16 or above diff --git a/gradle.properties b/gradle.properties index 63981a7..4821d67 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ org.gradle.configureondemand=true org.gradle.parallel.threads=128 org.gradle.jvmargs=-Xmx16G minecraftVersion=11202 -version=1.3.3.1 +version=1.3.3.2 diff --git a/src/main/java/gg/essential/mixins/transformers/client/network/Mixin_RedirectToLocalConnection.java b/src/main/java/gg/essential/mixins/transformers/client/network/Mixin_RedirectToLocalConnection.java index 091f7ca..6e8df61 100644 --- a/src/main/java/gg/essential/mixins/transformers/client/network/Mixin_RedirectToLocalConnection.java +++ b/src/main/java/gg/essential/mixins/transformers/client/network/Mixin_RedirectToLocalConnection.java @@ -12,6 +12,7 @@ package gg.essential.mixins.transformers.client.network; import gg.essential.Essential; +import gg.essential.config.FeatureFlags; import gg.essential.network.connectionmanager.ice.IIceManager; import gg.essential.network.pingproxy.ProxyPingServer; import gg.essential.network.pingproxy.ProxyPingServerKt; @@ -88,6 +89,15 @@ private static ChannelFuture injectLocalChannel(Bootstrap bootstrap, InetAddress if (user != null) { // ICE connection IIceManager iceManager = Essential.getInstance().getConnectionManager().getIceManager(); + boolean asyncSafe = + //#if FORGE && MC>=11400 + //$$ FeatureFlags.NEW_ICE_BACKEND_ENABLED; + //#else + true; + //#endif + if (!asyncSafe) { + return bootstrap.connect(iceManager.createClientAgent(user)); + } Channel channel = bootstrap.register().syncUninterruptibly().channel(); ChannelPromise connectPromise = channel.newPromise(); Dispatchers.getIO().dispatch(EmptyCoroutineContext.INSTANCE, () -> { diff --git a/src/main/resources/assets/essential/commit.txt b/src/main/resources/assets/essential/commit.txt index bfc3feb..0007024 100644 --- a/src/main/resources/assets/essential/commit.txt +++ b/src/main/resources/assets/essential/commit.txt @@ -1 +1 @@ -90976ad318 \ No newline at end of file +5372d82914 \ No newline at end of file