From 5719b9ec533b3e43213dbafcb448221884efd9e8 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 20 Jan 2014 11:58:14 -0500 Subject: [PATCH] Fix reply handling. Make the proxy message available for subclasses of indexedcodec. Fire user events into the network event firing. --- .../fml/common/network/FMLEventChannel.java | 6 +++ .../FMLIndexedMessageToMessageCodec.java | 8 +++ .../fml/common/network/FMLNetworkEvent.java | 54 +++++++++++++++++++ .../network/NetworkEventFiringHandler.java | 5 ++ 4 files changed, 73 insertions(+) diff --git a/src/main/java/cpw/mods/fml/common/network/FMLEventChannel.java b/src/main/java/cpw/mods/fml/common/network/FMLEventChannel.java index 7e52678313..6872c42da9 100644 --- a/src/main/java/cpw/mods/fml/common/network/FMLEventChannel.java +++ b/src/main/java/cpw/mods/fml/common/network/FMLEventChannel.java @@ -53,6 +53,12 @@ public class FMLEventChannel { } } + public void fireUserEvent(Object evt, ChannelHandlerContext ctx) + { + FMLNetworkEvent.CustomNetworkEvent event = new FMLNetworkEvent.CustomNetworkEvent(evt); + this.eventBus.post(event); + } + public void sendToAll(FMLProxyPacket pkt) { channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALL); diff --git a/src/main/java/cpw/mods/fml/common/network/FMLIndexedMessageToMessageCodec.java b/src/main/java/cpw/mods/fml/common/network/FMLIndexedMessageToMessageCodec.java index a355a511a3..408b98f660 100644 --- a/src/main/java/cpw/mods/fml/common/network/FMLIndexedMessageToMessageCodec.java +++ b/src/main/java/cpw/mods/fml/common/network/FMLIndexedMessageToMessageCodec.java @@ -15,6 +15,11 @@ public abstract class FMLIndexedMessageToMessageCodec extends MessageToMessag private TByteObjectHashMap> discriminators = new TByteObjectHashMap>(); private TObjectByteHashMap> types = new TObjectByteHashMap>(); + /** + * Make this accessible to subclasses + */ + protected final ThreadLocal inboundPacket = new ThreadLocal(); + public FMLIndexedMessageToMessageCodec addDiscriminator(int discriminator, Class type) { discriminators.put((byte)discriminator, type); @@ -33,6 +38,8 @@ public abstract class FMLIndexedMessageToMessageCodec extends MessageToMessag buffer.writeByte(discriminator); encodeInto(ctx, msg, buffer); FMLProxyPacket proxy = new FMLProxyPacket(buffer.copy(), ctx.channel().attr(NetworkRegistry.FML_CHANNEL).get()); + FMLProxyPacket old = inboundPacket.get(); + proxy.setDispatcher(old.getDispatcher()); out.add(proxy); } @@ -50,6 +57,7 @@ public abstract class FMLIndexedMessageToMessageCodec extends MessageToMessag throw new NullPointerException("Undefined message for discriminator " + discriminator + " in channel " + msg.channel()); } A newMsg = clazz.newInstance(); + inboundPacket.set(msg); decodeInto(ctx, payload.slice(), newMsg); out.add(newMsg); } diff --git a/src/main/java/cpw/mods/fml/common/network/FMLNetworkEvent.java b/src/main/java/cpw/mods/fml/common/network/FMLNetworkEvent.java index 3974ecc33a..c53ca99465 100644 --- a/src/main/java/cpw/mods/fml/common/network/FMLNetworkEvent.java +++ b/src/main/java/cpw/mods/fml/common/network/FMLNetworkEvent.java @@ -22,6 +22,11 @@ public class FMLNetworkEvent extends Event { this.type = type; this.manager = manager; } + /** + * Fired at the client when a client connects to a server + * @author cpw + * + */ public static class ClientConnectedToServerEvent extends FMLNetworkEvent { public final boolean isLocal; public final String connectionType; @@ -33,6 +38,12 @@ public class FMLNetworkEvent extends Event { } } + /** + * Fired at the server when a client connects to the server. + * + * @author cpw + * + */ public static class ServerConnectionFromClientEvent extends FMLNetworkEvent { public final boolean isLocal; public ServerConnectionFromClientEvent(NetworkManager manager) @@ -41,12 +52,24 @@ public class FMLNetworkEvent extends Event { this.isLocal = manager.func_150731_c(); } } + /** + * Fired at the server when a client disconnects. + * + * @author cpw + * + */ public static class ServerDisconnectionFromClientEvent extends FMLNetworkEvent { public ServerDisconnectionFromClientEvent(NetworkManager manager) { super((INetHandlerPlayServer) manager.func_150729_e(), INetHandlerPlayServer.class, manager); } } + /** + * Fired at the client when the client is disconnected from the server. + * + * @author cpw + * + */ public static class ClientDisconnectionFromServerEvent extends FMLNetworkEvent { public ClientDisconnectionFromServerEvent(NetworkManager manager) { @@ -54,6 +77,13 @@ public class FMLNetworkEvent extends Event { } } + /** + * Fired when the REGISTER/UNREGISTER for custom channels is received. + * + * @author cpw + * + * @param The side + */ public static class CustomPacketRegistrationEvent extends FMLNetworkEvent { public final ImmutableSet registrations; public final String operation; @@ -86,6 +116,11 @@ public class FMLNetworkEvent extends Event { public abstract Side side(); } + /** + * Fired when a custom packet is received on the client for the channel + * @author cpw + * + */ public static class ClientCustomPacketEvent extends CustomPacketEvent { public ClientCustomPacketEvent(NetworkManager manager, FMLProxyPacket packet) { @@ -99,6 +134,11 @@ public class FMLNetworkEvent extends Event { } } + /** + * Fired when a custom packet is received at the server for the channel + * @author cpw + * + */ public static class ServerCustomPacketEvent extends CustomPacketEvent { public ServerCustomPacketEvent(NetworkManager manager, FMLProxyPacket packet) { @@ -111,4 +151,18 @@ public class FMLNetworkEvent extends Event { return Side.SERVER; } } + + /** + * Fired when a custom event, such as {@link NetworkHandshakeEstablished} is fired for the channel + * + * @author cpw + * + */ + public static class CustomNetworkEvent extends Event { + public final Object wrappedEvent; + public CustomNetworkEvent(Object wrappedEvent) + { + this.wrappedEvent = wrappedEvent; + } + } } diff --git a/src/main/java/cpw/mods/fml/common/network/NetworkEventFiringHandler.java b/src/main/java/cpw/mods/fml/common/network/NetworkEventFiringHandler.java index c0379c6654..79a1a30cf8 100644 --- a/src/main/java/cpw/mods/fml/common/network/NetworkEventFiringHandler.java +++ b/src/main/java/cpw/mods/fml/common/network/NetworkEventFiringHandler.java @@ -30,6 +30,11 @@ public class NetworkEventFiringHandler extends SimpleChannelInboundHandler