From b0f92d44af24a6ef23ad9ae6ef414b825bee911d Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Sat, 22 Mar 2014 17:47:42 +0100 Subject: [PATCH] A bit of refactoring. --- mcp/mobius/opis/commands/client/CommandOpis.java | 2 +- .../opis/commands/server/CommandAddPrivileged.java | 2 +- .../opis/commands/server/CommandAmountEntities.java | 2 +- mcp/mobius/opis/commands/server/CommandChunkList.java | 2 +- .../opis/commands/server/CommandEntityCreate.java | 4 ++-- mcp/mobius/opis/commands/server/CommandFrequency.java | 2 +- mcp/mobius/opis/commands/server/CommandHandler.java | 2 +- mcp/mobius/opis/commands/server/CommandKill.java | 2 +- mcp/mobius/opis/commands/server/CommandKillAll.java | 2 +- .../opis/commands/server/CommandMeanModTime.java | 2 +- mcp/mobius/opis/commands/server/CommandReset.java | 4 ++-- .../opis/commands/server/CommandRmPrivileged.java | 2 +- mcp/mobius/opis/commands/server/CommandStart.java | 4 ++-- mcp/mobius/opis/commands/server/CommandStop.java | 4 ++-- mcp/mobius/opis/commands/server/CommandTicks.java | 2 +- .../opis/commands/server/CommandTimingEntities.java | 2 +- .../commands/server/CommandTimingTileEntities.java | 2 +- .../opis/data/client/TickHandlerClientProfiler.java | 4 ++-- mcp/mobius/opis/data/managers/MetaManager.java | 2 +- mcp/mobius/opis/data/server/EntityProfiler.java | 2 +- mcp/mobius/opis/data/server/HandlerProfiler.java | 2 +- mcp/mobius/opis/data/server/TileEntityProfiler.java | 2 +- .../{client => events}/OpisClientEventHandler.java | 2 +- .../opis/{client => events}/OpisClientTickHandler.java | 2 +- .../{server => events}/OpisServerEventHandler.java | 2 +- .../opis/{server => events}/OpisServerTickHandler.java | 2 +- mcp/mobius/opis/{server => events}/PlayerTracker.java | 2 +- mcp/mobius/opis/modOpis.java | 10 +++++----- mcp/mobius/opis/network/ClientCommandHandler.java | 2 +- mcp/mobius/opis/network/DataReqHandler.java | 2 +- mcp/mobius/opis/network/OpisPacketHandler.java | 2 +- mcp/mobius/opis/network/enums/DataReq.java | 2 +- 32 files changed, 41 insertions(+), 41 deletions(-) rename mcp/mobius/opis/{client => events}/OpisClientEventHandler.java (99%) rename mcp/mobius/opis/{client => events}/OpisClientTickHandler.java (97%) rename mcp/mobius/opis/{server => events}/OpisServerEventHandler.java (96%) rename mcp/mobius/opis/{server => events}/OpisServerTickHandler.java (99%) rename mcp/mobius/opis/{server => events}/PlayerTracker.java (99%) diff --git a/mcp/mobius/opis/commands/client/CommandOpis.java b/mcp/mobius/opis/commands/client/CommandOpis.java index 721afeb..8de34f5 100644 --- a/mcp/mobius/opis/commands/client/CommandOpis.java +++ b/mcp/mobius/opis/commands/client/CommandOpis.java @@ -4,10 +4,10 @@ import javax.swing.JFrame; import javax.swing.JLabel; import cpw.mods.fml.common.network.Player; +import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.DataReqHandler; import mcp.mobius.opis.network.enums.ClientCommand; import mcp.mobius.opis.network.server.Packet_ClientCommand; -import mcp.mobius.opis.server.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/mcp/mobius/opis/commands/server/CommandAddPrivileged.java b/mcp/mobius/opis/commands/server/CommandAddPrivileged.java index 6efa28d..66a98f2 100644 --- a/mcp/mobius/opis/commands/server/CommandAddPrivileged.java +++ b/mcp/mobius/opis/commands/server/CommandAddPrivileged.java @@ -1,7 +1,7 @@ package mcp.mobius.opis.commands.server; import mcp.mobius.opis.commands.IOpisCommand; -import mcp.mobius.opis.server.PlayerTracker; +import mcp.mobius.opis.events.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/mcp/mobius/opis/commands/server/CommandAmountEntities.java b/mcp/mobius/opis/commands/server/CommandAmountEntities.java index 9e1f339..0782419 100644 --- a/mcp/mobius/opis/commands/server/CommandAmountEntities.java +++ b/mcp/mobius/opis/commands/server/CommandAmountEntities.java @@ -6,9 +6,9 @@ import java.util.HashMap; import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.basetypes.AmountHolder; import mcp.mobius.opis.data.managers.EntityManager; +import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.enums.DataReq; import mcp.mobius.opis.network.server.Packet_DataList; -import mcp.mobius.opis.server.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/mcp/mobius/opis/commands/server/CommandChunkList.java b/mcp/mobius/opis/commands/server/CommandChunkList.java index dc62c69..994dcba 100644 --- a/mcp/mobius/opis/commands/server/CommandChunkList.java +++ b/mcp/mobius/opis/commands/server/CommandChunkList.java @@ -5,9 +5,9 @@ import java.util.ArrayList; import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.stats.StatsChunk; import mcp.mobius.opis.data.managers.ChunkManager; +import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.enums.DataReq; import mcp.mobius.opis.network.server.Packet_DataList; -import mcp.mobius.opis.server.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/mcp/mobius/opis/commands/server/CommandEntityCreate.java b/mcp/mobius/opis/commands/server/CommandEntityCreate.java index acaf396..988e49a 100644 --- a/mcp/mobius/opis/commands/server/CommandEntityCreate.java +++ b/mcp/mobius/opis/commands/server/CommandEntityCreate.java @@ -1,7 +1,7 @@ package mcp.mobius.opis.commands.server; -import mcp.mobius.opis.server.OpisServerEventHandler; -import mcp.mobius.opis.server.PlayerTracker; +import mcp.mobius.opis.events.OpisServerEventHandler; +import mcp.mobius.opis.events.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/mcp/mobius/opis/commands/server/CommandFrequency.java b/mcp/mobius/opis/commands/server/CommandFrequency.java index 63ad8dd..f5a95a4 100644 --- a/mcp/mobius/opis/commands/server/CommandFrequency.java +++ b/mcp/mobius/opis/commands/server/CommandFrequency.java @@ -4,7 +4,7 @@ import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.commands.IOpisCommand; -import mcp.mobius.opis.server.PlayerTracker; +import mcp.mobius.opis.events.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/mcp/mobius/opis/commands/server/CommandHandler.java b/mcp/mobius/opis/commands/server/CommandHandler.java index 0e6e3b6..dd81207 100644 --- a/mcp/mobius/opis/commands/server/CommandHandler.java +++ b/mcp/mobius/opis/commands/server/CommandHandler.java @@ -7,9 +7,9 @@ import java.util.HashMap; import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.stats.StatsTickHandler; import mcp.mobius.opis.data.managers.TickHandlerManager; +import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.enums.DataReq; import mcp.mobius.opis.network.server.Packet_DataList; -import mcp.mobius.opis.server.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/mcp/mobius/opis/commands/server/CommandKill.java b/mcp/mobius/opis/commands/server/CommandKill.java index fd0b616..7eb390d 100644 --- a/mcp/mobius/opis/commands/server/CommandKill.java +++ b/mcp/mobius/opis/commands/server/CommandKill.java @@ -3,7 +3,7 @@ package mcp.mobius.opis.commands.server; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.commands.IOpisCommand; -import mcp.mobius.opis.server.PlayerTracker; +import mcp.mobius.opis.events.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; diff --git a/mcp/mobius/opis/commands/server/CommandKillAll.java b/mcp/mobius/opis/commands/server/CommandKillAll.java index ae9506e..f331195 100644 --- a/mcp/mobius/opis/commands/server/CommandKillAll.java +++ b/mcp/mobius/opis/commands/server/CommandKillAll.java @@ -8,7 +8,7 @@ import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.managers.EntityManager; -import mcp.mobius.opis.server.PlayerTracker; +import mcp.mobius.opis.events.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; diff --git a/mcp/mobius/opis/commands/server/CommandMeanModTime.java b/mcp/mobius/opis/commands/server/CommandMeanModTime.java index d3e0a50..b57f7cb 100644 --- a/mcp/mobius/opis/commands/server/CommandMeanModTime.java +++ b/mcp/mobius/opis/commands/server/CommandMeanModTime.java @@ -5,8 +5,8 @@ import java.util.ArrayList; import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.stats.StatsMod; import mcp.mobius.opis.data.managers.TileEntityManager; +import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.server.Packet_ModMeanTime; -import mcp.mobius.opis.server.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/mcp/mobius/opis/commands/server/CommandReset.java b/mcp/mobius/opis/commands/server/CommandReset.java index 14ca645..6b46039 100644 --- a/mcp/mobius/opis/commands/server/CommandReset.java +++ b/mcp/mobius/opis/commands/server/CommandReset.java @@ -10,10 +10,10 @@ import mcp.mobius.opis.data.managers.EntityManager; import mcp.mobius.opis.data.managers.MetaManager; import mcp.mobius.opis.data.managers.TickHandlerManager; import mcp.mobius.opis.data.managers.TileEntityManager; +import mcp.mobius.opis.events.OpisServerTickHandler; +import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.enums.ClientCommand; import mcp.mobius.opis.network.server.Packet_ClientCommand; -import mcp.mobius.opis.server.OpisServerTickHandler; -import mcp.mobius.opis.server.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/mcp/mobius/opis/commands/server/CommandRmPrivileged.java b/mcp/mobius/opis/commands/server/CommandRmPrivileged.java index 343786f..e7b8e48 100644 --- a/mcp/mobius/opis/commands/server/CommandRmPrivileged.java +++ b/mcp/mobius/opis/commands/server/CommandRmPrivileged.java @@ -1,7 +1,7 @@ package mcp.mobius.opis.commands.server; import mcp.mobius.opis.commands.IOpisCommand; -import mcp.mobius.opis.server.PlayerTracker; +import mcp.mobius.opis.events.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/mcp/mobius/opis/commands/server/CommandStart.java b/mcp/mobius/opis/commands/server/CommandStart.java index 1297baa..d95d2ba 100644 --- a/mcp/mobius/opis/commands/server/CommandStart.java +++ b/mcp/mobius/opis/commands/server/CommandStart.java @@ -12,10 +12,10 @@ import mcp.mobius.opis.data.managers.TileEntityManager; import mcp.mobius.opis.data.server.EntityProfiler; import mcp.mobius.opis.data.server.HandlerProfiler; import mcp.mobius.opis.data.server.TileEntityProfiler; +import mcp.mobius.opis.events.OpisServerTickHandler; +import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.enums.DataReq; import mcp.mobius.opis.network.server.Packet_DataValue; -import mcp.mobius.opis.server.OpisServerTickHandler; -import mcp.mobius.opis.server.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/mcp/mobius/opis/commands/server/CommandStop.java b/mcp/mobius/opis/commands/server/CommandStop.java index 62f4b1e..a115a4a 100644 --- a/mcp/mobius/opis/commands/server/CommandStop.java +++ b/mcp/mobius/opis/commands/server/CommandStop.java @@ -5,8 +5,8 @@ import cpw.mods.fml.common.network.Player; import mcp.mobius.mobiuscore.profiler.DummyProfiler; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.commands.IOpisCommand; -import mcp.mobius.opis.server.OpisServerTickHandler; -import mcp.mobius.opis.server.PlayerTracker; +import mcp.mobius.opis.events.OpisServerTickHandler; +import mcp.mobius.opis.events.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/mcp/mobius/opis/commands/server/CommandTicks.java b/mcp/mobius/opis/commands/server/CommandTicks.java index 79e0b05..f5d4f4c 100644 --- a/mcp/mobius/opis/commands/server/CommandTicks.java +++ b/mcp/mobius/opis/commands/server/CommandTicks.java @@ -4,7 +4,7 @@ import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.commands.IOpisCommand; -import mcp.mobius.opis.server.PlayerTracker; +import mcp.mobius.opis.events.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/mcp/mobius/opis/commands/server/CommandTimingEntities.java b/mcp/mobius/opis/commands/server/CommandTimingEntities.java index 0c7f364..462489f 100644 --- a/mcp/mobius/opis/commands/server/CommandTimingEntities.java +++ b/mcp/mobius/opis/commands/server/CommandTimingEntities.java @@ -7,9 +7,9 @@ import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk; import mcp.mobius.opis.data.holders.stats.StatsEntity; import mcp.mobius.opis.data.managers.EntityManager; +import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.enums.DataReq; import mcp.mobius.opis.network.server.Packet_DataList; -import mcp.mobius.opis.server.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java b/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java index d292a5d..116c75e 100644 --- a/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java +++ b/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java @@ -5,9 +5,9 @@ import java.util.ArrayList; import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.stats.StatsTileEntity; import mcp.mobius.opis.data.managers.TileEntityManager; +import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.enums.DataReq; import mcp.mobius.opis.network.server.Packet_DataList; -import mcp.mobius.opis.server.PlayerTracker; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/mcp/mobius/opis/data/client/TickHandlerClientProfiler.java b/mcp/mobius/opis/data/client/TickHandlerClientProfiler.java index a6b709a..52e8a36 100644 --- a/mcp/mobius/opis/data/client/TickHandlerClientProfiler.java +++ b/mcp/mobius/opis/data/client/TickHandlerClientProfiler.java @@ -4,9 +4,9 @@ import java.util.EnumSet; import mcp.mobius.mobiuscore.profiler.IProfilerHandler; import mcp.mobius.opis.modOpis; -import mcp.mobius.opis.client.OpisClientTickHandler; import mcp.mobius.opis.data.managers.TickHandlerManager; -import mcp.mobius.opis.server.OpisServerTickHandler; +import mcp.mobius.opis.events.OpisClientTickHandler; +import mcp.mobius.opis.events.OpisServerTickHandler; import cpw.mods.fml.common.IScheduledTickHandler; import cpw.mods.fml.common.TickType; diff --git a/mcp/mobius/opis/data/managers/MetaManager.java b/mcp/mobius/opis/data/managers/MetaManager.java index e2b83a6..af3a1cd 100644 --- a/mcp/mobius/opis/data/managers/MetaManager.java +++ b/mcp/mobius/opis/data/managers/MetaManager.java @@ -4,7 +4,7 @@ import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.server.EntUpdateProfiler; import mcp.mobius.opis.data.server.WorldTickProfiler; -import mcp.mobius.opis.server.OpisServerTickHandler; +import mcp.mobius.opis.events.OpisServerTickHandler; public class MetaManager { diff --git a/mcp/mobius/opis/data/server/EntityProfiler.java b/mcp/mobius/opis/data/server/EntityProfiler.java index da9c1f5..8cf2972 100644 --- a/mcp/mobius/opis/data/server/EntityProfiler.java +++ b/mcp/mobius/opis/data/server/EntityProfiler.java @@ -6,7 +6,7 @@ import net.minecraft.entity.Entity; import mcp.mobius.mobiuscore.profiler.IProfilerEntity; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.managers.EntityManager; -import mcp.mobius.opis.server.OpisServerTickHandler; +import mcp.mobius.opis.events.OpisServerTickHandler; public class EntityProfiler extends AbstractProfiler implements IProfilerEntity { diff --git a/mcp/mobius/opis/data/server/HandlerProfiler.java b/mcp/mobius/opis/data/server/HandlerProfiler.java index 00816aa..5812387 100644 --- a/mcp/mobius/opis/data/server/HandlerProfiler.java +++ b/mcp/mobius/opis/data/server/HandlerProfiler.java @@ -7,7 +7,7 @@ import cpw.mods.fml.common.TickType; import mcp.mobius.mobiuscore.profiler.IProfilerHandler; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.managers.TickHandlerManager; -import mcp.mobius.opis.server.OpisServerTickHandler; +import mcp.mobius.opis.events.OpisServerTickHandler; public class HandlerProfiler extends AbstractProfiler implements IProfilerHandler { diff --git a/mcp/mobius/opis/data/server/TileEntityProfiler.java b/mcp/mobius/opis/data/server/TileEntityProfiler.java index ee9d7c0..80e6d79 100644 --- a/mcp/mobius/opis/data/server/TileEntityProfiler.java +++ b/mcp/mobius/opis/data/server/TileEntityProfiler.java @@ -7,7 +7,7 @@ import net.minecraftforge.common.ForgeHooks; import mcp.mobius.mobiuscore.profiler.IProfilerTileEntity; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.managers.TileEntityManager; -import mcp.mobius.opis.server.OpisServerTickHandler; +import mcp.mobius.opis.events.OpisServerTickHandler; public class TileEntityProfiler extends AbstractProfiler implements IProfilerTileEntity { diff --git a/mcp/mobius/opis/client/OpisClientEventHandler.java b/mcp/mobius/opis/events/OpisClientEventHandler.java similarity index 99% rename from mcp/mobius/opis/client/OpisClientEventHandler.java rename to mcp/mobius/opis/events/OpisClientEventHandler.java index 1172cea..f40d950 100644 --- a/mcp/mobius/opis/client/OpisClientEventHandler.java +++ b/mcp/mobius/opis/events/OpisClientEventHandler.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.client; +package mcp.mobius.opis.events; import org.lwjgl.opengl.GL11; diff --git a/mcp/mobius/opis/client/OpisClientTickHandler.java b/mcp/mobius/opis/events/OpisClientTickHandler.java similarity index 97% rename from mcp/mobius/opis/client/OpisClientTickHandler.java rename to mcp/mobius/opis/events/OpisClientTickHandler.java index 18ba490..aaa07f5 100644 --- a/mcp/mobius/opis/client/OpisClientTickHandler.java +++ b/mcp/mobius/opis/events/OpisClientTickHandler.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.client; +package mcp.mobius.opis.events; import java.util.EnumSet; import java.util.logging.Level; diff --git a/mcp/mobius/opis/server/OpisServerEventHandler.java b/mcp/mobius/opis/events/OpisServerEventHandler.java similarity index 96% rename from mcp/mobius/opis/server/OpisServerEventHandler.java rename to mcp/mobius/opis/events/OpisServerEventHandler.java index 328db73..b65b8e4 100644 --- a/mcp/mobius/opis/server/OpisServerEventHandler.java +++ b/mcp/mobius/opis/events/OpisServerEventHandler.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.server; +package mcp.mobius.opis.events; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mcp/mobius/opis/server/OpisServerTickHandler.java b/mcp/mobius/opis/events/OpisServerTickHandler.java similarity index 99% rename from mcp/mobius/opis/server/OpisServerTickHandler.java rename to mcp/mobius/opis/events/OpisServerTickHandler.java index 87cbabe..b3895c3 100644 --- a/mcp/mobius/opis/server/OpisServerTickHandler.java +++ b/mcp/mobius/opis/events/OpisServerTickHandler.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.server; +package mcp.mobius.opis.events; import java.util.ArrayList; import java.util.EnumSet; diff --git a/mcp/mobius/opis/server/PlayerTracker.java b/mcp/mobius/opis/events/PlayerTracker.java similarity index 99% rename from mcp/mobius/opis/server/PlayerTracker.java rename to mcp/mobius/opis/events/PlayerTracker.java index 6ff46e0..87ec251 100644 --- a/mcp/mobius/opis/server/PlayerTracker.java +++ b/mcp/mobius/opis/events/PlayerTracker.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.server; +package mcp.mobius.opis.events; import java.util.HashMap; import java.util.HashSet; diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index 6c997d9..795c7e7 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -8,8 +8,6 @@ import net.minecraft.network.packet.Packet; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.MinecraftForge; import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar; -import mcp.mobius.opis.client.OpisClientEventHandler; -import mcp.mobius.opis.client.OpisClientTickHandler; import mcp.mobius.opis.commands.client.CommandClientShowRenderTick; import mcp.mobius.opis.commands.client.CommandClientStart; import mcp.mobius.opis.commands.client.CommandOpis; @@ -41,14 +39,16 @@ import mcp.mobius.opis.data.server.PacketProfiler; import mcp.mobius.opis.data.server.WorldTickProfiler; import mcp.mobius.opis.data.server.TickProfiler; import mcp.mobius.opis.data.server.TileEntityProfiler; +import mcp.mobius.opis.events.OpisClientEventHandler; +import mcp.mobius.opis.events.OpisClientTickHandler; +import mcp.mobius.opis.events.OpisServerEventHandler; +import mcp.mobius.opis.events.OpisServerTickHandler; +import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.helpers.ModIdentification; import mcp.mobius.opis.network.OpisConnectionHandler; import mcp.mobius.opis.network.OpisPacketHandler; import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.proxy.ProxyServer; -import mcp.mobius.opis.server.OpisServerEventHandler; -import mcp.mobius.opis.server.OpisServerTickHandler; -import mcp.mobius.opis.server.PlayerTracker; import mcp.mobius.opis.tools.BlockLag; import mcp.mobius.opis.tools.TileLag; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/mcp/mobius/opis/network/ClientCommandHandler.java b/mcp/mobius/opis/network/ClientCommandHandler.java index d24ef42..8ef4f36 100644 --- a/mcp/mobius/opis/network/ClientCommandHandler.java +++ b/mcp/mobius/opis/network/ClientCommandHandler.java @@ -9,12 +9,12 @@ import javax.swing.table.DefaultTableModel; import cpw.mods.fml.common.network.PacketDispatcher; import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar; import mcp.mobius.opis.modOpis; -import mcp.mobius.opis.client.OpisClientTickHandler; import mcp.mobius.opis.data.client.DataCache; import mcp.mobius.opis.data.client.TickHandlerClientProfiler; import mcp.mobius.opis.data.holders.stats.StatsTickHandler; import mcp.mobius.opis.data.managers.MetaManager; import mcp.mobius.opis.data.managers.TickHandlerManager; +import mcp.mobius.opis.events.OpisClientTickHandler; import mcp.mobius.opis.gui.swing.SwingUI; import mcp.mobius.opis.network.client.Packet_ReqData; import mcp.mobius.opis.network.enums.ClientCommand; diff --git a/mcp/mobius/opis/network/DataReqHandler.java b/mcp/mobius/opis/network/DataReqHandler.java index 052e3b2..cd350c4 100644 --- a/mcp/mobius/opis/network/DataReqHandler.java +++ b/mcp/mobius/opis/network/DataReqHandler.java @@ -33,6 +33,7 @@ import mcp.mobius.opis.data.managers.TickHandlerManager; import mcp.mobius.opis.data.managers.TileEntityManager; import mcp.mobius.opis.data.server.EntUpdateProfiler; import mcp.mobius.opis.data.server.WorldTickProfiler; +import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.enums.DataReq; import mcp.mobius.opis.network.server.Packet_DataList; import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities; @@ -40,7 +41,6 @@ import mcp.mobius.opis.network.server.Packet_DataValue; import mcp.mobius.opis.network.server.Packet_LoadedChunks; import mcp.mobius.opis.network.server.Packet_Tickets; import mcp.mobius.opis.overlay.OverlayStatus; -import mcp.mobius.opis.server.PlayerTracker; public class DataReqHandler { diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index a824dfb..173573d 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -19,6 +19,7 @@ import mcp.mobius.opis.data.holders.stats.StatsTileEntity; 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.events.PlayerTracker; import mcp.mobius.opis.gui.swing.SwingUI; import mcp.mobius.opis.network.client.Packet_ReqChunks; import mcp.mobius.opis.network.client.Packet_ReqData; @@ -37,7 +38,6 @@ import mcp.mobius.opis.overlay.OverlayLoadedChunks; import mcp.mobius.opis.overlay.OverlayMeanTime; import mcp.mobius.opis.overlay.OverlayStatus; import mcp.mobius.opis.overlay.entperchunk.OverlayEntityPerChunk; -import mcp.mobius.opis.server.PlayerTracker; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet250CustomPayload; diff --git a/mcp/mobius/opis/network/enums/DataReq.java b/mcp/mobius/opis/network/enums/DataReq.java index c306cd4..d1f1eb4 100644 --- a/mcp/mobius/opis/network/enums/DataReq.java +++ b/mcp/mobius/opis/network/enums/DataReq.java @@ -2,7 +2,7 @@ package mcp.mobius.opis.network.enums; import static mcp.mobius.opis.network.enums.AccessLevel.*; import cpw.mods.fml.common.network.Player; -import mcp.mobius.opis.server.PlayerTracker; +import mcp.mobius.opis.events.PlayerTracker; public enum DataReq {