diff --git a/mcp/mobius/opis/commands/CommandAmountEntities.java b/mcp/mobius/opis/commands/server/CommandAmountEntities.java similarity index 91% rename from mcp/mobius/opis/commands/CommandAmountEntities.java rename to mcp/mobius/opis/commands/server/CommandAmountEntities.java index 8d58c73..643f062 100644 --- a/mcp/mobius/opis/commands/CommandAmountEntities.java +++ b/mcp/mobius/opis/commands/server/CommandAmountEntities.java @@ -1,8 +1,9 @@ -package mcp.mobius.opis.commands; +package mcp.mobius.opis.commands.server; import java.util.HashMap; -import mcp.mobius.opis.data.EntityManager; +import mcp.mobius.opis.commands.IOpisCommand; +import mcp.mobius.opis.data.server.EntityManager; import mcp.mobius.opis.network.server.Packet_DataScreenAmountEntities; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; diff --git a/mcp/mobius/opis/commands/CommandChunkDump.java b/mcp/mobius/opis/commands/server/CommandChunkDump.java similarity index 95% rename from mcp/mobius/opis/commands/CommandChunkDump.java rename to mcp/mobius/opis/commands/server/CommandChunkDump.java index 3c52843..ae5e980 100644 --- a/mcp/mobius/opis/commands/CommandChunkDump.java +++ b/mcp/mobius/opis/commands/server/CommandChunkDump.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.commands; +package mcp.mobius.opis.commands.server; import java.util.HashMap; import java.util.HashSet; @@ -8,6 +8,7 @@ import java.util.logging.Level; import com.google.common.collect.ImmutableSetMultimap; import mcp.mobius.opis.modOpis; +import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.network.server.Packet_LoadedChunks; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; diff --git a/mcp/mobius/opis/commands/CommandChunkList.java b/mcp/mobius/opis/commands/server/CommandChunkList.java similarity index 93% rename from mcp/mobius/opis/commands/CommandChunkList.java rename to mcp/mobius/opis/commands/server/CommandChunkList.java index 2c4d54d..fdaf71d 100644 --- a/mcp/mobius/opis/commands/CommandChunkList.java +++ b/mcp/mobius/opis/commands/server/CommandChunkList.java @@ -1,9 +1,10 @@ -package mcp.mobius.opis.commands; +package mcp.mobius.opis.commands.server; import java.util.ArrayList; -import mcp.mobius.opis.data.ChunkManager; +import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.ChunkStats; +import mcp.mobius.opis.data.server.ChunkManager; import mcp.mobius.opis.network.server.Packet_ChunkTopList; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; diff --git a/mcp/mobius/opis/commands/CommandDataDump.java b/mcp/mobius/opis/commands/server/CommandDataDump.java similarity index 97% rename from mcp/mobius/opis/commands/CommandDataDump.java rename to mcp/mobius/opis/commands/server/CommandDataDump.java index 099547c..15167e4 100644 --- a/mcp/mobius/opis/commands/CommandDataDump.java +++ b/mcp/mobius/opis/commands/server/CommandDataDump.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.commands; +package mcp.mobius.opis.commands.server; import java.io.BufferedWriter; import java.io.FileWriter; @@ -9,9 +9,10 @@ import java.util.logging.Level; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.modOpis; -import mcp.mobius.opis.data.TileEntityManager; +import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.ModStats; import mcp.mobius.opis.data.holders.TileEntityStats; +import mcp.mobius.opis.data.server.TileEntityManager; import mcp.mobius.opis.tools.ModIdentification; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; diff --git a/mcp/mobius/opis/commands/CommandFrequency.java b/mcp/mobius/opis/commands/server/CommandFrequency.java similarity index 95% rename from mcp/mobius/opis/commands/CommandFrequency.java rename to mcp/mobius/opis/commands/server/CommandFrequency.java index 45ddd4f..df3a1af 100644 --- a/mcp/mobius/opis/commands/CommandFrequency.java +++ b/mcp/mobius/opis/commands/server/CommandFrequency.java @@ -1,8 +1,9 @@ -package mcp.mobius.opis.commands; +package mcp.mobius.opis.commands.server; 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 net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/mcp/mobius/opis/commands/CommandHandler.java b/mcp/mobius/opis/commands/server/CommandHandler.java similarity index 91% rename from mcp/mobius/opis/commands/CommandHandler.java rename to mcp/mobius/opis/commands/server/CommandHandler.java index a59bc0a..d1ea0d4 100644 --- a/mcp/mobius/opis/commands/CommandHandler.java +++ b/mcp/mobius/opis/commands/server/CommandHandler.java @@ -1,11 +1,12 @@ -package mcp.mobius.opis.commands; +package mcp.mobius.opis.commands.server; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import mcp.mobius.opis.data.TickHandlerManager; +import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.TickHandlerStats; +import mcp.mobius.opis.data.server.TickHandlerManager; import mcp.mobius.opis.network.server.Packet_DataScreenTimingHandlers; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; diff --git a/mcp/mobius/opis/commands/CommandHelp.java b/mcp/mobius/opis/commands/server/CommandHelp.java similarity index 95% rename from mcp/mobius/opis/commands/CommandHelp.java rename to mcp/mobius/opis/commands/server/CommandHelp.java index 3301839..57d8906 100644 --- a/mcp/mobius/opis/commands/CommandHelp.java +++ b/mcp/mobius/opis/commands/server/CommandHelp.java @@ -1,7 +1,8 @@ -package mcp.mobius.opis.commands; +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 net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/mcp/mobius/opis/commands/CommandKill.java b/mcp/mobius/opis/commands/server/CommandKill.java similarity index 96% rename from mcp/mobius/opis/commands/CommandKill.java rename to mcp/mobius/opis/commands/server/CommandKill.java index f9ab842..4814dd8 100644 --- a/mcp/mobius/opis/commands/CommandKill.java +++ b/mcp/mobius/opis/commands/server/CommandKill.java @@ -1,7 +1,8 @@ -package mcp.mobius.opis.commands; +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 net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; diff --git a/mcp/mobius/opis/commands/CommandKillAll.java b/mcp/mobius/opis/commands/server/CommandKillAll.java similarity index 96% rename from mcp/mobius/opis/commands/CommandKillAll.java rename to mcp/mobius/opis/commands/server/CommandKillAll.java index 67206d7..c72681b 100644 --- a/mcp/mobius/opis/commands/CommandKillAll.java +++ b/mcp/mobius/opis/commands/server/CommandKillAll.java @@ -1,10 +1,11 @@ -package mcp.mobius.opis.commands; +package mcp.mobius.opis.commands.server; import org.apache.commons.lang3.StringUtils; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; -import mcp.mobius.opis.data.EntityManager; +import mcp.mobius.opis.commands.IOpisCommand; +import mcp.mobius.opis.data.server.EntityManager; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; diff --git a/mcp/mobius/opis/commands/CommandMeanModTime.java b/mcp/mobius/opis/commands/server/CommandMeanModTime.java similarity index 91% rename from mcp/mobius/opis/commands/CommandMeanModTime.java rename to mcp/mobius/opis/commands/server/CommandMeanModTime.java index 89f1c6d..d95dfe0 100644 --- a/mcp/mobius/opis/commands/CommandMeanModTime.java +++ b/mcp/mobius/opis/commands/server/CommandMeanModTime.java @@ -1,9 +1,10 @@ -package mcp.mobius.opis.commands; +package mcp.mobius.opis.commands.server; import java.util.ArrayList; -import mcp.mobius.opis.data.TileEntityManager; +import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.ModStats; +import mcp.mobius.opis.data.server.TileEntityManager; import mcp.mobius.opis.network.server.Packet_ModMeanTime; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; diff --git a/mcp/mobius/opis/commands/CommandReset.java b/mcp/mobius/opis/commands/server/CommandReset.java similarity index 91% rename from mcp/mobius/opis/commands/CommandReset.java rename to mcp/mobius/opis/commands/server/CommandReset.java index 17dcf4f..38c23d4 100644 --- a/mcp/mobius/opis/commands/CommandReset.java +++ b/mcp/mobius/opis/commands/server/CommandReset.java @@ -1,13 +1,14 @@ -package mcp.mobius.opis.commands; +package mcp.mobius.opis.commands.server; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; import mcp.mobius.mobiuscore.profiler.DummyProfiler; import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar; import mcp.mobius.opis.modOpis; -import mcp.mobius.opis.data.EntityManager; -import mcp.mobius.opis.data.TickHandlerManager; -import mcp.mobius.opis.data.TileEntityManager; +import mcp.mobius.opis.commands.IOpisCommand; +import mcp.mobius.opis.data.server.EntityManager; +import mcp.mobius.opis.data.server.TickHandlerManager; +import mcp.mobius.opis.data.server.TileEntityManager; import mcp.mobius.opis.network.server.Packet_ClearSelection; import mcp.mobius.opis.server.OpisServerTickHandler; import net.minecraft.command.CommandBase; diff --git a/mcp/mobius/opis/commands/CommandStart.java b/mcp/mobius/opis/commands/server/CommandStart.java similarity index 85% rename from mcp/mobius/opis/commands/CommandStart.java rename to mcp/mobius/opis/commands/server/CommandStart.java index 198d61b..f9f7aae 100644 --- a/mcp/mobius/opis/commands/CommandStart.java +++ b/mcp/mobius/opis/commands/server/CommandStart.java @@ -1,14 +1,15 @@ -package mcp.mobius.opis.commands; +package mcp.mobius.opis.commands.server; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.modOpis; -import mcp.mobius.opis.data.EntityManager; -import mcp.mobius.opis.data.EntityProfiler; -import mcp.mobius.opis.data.TickHandlerManager; -import mcp.mobius.opis.data.TickHandlerProfiler; -import mcp.mobius.opis.data.TileEntityManager; -import mcp.mobius.opis.data.TileEntityProfiler; +import mcp.mobius.opis.commands.IOpisCommand; +import mcp.mobius.opis.data.server.EntityManager; +import mcp.mobius.opis.data.server.EntityProfiler; +import mcp.mobius.opis.data.server.TickHandlerManager; +import mcp.mobius.opis.data.server.TickHandlerProfiler; +import mcp.mobius.opis.data.server.TileEntityManager; +import mcp.mobius.opis.data.server.TileEntityProfiler; import mcp.mobius.opis.server.OpisServerTickHandler; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; diff --git a/mcp/mobius/opis/commands/CommandStop.java b/mcp/mobius/opis/commands/server/CommandStop.java similarity index 96% rename from mcp/mobius/opis/commands/CommandStop.java rename to mcp/mobius/opis/commands/server/CommandStop.java index 1e00d4d..950a327 100644 --- a/mcp/mobius/opis/commands/CommandStop.java +++ b/mcp/mobius/opis/commands/server/CommandStop.java @@ -1,9 +1,10 @@ -package mcp.mobius.opis.commands; +package mcp.mobius.opis.commands.server; import cpw.mods.fml.common.network.PacketDispatcher; 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 net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; diff --git a/mcp/mobius/opis/commands/CommandTPS.java b/mcp/mobius/opis/commands/server/CommandTPS.java similarity index 91% rename from mcp/mobius/opis/commands/CommandTPS.java rename to mcp/mobius/opis/commands/server/CommandTPS.java index 8d679db..7cc28f9 100644 --- a/mcp/mobius/opis/commands/CommandTPS.java +++ b/mcp/mobius/opis/commands/server/CommandTPS.java @@ -1,5 +1,6 @@ -package mcp.mobius.opis.commands; +package mcp.mobius.opis.commands.server; +import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.network.server.Packet_TPS; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; diff --git a/mcp/mobius/opis/commands/CommandTicks.java b/mcp/mobius/opis/commands/server/CommandTicks.java similarity index 95% rename from mcp/mobius/opis/commands/CommandTicks.java rename to mcp/mobius/opis/commands/server/CommandTicks.java index a201886..8d15d1d 100644 --- a/mcp/mobius/opis/commands/CommandTicks.java +++ b/mcp/mobius/opis/commands/server/CommandTicks.java @@ -1,8 +1,9 @@ -package mcp.mobius.opis.commands; +package mcp.mobius.opis.commands.server; 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 net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/mcp/mobius/opis/commands/CommandTimingEntities.java b/mcp/mobius/opis/commands/server/CommandTimingEntities.java similarity index 92% rename from mcp/mobius/opis/commands/CommandTimingEntities.java rename to mcp/mobius/opis/commands/server/CommandTimingEntities.java index c150ef6..647c903 100644 --- a/mcp/mobius/opis/commands/CommandTimingEntities.java +++ b/mcp/mobius/opis/commands/server/CommandTimingEntities.java @@ -1,11 +1,12 @@ -package mcp.mobius.opis.commands; +package mcp.mobius.opis.commands.server; import java.util.ArrayList; import java.util.HashMap; -import mcp.mobius.opis.data.EntityManager; +import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.CoordinatesChunk; import mcp.mobius.opis.data.holders.EntityStats; +import mcp.mobius.opis.data.server.EntityManager; import mcp.mobius.opis.network.server.Packet_DataScreenTimingEntities; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; diff --git a/mcp/mobius/opis/commands/CommandTimingTileEntities.java b/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java similarity index 92% rename from mcp/mobius/opis/commands/CommandTimingTileEntities.java rename to mcp/mobius/opis/commands/server/CommandTimingTileEntities.java index cef03c3..640b601 100644 --- a/mcp/mobius/opis/commands/CommandTimingTileEntities.java +++ b/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java @@ -1,9 +1,10 @@ -package mcp.mobius.opis.commands; +package mcp.mobius.opis.commands.server; import java.util.ArrayList; -import mcp.mobius.opis.data.TileEntityManager; +import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.TileEntityStats; +import mcp.mobius.opis.data.server.TileEntityManager; import mcp.mobius.opis.network.server.Packet_TileEntitiesTopList; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; diff --git a/mcp/mobius/opis/data/ChunkManager.java b/mcp/mobius/opis/data/server/ChunkManager.java similarity index 98% rename from mcp/mobius/opis/data/ChunkManager.java rename to mcp/mobius/opis/data/server/ChunkManager.java index b9b1daf..49169a9 100644 --- a/mcp/mobius/opis/data/ChunkManager.java +++ b/mcp/mobius/opis/data/server/ChunkManager.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.data; +package mcp.mobius.opis.data.server; import java.io.DataOutputStream; import java.io.IOException; diff --git a/mcp/mobius/opis/data/EntityManager.java b/mcp/mobius/opis/data/server/EntityManager.java similarity index 99% rename from mcp/mobius/opis/data/EntityManager.java rename to mcp/mobius/opis/data/server/EntityManager.java index 5f5c410..28497d4 100644 --- a/mcp/mobius/opis/data/EntityManager.java +++ b/mcp/mobius/opis/data/server/EntityManager.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.data; +package mcp.mobius.opis.data.server; import java.util.ArrayList; import java.util.Collections; diff --git a/mcp/mobius/opis/data/EntityProfiler.java b/mcp/mobius/opis/data/server/EntityProfiler.java similarity index 97% rename from mcp/mobius/opis/data/EntityProfiler.java rename to mcp/mobius/opis/data/server/EntityProfiler.java index 2d0699c..ed9b2da 100644 --- a/mcp/mobius/opis/data/EntityProfiler.java +++ b/mcp/mobius/opis/data/server/EntityProfiler.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.data; +package mcp.mobius.opis.data.server; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; diff --git a/mcp/mobius/opis/data/TickHandlerManager.java b/mcp/mobius/opis/data/server/TickHandlerManager.java similarity index 97% rename from mcp/mobius/opis/data/TickHandlerManager.java rename to mcp/mobius/opis/data/server/TickHandlerManager.java index dba7e92..4c5bfec 100644 --- a/mcp/mobius/opis/data/TickHandlerManager.java +++ b/mcp/mobius/opis/data/server/TickHandlerManager.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.data; +package mcp.mobius.opis.data.server; import java.util.ArrayList; import java.util.Collections; diff --git a/mcp/mobius/opis/data/TickHandlerProfiler.java b/mcp/mobius/opis/data/server/TickHandlerProfiler.java similarity index 98% rename from mcp/mobius/opis/data/TickHandlerProfiler.java rename to mcp/mobius/opis/data/server/TickHandlerProfiler.java index bf05868..24126c1 100644 --- a/mcp/mobius/opis/data/TickHandlerProfiler.java +++ b/mcp/mobius/opis/data/server/TickHandlerProfiler.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.data; +package mcp.mobius.opis.data.server; import java.util.EnumSet; diff --git a/mcp/mobius/opis/data/TileEntityManager.java b/mcp/mobius/opis/data/server/TileEntityManager.java similarity index 99% rename from mcp/mobius/opis/data/TileEntityManager.java rename to mcp/mobius/opis/data/server/TileEntityManager.java index 54941bf..fa4089b 100644 --- a/mcp/mobius/opis/data/TileEntityManager.java +++ b/mcp/mobius/opis/data/server/TileEntityManager.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.data; +package mcp.mobius.opis.data.server; import java.util.ArrayList; import java.util.Collection; diff --git a/mcp/mobius/opis/data/TileEntityProfiler.java b/mcp/mobius/opis/data/server/TileEntityProfiler.java similarity index 97% rename from mcp/mobius/opis/data/TileEntityProfiler.java rename to mcp/mobius/opis/data/server/TileEntityProfiler.java index 85273aa..f4dd8a8 100644 --- a/mcp/mobius/opis/data/TileEntityProfiler.java +++ b/mcp/mobius/opis/data/server/TileEntityProfiler.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.data; +package mcp.mobius.opis.data.server; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index 065bb0d..9173c80 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -8,26 +8,26 @@ 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.CommandAmountEntities; -import mcp.mobius.opis.commands.CommandChunkDump; -import mcp.mobius.opis.commands.CommandChunkList; -import mcp.mobius.opis.commands.CommandDataDump; -import mcp.mobius.opis.commands.CommandHandler; -import mcp.mobius.opis.commands.CommandHelp; -import mcp.mobius.opis.commands.CommandKill; -import mcp.mobius.opis.commands.CommandKillAll; -import mcp.mobius.opis.commands.CommandReset; -import mcp.mobius.opis.commands.CommandTimingEntities; -import mcp.mobius.opis.commands.CommandFrequency; -import mcp.mobius.opis.commands.CommandMeanModTime; -import mcp.mobius.opis.commands.CommandStart; -import mcp.mobius.opis.commands.CommandStop; -import mcp.mobius.opis.commands.CommandTPS; -import mcp.mobius.opis.commands.CommandTicks; -import mcp.mobius.opis.commands.CommandTimingTileEntities; -import mcp.mobius.opis.data.EntityProfiler; -import mcp.mobius.opis.data.TileEntityProfiler; +import mcp.mobius.opis.commands.server.CommandAmountEntities; +import mcp.mobius.opis.commands.server.CommandChunkDump; +import mcp.mobius.opis.commands.server.CommandChunkList; +import mcp.mobius.opis.commands.server.CommandDataDump; +import mcp.mobius.opis.commands.server.CommandFrequency; +import mcp.mobius.opis.commands.server.CommandHandler; +import mcp.mobius.opis.commands.server.CommandHelp; +import mcp.mobius.opis.commands.server.CommandKill; +import mcp.mobius.opis.commands.server.CommandKillAll; +import mcp.mobius.opis.commands.server.CommandMeanModTime; +import mcp.mobius.opis.commands.server.CommandReset; +import mcp.mobius.opis.commands.server.CommandStart; +import mcp.mobius.opis.commands.server.CommandStop; +import mcp.mobius.opis.commands.server.CommandTPS; +import mcp.mobius.opis.commands.server.CommandTicks; +import mcp.mobius.opis.commands.server.CommandTimingEntities; +import mcp.mobius.opis.commands.server.CommandTimingTileEntities; import mcp.mobius.opis.data.holders.CoordinatesBlock; +import mcp.mobius.opis.data.server.EntityProfiler; +import mcp.mobius.opis.data.server.TileEntityProfiler; import mcp.mobius.opis.network.OpisConnectionHandler; import mcp.mobius.opis.network.OpisPacketHandler; import mcp.mobius.opis.network.Packet251Extended; @@ -88,7 +88,6 @@ public class modOpis { @EventHandler public void load(FMLInitializationEvent event) { TickRegistry.registerTickHandler(new OpisServerTickHandler(), Side.SERVER); - //TickRegistry.registerTickHandler(new OpisClientTickHandler(), Side.CLIENT); } @EventHandler @@ -118,7 +117,5 @@ public class modOpis { //event.registerServerCommand(new CommandTPS()); GameRegistry.registerPlayerTracker(new OpisPlayerTracker()); - //ProfilerRegistrar.registerProfilerTileEntity(new TileEntityProfiler()); - //ProfilerRegistrar.registerProfilerEntity(new EntityProfiler()); } } diff --git a/mcp/mobius/opis/network/DataReqHandler.java b/mcp/mobius/opis/network/DataReqHandler.java index 91dc7a5..674c1e9 100644 --- a/mcp/mobius/opis/network/DataReqHandler.java +++ b/mcp/mobius/opis/network/DataReqHandler.java @@ -7,9 +7,9 @@ import java.util.logging.Level; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.modOpis; -import mcp.mobius.opis.data.EntityManager; import mcp.mobius.opis.data.holders.CoordinatesChunk; import mcp.mobius.opis.data.holders.EntityStats; +import mcp.mobius.opis.data.server.EntityManager; import mcp.mobius.opis.network.server.Packet_DataListChunkEntities; import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities; diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index 55b6d25..57c04ed 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -7,12 +7,12 @@ import java.util.ArrayList; import mapwriter.Mw; import mcp.mobius.opis.modOpis; -import mcp.mobius.opis.data.ChunkManager; -import mcp.mobius.opis.data.EntityManager; -import mcp.mobius.opis.data.TileEntityManager; import mcp.mobius.opis.data.holders.CoordinatesChunk; import mcp.mobius.opis.data.holders.EntityStats; import mcp.mobius.opis.data.holders.TicketData; +import mcp.mobius.opis.data.server.ChunkManager; +import mcp.mobius.opis.data.server.EntityManager; +import mcp.mobius.opis.data.server.TileEntityManager; import mcp.mobius.opis.network.client.Packet_ReqChunks; import mcp.mobius.opis.network.client.Packet_ReqChunksInDim; import mcp.mobius.opis.network.client.Packet_ReqData; diff --git a/mcp/mobius/opis/overlay/OverlayLoadedChunks.java b/mcp/mobius/opis/overlay/OverlayLoadedChunks.java index 71e7c7b..2dc6c2c 100644 --- a/mcp/mobius/opis/overlay/OverlayLoadedChunks.java +++ b/mcp/mobius/opis/overlay/OverlayLoadedChunks.java @@ -17,10 +17,10 @@ import mapwriter.api.IMwChunkOverlay; import mapwriter.api.IMwDataProvider; import mapwriter.map.MapView; import mapwriter.map.mapmode.MapMode; -import mcp.mobius.opis.data.ChunkManager; import mcp.mobius.opis.data.holders.CoordinatesBlock; import mcp.mobius.opis.data.holders.CoordinatesChunk; import mcp.mobius.opis.data.holders.TicketData; +import mcp.mobius.opis.data.server.ChunkManager; import mcp.mobius.opis.gui.events.MouseEvent; import mcp.mobius.opis.gui.interfaces.CType; import mcp.mobius.opis.gui.interfaces.IWidget; diff --git a/mcp/mobius/opis/overlay/OverlayMeanTime.java b/mcp/mobius/opis/overlay/OverlayMeanTime.java index 1cdbbdb..e45259c 100644 --- a/mcp/mobius/opis/overlay/OverlayMeanTime.java +++ b/mcp/mobius/opis/overlay/OverlayMeanTime.java @@ -19,10 +19,10 @@ import mapwriter.api.IMwDataProvider; import mapwriter.map.MapView; import mapwriter.map.mapmode.MapMode; import mcp.mobius.opis.modOpis; -import mcp.mobius.opis.data.ChunkManager; import mcp.mobius.opis.data.holders.CoordinatesBlock; import mcp.mobius.opis.data.holders.CoordinatesChunk; import mcp.mobius.opis.data.holders.TileEntityStats; +import mcp.mobius.opis.data.server.ChunkManager; import mcp.mobius.opis.gui.events.MouseEvent; import mcp.mobius.opis.gui.interfaces.CType; import mcp.mobius.opis.gui.interfaces.IWidget; diff --git a/mcp/mobius/opis/server/OpisServerTickHandler.java b/mcp/mobius/opis/server/OpisServerTickHandler.java index e6f6e0e..4079e9e 100644 --- a/mcp/mobius/opis/server/OpisServerTickHandler.java +++ b/mcp/mobius/opis/server/OpisServerTickHandler.java @@ -9,8 +9,8 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.packet.Packet3Chat; import net.minecraft.util.ChatMessageComponent; import mcp.mobius.opis.modOpis; -import mcp.mobius.opis.data.ChunkManager; -import mcp.mobius.opis.data.TileEntityManager; +import mcp.mobius.opis.data.server.ChunkManager; +import mcp.mobius.opis.data.server.TileEntityManager; import mcp.mobius.opis.network.server.Packet_LoadedChunks; import mcp.mobius.opis.network.server.Packet_MeanTime; import mcp.mobius.opis.overlay.OverlayStatus;