From 1a55456fb3d34fa09133e95e3205f8368fa59575 Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Mon, 23 Dec 2013 04:41:33 +0100 Subject: [PATCH] Refactoring --- .../server/CommandAmountEntities.java | 2 +- .../commands/server/CommandChunkList.java | 2 +- .../opis/commands/server/CommandDataDump.java | 2 +- .../opis/commands/server/CommandHandler.java | 2 +- .../opis/commands/server/CommandKillAll.java | 2 +- .../commands/server/CommandMeanModTime.java | 2 +- .../opis/commands/server/CommandReset.java | 6 +- .../opis/commands/server/CommandStart.java | 6 +- .../server/CommandTimingEntities.java | 2 +- .../server/CommandTimingTileEntities.java | 2 +- .../data/client/TickHandlerClientManager.java | 57 ------------------- .../client/TickHandlerClientProfiler.java | 14 ++--- .../{server => managers}/ChunkManager.java | 2 +- .../{server => managers}/EntityManager.java | 2 +- .../TickHandlerManager.java | 2 +- .../TileEntityManager.java | 2 +- .../opis/data/server/EntityProfiler.java | 1 + .../opis/data/server/TickHandlerProfiler.java | 1 + .../opis/data/server/TileEntityProfiler.java | 1 + .../opis/network/ClientCommandHandler.java | 8 +-- mcp/mobius/opis/network/DataReqHandler.java | 2 +- .../opis/network/OpisPacketHandler.java | 6 +- .../opis/overlay/OverlayLoadedChunks.java | 2 +- mcp/mobius/opis/overlay/OverlayMeanTime.java | 2 +- .../opis/server/OpisServerTickHandler.java | 4 +- 25 files changed, 40 insertions(+), 94 deletions(-) delete mode 100644 mcp/mobius/opis/data/client/TickHandlerClientManager.java rename mcp/mobius/opis/data/{server => managers}/ChunkManager.java (98%) rename mcp/mobius/opis/data/{server => managers}/EntityManager.java (99%) rename mcp/mobius/opis/data/{server => managers}/TickHandlerManager.java (97%) rename mcp/mobius/opis/data/{server => managers}/TileEntityManager.java (99%) diff --git a/mcp/mobius/opis/commands/server/CommandAmountEntities.java b/mcp/mobius/opis/commands/server/CommandAmountEntities.java index 643f062..cdccc65 100644 --- a/mcp/mobius/opis/commands/server/CommandAmountEntities.java +++ b/mcp/mobius/opis/commands/server/CommandAmountEntities.java @@ -3,7 +3,7 @@ package mcp.mobius.opis.commands.server; import java.util.HashMap; import mcp.mobius.opis.commands.IOpisCommand; -import mcp.mobius.opis.data.server.EntityManager; +import mcp.mobius.opis.data.managers.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/server/CommandChunkList.java b/mcp/mobius/opis/commands/server/CommandChunkList.java index fdaf71d..e243cea 100644 --- a/mcp/mobius/opis/commands/server/CommandChunkList.java +++ b/mcp/mobius/opis/commands/server/CommandChunkList.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.ChunkStats; -import mcp.mobius.opis.data.server.ChunkManager; +import mcp.mobius.opis.data.managers.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/server/CommandDataDump.java b/mcp/mobius/opis/commands/server/CommandDataDump.java index 15167e4..9605ca8 100644 --- a/mcp/mobius/opis/commands/server/CommandDataDump.java +++ b/mcp/mobius/opis/commands/server/CommandDataDump.java @@ -12,7 +12,7 @@ import mcp.mobius.opis.modOpis; 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.data.managers.TileEntityManager; import mcp.mobius.opis.tools.ModIdentification; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; diff --git a/mcp/mobius/opis/commands/server/CommandHandler.java b/mcp/mobius/opis/commands/server/CommandHandler.java index d1ea0d4..6ede52f 100644 --- a/mcp/mobius/opis/commands/server/CommandHandler.java +++ b/mcp/mobius/opis/commands/server/CommandHandler.java @@ -6,7 +6,7 @@ import java.util.HashMap; import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.TickHandlerStats; -import mcp.mobius.opis.data.server.TickHandlerManager; +import mcp.mobius.opis.data.managers.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/server/CommandKillAll.java b/mcp/mobius/opis/commands/server/CommandKillAll.java index c72681b..5102b8c 100644 --- a/mcp/mobius/opis/commands/server/CommandKillAll.java +++ b/mcp/mobius/opis/commands/server/CommandKillAll.java @@ -5,7 +5,7 @@ import org.apache.commons.lang3.StringUtils; 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.server.EntityManager; +import mcp.mobius.opis.data.managers.EntityManager; 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 d95dfe0..98d5999 100644 --- a/mcp/mobius/opis/commands/server/CommandMeanModTime.java +++ b/mcp/mobius/opis/commands/server/CommandMeanModTime.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.ModStats; -import mcp.mobius.opis.data.server.TileEntityManager; +import mcp.mobius.opis.data.managers.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/server/CommandReset.java b/mcp/mobius/opis/commands/server/CommandReset.java index 38c23d4..27ce0c3 100644 --- a/mcp/mobius/opis/commands/server/CommandReset.java +++ b/mcp/mobius/opis/commands/server/CommandReset.java @@ -6,9 +6,9 @@ import mcp.mobius.mobiuscore.profiler.DummyProfiler; import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar; import mcp.mobius.opis.modOpis; 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.data.managers.EntityManager; +import mcp.mobius.opis.data.managers.TickHandlerManager; +import mcp.mobius.opis.data.managers.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/server/CommandStart.java b/mcp/mobius/opis/commands/server/CommandStart.java index f9f7aae..182b6d4 100644 --- a/mcp/mobius/opis/commands/server/CommandStart.java +++ b/mcp/mobius/opis/commands/server/CommandStart.java @@ -4,11 +4,11 @@ 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.data.server.EntityManager; +import mcp.mobius.opis.data.managers.EntityManager; +import mcp.mobius.opis.data.managers.TickHandlerManager; +import mcp.mobius.opis.data.managers.TileEntityManager; 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; diff --git a/mcp/mobius/opis/commands/server/CommandTimingEntities.java b/mcp/mobius/opis/commands/server/CommandTimingEntities.java index 647c903..ebf530d 100644 --- a/mcp/mobius/opis/commands/server/CommandTimingEntities.java +++ b/mcp/mobius/opis/commands/server/CommandTimingEntities.java @@ -6,7 +6,7 @@ import java.util.HashMap; 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.data.managers.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/server/CommandTimingTileEntities.java b/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java index 640b601..7a26315 100644 --- a/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java +++ b/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import mcp.mobius.opis.commands.IOpisCommand; import mcp.mobius.opis.data.holders.TileEntityStats; -import mcp.mobius.opis.data.server.TileEntityManager; +import mcp.mobius.opis.data.managers.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/client/TickHandlerClientManager.java b/mcp/mobius/opis/data/client/TickHandlerClientManager.java deleted file mode 100644 index 721c21d..0000000 --- a/mcp/mobius/opis/data/client/TickHandlerClientManager.java +++ /dev/null @@ -1,57 +0,0 @@ -package mcp.mobius.opis.data.client; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; - -import cpw.mods.fml.common.IScheduledTickHandler; -import cpw.mods.fml.common.SingleIntervalHandler; -import mcp.mobius.opis.data.holders.TickHandlerStats; - -public class TickHandlerClientManager { - - public static HashMap startStats = new HashMap(); - public static HashMap endStats = new HashMap(); - - public static void addHandlerStart(IScheduledTickHandler handler, long timing){ - String name = getHandlerName(handler); - - if (!(startStats.containsKey(name))) - startStats.put(name, new TickHandlerStats(name)); - startStats.get(name).addMeasure(timing); - } - - public static void addHandlerEnd(IScheduledTickHandler handler, long timing){ - String name = getHandlerName(handler); - - if (!(endStats.containsKey(name))) - endStats.put(name, new TickHandlerStats(name)); - endStats.get(name).addMeasure(timing); - } - - public static ArrayList getCumulatedStats(){ - HashMap totalStats = new HashMap(); - - for (String key : startStats.keySet()){ - totalStats.put(key, new TickHandlerStats(key)); - totalStats.get(key).setGeometricMean(startStats.get(key).getGeometricMean() + endStats.get(key).getGeometricMean()); - } - - ArrayList sortedStats = new ArrayList(totalStats.values()); - Collections.sort(sortedStats); - - return sortedStats; - } - - public static String getHandlerName(IScheduledTickHandler handler){ - String name = handler.getLabel(); - if (name == null || name.equals("")) - if (handler instanceof SingleIntervalHandler) - name = ((SingleIntervalHandler)handler).wrapped.getClass().getName(); - else - name = handler.getClass().getName(); - - return name; - } - -} diff --git a/mcp/mobius/opis/data/client/TickHandlerClientProfiler.java b/mcp/mobius/opis/data/client/TickHandlerClientProfiler.java index 3798116..e2b85ee 100644 --- a/mcp/mobius/opis/data/client/TickHandlerClientProfiler.java +++ b/mcp/mobius/opis/data/client/TickHandlerClientProfiler.java @@ -5,7 +5,7 @@ import java.util.EnumSet; import mcp.mobius.mobiuscore.profiler.IProfilerTick; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.client.OpisClientTickHandler; -import mcp.mobius.opis.data.server.TickHandlerManager; +import mcp.mobius.opis.data.managers.TickHandlerManager; import mcp.mobius.opis.server.OpisServerTickHandler; import cpw.mods.fml.common.IScheduledTickHandler; import cpw.mods.fml.common.TickType; @@ -28,7 +28,7 @@ public class TickHandlerClientProfiler implements IProfilerTick { if ((!modOpis.profilerRun) || (OpisClientTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0)) return; if (!ticksToRun.contains(TickType.RENDER)) return; - String name = TickHandlerClientManager.getHandlerName(ticker); + String name = TickHandlerManager.getHandlerName(ticker); this.currentHandler = name; this.clock.start(); } @@ -39,12 +39,12 @@ public class TickHandlerClientProfiler implements IProfilerTick { if (!ticksToRun.contains(TickType.RENDER)) return; this.clock.stop(); - String name = TickHandlerClientManager.getHandlerName(ticker); + String name = TickHandlerManager.getHandlerName(ticker); if (!this.currentHandler.equals(name)) throw new RuntimeException(String.format("Mismatched tick handler during the profiling ! %s %s", this.currentHandler, ticker.getLabel())); //EntityManager.addEntity(ent, this.clock.timeDelta); - TickHandlerClientManager.addHandlerStart(ticker, this.clock.timeDelta); + TickHandlerManager.addHandlerStart(ticker, this.clock.timeDelta); this.currentHandler = null; } @@ -53,7 +53,7 @@ public class TickHandlerClientProfiler implements IProfilerTick { if ((!modOpis.profilerRun) || (OpisClientTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0)) return; if (!ticksToRun.contains(TickType.RENDER)) return; - String name = TickHandlerClientManager.getHandlerName(ticker); + String name = TickHandlerManager.getHandlerName(ticker); this.currentHandler = name; this.clock.start(); } @@ -64,11 +64,11 @@ public class TickHandlerClientProfiler implements IProfilerTick { if (!ticksToRun.contains(TickType.RENDER)) return; this.clock.stop(); - String name = TickHandlerClientManager.getHandlerName(ticker); + String name = TickHandlerManager.getHandlerName(ticker); if (!this.currentHandler.equals(name)) throw new RuntimeException(String.format("Mismatched tick handler during the profiling ! %s %s", this.currentHandler, ticker.getLabel())); - TickHandlerClientManager.addHandlerEnd(ticker, this.clock.timeDelta); + TickHandlerManager.addHandlerEnd(ticker, this.clock.timeDelta); this.currentHandler = null; } diff --git a/mcp/mobius/opis/data/server/ChunkManager.java b/mcp/mobius/opis/data/managers/ChunkManager.java similarity index 98% rename from mcp/mobius/opis/data/server/ChunkManager.java rename to mcp/mobius/opis/data/managers/ChunkManager.java index 49169a9..7992513 100644 --- a/mcp/mobius/opis/data/server/ChunkManager.java +++ b/mcp/mobius/opis/data/managers/ChunkManager.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.data.server; +package mcp.mobius.opis.data.managers; import java.io.DataOutputStream; import java.io.IOException; diff --git a/mcp/mobius/opis/data/server/EntityManager.java b/mcp/mobius/opis/data/managers/EntityManager.java similarity index 99% rename from mcp/mobius/opis/data/server/EntityManager.java rename to mcp/mobius/opis/data/managers/EntityManager.java index 28497d4..2869b2b 100644 --- a/mcp/mobius/opis/data/server/EntityManager.java +++ b/mcp/mobius/opis/data/managers/EntityManager.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.data.server; +package mcp.mobius.opis.data.managers; import java.util.ArrayList; import java.util.Collections; diff --git a/mcp/mobius/opis/data/server/TickHandlerManager.java b/mcp/mobius/opis/data/managers/TickHandlerManager.java similarity index 97% rename from mcp/mobius/opis/data/server/TickHandlerManager.java rename to mcp/mobius/opis/data/managers/TickHandlerManager.java index c9405aa..7bb3ca2 100644 --- a/mcp/mobius/opis/data/server/TickHandlerManager.java +++ b/mcp/mobius/opis/data/managers/TickHandlerManager.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.data.server; +package mcp.mobius.opis.data.managers; import java.util.ArrayList; import java.util.Collections; diff --git a/mcp/mobius/opis/data/server/TileEntityManager.java b/mcp/mobius/opis/data/managers/TileEntityManager.java similarity index 99% rename from mcp/mobius/opis/data/server/TileEntityManager.java rename to mcp/mobius/opis/data/managers/TileEntityManager.java index fa4089b..cdf04ea 100644 --- a/mcp/mobius/opis/data/server/TileEntityManager.java +++ b/mcp/mobius/opis/data/managers/TileEntityManager.java @@ -1,4 +1,4 @@ -package mcp.mobius.opis.data.server; +package mcp.mobius.opis.data.managers; import java.util.ArrayList; import java.util.Collection; diff --git a/mcp/mobius/opis/data/server/EntityProfiler.java b/mcp/mobius/opis/data/server/EntityProfiler.java index ed9b2da..4c63aeb 100644 --- a/mcp/mobius/opis/data/server/EntityProfiler.java +++ b/mcp/mobius/opis/data/server/EntityProfiler.java @@ -5,6 +5,7 @@ import cpw.mods.fml.relauncher.Side; 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; public class EntityProfiler implements IProfilerEntity { diff --git a/mcp/mobius/opis/data/server/TickHandlerProfiler.java b/mcp/mobius/opis/data/server/TickHandlerProfiler.java index 450b3b1..3631cf9 100644 --- a/mcp/mobius/opis/data/server/TickHandlerProfiler.java +++ b/mcp/mobius/opis/data/server/TickHandlerProfiler.java @@ -6,6 +6,7 @@ import cpw.mods.fml.common.IScheduledTickHandler; import cpw.mods.fml.common.TickType; import mcp.mobius.mobiuscore.profiler.IProfilerTick; import mcp.mobius.opis.modOpis; +import mcp.mobius.opis.data.managers.TickHandlerManager; import mcp.mobius.opis.server.OpisServerTickHandler; public class TickHandlerProfiler implements IProfilerTick { diff --git a/mcp/mobius/opis/data/server/TileEntityProfiler.java b/mcp/mobius/opis/data/server/TileEntityProfiler.java index f4dd8a8..8ee241b 100644 --- a/mcp/mobius/opis/data/server/TileEntityProfiler.java +++ b/mcp/mobius/opis/data/server/TileEntityProfiler.java @@ -6,6 +6,7 @@ import net.minecraft.tileentity.TileEntity; 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; public class TileEntityProfiler implements IProfilerTileEntity { diff --git a/mcp/mobius/opis/network/ClientCommandHandler.java b/mcp/mobius/opis/network/ClientCommandHandler.java index 4e13d2d..dbcb478 100644 --- a/mcp/mobius/opis/network/ClientCommandHandler.java +++ b/mcp/mobius/opis/network/ClientCommandHandler.java @@ -6,9 +6,9 @@ import java.util.logging.Level; import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.client.OpisClientTickHandler; -import mcp.mobius.opis.data.client.TickHandlerClientManager; import mcp.mobius.opis.data.client.TickHandlerClientProfiler; import mcp.mobius.opis.data.holders.TickHandlerStats; +import mcp.mobius.opis.data.managers.TickHandlerManager; public class ClientCommandHandler { @@ -27,14 +27,14 @@ public class ClientCommandHandler { modOpis.profilerRun = true; OpisClientTickHandler.instance.profilerRunningTicks = 0; - TickHandlerClientManager.startStats.clear(); - TickHandlerClientManager.endStats.clear(); + TickHandlerManager.startStats.clear(); + TickHandlerManager.endStats.clear(); ProfilerRegistrar.registerProfilerTick(new TickHandlerClientProfiler()); } else if (cmd == ClientCommand.SHOW_RENDER_TICK){ modOpis.log.log(Level.INFO, "=== RENDER TICK ==="); - ArrayList stats = TickHandlerClientManager.getCumulatedStats(); + ArrayList stats = TickHandlerManager.getCumulatedStats(); for (TickHandlerStats stat : stats){ System.out.printf("%s \n", stat); } diff --git a/mcp/mobius/opis/network/DataReqHandler.java b/mcp/mobius/opis/network/DataReqHandler.java index 674c1e9..ce9539f 100644 --- a/mcp/mobius/opis/network/DataReqHandler.java +++ b/mcp/mobius/opis/network/DataReqHandler.java @@ -9,7 +9,7 @@ import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.modOpis; 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.data.managers.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 c3ccd8f..a3124d6 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -10,9 +10,9 @@ import mcp.mobius.opis.modOpis; 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.data.managers.ChunkManager; +import mcp.mobius.opis.data.managers.EntityManager; +import mcp.mobius.opis.data.managers.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 2dc6c2c..c9fb2c1 100644 --- a/mcp/mobius/opis/overlay/OverlayLoadedChunks.java +++ b/mcp/mobius/opis/overlay/OverlayLoadedChunks.java @@ -20,7 +20,7 @@ import mapwriter.map.mapmode.MapMode; 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.data.managers.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 e45259c..0bf1c2a 100644 --- a/mcp/mobius/opis/overlay/OverlayMeanTime.java +++ b/mcp/mobius/opis/overlay/OverlayMeanTime.java @@ -22,7 +22,7 @@ import mcp.mobius.opis.modOpis; 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.data.managers.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 4079e9e..b3e5d76 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.server.ChunkManager; -import mcp.mobius.opis.data.server.TileEntityManager; +import mcp.mobius.opis.data.managers.ChunkManager; +import mcp.mobius.opis.data.managers.TileEntityManager; import mcp.mobius.opis.network.server.Packet_LoadedChunks; import mcp.mobius.opis.network.server.Packet_MeanTime; import mcp.mobius.opis.overlay.OverlayStatus;