diff --git a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java b/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java index 06fd2f3d77..e7e2693a2c 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java +++ b/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java @@ -1,8 +1,12 @@ package cpw.mods.fml.common.network.simpleimpl; import org.apache.logging.log4j.Level; + import net.minecraft.network.INetHandler; + +import com.google.common.base.Preconditions; import com.google.common.base.Throwables; + import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.network.FMLOutboundHandler; import cpw.mods.fml.common.network.NetworkRegistry; @@ -12,18 +16,18 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; public class SimpleChannelHandlerWrapper extends SimpleChannelInboundHandler { - private IMessageHandler messageHandler; - private Side side; - public SimpleChannelHandlerWrapper(Class> handler, Side side, Class requestType) + private final IMessageHandler messageHandler; + private final Side side; + + public SimpleChannelHandlerWrapper(Class> handler, Side side, Class requestType) + { + this(SimpleNetworkWrapper.instantiate(handler), side, requestType); + } + + public SimpleChannelHandlerWrapper(IMessageHandler handler, Side side, Class requestType) { super(requestType); - try - { - messageHandler = handler.newInstance(); - } catch (Exception e) - { - Throwables.propagate(e); - } + messageHandler = Preconditions.checkNotNull(handler, "IMessageHandler must not be null"); this.side = side; } @Override diff --git a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleNetworkWrapper.java b/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleNetworkWrapper.java index 91ddb3b696..edd5074b5a 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleNetworkWrapper.java +++ b/fml/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleNetworkWrapper.java @@ -1,7 +1,11 @@ package cpw.mods.fml.common.network.simpleimpl; import io.netty.channel.ChannelFutureListener; + import java.util.EnumMap; + +import com.google.common.base.Throwables; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.INetHandler; import net.minecraft.network.Packet; @@ -98,6 +102,31 @@ public class SimpleNetworkWrapper { * @param side the side for the handler */ public void registerMessage(Class> messageHandler, Class requestMessageType, int discriminator, Side side) + { + registerMessage(instantiate(messageHandler), requestMessageType, discriminator, side); + } + + static IMessageHandler instantiate(Class> handler) + { + try + { + return handler.newInstance(); + } catch (Exception e) + { + throw Throwables.propagate(e); + } + } + + /** + * Register a message and it's associated handler. The message will have the supplied discriminator byte. The message handler will + * be registered on the supplied side (this is the side where you want the message to be processed and acted upon). + * + * @param messageHandler the message handler instance + * @param requestMessageType the message type + * @param discriminator a discriminator byte + * @param side the side for the handler + */ + public void registerMessage(IMessageHandler messageHandler, Class requestMessageType, int discriminator, Side side) { packetCodec.addDiscriminator(discriminator, requestMessageType); FMLEmbeddedChannel channel = channels.get(side); @@ -112,19 +141,19 @@ public class SimpleNetworkWrapper { } } - private void addServerHandlerAfter(FMLEmbeddedChannel channel, String type, Class> messageHandler, Class requestType) + private void addServerHandlerAfter(FMLEmbeddedChannel channel, String type, IMessageHandler messageHandler, Class requestType) { SimpleChannelHandlerWrapper handler = getHandlerWrapper(messageHandler, Side.SERVER, requestType); - channel.pipeline().addAfter(type, messageHandler.getName(), handler); + channel.pipeline().addAfter(type, messageHandler.getClass().getName(), handler); } - private void addClientHandlerAfter(FMLEmbeddedChannel channel, String type, Class> messageHandler, Class requestType) + private void addClientHandlerAfter(FMLEmbeddedChannel channel, String type, IMessageHandler messageHandler, Class requestType) { SimpleChannelHandlerWrapper handler = getHandlerWrapper(messageHandler, Side.CLIENT, requestType); - channel.pipeline().addAfter(type, messageHandler.getName(), handler); + channel.pipeline().addAfter(type, messageHandler.getClass().getName(), handler); } - private SimpleChannelHandlerWrapper getHandlerWrapper(Class> messageHandler, Side side, Class requestType) + private SimpleChannelHandlerWrapper getHandlerWrapper(IMessageHandler messageHandler, Side side, Class requestType) { return new SimpleChannelHandlerWrapper(messageHandler, side, requestType); }