mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 19:39:22 +00:00
Fix reply handling. Make the proxy message available for subclasses of indexedcodec. Fire user events into the network
event firing.
This commit is contained in:
1 parent
16d33d2989
commit
5719b9ec53
4 files changed
+73
No files matched your search
@@ -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);
|
||||
|
||||
@@ -15,6 +15,11 @@ public abstract class FMLIndexedMessageToMessageCodec<A> extends MessageToMessag
|
||||
private TByteObjectHashMap<Class<? extends A>> discriminators = new TByteObjectHashMap<Class<? extends A>>();
|
||||
private TObjectByteHashMap<Class<? extends A>> types = new TObjectByteHashMap<Class<? extends A>>();
|
||||
|
||||
/**
|
||||
* Make this accessible to subclasses
|
||||
*/
|
||||
protected final ThreadLocal<FMLProxyPacket> inboundPacket = new ThreadLocal<FMLProxyPacket>();
|
||||
|
||||
public FMLIndexedMessageToMessageCodec<A> addDiscriminator(int discriminator, Class<? extends A> type)
|
||||
{
|
||||
discriminators.put((byte)discriminator, type);
|
||||
@@ -33,6 +38,8 @@ public abstract class FMLIndexedMessageToMessageCodec<A> 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<A> 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);
|
||||
}
|
||||
|
||||
@@ -22,6 +22,11 @@ public class FMLNetworkEvent<T extends INetHandler> 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<INetHandlerPlayClient> {
|
||||
public final boolean isLocal;
|
||||
public final String connectionType;
|
||||
@@ -33,6 +38,12 @@ public class FMLNetworkEvent<T extends INetHandler> extends Event {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Fired at the server when a client connects to the server.
|
||||
*
|
||||
* @author cpw
|
||||
*
|
||||
*/
|
||||
public static class ServerConnectionFromClientEvent extends FMLNetworkEvent<INetHandlerPlayServer> {
|
||||
public final boolean isLocal;
|
||||
public ServerConnectionFromClientEvent(NetworkManager manager)
|
||||
@@ -41,12 +52,24 @@ public class FMLNetworkEvent<T extends INetHandler> extends Event {
|
||||
this.isLocal = manager.func_150731_c();
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Fired at the server when a client disconnects.
|
||||
*
|
||||
* @author cpw
|
||||
*
|
||||
*/
|
||||
public static class ServerDisconnectionFromClientEvent extends FMLNetworkEvent<INetHandlerPlayServer> {
|
||||
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<INetHandlerPlayClient> {
|
||||
public ClientDisconnectionFromServerEvent(NetworkManager manager)
|
||||
{
|
||||
@@ -54,6 +77,13 @@ public class FMLNetworkEvent<T extends INetHandler> extends Event {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Fired when the REGISTER/UNREGISTER for custom channels is received.
|
||||
*
|
||||
* @author cpw
|
||||
*
|
||||
* @param <S> The side
|
||||
*/
|
||||
public static class CustomPacketRegistrationEvent<S extends INetHandler> extends FMLNetworkEvent<S> {
|
||||
public final ImmutableSet<String> registrations;
|
||||
public final String operation;
|
||||
@@ -86,6 +116,11 @@ public class FMLNetworkEvent<T extends INetHandler> 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<INetHandlerPlayClient> {
|
||||
public ClientCustomPacketEvent(NetworkManager manager, FMLProxyPacket packet)
|
||||
{
|
||||
@@ -99,6 +134,11 @@ public class FMLNetworkEvent<T extends INetHandler> extends Event {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Fired when a custom packet is received at the server for the channel
|
||||
* @author cpw
|
||||
*
|
||||
*/
|
||||
public static class ServerCustomPacketEvent extends CustomPacketEvent<INetHandlerPlayServer> {
|
||||
public ServerCustomPacketEvent(NetworkManager manager, FMLProxyPacket packet)
|
||||
{
|
||||
@@ -111,4 +151,18 @@ public class FMLNetworkEvent<T extends INetHandler> 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -30,6 +30,11 @@ public class NetworkEventFiringHandler extends SimpleChannelInboundHandler<FMLPr
|
||||
eventChannel.fireRead(msg,ctx);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception
|
||||
{
|
||||
eventChannel.fireUserEvent(evt,ctx);
|
||||
}
|
||||
@Override
|
||||
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user