From baafce9698572d9238e3510381dec0bbe96cd04f Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Sat, 10 May 2014 20:43:12 +0200 Subject: [PATCH] Network migration --- .../mcp/mobius/opis/api/IMessageHandler.java | 4 +- .../opis/api/MessageHandlerRegistrar.java | 4 +- .../client/CommandClientShowRenderTick.java | 5 +- .../commands/client/CommandClientStart.java | 5 +- .../opis/commands/client/CommandOpis.java | 7 +- .../server/CommandAmountEntities.java | 1 - .../commands/server/CommandChunkList.java | 1 - .../opis/commands/server/CommandHandler.java | 7 +- .../opis/commands/server/CommandReset.java | 5 +- .../opis/commands/server/CommandStart.java | 5 +- .../server/CommandTimingEntities.java | 1 - .../server/CommandTimingTileEntities.java | 1 - .../mobius/opis/data/client/DataCache.java | 4 +- .../holders/newtypes/DataBlockRender.java | 3 +- .../opis/data/managers/ChunkManager.java | 4 +- .../opis/data/managers/EntityManager.java | 4 +- .../opis/data/managers/StringCache.java | 12 +- .../opis/events/OpisClientTickHandler.java | 2 +- .../opis/events/OpisServerTickHandler.java | 49 ++++---- .../mcp/mobius/opis/events/PlayerTracker.java | 5 +- .../opis/gui/overlay/OverlayMeanTime.java | 4 +- .../entperchunk/OverlayEntityPerChunk.java | 4 +- .../opis/helpers/ModIdentification.java | 90 ++++---------- .../opis/network/OpisPacketHandler_OLD.java | 96 +-------------- .../mcp/mobius/opis/network/PacketBase.java | 10 ++ .../mobius/opis/network/PacketManager.java | 110 ++++++++++++++++++ .../opis/network/ServerMessageHandler.java | 54 ++++----- .../packets/server/NetDataCommand.java | 38 ++++++ .../packets/server/NetDataCommand_OLD.java | 47 -------- .../network/packets/server/NetDataList.java | 62 ++++++++++ .../packets/server/NetDataList_OLD.java | 95 --------------- .../packets/server/NetDataRaw_OLD.java | 41 ------- .../network/packets/server/NetDataValue.java | 50 ++++++++ .../packets/server/NetDataValue_OLD.java | 62 ---------- .../mcp/mobius/opis/proxy/ProxyClient.java | 12 +- .../mcp/mobius/opis/proxy/ProxyServer.java | 4 +- .../java/mcp/mobius/opis/swing/SwingUI.java | 4 +- .../opis/swing/panels/PanelSummary.java | 4 +- .../panels/debug/PanelOrphanTileEntities.java | 4 +- .../opis/swing/panels/debug/PanelThreads.java | 4 +- .../swing/panels/network/PanelInbound.java | 4 +- .../swing/panels/network/PanelInbound250.java | 4 +- .../swing/panels/network/PanelOutbound.java | 4 +- .../panels/network/PanelOutbound250.java | 4 +- .../panels/timingclient/PanelEventClient.java | 4 +- .../timingclient/PanelRenderEntities.java | 4 +- .../timingclient/PanelRenderHandlers.java | 4 +- .../timingclient/PanelRenderTileEnts.java | 7 +- .../timingserver/PanelTimingChunks.java | 4 +- .../timingserver/PanelTimingEntities.java | 4 +- .../PanelTimingEntitiesPerClass.java | 4 +- .../timingserver/PanelTimingEvents.java | 4 +- .../timingserver/PanelTimingHandlers.java | 4 +- .../timingserver/PanelTimingTileEnts.java | 4 +- .../PanelTimingTileEntsPerClass.java | 4 +- .../panels/tracking/PanelAmountEntities.java | 4 +- .../panels/tracking/PanelAmountTileEnts.java | 4 +- .../panels/tracking/PanelDimensions.java | 4 +- .../swing/panels/tracking/PanelPlayers.java | 4 +- 59 files changed, 448 insertions(+), 555 deletions(-) create mode 100644 src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand.java delete mode 100644 src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand_OLD.java create mode 100644 src/main/java/mcp/mobius/opis/network/packets/server/NetDataList.java delete mode 100644 src/main/java/mcp/mobius/opis/network/packets/server/NetDataList_OLD.java delete mode 100644 src/main/java/mcp/mobius/opis/network/packets/server/NetDataRaw_OLD.java create mode 100644 src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue.java delete mode 100644 src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue_OLD.java diff --git a/src/main/java/mcp/mobius/opis/api/IMessageHandler.java b/src/main/java/mcp/mobius/opis/api/IMessageHandler.java index e59f823..f36468d 100644 --- a/src/main/java/mcp/mobius/opis/api/IMessageHandler.java +++ b/src/main/java/mcp/mobius/opis/api/IMessageHandler.java @@ -1,8 +1,8 @@ package mcp.mobius.opis.api; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; public interface IMessageHandler { - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata); + public boolean handleMessage(Message msg, PacketBase rawdata); } diff --git a/src/main/java/mcp/mobius/opis/api/MessageHandlerRegistrar.java b/src/main/java/mcp/mobius/opis/api/MessageHandlerRegistrar.java index 6f91862..6cc8080 100644 --- a/src/main/java/mcp/mobius/opis/api/MessageHandlerRegistrar.java +++ b/src/main/java/mcp/mobius/opis/api/MessageHandlerRegistrar.java @@ -5,8 +5,8 @@ import java.util.HashMap; import java.util.HashSet; import mcp.mobius.opis.modOpis; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; public enum MessageHandlerRegistrar { INSTANCE; @@ -20,7 +20,7 @@ public enum MessageHandlerRegistrar { msgHandlers.get(msg).add(handler); } - public void routeMessage(Message msg, NetDataRaw_OLD rawdata){ + public void routeMessage(Message msg, PacketBase rawdata){ if (msgHandlers.containsKey(msg)){ for (IMessageHandler handler : msgHandlers.get(msg)){ diff --git a/src/main/java/mcp/mobius/opis/commands/client/CommandClientShowRenderTick.java b/src/main/java/mcp/mobius/opis/commands/client/CommandClientShowRenderTick.java index a813cda..a67b759 100644 --- a/src/main/java/mcp/mobius/opis/commands/client/CommandClientShowRenderTick.java +++ b/src/main/java/mcp/mobius/opis/commands/client/CommandClientShowRenderTick.java @@ -2,8 +2,9 @@ package mcp.mobius.opis.commands.client; import mcp.mobius.opis.network.OpisPacketHandler_OLD; +import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataCommand_OLD; +import mcp.mobius.opis.network.packets.server.NetDataCommand; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; @@ -23,7 +24,7 @@ public class CommandClientShowRenderTick extends CommandBase { @Override public void processCommand(ICommandSender icommandsender, String[] astring) { if (icommandsender instanceof EntityPlayerMP) - OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.CLIENT_SHOW_RENDER_TICK), (EntityPlayerMP)icommandsender); + PacketManager.validateAndSend(new NetDataCommand(Message.CLIENT_SHOW_RENDER_TICK), (EntityPlayerMP)icommandsender); //((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(NetDataCommand.create(Message.CLIENT_SHOW_RENDER_TICK)); } diff --git a/src/main/java/mcp/mobius/opis/commands/client/CommandClientStart.java b/src/main/java/mcp/mobius/opis/commands/client/CommandClientStart.java index 9b6b85d..2bafa46 100644 --- a/src/main/java/mcp/mobius/opis/commands/client/CommandClientStart.java +++ b/src/main/java/mcp/mobius/opis/commands/client/CommandClientStart.java @@ -1,8 +1,9 @@ package mcp.mobius.opis.commands.client; import mcp.mobius.opis.network.OpisPacketHandler_OLD; +import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataCommand_OLD; +import mcp.mobius.opis.network.packets.server.NetDataCommand; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; @@ -22,7 +23,7 @@ public class CommandClientStart extends CommandBase { @Override public void processCommand(ICommandSender icommandsender, String[] astring) { if (icommandsender instanceof EntityPlayerMP) - OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.CLIENT_START_PROFILING), (EntityPlayerMP)icommandsender); + PacketManager.validateAndSend(new NetDataCommand(Message.CLIENT_START_PROFILING), (EntityPlayerMP)icommandsender); //((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(NetDataCommand.create(Message.CLIENT_START_PROFILING)); } diff --git a/src/main/java/mcp/mobius/opis/commands/client/CommandOpis.java b/src/main/java/mcp/mobius/opis/commands/client/CommandOpis.java index 0a240fa..01a993f 100644 --- a/src/main/java/mcp/mobius/opis/commands/client/CommandOpis.java +++ b/src/main/java/mcp/mobius/opis/commands/client/CommandOpis.java @@ -4,10 +4,11 @@ import javax.swing.JFrame; import javax.swing.JLabel; import mcp.mobius.opis.events.PlayerTracker; +import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.ServerMessageHandler; import mcp.mobius.opis.network.OpisPacketHandler_OLD; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataCommand_OLD; +import mcp.mobius.opis.network.packets.server.NetDataCommand; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; @@ -41,8 +42,8 @@ public class CommandOpis extends CommandBase { PlayerTracker.INSTANCE.playersSwing.add((EntityPlayerMP)icommandsender); //((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(NetDataCommand.create(Message.CLIENT_SHOW_SWING)); if (icommandsender instanceof EntityPlayerMP) - OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.CLIENT_SHOW_SWING), (EntityPlayerMP)icommandsender); - OpisPacketHandler_OLD.sendFullUpdate((EntityPlayerMP)icommandsender); + PacketManager.validateAndSend(new NetDataCommand(Message.CLIENT_SHOW_SWING), (EntityPlayerMP)icommandsender); + PacketManager.sendFullUpdate((EntityPlayerMP)icommandsender); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandAmountEntities.java b/src/main/java/mcp/mobius/opis/commands/server/CommandAmountEntities.java index ba704e7..a7d2b49 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandAmountEntities.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandAmountEntities.java @@ -9,7 +9,6 @@ import mcp.mobius.opis.data.managers.EntityManager; import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.OpisPacketHandler_OLD; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataList_OLD; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandChunkList.java b/src/main/java/mcp/mobius/opis/commands/server/CommandChunkList.java index 9b3764f..455e6db 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandChunkList.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandChunkList.java @@ -8,7 +8,6 @@ import mcp.mobius.opis.data.managers.ChunkManager; import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.OpisPacketHandler_OLD; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataList_OLD; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandHandler.java b/src/main/java/mcp/mobius/opis/commands/server/CommandHandler.java index 0f99088..34e2f2a 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandHandler.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandHandler.java @@ -10,7 +10,6 @@ import mcp.mobius.opis.data.managers.TickHandlerManager; import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.OpisPacketHandler_OLD; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataList_OLD; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; @@ -42,10 +41,10 @@ public class CommandHandler extends CommandBase implements IOpisCommand { return; } - ArrayList stats = TickHandlerManager.getCumulatedStatsServer(); + //ArrayList stats = TickHandlerManager.getCumulatedStatsServer(); - for (DataHandler s : stats) - icommandsender.addChatMessage(new ChatComponentText(String.format("%s : %.2f", s.name, s.update.toString()))); + //for (DataHandler s : stats) + // icommandsender.addChatMessage(new ChatComponentText(String.format("%s : %.2f", s.name, s.update.toString()))); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java b/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java index 43fd31d..e56fbbf 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java @@ -9,8 +9,9 @@ import mcp.mobius.opis.data.managers.TileEntityManager; import mcp.mobius.opis.events.OpisServerTickHandler; import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.OpisPacketHandler_OLD; +import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataCommand_OLD; +import mcp.mobius.opis.network.packets.server.NetDataCommand; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; @@ -44,7 +45,7 @@ public class CommandReset extends CommandBase implements IOpisCommand { //PacketDispatcher.sendPacketToAllPlayers(NetDataCommand.create(Message.CLIENT_CLEAR_SELECTION)); if (icommandsender instanceof EntityPlayerMP) - OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.CLIENT_CLEAR_SELECTION), (EntityPlayerMP)icommandsender); + PacketManager.validateAndSend(new NetDataCommand(Message.CLIENT_CLEAR_SELECTION), (EntityPlayerMP)icommandsender); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandStart.java b/src/main/java/mcp/mobius/opis/commands/server/CommandStart.java index 0bab15f..7cefb79 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandStart.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandStart.java @@ -11,8 +11,9 @@ import mcp.mobius.opis.data.managers.TileEntityManager; import mcp.mobius.opis.events.OpisServerTickHandler; import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.OpisPacketHandler_OLD; +import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataValue_OLD; +import mcp.mobius.opis.network.packets.server.NetDataValue; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; @@ -50,7 +51,7 @@ public class CommandStart extends CommandBase implements IOpisCommand { modOpis.profilerRun = true; ProfilerSection.activateAll(Side.SERVER); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.STATUS_START, new SerialInt(modOpis.profilerMaxTicks))); + PacketManager.sendPacketToAllSwing(new NetDataValue(Message.STATUS_START, new SerialInt(modOpis.profilerMaxTicks))); icommandsender.addChatMessage(new ChatComponentText(String.format("\u00A7oOpis started with a tick delay %s.", modOpis.profilerDelay))); diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandTimingEntities.java b/src/main/java/mcp/mobius/opis/commands/server/CommandTimingEntities.java index 0d04dd0..22bff8f 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandTimingEntities.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandTimingEntities.java @@ -10,7 +10,6 @@ import mcp.mobius.opis.data.managers.EntityManager; import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.OpisPacketHandler_OLD; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataList_OLD; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java b/src/main/java/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java index bc14194..448eec7 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java @@ -8,7 +8,6 @@ import mcp.mobius.opis.data.managers.TileEntityManager; import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.OpisPacketHandler_OLD; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataList_OLD; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mcp/mobius/opis/data/client/DataCache.java b/src/main/java/mcp/mobius/opis/data/client/DataCache.java index 3123b72..47d5542 100644 --- a/src/main/java/mcp/mobius/opis/data/client/DataCache.java +++ b/src/main/java/mcp/mobius/opis/data/client/DataCache.java @@ -36,9 +36,9 @@ import mcp.mobius.opis.data.holders.basetypes.SerialLong; import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.data.holders.stats.StatsChunk; import mcp.mobius.opis.helpers.ModIdentification; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SwingUI; import mcp.mobius.opis.swing.widgets.JButtonAccess; @@ -59,7 +59,7 @@ public class DataCache implements IMessageHandler{ } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case STATUS_ACCESS_LEVEL:{ this.clientAccess = AccessLevel.values()[((SerialInt)rawdata.value).value]; diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockRender.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockRender.java index e6b0073..6a6f288 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockRender.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockRender.java @@ -4,6 +4,7 @@ import java.util.HashMap; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.world.World; import mcp.mobius.mobiuscore.profiler.ProfilerSection; @@ -16,7 +17,7 @@ public class DataBlockRender extends DataBlockTileEntity { this.pos = coord; World world = Minecraft.getMinecraft().theWorld; //DimensionManager.getWorld(this.pos.dim); - this.id = (short) world.getBlockId(this.pos.x, this.pos.y, this.pos.z); + this.id = (short) Block.getIdFromBlock(world.getBlock(this.pos.x, this.pos.y, this.pos.z)); this.meta = (short) world.getBlockMetadata(this.pos.x, this.pos.y, this.pos.z); HashMap data = ((ProfilerRenderBlock)(ProfilerSection.RENDER_BLOCK.getProfiler())).data; diff --git a/src/main/java/mcp/mobius/opis/data/managers/ChunkManager.java b/src/main/java/mcp/mobius/opis/data/managers/ChunkManager.java index ccab727..5f70447 100644 --- a/src/main/java/mcp/mobius/opis/data/managers/ChunkManager.java +++ b/src/main/java/mcp/mobius/opis/data/managers/ChunkManager.java @@ -20,8 +20,8 @@ import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntity; import mcp.mobius.opis.data.holders.stats.StatsChunk; import mcp.mobius.opis.data.profilers.ProfilerEntityUpdate; import mcp.mobius.opis.data.profilers.ProfilerTileEntityUpdate; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; @@ -164,7 +164,7 @@ public enum ChunkManager implements IMessageHandler{ } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_TIMING_CHUNK:{ this.setChunkMeanTime(rawdata.array); diff --git a/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java b/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java index 20db1a2..2ce29ee 100644 --- a/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java +++ b/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java @@ -186,12 +186,12 @@ public enum EntityManager { public boolean teleportEntity(Entity src, Entity trg, EntityPlayerMP msgtrg){ if ((src == null) && (msgtrg != null)) { - PacketManager.sendToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oCannot find source entity %s", src))), msgtrg); + PacketManager.sendChatMsg(String.format("\u00A7oCannot find source entity %s", src), msgtrg); return false; } if ((trg == null) && (msgtrg != null)) { - PacketManager.sendToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oCannot find target entity %s", trg))), msgtrg); + PacketManager.sendChatMsg(String.format("\u00A7oCannot find target entity %s", src), msgtrg); return false; } diff --git a/src/main/java/mcp/mobius/opis/data/managers/StringCache.java b/src/main/java/mcp/mobius/opis/data/managers/StringCache.java index 5c2ba98..2b74156 100644 --- a/src/main/java/mcp/mobius/opis/data/managers/StringCache.java +++ b/src/main/java/mcp/mobius/opis/data/managers/StringCache.java @@ -12,11 +12,11 @@ import mcp.mobius.opis.modOpis; import mcp.mobius.opis.api.IMessageHandler; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.holders.newtypes.DataStringUpdate; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataList_OLD; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; -import mcp.mobius.opis.network.packets.server.NetDataValue_OLD; +import mcp.mobius.opis.network.packets.server.NetDataList; +import mcp.mobius.opis.network.packets.server.NetDataValue; public enum StringCache implements IMessageHandler { INSTANCE; @@ -52,7 +52,7 @@ public enum StringCache implements IMessageHandler { DataStringUpdate upd = new DataStringUpdate(str, currentIndex); this.toSend.add(upd); - PacketManager.sendToAll(NetDataValue_OLD.create(Message.STATUS_STRINGUPD, upd).packet); + PacketManager.sendToAll(new NetDataValue(Message.STATUS_STRINGUPD, upd)); return currentIndex; } } @@ -64,7 +64,7 @@ public enum StringCache implements IMessageHandler { ArrayList toSendCopy = new ArrayList(toSend); while (i < toSendCopy.size()){ - PacketManager.sendToPlayer(NetDataList_OLD.create(Message.STATUS_STRINGUPD_FULL, toSendCopy.subList(i, Math.min(i + 50, toSendCopy.size()))).packet, player); + PacketManager.sendToPlayer(new NetDataList(Message.STATUS_STRINGUPD_FULL, toSendCopy.subList(i, Math.min(i + 50, toSendCopy.size()))), player); i += 50; } @@ -72,7 +72,7 @@ public enum StringCache implements IMessageHandler { } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case STATUS_STRINGUPD:{ DataStringUpdate data = (DataStringUpdate)rawdata.value; diff --git a/src/main/java/mcp/mobius/opis/events/OpisClientTickHandler.java b/src/main/java/mcp/mobius/opis/events/OpisClientTickHandler.java index 85e3dd9..1775117 100644 --- a/src/main/java/mcp/mobius/opis/events/OpisClientTickHandler.java +++ b/src/main/java/mcp/mobius/opis/events/OpisClientTickHandler.java @@ -136,7 +136,7 @@ public enum OpisClientTickHandler{ //==================================================================================== - ((PanelRenderHandlers)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERHANDLERS))).setTable(TickHandlerManager.getCumulatedStatsRender()); + //((PanelRenderHandlers)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERHANDLERS))).setTable(TickHandlerManager.getCumulatedStatsRender()); //==================================================================================== diff --git a/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java b/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java index 304a95f..da32698 100644 --- a/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java +++ b/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java @@ -36,11 +36,12 @@ import mcp.mobius.opis.data.profilers.ProfilerPacket; import mcp.mobius.opis.data.profilers.ProfilerTick; import mcp.mobius.opis.gui.overlay.OverlayStatus; import mcp.mobius.opis.network.OpisPacketHandler_OLD; +import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataCommand_OLD; -import mcp.mobius.opis.network.packets.server.NetDataList_OLD; -import mcp.mobius.opis.network.packets.server.NetDataValue_OLD; +import mcp.mobius.opis.network.packets.server.NetDataCommand; +import mcp.mobius.opis.network.packets.server.NetDataList; +import mcp.mobius.opis.network.packets.server.NetDataValue; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; @@ -75,17 +76,17 @@ public enum OpisServerTickHandler{ // One second timer if (timer1000.isDone()){ - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.VALUE_AMOUNT_UPLOAD, new SerialLong(((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).dataAmount))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.VALUE_AMOUNT_DOWNLOAD, new SerialLong(((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).dataAmount))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.VALUE_CHUNK_FORCED, new SerialInt(ChunkManager.INSTANCE.getForcedChunkAmount()))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.VALUE_CHUNK_LOADED, new SerialInt(ChunkManager.INSTANCE.getLoadedChunkAmount()))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.VALUE_TIMING_TICK, new DataTiming(((ProfilerTick)ProfilerSection.TICK.getProfiler()).data.getGeometricMean()))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.VALUE_AMOUNT_TILEENTS, new SerialInt(TileEntityManager.INSTANCE.getAmountTileEntities()))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.VALUE_AMOUNT_ENTITIES, new SerialInt(EntityManager.INSTANCE.getAmountEntities()))); + PacketManager.sendPacketToAllSwing(new NetDataValue(Message.VALUE_AMOUNT_UPLOAD, new SerialLong(((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).dataAmount))); + PacketManager.sendPacketToAllSwing(new NetDataValue(Message.VALUE_AMOUNT_DOWNLOAD, new SerialLong(((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).dataAmount))); + PacketManager.sendPacketToAllSwing(new NetDataValue(Message.VALUE_CHUNK_FORCED, new SerialInt(ChunkManager.INSTANCE.getForcedChunkAmount()))); + PacketManager.sendPacketToAllSwing(new NetDataValue(Message.VALUE_CHUNK_LOADED, new SerialInt(ChunkManager.INSTANCE.getLoadedChunkAmount()))); + PacketManager.sendPacketToAllSwing(new NetDataValue(Message.VALUE_TIMING_TICK, new DataTiming(((ProfilerTick)ProfilerSection.TICK.getProfiler()).data.getGeometricMean()))); + PacketManager.sendPacketToAllSwing(new NetDataValue(Message.VALUE_AMOUNT_TILEENTS, new SerialInt(TileEntityManager.INSTANCE.getAmountTileEntities()))); + PacketManager.sendPacketToAllSwing(new NetDataValue(Message.VALUE_AMOUNT_ENTITIES, new SerialInt(EntityManager.INSTANCE.getAmountEntities()))); for (EntityPlayerMP player : PlayerTracker.INSTANCE.playersSwing){ if (!cachedAccess.containsKey(player) || cachedAccess.get(player) != PlayerTracker.INSTANCE.getPlayerAccessLevel(player)){ - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_ACCESS_LEVEL, new SerialInt(PlayerTracker.INSTANCE.getPlayerAccessLevel(player).ordinal())), player); + PacketManager.validateAndSend(new NetDataValue(Message.STATUS_ACCESS_LEVEL, new SerialInt(PlayerTracker.INSTANCE.getPlayerAccessLevel(player).ordinal())), player); cachedAccess.put(player, PlayerTracker.INSTANCE.getPlayerAccessLevel(player)); } } @@ -94,19 +95,19 @@ public enum OpisServerTickHandler{ for (Thread t : Thread.getAllStackTraces().keySet()){ threads.add(new DataThread().fill(t)); } - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList_OLD.create(Message.LIST_THREADS, threads)); + PacketManager.sendPacketToAllSwing(new NetDataList(Message.LIST_THREADS, threads)); // Dimension data update. ArrayList dimData = new ArrayList(); for (int dim : DimensionManager.getIDs()){ dimData.add(new DataDimension().fill(dim)); } - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList_OLD.create(Message.LIST_DIMENSION_DATA, dimData)); + PacketManager.sendPacketToAllSwing(new NetDataList(Message.LIST_DIMENSION_DATA, dimData)); // Profiler update (if running) if (modOpis.profilerRun){ - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.STATUS_RUNNING, new SerialInt(modOpis.profilerMaxTicks))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.STATUS_RUN_UPDATE, new SerialInt(profilerRunningTicks))); + PacketManager.sendPacketToAllSwing(new NetDataValue(Message.STATUS_RUNNING, new SerialInt(modOpis.profilerMaxTicks))); + PacketManager.sendPacketToAllSwing(new NetDataValue(Message.STATUS_RUN_UPDATE, new SerialInt(profilerRunningTicks))); } ((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).dataAmount = 0L; @@ -115,18 +116,18 @@ public enum OpisServerTickHandler{ // Two second timer if (timer2000.isDone()){ - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList_OLD.create(Message.LIST_PLAYERS, EntityManager.INSTANCE.getAllPlayers())); + PacketManager.sendPacketToAllSwing(new NetDataList(Message.LIST_PLAYERS, EntityManager.INSTANCE.getAllPlayers())); } // Five second timer if (timer5000.isDone()){ updatePlayers(); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList_OLD.create(Message.LIST_PACKETS_OUTBOUND, ((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).data)); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList_OLD.create(Message.LIST_PACKETS_INBOUND, ((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).data)); + PacketManager.sendPacketToAllSwing(new NetDataList(Message.LIST_PACKETS_OUTBOUND, ((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).data)); + PacketManager.sendPacketToAllSwing(new NetDataList(Message.LIST_PACKETS_INBOUND, ((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).data)); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList_OLD.create(Message.LIST_PACKETS_OUTBOUND_250, new ArrayList( ((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).data250.values()))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList_OLD.create(Message.LIST_PACKETS_INBOUND_250, new ArrayList( ((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).data250.values()))); + PacketManager.sendPacketToAllSwing(new NetDataList(Message.LIST_PACKETS_OUTBOUND_250, new ArrayList( ((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).data250.values()))); + PacketManager.sendPacketToAllSwing(new NetDataList(Message.LIST_PACKETS_INBOUND_250, new ArrayList( ((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).data250.values()))); ((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).startInterval(); ((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).startInterval(); @@ -147,7 +148,7 @@ public enum OpisServerTickHandler{ modOpis.profilerRun = false; ProfilerSection.desactivateAll(Side.SERVER); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.STATUS_STOP, new SerialInt(modOpis.profilerMaxTicks))); + PacketManager.sendPacketToAllSwing(new NetDataValue(Message.STATUS_STOP, new SerialInt(modOpis.profilerMaxTicks))); for (EntityPlayerMP player : PlayerTracker.INSTANCE.playersSwing){ OpisPacketHandler_OLD.sendFullUpdate(player); @@ -162,14 +163,14 @@ public enum OpisServerTickHandler{ for (EntityPlayerMP player : PlayerTracker.INSTANCE.playerOverlayStatus.keySet()){ if (PlayerTracker.INSTANCE.playerOverlayStatus.get(player) == OverlayStatus.CHUNKSTATUS){ - OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.LIST_CHUNK_LOADED_CLEAR), player); - OpisPacketHandler_OLD.splitAndSend(Message.LIST_CHUNK_LOADED, ChunkManager.INSTANCE.getLoadedChunks(PlayerTracker.INSTANCE.playerDimension.get(player)), player); + PacketManager.validateAndSend(new NetDataCommand(Message.LIST_CHUNK_LOADED_CLEAR), player); + PacketManager.splitAndSend(Message.LIST_CHUNK_LOADED, ChunkManager.INSTANCE.getLoadedChunks(PlayerTracker.INSTANCE.playerDimension.get(player)), player); } if (PlayerTracker.INSTANCE.playerOverlayStatus.get(player) == OverlayStatus.MEANTIME){ ArrayList timingChunks = ChunkManager.INSTANCE.getTopChunks(100); //OpisPacketHandler.validateAndSend(Packet_DataList.create(DataReq.LIST_TIMING_CHUNK, timingChunks), player); - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_CHUNK, timingChunks), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_TIMING_CHUNK, timingChunks), player); } } } diff --git a/src/main/java/mcp/mobius/opis/events/PlayerTracker.java b/src/main/java/mcp/mobius/opis/events/PlayerTracker.java index 5cf5d12..62cdda3 100644 --- a/src/main/java/mcp/mobius/opis/events/PlayerTracker.java +++ b/src/main/java/mcp/mobius/opis/events/PlayerTracker.java @@ -10,9 +10,10 @@ import mcp.mobius.opis.data.holders.basetypes.SerialLong; import mcp.mobius.opis.data.managers.StringCache; import mcp.mobius.opis.gui.overlay.OverlayStatus; import mcp.mobius.opis.network.OpisPacketHandler_OLD; +import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataValue_OLD; +import mcp.mobius.opis.network.packets.server.NetDataValue; import mcp.mobius.opis.swing.SelectedTab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -101,7 +102,7 @@ public enum PlayerTracker{ @SubscribeEvent public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event){ - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_CURRENT_TIME, new SerialLong(System.currentTimeMillis())), event.player); + PacketManager.validateAndSend(new NetDataValue(Message.STATUS_CURRENT_TIME, new SerialLong(System.currentTimeMillis())), (EntityPlayerMP)event.player); /* if (manager instanceof MemoryConnection){ diff --git a/src/main/java/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java b/src/main/java/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java index 2c691bd..5c2c4b5 100644 --- a/src/main/java/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java +++ b/src/main/java/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java @@ -34,11 +34,11 @@ import mcp.mobius.opis.gui.widgets.LayoutCanvas; import mcp.mobius.opis.gui.widgets.WidgetGeometry; import mcp.mobius.opis.gui.widgets.tableview.TableRow; import mcp.mobius.opis.gui.widgets.tableview.ViewTable; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.PacketReqChunks; import mcp.mobius.opis.network.packets.client.PacketReqData; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{ @@ -334,7 +334,7 @@ public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{ } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_CHUNK_TILEENTS:{ this.setupTable(rawdata.array); diff --git a/src/main/java/mcp/mobius/opis/gui/overlay/entperchunk/OverlayEntityPerChunk.java b/src/main/java/mcp/mobius/opis/gui/overlay/entperchunk/OverlayEntityPerChunk.java index 22cf5ce..abebda9 100644 --- a/src/main/java/mcp/mobius/opis/gui/overlay/entperchunk/OverlayEntityPerChunk.java +++ b/src/main/java/mcp/mobius/opis/gui/overlay/entperchunk/OverlayEntityPerChunk.java @@ -27,11 +27,11 @@ import mcp.mobius.opis.gui.widgets.LayoutCanvas; import mcp.mobius.opis.gui.widgets.WidgetGeometry; import mcp.mobius.opis.gui.widgets.tableview.TableRow; import mcp.mobius.opis.gui.widgets.tableview.ViewTable; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.PacketReqChunks; import mcp.mobius.opis.network.packets.client.PacketReqData; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler { @@ -286,7 +286,7 @@ public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler { } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_CHUNK_ENTITIES:{ this.setEntStats(rawdata.array); diff --git a/src/main/java/mcp/mobius/opis/helpers/ModIdentification.java b/src/main/java/mcp/mobius/opis/helpers/ModIdentification.java index 9269d22..71327ae 100644 --- a/src/main/java/mcp/mobius/opis/helpers/ModIdentification.java +++ b/src/main/java/mcp/mobius/opis/helpers/ModIdentification.java @@ -6,6 +6,7 @@ import java.net.URLDecoder; import java.util.HashMap; import java.util.Set; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -21,18 +22,6 @@ public class ModIdentification { public static HashMap keyhandlerStrings = new HashMap(); public static void init(){ - - //TODO : Redo this for the new frameworkn (1.7.2) - /* - NBTTagList itemDataList = new NBTTagList(); - GameData.writeItemData(itemDataList); - - for(int i = 0; i < itemDataList.tagCount(); i++) - { - ItemData itemData = new ItemData((NBTTagCompound) itemDataList.tagAt(i)); - itemMap.put(itemData.getItemId(), itemData.getModId()); - } - */ for (ModContainer mod : Loader.instance().getModList()){ modSource_Name.put(mod.getSource().getName(), mod.getName()); @@ -50,27 +39,6 @@ public class ModIdentification { modSource_ID.put("1.6.4.jar", "Minecraft"); modSource_ID.put("1.7.2.jar", "Minecraft"); modSource_ID.put("Forge", "Minecraft"); - - -// for (String s : this.modSourceList.keySet()) -// if (this.modSourceList.get(s) == "Minecraft Coder Pack") -// this.modSourceList.put(s, "Minecraft"); - - // Code to retrieve all the registered keybindings along with the mod adding them. - /* - Field keyHandlers_Field = AccessHelper.getDeclaredField("cpw.mods.fml.client.registry.KeyBindingRegistry", "keyHandlers"); - try { - Set keyHandlers = (Set)keyHandlers_Field.get(KeyBindingRegistry.instance()); - for (KeyHandler keyhandler : keyHandlers) - for (int i = 0; i < keyhandler.getKeyBindings().length; i++) - keyhandlerStrings.put(keyhandler.getKeyBindings()[i].keyDescription, idFromObject(keyhandler)); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - */ - } public static String nameFromObject(Object obj){ @@ -95,31 +63,6 @@ public class ModIdentification { return modName; } - /* - public static String idFromObject(Object obj){ - String objPath = obj.getClass().getProtectionDomain().getCodeSource().getLocation().toString(); - - try { - objPath = URLDecoder.decode(objPath, "UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - - - String modName = ""; - for (String s: modSource_ID.keySet()) - if (objPath.contains(s)){ - modName = modSource_ID.get(s); - break; - } - - if (modName.equals("Minecraft Coder Pack")) - modName = "Minecraft"; - - return modName; - } - */ - public static String nameFromStack(ItemStack stack){ try{ //String modID = itemMap.get(itemstack.itemID); @@ -133,14 +76,27 @@ public class ModIdentification { } } - /* - public static ModContainer findModContainer(String modID) - { - for(ModContainer mc : Loader.instance().getModList()) - if(modID.equals(mc.getModId())) - return mc; - - return null; + public static String getStackName(int id, int meta){ + ItemStack is; + String name = String.format("te.%d.%d", id, meta); + + try{ + is = new ItemStack(Block.getBlockById(id), 1, meta); + name = is.getDisplayName(); + } catch (Exception e) { } + + return name; } - */ + + public static String getModStackName(int id, int meta){ + ItemStack is; + String modID = ""; + + try{ + is = new ItemStack(Block.getBlockById(id), 1, meta); + modID = nameFromStack(is); + } catch (Exception e) { } + + return modID; + } } diff --git a/src/main/java/mcp/mobius/opis/network/OpisPacketHandler_OLD.java b/src/main/java/mcp/mobius/opis/network/OpisPacketHandler_OLD.java index 965c0ab..e1202ed 100644 --- a/src/main/java/mcp/mobius/opis/network/OpisPacketHandler_OLD.java +++ b/src/main/java/mcp/mobius/opis/network/OpisPacketHandler_OLD.java @@ -50,11 +50,7 @@ import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.enums.Packets; import mcp.mobius.opis.network.packets.server.Packet_Chunks_OLD; -import mcp.mobius.opis.network.packets.server.NetDataCommand_OLD; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; -import mcp.mobius.opis.network.packets.server.NetDataList_OLD; import mcp.mobius.opis.network.packets.server.Packet_DataOverlayChunkEntities_OLD; -import mcp.mobius.opis.network.packets.server.NetDataValue_OLD; import mcp.mobius.opis.network.packets.server.Packet_Tickets_OLD; import mcp.mobius.opis.swing.SwingUI; import net.minecraft.entity.player.EntityPlayer; @@ -101,21 +97,6 @@ public class OpisPacketHandler_OLD implements IPacketHandler { OverlayEntityPerChunk.instance().reduceData(); OverlayEntityPerChunk.instance().setupChunkTable(); } - - else if (header == Packets.NETDATACOMMAND){ - NetDataRaw_OLD rawdata = new NetDataCommand_OLD(packet); - MessageHandlerRegistrar.INSTANCE.routeMessage(rawdata.msg, rawdata); - } - - else if (header == Packets.NETDATALIST){ - NetDataRaw_OLD rawdata = new NetDataList_OLD(packet); - MessageHandlerRegistrar.INSTANCE.routeMessage(rawdata.msg, rawdata); - } - - else if (header == Packets.NETDATAVALUE){ - NetDataRaw_OLD rawdata = new NetDataValue_OLD(packet); - MessageHandlerRegistrar.INSTANCE.routeMessage(rawdata.msg, rawdata); - } } /* @@ -128,84 +109,11 @@ public class OpisPacketHandler_OLD implements IPacketHandler { } } */ + + - public static void validateAndSend(NetDataRaw_OLD capsule, EntityPlayerMP player){ - if (!capsule.msg.isDisplayActive(PlayerTracker.INSTANCE.getPlayerSelectedTab(player))) return; - - if (capsule.msg.canPlayerUseCommand(player) && capsule.packet.getPacketSize() < 32000) - PacketManager.sendPacketToPlayer(capsule.packet, player); - else if (capsule.packet.getPacketSize() > 32000) - modOpis.log.warning(String.format("Data packet size of type %s too big : %d ! Dropping !", capsule.msg, capsule.packet.getPacketSize())); - } - public static void sendPacketToAllSwing(NetDataRaw_OLD capsule){ - for (EntityPlayerMP player : PlayerTracker.INSTANCE.playersSwing) - OpisPacketHandler_OLD.validateAndSend(capsule, player); - } - - public static void splitAndSend(Message msg, ArrayList data, EntityPlayerMP player){ - int i = 0; - while (i < data.size()){ - validateAndSend(NetDataList_OLD.create(msg, data.subList(i, Math.min(i + 500, data.size()))), player); - i += 500; - } - - } - public static void sendChatMsg(String msg, EntityPlayerMP player){ - PacketManager.sendToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(msg)), player); - } - - public static void sendFullUpdate(EntityPlayerMP player){ - ArrayList timingEntities = EntityManager.INSTANCE.getWorses(100); - ArrayList timingTileEnts = TileEntityManager.INSTANCE.getWorses(100); - ArrayList timingHandlers = TickHandlerManager.getCumulatedStatsServer(); - ArrayList timingChunks = ChunkManager.INSTANCE.getTopChunks(100); - ArrayList timingEntsClass = EntityManager.INSTANCE.getTotalPerClass(); - ArrayList timingTEsClass = TileEntityManager.INSTANCE.getCumulativeTimingTileEntities(); - - DataTiming totalTimeTE = TileEntityManager.INSTANCE.getTotalUpdateTime(); - DataTiming totalTimeEnt = EntityManager.INSTANCE.getTotalUpdateTime(); - DataTiming totalTimeHandler = TickHandlerManager.getTotalUpdateTime(); - DataNetworkTick totalNetwork = new DataNetworkTick().fill(); - DataBlockTick totalWorldTick = new DataBlockTick().fill(); - ArrayList timingEvents = new ArrayList(); - HashBasedTable eventData = ((ProfilerEvent)ProfilerSection.EVENT_INVOKE.getProfiler()).data; - for (Cell cell : eventData.cellSet()){ - timingEvents.add(new DataEvent().fill(cell)); - } - - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_HANDLERS, timingHandlers), player); - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_ENTITIES, timingEntities), player); - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_TILEENTS, timingTileEnts), player); - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_TILEENTS_PER_CLASS, timingTEsClass), player); - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_CHUNK, timingChunks), player); - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_EVENTS, timingEvents), player); - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_ENTITIES_PER_CLASS, timingEntsClass), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.VALUE_TIMING_TILEENTS, totalTimeTE), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.VALUE_TIMING_ENTITIES, totalTimeEnt), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.VALUE_TIMING_HANDLERS, totalTimeHandler), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.VALUE_TIMING_WORLDTICK, totalWorldTick), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.VALUE_TIMING_NETWORK, totalNetwork), player); - - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.VALUE_AMOUNT_HANDLERS, new SerialInt(timingHandlers.size())), player); - - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_TIME_LAST_RUN, new SerialLong(ProfilerSection.timeStampLastRun)), player); - - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_ACCESS_LEVEL, new SerialInt(PlayerTracker.INSTANCE.getPlayerAccessLevel(player).ordinal())), player); - - // This portion is to get the proper filtered amounts depending on the player preferences. - String name = player.getDisplayName(); - boolean filtered = false; - if (PlayerTracker.INSTANCE.filteredAmount.containsKey(name)) - filtered = PlayerTracker.INSTANCE.filteredAmount.get(name); - ArrayList amountEntities = EntityManager.INSTANCE.getCumulativeEntities(filtered); - - // Here we send a full update to the player - //OpisPacketHandler.validateAndSend(Packet_DataList.create(DataReq.LIST_AMOUNT_ENTITIES, amountEntities), player); - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_AMOUNT_ENTITIES, amountEntities), player); - - } } diff --git a/src/main/java/mcp/mobius/opis/network/PacketBase.java b/src/main/java/mcp/mobius/opis/network/PacketBase.java index 1f8b375..946e2f8 100644 --- a/src/main/java/mcp/mobius/opis/network/PacketBase.java +++ b/src/main/java/mcp/mobius/opis/network/PacketBase.java @@ -2,11 +2,14 @@ package mcp.mobius.opis.network; import java.io.DataInputStream; import java.lang.reflect.Method; +import java.util.ArrayList; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.holders.newtypes.DataError; +import mcp.mobius.opis.network.enums.Message; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.Packet; import net.minecraft.world.World; import com.google.common.io.ByteArrayDataInput; @@ -22,6 +25,13 @@ import cpw.mods.fml.relauncher.SideOnly; */ public abstract class PacketBase { + public byte header; + public Message msg; + public String clazzStr; + public Class clazz; + public ArrayList array = null; + public ISerializable value = null; + public abstract void encode(ByteArrayDataOutput output); public abstract void decode(ByteArrayDataInput input); diff --git a/src/main/java/mcp/mobius/opis/network/PacketManager.java b/src/main/java/mcp/mobius/opis/network/PacketManager.java index 245f09d..c558e17 100644 --- a/src/main/java/mcp/mobius/opis/network/PacketManager.java +++ b/src/main/java/mcp/mobius/opis/network/PacketManager.java @@ -9,20 +9,47 @@ import io.netty.channel.ChannelHandler.Sharable; import java.io.IOException; import java.lang.reflect.Constructor; +import java.util.ArrayList; import java.util.EnumMap; +import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.google.common.base.Charsets; +import com.google.common.collect.HashBasedTable; import com.google.common.collect.Maps; +import com.google.common.collect.Table.Cell; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; +import mcp.mobius.opis.modOpis; +import mcp.mobius.opis.data.holders.ISerializable; +import mcp.mobius.opis.data.holders.basetypes.AmountHolder; +import mcp.mobius.opis.data.holders.basetypes.SerialInt; +import mcp.mobius.opis.data.holders.basetypes.SerialLong; +import mcp.mobius.opis.data.holders.newtypes.DataBlockTick; +import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntity; +import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntityPerClass; +import mcp.mobius.opis.data.holders.newtypes.DataEntity; +import mcp.mobius.opis.data.holders.newtypes.DataEntityPerClass; +import mcp.mobius.opis.data.holders.newtypes.DataEvent; +import mcp.mobius.opis.data.holders.newtypes.DataNetworkTick; +import mcp.mobius.opis.data.holders.newtypes.DataTiming; +import mcp.mobius.opis.data.holders.stats.StatsChunk; +import mcp.mobius.opis.data.managers.ChunkManager; +import mcp.mobius.opis.data.managers.EntityManager; +import mcp.mobius.opis.data.managers.TileEntityManager; +import mcp.mobius.opis.data.profilers.ProfilerEvent; +import mcp.mobius.opis.events.PlayerTracker; +import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.PacketReqChunks; import mcp.mobius.opis.network.packets.client.PacketReqData; +import mcp.mobius.opis.network.packets.server.NetDataList; +import mcp.mobius.opis.network.packets.server.NetDataValue; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -37,6 +64,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.network.Packet; +import net.minecraft.network.play.server.S02PacketChat; +import net.minecraft.util.ChatComponentText; @Sharable public class PacketManager extends FMLIndexedMessageToMessageCodec @@ -113,6 +142,11 @@ public class PacketManager extends FMLIndexedMessageToMessageCodec channels.get(SERVER).writeAndFlush(packet); } + public static void sendToPlayer(Packet packet, EntityPlayerMP player) + { + player.playerNetServerHandler.sendPacket(packet); + } + public static void sendToAllAround(PacketBase packet, NetworkRegistry.TargetPoint point) { channels.get(SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT); @@ -154,6 +188,30 @@ public class PacketManager extends FMLIndexedMessageToMessageCodec } */ + public static void validateAndSend(PacketBase capsule, EntityPlayerMP player){ + if (!capsule.msg.isDisplayActive(PlayerTracker.INSTANCE.getPlayerSelectedTab(player))) return; + + if (capsule.msg.canPlayerUseCommand(player)) + PacketManager.sendToPlayer(capsule, player); + } + + public static void sendPacketToAllSwing(PacketBase capsule){ + for (EntityPlayerMP player : PlayerTracker.INSTANCE.playersSwing) + PacketManager.validateAndSend(capsule, player); + } + + public static void sendChatMsg(String msg, EntityPlayerMP player){ + PacketManager.sendToPlayer(new S02PacketChat(new ChatComponentText(msg)), player); + } + + public static void splitAndSend(Message msg, ArrayList data, EntityPlayerMP player){ + int i = 0; + while (i < data.size()){ + validateAndSend(new NetDataList(msg, data.subList(i, Math.min(i + 500, data.size()))), player); + i += 500; + } + } + // OTHER METHODS @Override @@ -198,4 +256,56 @@ public class PacketManager extends FMLIndexedMessageToMessageCodec return false; } + + public static void sendFullUpdate(EntityPlayerMP player){ + ArrayList timingEntities = EntityManager.INSTANCE.getWorses(100); + ArrayList timingTileEnts = TileEntityManager.INSTANCE.getWorses(100); + //ArrayList timingHandlers = TickHandlerManager.getCumulatedStatsServer(); + ArrayList timingChunks = ChunkManager.INSTANCE.getTopChunks(100); + ArrayList timingEntsClass = EntityManager.INSTANCE.getTotalPerClass(); + ArrayList timingTEsClass = TileEntityManager.INSTANCE.getCumulativeTimingTileEntities(); + + DataTiming totalTimeTE = TileEntityManager.INSTANCE.getTotalUpdateTime(); + DataTiming totalTimeEnt = EntityManager.INSTANCE.getTotalUpdateTime(); + //DataTiming totalTimeHandler = TickHandlerManager.getTotalUpdateTime(); + DataNetworkTick totalNetwork = new DataNetworkTick().fill(); + DataBlockTick totalWorldTick = new DataBlockTick().fill(); + + ArrayList timingEvents = new ArrayList(); + HashBasedTable eventData = ((ProfilerEvent)ProfilerSection.EVENT_INVOKE.getProfiler()).data; + for (Cell cell : eventData.cellSet()){ + timingEvents.add(new DataEvent().fill(cell)); + } + + //PacketManager.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_HANDLERS, timingHandlers), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_TIMING_ENTITIES, timingEntities), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_TIMING_TILEENTS, timingTileEnts), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_TIMING_TILEENTS_PER_CLASS, timingTEsClass), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_TIMING_CHUNK, timingChunks), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_TIMING_EVENTS, timingEvents), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_TIMING_ENTITIES_PER_CLASS, timingEntsClass), player); + PacketManager.validateAndSend(new NetDataValue(Message.VALUE_TIMING_TILEENTS, totalTimeTE), player); + PacketManager.validateAndSend(new NetDataValue(Message.VALUE_TIMING_ENTITIES, totalTimeEnt), player); + //PacketManager.validateAndSend(NetDataValue_OLD.create(Message.VALUE_TIMING_HANDLERS, totalTimeHandler), player); + PacketManager.validateAndSend(new NetDataValue(Message.VALUE_TIMING_WORLDTICK, totalWorldTick), player); + PacketManager.validateAndSend(new NetDataValue(Message.VALUE_TIMING_NETWORK, totalNetwork), player); + + //PacketManager.validateAndSend(NetDataValue_OLD.create(Message.VALUE_AMOUNT_HANDLERS, new SerialInt(timingHandlers.size())), player); + + PacketManager.validateAndSend(new NetDataValue(Message.STATUS_TIME_LAST_RUN, new SerialLong(ProfilerSection.timeStampLastRun)), player); + + PacketManager.validateAndSend(new NetDataValue(Message.STATUS_ACCESS_LEVEL, new SerialInt(PlayerTracker.INSTANCE.getPlayerAccessLevel(player).ordinal())), player); + + // This portion is to get the proper filtered amounts depending on the player preferences. + String name = player.getDisplayName(); + boolean filtered = false; + if (PlayerTracker.INSTANCE.filteredAmount.containsKey(name)) + filtered = PlayerTracker.INSTANCE.filteredAmount.get(name); + ArrayList amountEntities = EntityManager.INSTANCE.getCumulativeEntities(filtered); + + // Here we send a full update to the player + //OpisPacketHandler.validateAndSend(Packet_DataList.create(DataReq.LIST_AMOUNT_ENTITIES, amountEntities), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_AMOUNT_ENTITIES, amountEntities), player); + + } } \ No newline at end of file diff --git a/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java b/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java index f6d7fb2..86f7646 100644 --- a/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java +++ b/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java @@ -38,10 +38,10 @@ import mcp.mobius.opis.data.managers.TileEntityManager; import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.gui.overlay.OverlayStatus; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataCommand_OLD; -import mcp.mobius.opis.network.packets.server.NetDataList_OLD; +import mcp.mobius.opis.network.packets.server.NetDataCommand; +import mcp.mobius.opis.network.packets.server.NetDataList; +import mcp.mobius.opis.network.packets.server.NetDataValue; import mcp.mobius.opis.network.packets.server.Packet_DataOverlayChunkEntities_OLD; -import mcp.mobius.opis.network.packets.server.NetDataValue_OLD; import mcp.mobius.opis.network.packets.server.Packet_Tickets_OLD; import mcp.mobius.opis.swing.SelectedTab; @@ -65,56 +65,56 @@ public class ServerMessageHandler { else if (maintype == Message.OVERLAY_CHUNK_TIMING){ ArrayList timingChunks = ChunkManager.INSTANCE.getTopChunks(100); - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_CHUNK, timingChunks), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_TIMING_CHUNK, timingChunks), player); } else if (maintype == Message.LIST_CHUNK_TILEENTS){ - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_CHUNK_TILEENTS, TileEntityManager.INSTANCE.getTileEntitiesInChunk((CoordinatesChunk)param1)), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_CHUNK_TILEENTS, TileEntityManager.INSTANCE.getTileEntitiesInChunk((CoordinatesChunk)param1)), player); } else if (maintype == Message.LIST_CHUNK_ENTITIES){ - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_CHUNK_ENTITIES, EntityManager.INSTANCE.getEntitiesInChunk((CoordinatesChunk)param1)), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_CHUNK_ENTITIES, EntityManager.INSTANCE.getEntitiesInChunk((CoordinatesChunk)param1)), player); } else if (maintype == Message.LIST_CHUNK_LOADED){ PlayerTracker.INSTANCE.playerOverlayStatus.put(player, OverlayStatus.CHUNKSTATUS); PlayerTracker.INSTANCE.playerDimension.put(player, ((SerialInt)param1).value); - OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.LIST_CHUNK_LOADED_CLEAR), player); - OpisPacketHandler_OLD.splitAndSend(Message.LIST_CHUNK_LOADED, ChunkManager.INSTANCE.getLoadedChunks(((SerialInt)param1).value), player); + PacketManager.validateAndSend(new NetDataCommand(Message.LIST_CHUNK_LOADED_CLEAR), player); + PacketManager.splitAndSend(Message.LIST_CHUNK_LOADED, ChunkManager.INSTANCE.getLoadedChunks(((SerialInt)param1).value), player); } else if (maintype == Message.LIST_CHUNK_TICKETS){ - PacketManager.sendToPlayer(Packet_Tickets_OLD.create(ChunkManager.INSTANCE.getTickets()), player); + PacketManager.sendToPlayer(new Packet_Tickets(ChunkManager.INSTANCE.getTickets()), player); } else if (maintype == Message.LIST_TIMING_TILEENTS){ ArrayList timingTileEnts = TileEntityManager.INSTANCE.getWorses(100); DataTiming totalTime = TileEntityManager.INSTANCE.getTotalUpdateTime(); - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create (Message.LIST_TIMING_TILEENTS, timingTileEnts), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.VALUE_TIMING_TILEENTS, totalTime), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_TIMING_TILEENTS, timingTileEnts), player); + PacketManager.validateAndSend(new NetDataValue(Message.VALUE_TIMING_TILEENTS, totalTime), player); } else if (maintype == Message.LIST_TIMING_ENTITIES){ ArrayList timingEntities = EntityManager.INSTANCE.getWorses(100); DataTiming totalTime = EntityManager.INSTANCE.getTotalUpdateTime(); - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_ENTITIES, timingEntities), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.VALUE_TIMING_ENTITIES, totalTime), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_TIMING_ENTITIES, timingEntities), player); + PacketManager.validateAndSend(new NetDataValue(Message.VALUE_TIMING_ENTITIES, totalTime), player); } else if (maintype == Message.LIST_TIMING_HANDLERS){ - ArrayList timingHandlers = TickHandlerManager.getCumulatedStatsServer(); - DataTiming totalTime = TickHandlerManager.getTotalUpdateTime(); - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_HANDLERS, timingHandlers), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.VALUE_TIMING_HANDLERS, totalTime), player); + //ArrayList timingHandlers = TickHandlerManager.getCumulatedStatsServer(); + //DataTiming totalTime = TickHandlerManager.getTotalUpdateTime(); + //OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_HANDLERS, timingHandlers), player); + //OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.VALUE_TIMING_HANDLERS, totalTime), player); } else if (maintype == Message.LIST_TIMING_CHUNK){ ArrayList timingChunks = ChunkManager.INSTANCE.getTopChunks(100); - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_CHUNK, timingChunks), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_TIMING_CHUNK, timingChunks), player); } else if (maintype == Message.VALUE_TIMING_WORLDTICK){ - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.VALUE_TIMING_WORLDTICK, new DataBlockTick().fill()), player); + PacketManager.validateAndSend(new NetDataValue(Message.VALUE_TIMING_WORLDTICK, new DataBlockTick().fill()), player); } else if (maintype == Message.VALUE_TIMING_ENTUPDATE){ @@ -126,11 +126,11 @@ public class ServerMessageHandler { filtered = PlayerTracker.INSTANCE.filteredAmount.get(name); ArrayList ents = EntityManager.INSTANCE.getCumulativeEntities(filtered); - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_AMOUNT_ENTITIES, ents), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_AMOUNT_ENTITIES, ents), player); } else if (maintype == Message.LIST_AMOUNT_TILEENTS){ - OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_AMOUNT_TILEENTS, TileEntityManager.INSTANCE.getCumulativeAmountTileEntities()), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_AMOUNT_TILEENTS, TileEntityManager.INSTANCE.getCumulativeAmountTileEntities()), player); } else if (maintype == Message.COMMAND_FILTERING_TRUE){ @@ -150,12 +150,12 @@ public class ServerMessageHandler { MetaManager.reset(); modOpis.profilerRun = true; ProfilerSection.activateAll(Side.SERVER); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.STATUS_START, new SerialInt(modOpis.profilerMaxTicks))); + PacketManager.sendPacketToAllSwing(new NetDataValue(Message.STATUS_START, new SerialInt(modOpis.profilerMaxTicks))); } else if (maintype == Message.COMMAND_TELEPORT_BLOCK){ EntityManager.INSTANCE.teleportPlayer((CoordinatesBlock)param1, (EntityPlayerMP)player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.CLIENT_HIGHLIGHT_BLOCK, param1), player); + PacketManager.validateAndSend(new NetDataValue(Message.CLIENT_HIGHLIGHT_BLOCK, param1), player); } else if (maintype == Message.COMMAND_TELEPORT_TO_ENTITY){ @@ -187,7 +187,7 @@ public class ServerMessageHandler { } else if(maintype == Message.STATUS_TIME_LAST_RUN){ - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_TIME_LAST_RUN, new SerialLong(ProfilerSection.timeStampLastRun)), player); + PacketManager.validateAndSend(new NetDataValue(Message.STATUS_TIME_LAST_RUN, new SerialLong(ProfilerSection.timeStampLastRun)), player); } else if(maintype == Message.COMMAND_KILL_HOSTILES_ALL){ @@ -218,7 +218,7 @@ public class ServerMessageHandler { } else if(maintype == Message.STATUS_PING){ - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_PING, param1), player); + PacketManager.validateAndSend(new NetDataValue(Message.STATUS_PING, param1), player); } else if(maintype == Message.SWING_TAB_CHANGED){ @@ -227,8 +227,8 @@ public class ServerMessageHandler { } else if(maintype == Message.LIST_ORPHAN_TILEENTS){ - OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.LIST_ORPHAN_TILEENTS_CLEAR), player); - OpisPacketHandler_OLD.splitAndSend(Message.LIST_ORPHAN_TILEENTS, TileEntityManager.INSTANCE.getOrphans(), player); + PacketManager.validateAndSend(new NetDataCommand(Message.LIST_ORPHAN_TILEENTS_CLEAR), player); + PacketManager.splitAndSend(Message.LIST_ORPHAN_TILEENTS, TileEntityManager.INSTANCE.getOrphans(), player); } else{ diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand.java b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand.java new file mode 100644 index 0000000..ddf414a --- /dev/null +++ b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand.java @@ -0,0 +1,38 @@ +package mcp.mobius.opis.network.packets.server; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import mcp.mobius.opis.api.MessageHandlerRegistrar; +import mcp.mobius.opis.network.PacketBase; +import mcp.mobius.opis.network.enums.Message; + +public class NetDataCommand extends PacketBase { + + public NetDataCommand(){}; + + public NetDataCommand(Message msg){ + this.msg = msg; + }; + + @Override + public void encode(ByteArrayDataOutput output) { + output.writeInt(this.msg.ordinal()); + } + + @Override + public void decode(ByteArrayDataInput input) { + this.msg = Message.values()[input.readInt()]; + } + + @SideOnly(Side.CLIENT) + public void actionClient(World world, EntityPlayer player){ + MessageHandlerRegistrar.INSTANCE.routeMessage(this.msg, this); + } + +} diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand_OLD.java b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand_OLD.java deleted file mode 100644 index ca1ea29..0000000 --- a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand_OLD.java +++ /dev/null @@ -1,47 +0,0 @@ -package mcp.mobius.opis.network.packets.server; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.enums.Packets; - -public class NetDataCommand_OLD extends NetDataRaw_OLD{ - - public NetDataCommand_OLD(){}; - - public NetDataCommand_OLD(Packet250CustomPayload packet) { - DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); - try{ - this.header = inputStream.readByte(); - this.msg = Message.values()[inputStream.readInt()]; - } catch (IOException e){} - - } - - public static NetDataCommand_OLD create(Message msg){ - Packet250CustomPayload packet = new Packet250CustomPayload(); - ByteArrayOutputStream bos = new ByteArrayOutputStream(1); - DataOutputStream outputStream = new DataOutputStream(bos); - - try{ - outputStream.writeByte(Packets.NETDATACOMMAND); - outputStream.writeInt(msg.ordinal()); - }catch(IOException e){} - - packet.channel = "Opis"; - packet.data = bos.toByteArray(); - packet.length = bos.size(); - - NetDataCommand_OLD capsule = new NetDataCommand_OLD(); - capsule.msg = msg; - capsule.header = Packets.NETDATACOMMAND; - capsule.packet = packet; - - return capsule; - } - -} diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataList.java b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataList.java new file mode 100644 index 0000000..2da35dc --- /dev/null +++ b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataList.java @@ -0,0 +1,62 @@ +package mcp.mobius.opis.network.packets.server; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import mcp.mobius.opis.api.MessageHandlerRegistrar; +import mcp.mobius.opis.data.holders.DataType; +import mcp.mobius.opis.data.holders.ISerializable; +import mcp.mobius.opis.network.PacketBase; +import mcp.mobius.opis.network.enums.Message; + +public class NetDataList extends PacketBase { + + public NetDataList(){} + + public NetDataList(Message msg, List data) { + this.msg = msg; + this.array = (ArrayList) data; + } + + @Override + public void encode(ByteArrayDataOutput output) { + output.writeInt(this.msg.ordinal()); + output.writeInt(this.array.size()); + + if (this.array.size() > 0) + //Packet.writeString(data.get(0).getClass().getCanonicalName(), ostream); + output.writeInt(DataType.getForClass(this.array.get(0).getClass()).ordinal()); + + for (ISerializable odata : this.array) + odata.writeToStream(output); + } + + @Override + public void decode(ByteArrayDataInput input) { + this.msg = Message.values()[input.readInt()]; + int ndata = input.readInt(); + this.clazzStr = ""; + if (ndata > 0){ + this.clazz = DataType.getForOrdinal(input.readInt()); + } + + this.array = new ArrayList(); + + for (int i = 0; i < ndata; i++) + this.array.add(dataRead(this.clazz, input)); + } + + @SideOnly(Side.CLIENT) + public void actionClient(World world, EntityPlayer player){ + MessageHandlerRegistrar.INSTANCE.routeMessage(this.msg, this); + } + +} diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataList_OLD.java b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataList_OLD.java deleted file mode 100644 index 3dcc165..0000000 --- a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataList_OLD.java +++ /dev/null @@ -1,95 +0,0 @@ -package mcp.mobius.opis.network.packets.server; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - -import mcp.mobius.opis.data.holders.DataType; -import mcp.mobius.opis.data.holders.ISerializable; -import mcp.mobius.opis.data.holders.basetypes.AmountHolder; -import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.enums.Packets; - -public class NetDataList_OLD extends NetDataRaw_OLD{ - - //public ArrayList data = new ArrayList(); - - public NetDataList_OLD() {} - - public NetDataList_OLD(Packet250CustomPayload packet) { - DataInputStream istream = new DataInputStream(new ByteArrayInputStream(packet.data)); - - try{ - this.header = istream.readByte(); - this.msg = Message.values()[istream.readInt()]; - int ndata = istream.readInt(); - this.clazzStr = ""; - if (ndata > 0){ - //this.clazzStr = Packet.readString(istream, 255); - //this.clazz = this.getClass(this.clazzStr); - this.clazz = DataType.getForOrdinal(istream.readInt()); - } - - this.array = new ArrayList(); - - for (int i = 0; i < ndata; i++) - this.array.add(dataRead(this.clazz, istream)); - } catch (IOException e){} - } - - /* - public static Packet_DataList create(Message msg){ - ArrayList list = new ArrayList(); - return create(msg, list); - } - - public static Packet_DataList create(Message msg, ISerializable data){ - ArrayList list = new ArrayList(); - list.add(data); - return create(msg, list); - } - */ - - //public static Packet250Metadata create(DataReq dataReq, ArrayList stats){ - public static NetDataList_OLD create(Message msg, List data){ - //Packet250Metadata packet = new Packet250Metadata(); - Packet250CustomPayload packet = new Packet250CustomPayload(); - ByteArrayOutputStream bos = new ByteArrayOutputStream(1); - DataOutputStream ostream = new DataOutputStream(bos); - - try{ - ostream.writeByte(Packets.NETDATALIST); - ostream.writeInt(msg.ordinal()); - ostream.writeInt(data.size()); - - if (data.size() > 0) - //Packet.writeString(data.get(0).getClass().getCanonicalName(), ostream); - ostream.writeInt(DataType.getForClass(data.get(0).getClass()).ordinal()); - - for (ISerializable odata : data) - odata.writeToStream(ostream); - }catch(IOException e){} - - //packet.dataReq = dataReq; - //packet.dataList = stats; - - packet.channel = "Opis"; - packet.data = bos.toByteArray(); - packet.length = bos.size(); - - NetDataList_OLD capsule = new NetDataList_OLD(); - capsule.msg = msg; - capsule.header = Packets.NETDATAVALUE; - capsule.packet = packet; - - return capsule; - } - - - -} diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataRaw_OLD.java b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataRaw_OLD.java deleted file mode 100644 index 343d1aa..0000000 --- a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataRaw_OLD.java +++ /dev/null @@ -1,41 +0,0 @@ -package mcp.mobius.opis.network.packets.server; - -import java.io.DataInputStream; -import java.lang.reflect.Method; -import java.util.ArrayList; - -import mcp.mobius.opis.data.holders.ISerializable; -import mcp.mobius.opis.data.holders.newtypes.DataError; -import mcp.mobius.opis.network.enums.Message; - -public class NetDataRaw_OLD { - - public byte header; - public Message msg; - public String clazzStr; - public Class clazz; - public Packet250CustomPayload packet; - public ArrayList array = null; - public ISerializable value = null; - - protected Class getClass(String datatypeStr){ - try{ - return Class.forName(datatypeStr); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - protected ISerializable dataRead(Class datatype, DataInputStream istream){ - if (datatype == null) return new DataError(); - - try{ - Method readFromStream = datatype.getMethod("readFromStream", DataInputStream.class); - - return (ISerializable)readFromStream.invoke(null, istream); - - } catch (Exception e) { - throw new RuntimeException(e); - } - } -} diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue.java b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue.java new file mode 100644 index 0000000..6e89a70 --- /dev/null +++ b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue.java @@ -0,0 +1,50 @@ +package mcp.mobius.opis.network.packets.server; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import mcp.mobius.opis.api.MessageHandlerRegistrar; +import mcp.mobius.opis.data.holders.DataType; +import mcp.mobius.opis.data.holders.ISerializable; +import mcp.mobius.opis.network.PacketBase; +import mcp.mobius.opis.network.enums.Message; +import mcp.mobius.opis.network.enums.Packets; + +public class NetDataValue extends PacketBase { + + public NetDataValue(){} + + public NetDataValue(Message msg, ISerializable data) { + this.msg = msg; + this.value = data; + } + + @Override + public void encode(ByteArrayDataOutput output) { + output.writeInt(this.msg.ordinal()); + output.writeInt(DataType.getForClass(this.value.getClass()).ordinal()); + this.value.writeToStream(output); + } + + @Override + public void decode(ByteArrayDataInput input) { + this.msg = Message.values()[input.readInt()]; + this.clazz = DataType.getForOrdinal(input.readInt()); + this.value = dataRead(this.clazz, input); + + } + + @SideOnly(Side.CLIENT) + public void actionClient(World world, EntityPlayer player){ + MessageHandlerRegistrar.INSTANCE.routeMessage(this.msg, this); + } + +} diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue_OLD.java b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue_OLD.java deleted file mode 100644 index edc4684..0000000 --- a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue_OLD.java +++ /dev/null @@ -1,62 +0,0 @@ -package mcp.mobius.opis.network.packets.server; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.lang.reflect.Method; -import mcp.mobius.opis.data.holders.DataType; -import mcp.mobius.opis.data.holders.ISerializable; -import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.enums.Packets; - -public class NetDataValue_OLD extends NetDataRaw_OLD{ - - public NetDataValue_OLD(){}; - - public NetDataValue_OLD(Packet250CustomPayload packet) { - DataInputStream istream = new DataInputStream(new ByteArrayInputStream(packet.data)); - - try{ - this.header = istream.readByte(); - this.msg = Message.values()[istream.readInt()]; - //this.clazzStr = Packet.readString(istream, 255); - //this.clazz = this.getClass(this.clazzStr); - this.clazz = DataType.getForOrdinal(istream.readInt()); - this.value = dataRead(this.clazz, istream); - - } catch (IOException e){} - } - - //public static Packet250Metadata create(DataReq dataReq, ISerializable data){ - public static NetDataValue_OLD create(Message dataReq, ISerializable data){ - //Packet250Metadata packet = new Packet250Metadata(); - Packet250CustomPayload packet = new Packet250CustomPayload(); - ByteArrayOutputStream bos = new ByteArrayOutputStream(1); - DataOutputStream ostream = new DataOutputStream(bos); - - try{ - ostream.writeByte(Packets.NETDATAVALUE); - ostream.writeInt(dataReq.ordinal()); - ostream.writeInt(DataType.getForClass(data.getClass()).ordinal()); - //Packet.writeString(data.getClass().getCanonicalName(), ostream); - data.writeToStream(ostream); - - }catch(IOException e){} - - //packet.dataReq = dataReq; - //packet.dataValue = data; - - packet.channel = "Opis"; - packet.data = bos.toByteArray(); - packet.length = bos.size(); - - NetDataValue_OLD capsule = new NetDataValue_OLD(); - capsule.msg = dataReq; - capsule.header = Packets.NETDATAVALUE; - capsule.packet = packet; - - return capsule; - } -} diff --git a/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java b/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java index bd88d8e..ec476bd 100644 --- a/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java +++ b/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java @@ -29,8 +29,8 @@ import mcp.mobius.opis.gui.overlay.OverlayLoadedChunks; import mcp.mobius.opis.gui.overlay.OverlayMeanTime; import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk; import mcp.mobius.opis.gui.screens.ScreenBase; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SwingUI; import mcp.mobius.opis.swing.panels.PanelSummary; import mcp.mobius.opis.swing.panels.debug.PanelOrphanTileEntities; @@ -207,7 +207,7 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{ } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case CLIENT_CLEAR_SELECTION:{ modOpis.selectedBlock = null; @@ -222,10 +222,10 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{ } case CLIENT_SHOW_RENDER_TICK:{ modOpis.log.log(Level.INFO, "=== RENDER TICK ==="); - ArrayList stats = TickHandlerManager.getCumulatedStatsServer(); - for (DataHandler stat : stats){ - System.out.printf("%s \n", stat); - } + //ArrayList stats = TickHandlerManager.getCumulatedStatsServer(); + //for (DataHandler stat : stats){ + // System.out.printf("%s \n", stat); + //} break; } default: diff --git a/src/main/java/mcp/mobius/opis/proxy/ProxyServer.java b/src/main/java/mcp/mobius/opis/proxy/ProxyServer.java index a8f2804..d1dba45 100644 --- a/src/main/java/mcp/mobius/opis/proxy/ProxyServer.java +++ b/src/main/java/mcp/mobius/opis/proxy/ProxyServer.java @@ -5,15 +5,15 @@ import java.util.HashMap; import mcp.mobius.opis.api.IMessageHandler; import mcp.mobius.opis.gui.overlay.OverlayStatus; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; public class ProxyServer implements IMessageHandler{ public void init(){} @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { return false; } } diff --git a/src/main/java/mcp/mobius/opis/swing/SwingUI.java b/src/main/java/mcp/mobius/opis/swing/SwingUI.java index 094dd0b..a4ab065 100644 --- a/src/main/java/mcp/mobius/opis/swing/SwingUI.java +++ b/src/main/java/mcp/mobius/opis/swing/SwingUI.java @@ -28,11 +28,11 @@ import mcp.mobius.opis.api.IMessageHandler; import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.api.TabPanelRegistrar; import mcp.mobius.opis.data.holders.basetypes.SerialInt; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.PacketReqData; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.panels.PanelSummary; import mcp.mobius.opis.swing.panels.timingserver.PanelTimingChunks; import mcp.mobius.opis.swing.panels.timingserver.PanelTimingEntities; @@ -119,7 +119,7 @@ public class SwingUI extends JFrame implements WindowListener, ChangeListener, I } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case STATUS_ACCESS_LEVEL:{ AccessLevel level = AccessLevel.values()[((SerialInt)rawdata.value).value]; diff --git a/src/main/java/mcp/mobius/opis/swing/panels/PanelSummary.java b/src/main/java/mcp/mobius/opis/swing/panels/PanelSummary.java index 8f5ea99..3633547 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/PanelSummary.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/PanelSummary.java @@ -20,9 +20,9 @@ import mcp.mobius.opis.data.holders.newtypes.DataNetworkTick; import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntity; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.holders.newtypes.DataTimingMillisecond; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionRunOpis; import mcp.mobius.opis.swing.widgets.JButtonAccess; @@ -331,7 +331,7 @@ public class PanelSummary extends JPanelMsgHandler implements ITabPanel{ } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case VALUE_AMOUNT_TILEENTS:{ this.getLblAmountTileEnts().setText(String.valueOf(((SerialInt)rawdata.value).value)); diff --git a/src/main/java/mcp/mobius/opis/swing/panels/debug/PanelOrphanTileEntities.java b/src/main/java/mcp/mobius/opis/swing/panels/debug/PanelOrphanTileEntities.java index 4aa9ce1..25ab342 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/debug/PanelOrphanTileEntities.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/debug/PanelOrphanTileEntities.java @@ -3,9 +3,9 @@ package mcp.mobius.opis.swing.panels.debug; import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.data.holders.newtypes.CachedString; import mcp.mobius.opis.data.holders.newtypes.DataTileEntity; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionOrphanTileEntities; import mcp.mobius.opis.swing.widgets.JButtonAccess; @@ -43,7 +43,7 @@ public class PanelOrphanTileEntities extends JPanelMsgHandler implements ITabPan int row; @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_ORPHAN_TILEENTS:{ diff --git a/src/main/java/mcp/mobius/opis/swing/panels/debug/PanelThreads.java b/src/main/java/mcp/mobius/opis/swing/panels/debug/PanelThreads.java index f01fcfd..d25a43e 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/debug/PanelThreads.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/debug/PanelThreads.java @@ -4,8 +4,8 @@ import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.data.holders.newtypes.CachedString; import mcp.mobius.opis.data.holders.newtypes.DataThread; import mcp.mobius.opis.data.holders.newtypes.DataTileEntity; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionOrphanTileEntities; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; @@ -35,7 +35,7 @@ public class PanelThreads extends JPanelMsgHandler implements ITabPanel { } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_THREADS:{ diff --git a/src/main/java/mcp/mobius/opis/swing/panels/network/PanelInbound.java b/src/main/java/mcp/mobius/opis/swing/panels/network/PanelInbound.java index db80c5f..d2e1827 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/network/PanelInbound.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/network/PanelInbound.java @@ -10,8 +10,8 @@ import mcp.mobius.opis.data.holders.newtypes.DataAmountRate; import mcp.mobius.opis.data.holders.newtypes.DataByteRate; import mcp.mobius.opis.data.holders.newtypes.DataByteSize; import mcp.mobius.opis.data.holders.newtypes.DataPacket; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -37,7 +37,7 @@ public class PanelInbound extends JPanelMsgHandler implements ITabPanel { } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_PACKETS_INBOUND:{ diff --git a/src/main/java/mcp/mobius/opis/swing/panels/network/PanelInbound250.java b/src/main/java/mcp/mobius/opis/swing/panels/network/PanelInbound250.java index 8818858..a0e6b53 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/network/PanelInbound250.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/network/PanelInbound250.java @@ -12,8 +12,8 @@ import mcp.mobius.opis.data.holders.newtypes.DataByteRate; import mcp.mobius.opis.data.holders.newtypes.DataByteSize; import mcp.mobius.opis.data.holders.newtypes.DataPacket; import mcp.mobius.opis.data.holders.newtypes.DataPacket250; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -39,7 +39,7 @@ public class PanelInbound250 extends JPanelMsgHandler implements ITabPanel { } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_PACKETS_INBOUND_250:{ diff --git a/src/main/java/mcp/mobius/opis/swing/panels/network/PanelOutbound.java b/src/main/java/mcp/mobius/opis/swing/panels/network/PanelOutbound.java index ccc21b2..163d476 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/network/PanelOutbound.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/network/PanelOutbound.java @@ -10,8 +10,8 @@ import mcp.mobius.opis.data.holders.newtypes.DataAmountRate; import mcp.mobius.opis.data.holders.newtypes.DataByteRate; import mcp.mobius.opis.data.holders.newtypes.DataByteSize; import mcp.mobius.opis.data.holders.newtypes.DataPacket; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -38,7 +38,7 @@ public class PanelOutbound extends JPanelMsgHandler implements ITabPanel { } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_PACKETS_OUTBOUND:{ diff --git a/src/main/java/mcp/mobius/opis/swing/panels/network/PanelOutbound250.java b/src/main/java/mcp/mobius/opis/swing/panels/network/PanelOutbound250.java index 8bd7fc6..15dee03 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/network/PanelOutbound250.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/network/PanelOutbound250.java @@ -11,8 +11,8 @@ import mcp.mobius.opis.data.holders.newtypes.DataAmountRate; import mcp.mobius.opis.data.holders.newtypes.DataByteRate; import mcp.mobius.opis.data.holders.newtypes.DataByteSize; import mcp.mobius.opis.data.holders.newtypes.DataPacket250; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -39,7 +39,7 @@ public class PanelOutbound250 extends JPanelMsgHandler implements ITabPanel { } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_PACKETS_OUTBOUND_250:{ diff --git a/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelEventClient.java b/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelEventClient.java index f90794c..da86553 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelEventClient.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelEventClient.java @@ -20,8 +20,8 @@ import mcp.mobius.opis.data.holders.newtypes.DataEntityRender; import mcp.mobius.opis.data.holders.newtypes.DataEvent; import mcp.mobius.opis.data.holders.newtypes.DataHandler; import mcp.mobius.opis.data.holders.newtypes.DataTiming; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionRunOpisClient; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -94,7 +94,7 @@ public class PanelEventClient extends JPanel implements ITabPanel, IMessageHandl } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { // TODO Auto-generated method stub return false; } diff --git a/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelRenderEntities.java b/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelRenderEntities.java index ff62da4..0e8b319 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelRenderEntities.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelRenderEntities.java @@ -16,8 +16,8 @@ import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.data.holders.newtypes.CachedString; import mcp.mobius.opis.data.holders.newtypes.DataEntityRender; import mcp.mobius.opis.data.holders.newtypes.DataTiming; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionRunOpisClient; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -100,7 +100,7 @@ public class PanelRenderEntities extends JPanel implements ITabPanel, IMessageHa } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { // TODO Auto-generated method stub return false; } diff --git a/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelRenderHandlers.java b/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelRenderHandlers.java index d516762..582c4a2 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelRenderHandlers.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelRenderHandlers.java @@ -17,8 +17,8 @@ import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.data.holders.newtypes.DataEntityRender; import mcp.mobius.opis.data.holders.newtypes.DataHandler; import mcp.mobius.opis.data.holders.newtypes.DataTiming; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionRunOpisClient; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -89,7 +89,7 @@ public class PanelRenderHandlers extends JPanel implements ITabPanel, IMessageHa } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { // TODO Auto-generated method stub return false; } diff --git a/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelRenderTileEnts.java b/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelRenderTileEnts.java index 616f707..e442101 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelRenderTileEnts.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/timingclient/PanelRenderTileEnts.java @@ -8,12 +8,13 @@ import mcp.mobius.opis.api.IMessageHandler; import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.data.holders.newtypes.DataTileEntityRender; import mcp.mobius.opis.data.holders.newtypes.DataTiming; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionRunOpisClient; import mcp.mobius.opis.swing.widgets.JTableStats; import net.miginfocom.swing.MigLayout; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import javax.swing.JButton; @@ -63,7 +64,7 @@ public class PanelRenderTileEnts extends JPanel implements ITabPanel, IMessageHa String name = String.format("te.%d.%d", o.id, o.meta); try{ - is = new ItemStack(o.id, 1, o.meta); + is = new ItemStack(Block.getBlockById(o.id), 1, o.meta); name = is.getDisplayName(); } catch (Exception e) { } @@ -108,7 +109,7 @@ public class PanelRenderTileEnts extends JPanel implements ITabPanel, IMessageHa } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { // TODO Auto-generated method stub return false; } diff --git a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingChunks.java b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingChunks.java index 9ff1b44..a5a50b6 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingChunks.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingChunks.java @@ -7,9 +7,9 @@ import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.data.holders.stats.StatsChunk; import mcp.mobius.opis.gui.overlay.OverlayMeanTime; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionRunOpis; import mcp.mobius.opis.swing.actions.ActionTimingChunks; @@ -65,7 +65,7 @@ public class PanelTimingChunks extends JPanelMsgHandler implements ITabPanel{ public JButton getBtnCenter() {return btnCenter;} @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_TIMING_CHUNK:{ diff --git a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingEntities.java b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingEntities.java index 985d5ca..ab04eeb 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingEntities.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingEntities.java @@ -9,9 +9,9 @@ import mcp.mobius.opis.data.holders.newtypes.DataEntity; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionRunOpis; import mcp.mobius.opis.swing.actions.ActionTimingEntities; @@ -78,7 +78,7 @@ public class PanelTimingEntities extends JPanelMsgHandler implements ITabPanel{ public JLabel getLblSummary() {return lblSummary;} @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_TIMING_ENTITIES:{ diff --git a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingEntitiesPerClass.java b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingEntitiesPerClass.java index e673c47..05ca76d 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingEntitiesPerClass.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingEntitiesPerClass.java @@ -10,9 +10,9 @@ import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.data.holders.newtypes.CachedString; import mcp.mobius.opis.data.holders.newtypes.DataEntityPerClass; import mcp.mobius.opis.data.holders.newtypes.DataTiming; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionRunOpis; import mcp.mobius.opis.swing.widgets.JButtonAccess; @@ -41,7 +41,7 @@ public class PanelTimingEntitiesPerClass extends JPanelMsgHandler implements ITa } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_TIMING_ENTITIES_PER_CLASS:{ diff --git a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingEvents.java b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingEvents.java index 09428b0..afd2979 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingEvents.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingEvents.java @@ -5,9 +5,9 @@ import javax.swing.JPanel; import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.data.holders.newtypes.DataEvent; import mcp.mobius.opis.data.holders.newtypes.DataTiming; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionRunOpis; import mcp.mobius.opis.swing.widgets.JButtonAccess; @@ -43,7 +43,7 @@ public class PanelTimingEvents extends JPanelMsgHandler implements ITabPanel { } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_TIMING_EVENTS:{ diff --git a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingHandlers.java b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingHandlers.java index b4f33eb..25836cb 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingHandlers.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingHandlers.java @@ -9,9 +9,9 @@ import mcp.mobius.opis.data.holders.newtypes.CachedString; import mcp.mobius.opis.data.holders.newtypes.DataHandler; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.holders.stats.StatAbstract; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionRunOpis; import mcp.mobius.opis.swing.widgets.JButtonAccess; @@ -61,7 +61,7 @@ public class PanelTimingHandlers extends JPanelMsgHandler implements ITabPanel{ public JLabel getLblSummary(){return lblSummary;} @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_TIMING_HANDLERS:{ diff --git a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingTileEnts.java b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingTileEnts.java index 6698f42..eda3a9e 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingTileEnts.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingTileEnts.java @@ -12,9 +12,9 @@ import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.gui.overlay.OverlayMeanTime; import mcp.mobius.opis.helpers.ModIdentification; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionRunOpis; import mcp.mobius.opis.swing.actions.ActionTimingTileEnts; @@ -83,7 +83,7 @@ public class PanelTimingTileEnts extends JPanelMsgHandler implements ITabPanel{ public JLabel getLblSummary() {return lblSummary;} @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_TIMING_TILEENTS:{ diff --git a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingTileEntsPerClass.java b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingTileEntsPerClass.java index 2d305bd..dc4af59 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingTileEntsPerClass.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingTileEntsPerClass.java @@ -13,9 +13,9 @@ import mcp.mobius.opis.data.holders.newtypes.CachedString; import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntityPerClass; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.helpers.ModIdentification; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionRunOpis; import mcp.mobius.opis.swing.widgets.JButtonAccess; @@ -44,7 +44,7 @@ public class PanelTimingTileEntsPerClass extends JPanelMsgHandler implements ITa } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_TIMING_TILEENTS_PER_CLASS:{ diff --git a/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelAmountEntities.java b/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelAmountEntities.java index f2380c5..9aa8ed7 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelAmountEntities.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelAmountEntities.java @@ -7,9 +7,9 @@ import java.awt.event.ItemListener; import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.data.holders.basetypes.AmountHolder; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionAmountEntities; import mcp.mobius.opis.swing.widgets.JButtonAccess; @@ -70,7 +70,7 @@ public class PanelAmountEntities extends JPanelMsgHandler implements ITabPanel{ public JLabel getLblSummary() {return lblSummary;} @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_AMOUNT_ENTITIES:{ ((JTableStats)this.getTable()).setTableData(rawdata.array); diff --git a/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelAmountTileEnts.java b/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelAmountTileEnts.java index 5b81594..a13c787 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelAmountTileEnts.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelAmountTileEnts.java @@ -10,9 +10,9 @@ import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.data.holders.basetypes.AmountHolder; import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntityPerClass; import mcp.mobius.opis.helpers.ModIdentification; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionAmountEntities; import mcp.mobius.opis.swing.actions.ActionAmountTileEnts; @@ -59,7 +59,7 @@ public class PanelAmountTileEnts extends JPanelMsgHandler implements ITabPanel{ public JButton getBtnRefresh() {return btnRefresh;} @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_AMOUNT_TILEENTS:{ diff --git a/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelDimensions.java b/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelDimensions.java index d67aad4..a356d7d 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelDimensions.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelDimensions.java @@ -7,9 +7,9 @@ import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.data.holders.newtypes.DataDimension; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.holders.newtypes.DataTimingMillisecond; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionDimensions; import mcp.mobius.opis.swing.widgets.JButtonAccess; @@ -53,7 +53,7 @@ public class PanelDimensions extends JPanelMsgHandler implements IMessageHandler } @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_DIMENSION_DATA:{ ((JTableStats)this.getTable()).setTableData(rawdata.array); diff --git a/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelPlayers.java b/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelPlayers.java index 2204fd7..bbae456 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelPlayers.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelPlayers.java @@ -6,9 +6,9 @@ import java.awt.event.ActionListener; import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.data.holders.newtypes.DataEntity; import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionPlayers; import mcp.mobius.opis.swing.widgets.JButtonAccess; @@ -70,7 +70,7 @@ public class PanelPlayers extends JPanelMsgHandler implements ITabPanel{ public JButton getBtnPull() {return btnPull;} @Override - public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { + public boolean handleMessage(Message msg, PacketBase rawdata) { switch(msg){ case LIST_PLAYERS:{