Skip to content

Commit 22011be

Browse files
committed
Send initial channels with Neo configuration
Fixes an issue where sendable configuration channels were not yet received during ServerConfigurationConnectionEvents.CONFIGURE, resulting in ServerConfigurationNetworking.canSend returning false.
1 parent 35924b7 commit 22011be

2 files changed

Lines changed: 14 additions & 1 deletion

File tree

fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientNetworkRegistryMixin.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
package net.fabricmc.fabric.mixin.networking.client;
22

3+
import java.util.HashSet;
4+
import java.util.Set;
5+
36
import net.neoforged.neoforge.client.network.registration.ClientNetworkRegistry;
47
import org.spongepowered.asm.mixin.Mixin;
58
import org.spongepowered.asm.mixin.injection.At;
69
import org.spongepowered.asm.mixin.injection.Inject;
10+
import org.spongepowered.asm.mixin.injection.ModifyVariable;
711
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
812

913
import net.minecraft.network.protocol.common.ClientCommonPacketListener;
1014
import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
15+
import net.minecraft.resources.Identifier;
1116

17+
import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationNetworking;
1218
import net.fabricmc.fabric.impl.networking.NetworkingImpl;
1319

1420
@Mixin(ClientNetworkRegistry.class)
@@ -19,4 +25,11 @@ private static void preventDisconnect(ClientCommonPacketListener listener, Clien
1925
ci.cancel();
2026
}
2127
}
28+
29+
@ModifyVariable(method = "sendInitialListeningChannels", at = @At(value = "STORE"))
30+
private static Set<Identifier> sendInitialFabricChannels(Set<Identifier> nowListeningOn) {
31+
Set<Identifier> withFabricChannels = new HashSet<>(nowListeningOn);
32+
withFabricChannels.addAll(ClientConfigurationNetworking.getGlobalReceivers());
33+
return withFabricChannels;
34+
}
2235
}

ffapi.gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
implementationVersion=3.2.5
1+
implementationVersion=3.2.6
22

33
versionMc=26.1.2
44
versionNeoForge=26.1.2.76

0 commit comments

Comments
 (0)