From 1a30e7a633578eec3c445bf00bb482386c3daff2 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 9 Aug 2015 12:43:19 -0400 Subject: [PATCH] Actually register PacketNoSpamChat, clean up packets Ref SleepyTrousers/EnderIO#2695 --- .../core/common/config/PacketConfigSync.java | 103 +++++++++--------- .../common/network/EnderPacketHandler.java | 6 +- .../core/common/network/PacketProgress.java | 17 +-- .../enderio/core/common/util/ChatUtil.java | 2 +- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/main/java/com/enderio/core/common/config/PacketConfigSync.java b/src/main/java/com/enderio/core/common/config/PacketConfigSync.java index 78670ab..95e9d8d 100644 --- a/src/main/java/com/enderio/core/common/config/PacketConfigSync.java +++ b/src/main/java/com/enderio/core/common/config/PacketConfigSync.java @@ -16,64 +16,59 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -public class PacketConfigSync implements IMessage, IMessageHandler -{ +public class PacketConfigSync implements IMessage { - public PacketConfigSync() - { - } + public PacketConfigSync() { + } - private Map configValues; - private String modid; + private Map configValues; + private String modid; - public PacketConfigSync(ConfigProcessor toSync) - { - this.configValues = toSync.configValues; - this.modid = toSync.modid; - } + public PacketConfigSync(ConfigProcessor toSync) { + this.configValues = toSync.configValues; + this.modid = toSync.modid; + } + @Override + @SneakyThrows + public void toBytes(ByteBuf buf) { + ByteArrayOutputStream obj = new ByteArrayOutputStream(); + GZIPOutputStream gzip = new GZIPOutputStream(obj); + ObjectOutputStream objStream = new ObjectOutputStream(gzip); + objStream.writeObject(configValues); + objStream.close(); + + buf.writeShort(obj.size()); + buf.writeBytes(obj.toByteArray()); + + ByteBufUtils.writeUTF8String(buf, modid); + } + + @SuppressWarnings("unchecked") + @Override + @SneakyThrows + public void fromBytes(ByteBuf buf) { + short len = buf.readShort(); + byte[] compressedBody = new byte[len]; + + for (short i = 0; i < len; i++) + compressedBody[i] = buf.readByte(); + + ObjectInputStream obj = new ObjectInputStream(new GZIPInputStream(new ByteArrayInputStream(compressedBody))); + configValues = (Map) obj.readObject(); + obj.close(); + + modid = ByteBufUtils.readUTF8String(buf); + } + + public static class Handler implements IMessageHandler { @Override - @SneakyThrows - public void toBytes(ByteBuf buf) - { - ByteArrayOutputStream obj = new ByteArrayOutputStream(); - GZIPOutputStream gzip = new GZIPOutputStream(obj); - ObjectOutputStream objStream = new ObjectOutputStream(gzip); - objStream.writeObject(configValues); - objStream.close(); - - buf.writeShort(obj.size()); - buf.writeBytes(obj.toByteArray()); - - ByteBufUtils.writeUTF8String(buf, modid); - } - - @SuppressWarnings("unchecked") - @Override - @SneakyThrows - public void fromBytes(ByteBuf buf) - { - short len = buf.readShort(); - byte[] compressedBody = new byte[len]; - - for (short i = 0; i < len; i++) - compressedBody[i] = buf.readByte(); - - ObjectInputStream obj = new ObjectInputStream(new GZIPInputStream(new ByteArrayInputStream(compressedBody))); - configValues = (Map) obj.readObject(); - obj.close(); - - modid = ByteBufUtils.readUTF8String(buf); - } - - @Override - public PacketConfigSync onMessage(PacketConfigSync message, MessageContext ctx) - { - ConfigProcessor processor = ConfigProcessor.processorMap.get(message.modid); - if (processor != null) - { - processor.syncTo(message.configValues); - } - return null; + public PacketConfigSync onMessage(PacketConfigSync message, MessageContext ctx) { + ConfigProcessor processor = ConfigProcessor.processorMap.get(message.modid); + if (processor != null) { + processor.syncTo(message.configValues); + } + return null; } + } } diff --git a/src/main/java/com/enderio/core/common/network/EnderPacketHandler.java b/src/main/java/com/enderio/core/common/network/EnderPacketHandler.java index 1f7c8b7..08dddeb 100644 --- a/src/main/java/com/enderio/core/common/network/EnderPacketHandler.java +++ b/src/main/java/com/enderio/core/common/network/EnderPacketHandler.java @@ -5,6 +5,7 @@ import net.minecraft.tileentity.TileEntity; import com.enderio.core.EnderCore; import com.enderio.core.common.config.PacketConfigSync; +import com.enderio.core.common.util.ChatUtil.PacketNoSpamChat; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -16,8 +17,9 @@ public class EnderPacketHandler { public static final SimpleNetworkWrapper INSTANCE = new SimpleNetworkWrapper(EnderCore.NAME); public static void init() { - INSTANCE.registerMessage(PacketConfigSync.class, PacketConfigSync.class, 0, Side.CLIENT); - INSTANCE.registerMessage(PacketProgress.class, PacketProgress.class, 1, Side.CLIENT); + INSTANCE.registerMessage(PacketConfigSync.Handler.class, PacketConfigSync.class, 0, Side.CLIENT); + INSTANCE.registerMessage(PacketProgress.Handler.class, PacketProgress.class, 1, Side.CLIENT); + INSTANCE.registerMessage(PacketNoSpamChat.Handler.class, PacketNoSpamChat.class, 2, Side.CLIENT); } public static void sendToAllAround(IMessage message, TileEntity te, int range) { diff --git a/src/main/java/com/enderio/core/common/network/PacketProgress.java b/src/main/java/com/enderio/core/common/network/PacketProgress.java index ec631ad..4016dea 100644 --- a/src/main/java/com/enderio/core/common/network/PacketProgress.java +++ b/src/main/java/com/enderio/core/common/network/PacketProgress.java @@ -10,7 +10,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -public class PacketProgress extends MessageTileEntity implements IMessageHandler { +public class PacketProgress extends MessageTileEntity { private float progress; @@ -37,12 +37,15 @@ public class PacketProgress extends MessageTileEntity implements IMe progress = buf.readFloat(); } - @Override - public IMessage onMessage(PacketProgress message, MessageContext ctx) { - TileEntity tile = message.getTileEntity(EnderCore.proxy.getClientWorld()); - if (tile instanceof IProgressTile) { - ((IProgressTile) tile).setProgress(message.progress); + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(PacketProgress message, MessageContext ctx) { + TileEntity tile = message.getTileEntity(EnderCore.proxy.getClientWorld()); + if (tile instanceof IProgressTile) { + ((IProgressTile) tile).setProgress(message.progress); + } + return null; } - return null; } } diff --git a/src/main/java/com/enderio/core/common/util/ChatUtil.java b/src/main/java/com/enderio/core/common/util/ChatUtil.java index 5fe0726..695536b 100644 --- a/src/main/java/com/enderio/core/common/util/ChatUtil.java +++ b/src/main/java/com/enderio/core/common/util/ChatUtil.java @@ -48,7 +48,7 @@ public class ChatUtil { } } - public static class NoSpamChatHandler implements IMessageHandler { + public static class Handler implements IMessageHandler { @Override public IMessage onMessage(PacketNoSpamChat message, MessageContext ctx) {