From ac6e3ef7bd2d8cdb18ecfcedd866545f64bf2a4d Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Wed, 23 Dec 2015 19:02:40 +0100 Subject: [PATCH] Change abstract packet to have one handler that handles all abstract packages and calls their methods. No changes on the implementation side of them. --- build.properties | 2 +- .../mantle/network/AbstractPacket.java | 18 +------------ .../network/AbstractPacketThreadsafe.java | 1 + .../mantle/network/NetworkWrapper.java | 25 ++++++++++++------- 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/build.properties b/build.properties index a14d236..9551321 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ mod_version=0.5 minecraft_version=1.8.8 -forge_version=11.15.0.1635-1.8.8 +forge_version=11.15.0.1641-1.8.8 mappings=snapshot_20151212 CCLIB_version=1.1.2.133 diff --git a/src/main/java/slimeknights/mantle/network/AbstractPacket.java b/src/main/java/slimeknights/mantle/network/AbstractPacket.java index dd9bd46..2ef620b 100644 --- a/src/main/java/slimeknights/mantle/network/AbstractPacket.java +++ b/src/main/java/slimeknights/mantle/network/AbstractPacket.java @@ -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); diff --git a/src/main/java/slimeknights/mantle/network/AbstractPacketThreadsafe.java b/src/main/java/slimeknights/mantle/network/AbstractPacketThreadsafe.java index d055113..8e9a563 100644 --- a/src/main/java/slimeknights/mantle/network/AbstractPacketThreadsafe.java +++ b/src/main/java/slimeknights/mantle/network/AbstractPacketThreadsafe.java @@ -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; /** diff --git a/src/main/java/slimeknights/mantle/network/NetworkWrapper.java b/src/main/java/slimeknights/mantle/network/NetworkWrapper.java index b3423e5..cfa3ea3 100644 --- a/src/main/java/slimeknights/mantle/network/NetworkWrapper.java +++ b/src/main/java/slimeknights/mantle/network/NetworkWrapper.java @@ -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 packetClazz, Side side) { - IMessageHandler handler; - try { - handler = packetClazz.newInstance(); - } catch(Exception e) { - throw Throwables.propagate(e); - } - network.registerMessage(handler, packetClazz, id++, side); } + + public static class AbstactPacketHandler implements IMessageHandler { + @Override + public IMessage onMessage(AbstractPacket packet, MessageContext ctx) { + if(ctx.side == Side.SERVER) { + return packet.handleServer(ctx.getServerHandler()); + } + else { + return packet.handleClient(ctx.getClientHandler()); + } + } + } }