diff --git a/src/main/java/mcp/mobius/opis/api/IMessageHandler.java b/src/main/java/mcp/mobius/opis/api/IMessageHandler.java index 096ac84..e59f823 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.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; public interface IMessageHandler { - public boolean handleMessage(Message msg, NetDataRaw rawdata); + public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata); } diff --git a/src/main/java/mcp/mobius/opis/api/MessageHandlerRegistrar.java b/src/main/java/mcp/mobius/opis/api/MessageHandlerRegistrar.java index 6235d7c..6f91862 100644 --- a/src/main/java/mcp/mobius/opis/api/MessageHandlerRegistrar.java +++ b/src/main/java/mcp/mobius/opis/api/MessageHandlerRegistrar.java @@ -6,7 +6,7 @@ import java.util.HashSet; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata){ + public void routeMessage(Message msg, NetDataRaw_OLD 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 d84d5b4..164b8df 100644 --- a/src/main/java/mcp/mobius/opis/commands/client/CommandClientShowRenderTick.java +++ b/src/main/java/mcp/mobius/opis/commands/client/CommandClientShowRenderTick.java @@ -3,7 +3,7 @@ package mcp.mobius.opis.commands.client; import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.network.OpisPacketHandler_OLD; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataCommand; +import mcp.mobius.opis.network.packets.server.NetDataCommand_OLD; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; @@ -23,7 +23,7 @@ public class CommandClientShowRenderTick extends CommandBase { @Override public void processCommand(ICommandSender icommandsender, String[] astring) { if (icommandsender instanceof Player) - OpisPacketHandler_OLD.validateAndSend(NetDataCommand.create(Message.CLIENT_SHOW_RENDER_TICK), (Player)icommandsender); + OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.CLIENT_SHOW_RENDER_TICK), (Player)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 89f5f20..e4b9d27 100644 --- a/src/main/java/mcp/mobius/opis/commands/client/CommandClientStart.java +++ b/src/main/java/mcp/mobius/opis/commands/client/CommandClientStart.java @@ -3,7 +3,7 @@ package mcp.mobius.opis.commands.client; import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.network.OpisPacketHandler_OLD; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataCommand; +import mcp.mobius.opis.network.packets.server.NetDataCommand_OLD; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; @@ -23,7 +23,7 @@ public class CommandClientStart extends CommandBase { @Override public void processCommand(ICommandSender icommandsender, String[] astring) { if (icommandsender instanceof Player) - OpisPacketHandler_OLD.validateAndSend(NetDataCommand.create(Message.CLIENT_START_PROFILING), (Player)icommandsender); + OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.CLIENT_START_PROFILING), (Player)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 6dbce9c..7930dd6 100644 --- a/src/main/java/mcp/mobius/opis/commands/client/CommandOpis.java +++ b/src/main/java/mcp/mobius/opis/commands/client/CommandOpis.java @@ -8,7 +8,7 @@ import mcp.mobius.opis.events.PlayerTracker; 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; +import mcp.mobius.opis.network.packets.server.NetDataCommand_OLD; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; @@ -42,7 +42,7 @@ public class CommandOpis extends CommandBase { PlayerTracker.instance().playersSwing.add((Player)icommandsender); //((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(NetDataCommand.create(Message.CLIENT_SHOW_SWING)); if (icommandsender instanceof Player) - OpisPacketHandler_OLD.validateAndSend(NetDataCommand.create(Message.CLIENT_SHOW_SWING), (Player)icommandsender); + OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.CLIENT_SHOW_SWING), (Player)icommandsender); OpisPacketHandler_OLD.sendFullUpdate((Player)icommandsender); } 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 c8b677a..40e850d 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandAmountEntities.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandAmountEntities.java @@ -10,7 +10,7 @@ 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; +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 4e00a6d..bd08d4d 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandChunkList.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandChunkList.java @@ -9,7 +9,7 @@ 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; +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 3934f00..046068f 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandHandler.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandHandler.java @@ -11,7 +11,7 @@ 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; +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; 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 7f7aea0..0bd4dd3 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java @@ -12,7 +12,7 @@ import mcp.mobius.opis.events.OpisServerTickHandler; 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.NetDataCommand; +import mcp.mobius.opis.network.packets.server.NetDataCommand_OLD; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; @@ -48,7 +48,7 @@ public class CommandReset extends CommandBase implements IOpisCommand { //PacketDispatcher.sendPacketToAllPlayers(NetDataCommand.create(Message.CLIENT_CLEAR_SELECTION)); if (icommandsender instanceof Player) - OpisPacketHandler_OLD.validateAndSend(NetDataCommand.create(Message.CLIENT_CLEAR_SELECTION), (Player)icommandsender); + OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.CLIENT_CLEAR_SELECTION), (Player)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 c66061a..f434f93 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandStart.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandStart.java @@ -14,7 +14,7 @@ import mcp.mobius.opis.events.OpisServerTickHandler; 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.NetDataValue; +import mcp.mobius.opis.network.packets.server.NetDataValue_OLD; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; @@ -54,7 +54,7 @@ public class CommandStart extends CommandBase implements IOpisCommand { modOpis.profilerRun = true; ProfilerSection.activateAll(Side.SERVER); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue.create(Message.STATUS_START, new SerialInt(modOpis.profilerMaxTicks))); + OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.STATUS_START, new SerialInt(modOpis.profilerMaxTicks))); icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(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 5056865..4d5da9d 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandTimingEntities.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandTimingEntities.java @@ -11,7 +11,7 @@ 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; +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 d0a907c..a4dbf28 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java @@ -9,7 +9,7 @@ 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; +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 f6cef70..3123b72 100644 --- a/src/main/java/mcp/mobius/opis/data/client/DataCache.java +++ b/src/main/java/mcp/mobius/opis/data/client/DataCache.java @@ -38,7 +38,7 @@ import mcp.mobius.opis.data.holders.stats.StatsChunk; import mcp.mobius.opis.helpers.ModIdentification; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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/managers/ChunkManager.java b/src/main/java/mcp/mobius/opis/data/managers/ChunkManager.java index ce484fa..ccab727 100644 --- a/src/main/java/mcp/mobius/opis/data/managers/ChunkManager.java +++ b/src/main/java/mcp/mobius/opis/data/managers/ChunkManager.java @@ -21,7 +21,7 @@ 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.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { switch(msg){ case LIST_TIMING_CHUNK:{ this.setChunkMeanTime(rawdata.array); 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 171a647..33b57f2 100644 --- a/src/main/java/mcp/mobius/opis/data/managers/StringCache.java +++ b/src/main/java/mcp/mobius/opis/data/managers/StringCache.java @@ -13,9 +13,9 @@ 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.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataList; -import mcp.mobius.opis.network.packets.server.NetDataRaw; -import mcp.mobius.opis.network.packets.server.NetDataValue; +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; public enum StringCache implements IMessageHandler { INSTANCE; @@ -51,7 +51,7 @@ public enum StringCache implements IMessageHandler { DataStringUpdate upd = new DataStringUpdate(str, currentIndex); this.toSend.add(upd); - PacketDispatcher.sendPacketToAllPlayers(NetDataValue.create(Message.STATUS_STRINGUPD, upd).packet); + PacketDispatcher.sendPacketToAllPlayers(NetDataValue_OLD.create(Message.STATUS_STRINGUPD, upd).packet); return currentIndex; } } @@ -63,7 +63,7 @@ public enum StringCache implements IMessageHandler { ArrayList toSendCopy = new ArrayList(toSend); while (i < toSendCopy.size()){ - PacketDispatcher.sendPacketToPlayer(NetDataList.create(Message.STATUS_STRINGUPD_FULL, toSendCopy.subList(i, Math.min(i + 50, toSendCopy.size()))).packet, player); + PacketDispatcher.sendPacketToPlayer(NetDataList_OLD.create(Message.STATUS_STRINGUPD_FULL, toSendCopy.subList(i, Math.min(i + 50, toSendCopy.size()))).packet, player); i += 50; } @@ -71,7 +71,7 @@ public enum StringCache implements IMessageHandler { } @Override - public boolean handleMessage(Message msg, NetDataRaw rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { switch(msg){ case STATUS_STRINGUPD:{ DataStringUpdate data = (DataStringUpdate)rawdata.value; diff --git a/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java b/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java index 7c33692..81b63f6 100644 --- a/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java +++ b/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java @@ -40,9 +40,9 @@ import mcp.mobius.opis.gui.overlay.OverlayStatus; import mcp.mobius.opis.network.OpisPacketHandler_OLD; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -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.NetDataCommand_OLD; +import mcp.mobius.opis.network.packets.server.NetDataList_OLD; +import mcp.mobius.opis.network.packets.server.NetDataValue_OLD; import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.network.PacketDispatcher; @@ -84,17 +84,17 @@ public enum OpisServerTickHandler implements ITickHandler { // One second timer if (timer1000.isDone()){ - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_UPLOAD, new SerialLong(((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).dataAmount))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_DOWNLOAD, new SerialLong(((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).dataAmount))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_FORCED, new SerialInt(ChunkManager.INSTANCE.getForcedChunkAmount()))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_LOADED, new SerialInt(ChunkManager.INSTANCE.getLoadedChunkAmount()))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_TIMING_TICK, new DataTiming(((ProfilerTick)ProfilerSection.TICK.getProfiler()).data.getGeometricMean()))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_TILEENTS, new SerialInt(TileEntityManager.INSTANCE.getAmountTileEntities()))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_ENTITIES, new SerialInt(EntityManager.INSTANCE.getAmountEntities()))); + 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()))); for (Player player : PlayerTracker.instance().playersSwing){ if (!cachedAccess.containsKey(player) || cachedAccess.get(player) != PlayerTracker.instance().getPlayerAccessLevel(player)){ - OpisPacketHandler_OLD.validateAndSend(NetDataValue.create(Message.STATUS_ACCESS_LEVEL, new SerialInt(PlayerTracker.instance().getPlayerAccessLevel(player).ordinal())), player); + OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_ACCESS_LEVEL, new SerialInt(PlayerTracker.instance().getPlayerAccessLevel(player).ordinal())), player); cachedAccess.put(player, PlayerTracker.instance().getPlayerAccessLevel(player)); } } @@ -103,19 +103,19 @@ public enum OpisServerTickHandler implements ITickHandler { for (Thread t : Thread.getAllStackTraces().keySet()){ threads.add(new DataThread().fill(t)); } - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList.create(Message.LIST_THREADS, threads)); + OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList_OLD.create(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.create(Message.LIST_DIMENSION_DATA, dimData)); + OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList_OLD.create(Message.LIST_DIMENSION_DATA, dimData)); // Profiler update (if running) if (modOpis.profilerRun){ - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue.create(Message.STATUS_RUNNING, new SerialInt(modOpis.profilerMaxTicks))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue.create(Message.STATUS_RUN_UPDATE, new SerialInt(profilerRunningTicks))); + 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))); } ((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).dataAmount = 0L; @@ -124,18 +124,18 @@ public enum OpisServerTickHandler implements ITickHandler { // Two second timer if (timer2000.isDone()){ - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList.create(Message.LIST_PLAYERS, EntityManager.INSTANCE.getAllPlayers())); + OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList_OLD.create(Message.LIST_PLAYERS, EntityManager.INSTANCE.getAllPlayers())); } // Five second timer if (timer5000.isDone()){ updatePlayers(); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList.create(Message.LIST_PACKETS_OUTBOUND, ((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).data)); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList.create(Message.LIST_PACKETS_INBOUND, ((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).data)); + 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)); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList.create(Message.LIST_PACKETS_OUTBOUND_250, new ArrayList( ((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).data250.values()))); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataList.create(Message.LIST_PACKETS_INBOUND_250, new ArrayList( ((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).data250.values()))); + 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()))); ((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).startInterval(); ((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).startInterval(); @@ -156,7 +156,7 @@ public enum OpisServerTickHandler implements ITickHandler { modOpis.profilerRun = false; ProfilerSection.desactivateAll(Side.SERVER); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue.create(Message.STATUS_STOP, new SerialInt(modOpis.profilerMaxTicks))); + OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.STATUS_STOP, new SerialInt(modOpis.profilerMaxTicks))); for (Player player : PlayerTracker.instance().playersSwing){ OpisPacketHandler_OLD.sendFullUpdate(player); @@ -182,14 +182,14 @@ public enum OpisServerTickHandler implements ITickHandler { for (Player player : PlayerTracker.instance().playerOverlayStatus.keySet()){ if (PlayerTracker.instance().playerOverlayStatus.get(player) == OverlayStatus.CHUNKSTATUS){ - OpisPacketHandler_OLD.validateAndSend(NetDataCommand.create(Message.LIST_CHUNK_LOADED_CLEAR), player); + 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); } 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.create(Message.LIST_TIMING_CHUNK, timingChunks), player); + OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_CHUNK, timingChunks), player); } } } 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 818fb7c..db4d61f 100644 --- a/src/main/java/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java +++ b/src/main/java/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java @@ -38,7 +38,7 @@ import mcp.mobius.opis.gui.widgets.tableview.ViewTable; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqChunks; import mcp.mobius.opis.network.packets.client.Packet_ReqData; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{ @@ -336,7 +336,7 @@ public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{ } @Override - public boolean handleMessage(Message msg, NetDataRaw rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 69338f6..257b02c 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 @@ -32,7 +32,7 @@ import mcp.mobius.opis.gui.widgets.tableview.ViewTable; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqChunks; import mcp.mobius.opis.network.packets.client.Packet_ReqData; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler { @@ -289,7 +289,7 @@ public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler { } @Override - public boolean handleMessage(Message msg, NetDataRaw rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { switch(msg){ case LIST_CHUNK_ENTITIES:{ this.setEntStats(rawdata.array); diff --git a/src/main/java/mcp/mobius/opis/modOpis.java b/src/main/java/mcp/mobius/opis/modOpis.java index db32df4..431915f 100644 --- a/src/main/java/mcp/mobius/opis/modOpis.java +++ b/src/main/java/mcp/mobius/opis/modOpis.java @@ -52,7 +52,6 @@ import mcp.mobius.opis.network.OpisConnectionHandler; import mcp.mobius.opis.network.OpisPacketHandler_OLD; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.custom.Packet251Extended; import mcp.mobius.opis.proxy.ProxyServer; import mcp.mobius.opis.tools.BlockDebug; import mcp.mobius.opis.tools.BlockLag; diff --git a/src/main/java/mcp/mobius/opis/network/OpisConnectionHandler.java b/src/main/java/mcp/mobius/opis/network/OpisConnectionHandler.java index 558d011..0ac5613 100644 --- a/src/main/java/mcp/mobius/opis/network/OpisConnectionHandler.java +++ b/src/main/java/mcp/mobius/opis/network/OpisConnectionHandler.java @@ -4,22 +4,15 @@ import mcp.mobius.opis.data.holders.basetypes.SerialLong; import mcp.mobius.opis.data.managers.StringCache; import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataValue; +import mcp.mobius.opis.network.packets.server.NetDataValue_OLD; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.network.INetworkManager; -import net.minecraft.network.MemoryConnection; -import net.minecraft.network.NetLoginHandler; -import net.minecraft.network.packet.NetHandler; -import net.minecraft.network.packet.Packet1Login; import net.minecraft.server.MinecraftServer; -import cpw.mods.fml.common.network.IConnectionHandler; -import cpw.mods.fml.common.network.Player; public class OpisConnectionHandler implements IConnectionHandler { @Override public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager) { - OpisPacketHandler_OLD.validateAndSend(NetDataValue.create(Message.STATUS_CURRENT_TIME, new SerialLong(System.currentTimeMillis())), player); + OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_CURRENT_TIME, new SerialLong(System.currentTimeMillis())), player); if (manager instanceof MemoryConnection){ System.out.printf("Adding SSP player to list of privileged users\n"); 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 925045d..597b63c 100644 --- a/src/main/java/mcp/mobius/opis/network/OpisPacketHandler_OLD.java +++ b/src/main/java/mcp/mobius/opis/network/OpisPacketHandler_OLD.java @@ -52,13 +52,13 @@ import mcp.mobius.opis.network.enums.Packets; import mcp.mobius.opis.network.packets.client.Packet_ReqChunks; import mcp.mobius.opis.network.packets.client.Packet_ReqData; import mcp.mobius.opis.network.packets.custom.Packet250Metadata; -import mcp.mobius.opis.network.packets.server.Packet_Chunks; -import mcp.mobius.opis.network.packets.server.NetDataCommand; -import mcp.mobius.opis.network.packets.server.NetDataRaw; -import mcp.mobius.opis.network.packets.server.NetDataList; -import mcp.mobius.opis.network.packets.server.Packet_DataOverlayChunkEntities; -import mcp.mobius.opis.network.packets.server.NetDataValue; -import mcp.mobius.opis.network.packets.server.Packet_Tickets; +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; import net.minecraft.entity.player.EntityPlayerMP; @@ -88,91 +88,45 @@ public class OpisPacketHandler_OLD implements IPacketHandler { if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) this.onPacketToClient(manager, packet, player, header); - - if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) - this.onPacketToServer(manager, packet, player, header); } } void onPacketToClient(INetworkManager manager, Packet250CustomPayload packet, Player player, Byte header) { if (header == Packets.TICKETS){ - Packet_Tickets castedPacket = new Packet_Tickets(packet); + Packet_Tickets_OLD castedPacket = new Packet_Tickets_OLD(packet); OverlayLoadedChunks.instance().setupTable(castedPacket.tickets); } else if (header == Packets.CHUNKS){ - Packet_Chunks castedPacket = Packet_Chunks.read(packet); + Packet_Chunks_OLD castedPacket = Packet_Chunks_OLD.read(packet); if (castedPacket != null) Mw.instance.chunkManager.forceChunks(castedPacket.chunks); } else if (header == Packets.DATA_OVERLAY_CHUNK_ENTITIES){ - Packet_DataOverlayChunkEntities castedPacket = new Packet_DataOverlayChunkEntities(packet); + Packet_DataOverlayChunkEntities_OLD castedPacket = new Packet_DataOverlayChunkEntities_OLD(packet); OverlayEntityPerChunk.instance().overlayData = castedPacket.chunkStatus; OverlayEntityPerChunk.instance().reduceData(); OverlayEntityPerChunk.instance().setupChunkTable(); } else if (header == Packets.NETDATACOMMAND){ - NetDataRaw rawdata = new NetDataCommand(packet); + NetDataRaw_OLD rawdata = new NetDataCommand_OLD(packet); MessageHandlerRegistrar.INSTANCE.routeMessage(rawdata.msg, rawdata); } else if (header == Packets.NETDATALIST){ - NetDataRaw rawdata = new NetDataList(packet); + NetDataRaw_OLD rawdata = new NetDataList_OLD(packet); MessageHandlerRegistrar.INSTANCE.routeMessage(rawdata.msg, rawdata); } else if (header == Packets.NETDATAVALUE){ - NetDataRaw rawdata = new NetDataValue(packet); + NetDataRaw_OLD rawdata = new NetDataValue_OLD(packet); MessageHandlerRegistrar.INSTANCE.routeMessage(rawdata.msg, rawdata); } } - void onPacketToServer(INetworkManager manager, Packet250CustomPayload packet, Player player, Byte header) { - if (header == Packets.REQ_CHUNKS){ - Packet_ReqChunks castedPacket = new Packet_ReqChunks(packet); - if (PlayerTracker.instance().getPlayerAccessLevel(player).ordinal() > AccessLevel.PRIVILEGED.ordinal()){ - ArrayList list = new ArrayList(); - World world = DimensionManager.getWorld(castedPacket.dim); - - if (world != null){ - for (CoordinatesChunk chunk : castedPacket.chunks) - list.add(world.getChunkFromChunkCoords(chunk.chunkX, chunk.chunkZ)); - - //if (!list.isEmpty()){ - // Packet_Chunks.send(castedPacket.dim, !world.provider.hasNoSky, list, player); - - - /* - Packet250CustomPayload chunkPacket = Packet_Chunks.create(castedPacket.dim, !world.provider.hasNoSky, list); - if (chunkPacket != null) - PacketDispatcher.sendPacketToPlayer( chunkPacket, player); - */ - //} - } - } - } - - else if (header == Packets.REQ_DATA){ - Packet_ReqData castedPacket = new Packet_ReqData(packet); - - String logmsg = String.format("Received request %s from player %s ... ", castedPacket.dataReq, ((EntityPlayer)player).username); - - if (castedPacket.dataReq.canPlayerUseCommand(player)){ - logmsg += "Accepted"; - ServerMessageHandler.instance().handle(castedPacket.dataReq, castedPacket.param1, castedPacket.param2, player); - } else { - logmsg += "Rejected"; - } - - //modOpis.log.log(Level.INFO, logmsg); - } - } - - - public byte getHeader(Packet250CustomPayload packet){ try{ DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); @@ -182,7 +136,7 @@ public class OpisPacketHandler_OLD implements IPacketHandler { } } - public static void validateAndSend(NetDataRaw capsule, EntityPlayerMP player){ + 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) @@ -191,7 +145,7 @@ public class OpisPacketHandler_OLD implements IPacketHandler { 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 capsule){ + public static void sendPacketToAllSwing(NetDataRaw_OLD capsule){ for (EntityPlayerMP player : PlayerTracker.instance().playersSwing) OpisPacketHandler_OLD.validateAndSend(capsule, player); } @@ -199,7 +153,7 @@ public class OpisPacketHandler_OLD implements IPacketHandler { public static void splitAndSend(Message msg, ArrayList data, EntityPlayerMP player){ int i = 0; while (i < data.size()){ - validateAndSend(NetDataList.create(msg, data.subList(i, Math.min(i + 500, data.size()))), player); + validateAndSend(NetDataList_OLD.create(msg, data.subList(i, Math.min(i + 500, data.size()))), player); i += 500; } @@ -229,24 +183,24 @@ public class OpisPacketHandler_OLD implements IPacketHandler { timingEvents.add(new DataEvent().fill(cell)); } - OpisPacketHandler_OLD.validateAndSend(NetDataList.create(Message.LIST_TIMING_HANDLERS, timingHandlers), player); - OpisPacketHandler_OLD.validateAndSend(NetDataList.create(Message.LIST_TIMING_ENTITIES, timingEntities), player); - OpisPacketHandler_OLD.validateAndSend(NetDataList.create(Message.LIST_TIMING_TILEENTS, timingTileEnts), player); - OpisPacketHandler_OLD.validateAndSend(NetDataList.create(Message.LIST_TIMING_TILEENTS_PER_CLASS, timingTEsClass), player); - OpisPacketHandler_OLD.validateAndSend(NetDataList.create(Message.LIST_TIMING_CHUNK, timingChunks), player); - OpisPacketHandler_OLD.validateAndSend(NetDataList.create(Message.LIST_TIMING_EVENTS, timingEvents), player); - OpisPacketHandler_OLD.validateAndSend(NetDataList.create(Message.LIST_TIMING_ENTITIES_PER_CLASS, timingEntsClass), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_TILEENTS, totalTimeTE), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_ENTITIES, totalTimeEnt), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_HANDLERS, totalTimeHandler), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_WORLDTICK, totalWorldTick), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_NETWORK, totalNetwork), player); + 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.create(Message.VALUE_AMOUNT_HANDLERS, new SerialInt(timingHandlers.size())), player); + OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.VALUE_AMOUNT_HANDLERS, new SerialInt(timingHandlers.size())), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue.create(Message.STATUS_TIME_LAST_RUN, new SerialLong(ProfilerSection.timeStampLastRun)), player); + OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_TIME_LAST_RUN, new SerialLong(ProfilerSection.timeStampLastRun)), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue.create(Message.STATUS_ACCESS_LEVEL, new SerialInt(PlayerTracker.instance().getPlayerAccessLevel(player).ordinal())), 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(); @@ -257,7 +211,7 @@ public class OpisPacketHandler_OLD implements IPacketHandler { // Here we send a full update to the player //OpisPacketHandler.validateAndSend(Packet_DataList.create(DataReq.LIST_AMOUNT_ENTITIES, amountEntities), player); - OpisPacketHandler_OLD.validateAndSend(NetDataList.create(Message.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/ServerMessageHandler.java b/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java index e9367aa..6c9e0bc 100644 --- a/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java +++ b/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java @@ -38,11 +38,11 @@ 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; -import mcp.mobius.opis.network.packets.server.NetDataList; -import mcp.mobius.opis.network.packets.server.Packet_DataOverlayChunkEntities; -import mcp.mobius.opis.network.packets.server.NetDataValue; -import mcp.mobius.opis.network.packets.server.Packet_Tickets; +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.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; public class ServerMessageHandler { @@ -65,56 +65,56 @@ public class ServerMessageHandler { else if (maintype == Message.OVERLAY_CHUNK_TIMING){ ArrayList timingChunks = ChunkManager.INSTANCE.getTopChunks(100); - OpisPacketHandler_OLD.validateAndSend(NetDataList.create(Message.LIST_TIMING_CHUNK, timingChunks), (Player)player); + OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_CHUNK, timingChunks), player); } else if (maintype == Message.LIST_CHUNK_TILEENTS){ - OpisPacketHandler_OLD.validateAndSend(NetDataList.create(Message.LIST_CHUNK_TILEENTS, TileEntityManager.INSTANCE.getTileEntitiesInChunk((CoordinatesChunk)param1)), player); + OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_CHUNK_TILEENTS, TileEntityManager.INSTANCE.getTileEntitiesInChunk((CoordinatesChunk)param1)), player); } else if (maintype == Message.LIST_CHUNK_ENTITIES){ - OpisPacketHandler_OLD.validateAndSend(NetDataList.create(Message.LIST_CHUNK_ENTITIES, EntityManager.INSTANCE.getEntitiesInChunk((CoordinatesChunk)param1)), (Player)player); + OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(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.create(Message.LIST_CHUNK_LOADED_CLEAR), player); + 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); } else if (maintype == Message.LIST_CHUNK_TICKETS){ - PacketDispatcher.sendPacketToPlayer(Packet_Tickets.create(ChunkManager.INSTANCE.getTickets()), player); + PacketManager.sendPacketToPlayer(Packet_Tickets_OLD.create(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.create (Message.LIST_TIMING_TILEENTS, timingTileEnts), (Player)player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_TILEENTS, totalTime), (Player)player); + OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create (Message.LIST_TIMING_TILEENTS, timingTileEnts), player); + OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(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.create(Message.LIST_TIMING_ENTITIES, timingEntities), (Player)player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_ENTITIES, totalTime), (Player)player); + OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_ENTITIES, timingEntities), player); + OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(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.create(Message.LIST_TIMING_HANDLERS, timingHandlers), (Player)player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_HANDLERS, totalTime), (Player)player); + 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.create(Message.LIST_TIMING_CHUNK, timingChunks), (Player)player); + OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_TIMING_CHUNK, timingChunks), player); } else if (maintype == Message.VALUE_TIMING_WORLDTICK){ - OpisPacketHandler_OLD.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_WORLDTICK, new DataBlockTick().fill()), (Player)player); + OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(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.create(Message.LIST_AMOUNT_ENTITIES, ents), (Player)player); + OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_AMOUNT_ENTITIES, ents), player); } else if (maintype == Message.LIST_AMOUNT_TILEENTS){ - OpisPacketHandler_OLD.validateAndSend(NetDataList.create(Message.LIST_AMOUNT_TILEENTS, TileEntityManager.INSTANCE.getCumulativeAmountTileEntities()), (Player)player); + OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_AMOUNT_TILEENTS, TileEntityManager.INSTANCE.getCumulativeAmountTileEntities()), player); } else if (maintype == Message.COMMAND_FILTERING_TRUE){ @@ -150,20 +150,20 @@ public class ServerMessageHandler { MetaManager.reset(); modOpis.profilerRun = true; ProfilerSection.activateAll(Side.SERVER); - OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue.create(Message.STATUS_START, new SerialInt(modOpis.profilerMaxTicks))); + OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(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.create(Message.CLIENT_HIGHLIGHT_BLOCK, param1), (Player)player); + OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.CLIENT_HIGHLIGHT_BLOCK, param1), player); } else if (maintype == Message.COMMAND_TELEPORT_TO_ENTITY){ - EntityManager.INSTANCE.teleportEntity((EntityPlayerMP)player, EntityManager.INSTANCE.getEntity(((TargetEntity)param1).entityID, ((TargetEntity)param1).dim), player); + EntityManager.INSTANCE.teleportEntity(player, EntityManager.INSTANCE.getEntity(((TargetEntity)param1).entityID, ((TargetEntity)param1).dim), player); } else if (maintype == Message.COMMAND_TELEPORT_PULL_ENTITY){ - EntityManager.INSTANCE.teleportEntity(EntityManager.INSTANCE.getEntity(((TargetEntity)param1).entityID, ((TargetEntity)param1).dim), (EntityPlayerMP)player, player); + EntityManager.INSTANCE.teleportEntity(EntityManager.INSTANCE.getEntity(((TargetEntity)param1).entityID, ((TargetEntity)param1).dim), player, player); } else if (maintype == Message.COMMAND_TELEPORT_CHUNK){ @@ -187,7 +187,7 @@ public class ServerMessageHandler { } else if(maintype == Message.STATUS_TIME_LAST_RUN){ - OpisPacketHandler_OLD.validateAndSend(NetDataValue.create(Message.STATUS_TIME_LAST_RUN, new SerialLong(ProfilerSection.timeStampLastRun)), (Player)player); + OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_TIME_LAST_RUN, new SerialLong(ProfilerSection.timeStampLastRun)), player); } else if(maintype == Message.COMMAND_KILL_HOSTILES_ALL){ @@ -218,17 +218,17 @@ public class ServerMessageHandler { } else if(maintype == Message.STATUS_PING){ - OpisPacketHandler_OLD.validateAndSend(NetDataValue.create(Message.STATUS_PING, param1), (Player)player); + OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_PING, param1), player); } else if(maintype == Message.SWING_TAB_CHANGED){ SelectedTab tab = SelectedTab.values()[((SerialInt)param1).value]; - PlayerTracker.instance().playerTab.put((Player)player, tab); + PlayerTracker.instance().playerTab.put(player, tab); } else if(maintype == Message.LIST_ORPHAN_TILEENTS){ - OpisPacketHandler_OLD.validateAndSend(NetDataCommand.create(Message.LIST_ORPHAN_TILEENTS_CLEAR), (Player)player); - OpisPacketHandler_OLD.splitAndSend(Message.LIST_ORPHAN_TILEENTS, TileEntityManager.INSTANCE.getOrphans(), (Player)player); + OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.LIST_ORPHAN_TILEENTS_CLEAR), player); + OpisPacketHandler_OLD.splitAndSend(Message.LIST_ORPHAN_TILEENTS, TileEntityManager.INSTANCE.getOrphans(), player); } else{ @@ -244,7 +244,7 @@ public class ServerMessageHandler { for (CoordinatesChunk chunk : entities.keySet()) perChunk.put(chunk, entities.get(chunk).size()); - PacketManager.sendPacketToPlayer(Packet_DataOverlayChunkEntities.create(perChunk), player); + PacketManager.sendPacketToPlayer(Packet_DataOverlayChunkEntities_OLD.create(perChunk), player); } } 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_OLD.java similarity index 81% rename from src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand.java rename to src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand_OLD.java index 67de294..d47ea81 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand.java +++ b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand_OLD.java @@ -10,11 +10,11 @@ import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.enums.Packets; import net.minecraft.network.packet.Packet250CustomPayload; -public class NetDataCommand extends NetDataRaw{ +public class NetDataCommand_OLD extends NetDataRaw_OLD{ - public NetDataCommand(){}; + public NetDataCommand_OLD(){}; - public NetDataCommand(Packet250CustomPayload packet) { + public NetDataCommand_OLD(Packet250CustomPayload packet) { DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); try{ this.header = inputStream.readByte(); @@ -23,7 +23,7 @@ public class NetDataCommand extends NetDataRaw{ } - public static NetDataCommand create(Message msg){ + public static NetDataCommand_OLD create(Message msg){ Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); @@ -37,7 +37,7 @@ public class NetDataCommand extends NetDataRaw{ packet.data = bos.toByteArray(); packet.length = bos.size(); - NetDataCommand capsule = new NetDataCommand(); + NetDataCommand_OLD capsule = new NetDataCommand_OLD(); capsule.msg = msg; capsule.header = Packets.NETDATACOMMAND; capsule.packet = packet; 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_OLD.java similarity index 90% rename from src/main/java/mcp/mobius/opis/network/packets/server/NetDataList.java rename to src/main/java/mcp/mobius/opis/network/packets/server/NetDataList_OLD.java index 7855475..6871293 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataList.java +++ b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataList_OLD.java @@ -17,13 +17,13 @@ import mcp.mobius.opis.network.enums.Packets; import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet250CustomPayload; -public class NetDataList extends NetDataRaw{ +public class NetDataList_OLD extends NetDataRaw_OLD{ //public ArrayList data = new ArrayList(); - public NetDataList() {} + public NetDataList_OLD() {} - public NetDataList(Packet250CustomPayload packet) { + public NetDataList_OLD(Packet250CustomPayload packet) { DataInputStream istream = new DataInputStream(new ByteArrayInputStream(packet.data)); try{ @@ -58,7 +58,7 @@ public class NetDataList extends NetDataRaw{ */ //public static Packet250Metadata create(DataReq dataReq, ArrayList stats){ - public static NetDataList create(Message msg, List data){ + public static NetDataList_OLD create(Message msg, List data){ //Packet250Metadata packet = new Packet250Metadata(); Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); @@ -84,7 +84,7 @@ public class NetDataList extends NetDataRaw{ packet.data = bos.toByteArray(); packet.length = bos.size(); - NetDataList capsule = new NetDataList(); + NetDataList_OLD capsule = new NetDataList_OLD(); capsule.msg = msg; capsule.header = Packets.NETDATAVALUE; capsule.packet = packet; diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataRaw.java b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataRaw_OLD.java similarity index 97% rename from src/main/java/mcp/mobius/opis/network/packets/server/NetDataRaw.java rename to src/main/java/mcp/mobius/opis/network/packets/server/NetDataRaw_OLD.java index 05d1a0b..55910b3 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataRaw.java +++ b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataRaw_OLD.java @@ -9,7 +9,7 @@ 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 { +public class NetDataRaw_OLD { public byte header; public Message msg; 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_OLD.java similarity index 87% rename from src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue.java rename to src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue_OLD.java index 0a0e255..41d5802 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue.java +++ b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue_OLD.java @@ -13,11 +13,11 @@ import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.enums.Packets; -public class NetDataValue extends NetDataRaw{ +public class NetDataValue_OLD extends NetDataRaw_OLD{ - public NetDataValue(){}; + public NetDataValue_OLD(){}; - public NetDataValue(Packet250CustomPayload packet) { + public NetDataValue_OLD(Packet250CustomPayload packet) { DataInputStream istream = new DataInputStream(new ByteArrayInputStream(packet.data)); try{ @@ -32,7 +32,7 @@ public class NetDataValue extends NetDataRaw{ } //public static Packet250Metadata create(DataReq dataReq, ISerializable data){ - public static NetDataValue create(Message 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); @@ -54,7 +54,7 @@ public class NetDataValue extends NetDataRaw{ packet.data = bos.toByteArray(); packet.length = bos.size(); - NetDataValue capsule = new NetDataValue(); + NetDataValue_OLD capsule = new NetDataValue_OLD(); capsule.msg = dataReq; capsule.header = Packets.NETDATAVALUE; capsule.packet = packet; diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Chunks.java b/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Chunks_OLD.java similarity index 97% rename from src/main/java/mcp/mobius/opis/network/packets/server/Packet_Chunks.java rename to src/main/java/mcp/mobius/opis/network/packets/server/Packet_Chunks_OLD.java index d6e7a86..9874ced 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Chunks.java +++ b/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Chunks_OLD.java @@ -21,7 +21,7 @@ import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.NibbleArray; import net.minecraft.world.chunk.storage.ExtendedBlockStorage; -public class Packet_Chunks { +public class Packet_Chunks_OLD { public static int MAXPACKETSIZE = 30000; // This should be set to 32k but can be made lower for testing @@ -33,9 +33,9 @@ public class Packet_Chunks { private static DataOutputStream streamPayload = new DataOutputStream(bosPayload); @SideOnly(Side.CLIENT) - public static Packet_Chunks read(Packet250CustomPayload packet) { + public static Packet_Chunks_OLD read(Packet250CustomPayload packet) { DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); - Packet_Chunks retPacket = null; + Packet_Chunks_OLD retPacket = null; byte header; int dataSize; @@ -45,7 +45,7 @@ public class Packet_Chunks { dataSize = inputStream.readInt(); if (dataSize == -1){ - retPacket = new Packet_Chunks(bosPayload.toByteArray()); + retPacket = new Packet_Chunks_OLD(bosPayload.toByteArray()); bosPayload.reset(); } else { byte[] buffer = new byte[dataSize]; @@ -98,7 +98,7 @@ public class Packet_Chunks { @SideOnly(Side.CLIENT) - public Packet_Chunks(byte[] data) { + public Packet_Chunks_OLD(byte[] data) { DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(data)); try{ diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/Packet_DataOverlayChunkEntities.java b/src/main/java/mcp/mobius/opis/network/packets/server/Packet_DataOverlayChunkEntities_OLD.java similarity index 93% rename from src/main/java/mcp/mobius/opis/network/packets/server/Packet_DataOverlayChunkEntities.java rename to src/main/java/mcp/mobius/opis/network/packets/server/Packet_DataOverlayChunkEntities_OLD.java index 3aeb709..b5e5043 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/server/Packet_DataOverlayChunkEntities.java +++ b/src/main/java/mcp/mobius/opis/network/packets/server/Packet_DataOverlayChunkEntities_OLD.java @@ -12,12 +12,12 @@ import mcp.mobius.opis.network.enums.Packets; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.world.ChunkCoordIntPair; -public class Packet_DataOverlayChunkEntities { +public class Packet_DataOverlayChunkEntities_OLD { public byte header; public HashMap chunkStatus = new HashMap(); - public Packet_DataOverlayChunkEntities(Packet250CustomPayload packet) { + public Packet_DataOverlayChunkEntities_OLD(Packet250CustomPayload packet) { DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); this.chunkStatus.clear(); diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Tickets.java b/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Tickets_OLD.java similarity index 93% rename from src/main/java/mcp/mobius/opis/network/packets/server/Packet_Tickets.java rename to src/main/java/mcp/mobius/opis/network/packets/server/Packet_Tickets_OLD.java index 5793ddc..a2ae333 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Tickets.java +++ b/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Tickets_OLD.java @@ -11,12 +11,12 @@ import mcp.mobius.opis.data.holders.basetypes.TicketData; import mcp.mobius.opis.network.enums.Packets; import net.minecraft.network.packet.Packet250CustomPayload; -public class Packet_Tickets { +public class Packet_Tickets_OLD { public byte header; public HashSet tickets = new HashSet(); - public Packet_Tickets(Packet250CustomPayload packet) { + public Packet_Tickets_OLD(Packet250CustomPayload packet) { DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); try{ diff --git a/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java b/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java index 5beca2e..bd88d8e 100644 --- a/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java +++ b/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java @@ -30,7 +30,7 @@ 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.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { switch(msg){ case CLIENT_CLEAR_SELECTION:{ modOpis.selectedBlock = null; diff --git a/src/main/java/mcp/mobius/opis/proxy/ProxyServer.java b/src/main/java/mcp/mobius/opis/proxy/ProxyServer.java index 89bb00a..db80dc4 100644 --- a/src/main/java/mcp/mobius/opis/proxy/ProxyServer.java +++ b/src/main/java/mcp/mobius/opis/proxy/ProxyServer.java @@ -7,14 +7,14 @@ import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.api.IMessageHandler; import mcp.mobius.opis.gui.overlay.OverlayStatus; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; public class ProxyServer implements IMessageHandler{ public void init(){} @Override - public boolean handleMessage(Message msg, NetDataRaw rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 4036439..ad16926 100644 --- a/src/main/java/mcp/mobius/opis/swing/SwingUI.java +++ b/src/main/java/mcp/mobius/opis/swing/SwingUI.java @@ -32,7 +32,7 @@ import mcp.mobius.opis.data.holders.basetypes.SerialInt; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 27fb7c5..8f5ea99 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/PanelSummary.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/PanelSummary.java @@ -22,7 +22,7 @@ import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.holders.newtypes.DataTimingMillisecond; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 a6f6619..4aa9ce1 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 @@ -5,7 +5,7 @@ import mcp.mobius.opis.data.holders.newtypes.CachedString; import mcp.mobius.opis.data.holders.newtypes.DataTileEntity; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 5a07cb9..f01fcfd 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 @@ -5,7 +5,7 @@ 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.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 d4804dd..db80c5f 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 @@ -11,7 +11,7 @@ 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.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 03ac841..8818858 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 @@ -13,7 +13,7 @@ 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.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 634d974..ccc21b2 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 @@ -11,7 +11,7 @@ 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.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 e8a4ac9..8bd7fc6 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 @@ -12,7 +12,7 @@ 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.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 cc62d79..f90794c 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 @@ -21,7 +21,7 @@ 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.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 2cfa50f..ff62da4 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 @@ -17,7 +17,7 @@ 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.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 fbf4e7d..d516762 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 @@ -18,7 +18,7 @@ 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.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 d78fb51..616f707 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 @@ -9,7 +9,7 @@ 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.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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; @@ -108,7 +108,7 @@ public class PanelRenderTileEnts extends JPanel implements ITabPanel, IMessageHa } @Override - public boolean handleMessage(Message msg, NetDataRaw rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 fb06500..9ff1b44 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 @@ -9,7 +9,7 @@ import mcp.mobius.opis.data.holders.stats.StatsChunk; import mcp.mobius.opis.gui.overlay.OverlayMeanTime; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 300b8c3..985d5ca 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 @@ -11,7 +11,7 @@ import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 360aa29..e673c47 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 @@ -12,7 +12,7 @@ import mcp.mobius.opis.data.holders.newtypes.DataEntityPerClass; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 a3edb0d..09428b0 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 @@ -7,7 +7,7 @@ import mcp.mobius.opis.data.holders.newtypes.DataEvent; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 166745e..ff403a6 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 @@ -12,7 +12,7 @@ import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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; @@ -63,7 +63,7 @@ public class PanelTimingHandlers extends JPanelMsgHandler implements ITabPanel{ public JLabel getLblSummary(){return lblSummary;} @Override - public boolean handleMessage(Message msg, NetDataRaw rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 9d25c61..6698f42 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 @@ -14,7 +14,7 @@ import mcp.mobius.opis.gui.overlay.OverlayMeanTime; import mcp.mobius.opis.helpers.ModIdentification; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 be619f3..2d305bd 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 @@ -15,7 +15,7 @@ import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.helpers.ModIdentification; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 78a48d3..f2380c5 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 @@ -9,7 +9,7 @@ import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.data.holders.basetypes.AmountHolder; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 630ae5a..5b81594 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 @@ -12,7 +12,7 @@ import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntityPerClass; import mcp.mobius.opis.helpers.ModIdentification; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 3e64a61..d67aad4 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 @@ -9,7 +9,7 @@ import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.holders.newtypes.DataTimingMillisecond; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD 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 5921c54..2204fd7 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 @@ -8,7 +8,7 @@ import mcp.mobius.opis.data.holders.newtypes.DataEntity; import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.server.NetDataRaw; +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 rawdata) { + public boolean handleMessage(Message msg, NetDataRaw_OLD rawdata) { switch(msg){ case LIST_PLAYERS:{