Change abstract packet to have one handler that handles all abstract packages and calls their methods.

No changes on the implementation side of them.
This commit is contained in:
Bernhard Bonigl committed 2015-12-23 19:02:40 +01:00
1 parent ac6e5d2861
commit ac6e3ef7bd
4 files changed
+19 -27

No files matched your search

@@ -10,23 +10,7 @@ import net.minecraftforge.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
public abstract class AbstractPacket implements IMessage, IMessageHandler {
@Override
public IMessage onMessage(IMessage message, MessageContext ctx) {
if(!(message instanceof AbstractPacket)) {
return null;
}
AbstractPacket packet = (AbstractPacket) message;
if(ctx.side == Side.SERVER) {
return packet.handleServer(ctx.getServerHandler());
}
else {
return packet.handleClient(ctx.getClientHandler());
}
}
public abstract class AbstractPacket implements IMessage {
public abstract IMessage handleClient(NetHandlerPlayClient netHandler);
@@ -4,6 +4,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.network.NetHandlerPlayClient;
import net.minecraft.network.NetHandlerPlayServer;
import net.minecraft.server.MinecraftServer;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
/**
@@ -1,9 +1,9 @@
package slimeknights.mantle.network;
import com.google.common.base.Throwables;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import net.minecraftforge.fml.relauncher.Side;
@@ -14,10 +14,12 @@ import net.minecraftforge.fml.relauncher.Side;
public class NetworkWrapper {
public final SimpleNetworkWrapper network;
protected final AbstactPacketHandler handler;
private int id = 0;
public NetworkWrapper(String channelName) {
network = NetworkRegistry.INSTANCE.newSimpleChannel(channelName);
handler = new AbstactPacketHandler();
}
/**
@@ -43,13 +45,18 @@ public class NetworkWrapper {
}
private void registerPacketImpl(Class<? extends AbstractPacket> packetClazz, Side side) {
IMessageHandler<AbstractPacket, AbstractPacket> handler;
try {
handler = packetClazz.newInstance();
} catch(Exception e) {
throw Throwables.propagate(e);
}
network.registerMessage(handler, packetClazz, id++, side);
}
public static class AbstactPacketHandler implements IMessageHandler<AbstractPacket, IMessage> {
@Override
public IMessage onMessage(AbstractPacket packet, MessageContext ctx) {
if(ctx.side == Side.SERVER) {
return packet.handleServer(ctx.getServerHandler());
}
else {
return packet.handleClient(ctx.getClientHandler());
}
}
}
}