From d150c22b82db97efc16598ddc0d2b0cf3c4b9560 Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Fri, 4 Apr 2014 00:40:46 +0200 Subject: [PATCH] Refactoring --- mcp/mobius/opis/commands/server/CommandStart.java | 2 +- mcp/mobius/opis/commands/server/CommandStop.java | 2 +- mcp/mobius/opis/data/holders/newtypes/DataBlockTick.java | 2 +- mcp/mobius/opis/data/holders/newtypes/DataDimension.java | 2 +- mcp/mobius/opis/data/holders/newtypes/DataEntity.java | 2 +- mcp/mobius/opis/data/holders/newtypes/DataHandler.java | 2 +- mcp/mobius/opis/data/holders/newtypes/DataTileEntity.java | 2 +- mcp/mobius/opis/data/managers/ChunkManager.java | 2 +- mcp/mobius/opis/data/managers/EntityManager.java | 2 +- mcp/mobius/opis/data/managers/MetaManager.java | 2 +- mcp/mobius/opis/data/managers/TickHandlerManager.java | 2 +- mcp/mobius/opis/data/managers/TileEntityManager.java | 2 +- mcp/mobius/opis/data/profilers/ProfilerAbstract.java | 2 +- mcp/mobius/opis/data/profilers/ProfilerDimBlockTick.java | 2 +- mcp/mobius/opis/data/profilers/ProfilerDimTick.java | 2 +- mcp/mobius/opis/data/profilers/ProfilerEntityUpdate.java | 2 +- mcp/mobius/opis/events/OpisClientTickHandler.java | 2 +- mcp/mobius/opis/events/OpisServerTickHandler.java | 2 +- mcp/mobius/opis/modOpis.java | 2 +- mcp/mobius/opis/network/OpisPacketHandler.java | 2 +- mcp/mobius/opis/network/ServerMessageHandler.java | 2 +- mcp/mobius/opis/proxy/ProxyClient.java | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mcp/mobius/opis/commands/server/CommandStart.java b/mcp/mobius/opis/commands/server/CommandStart.java index d0b1417..256ef7e 100644 --- a/mcp/mobius/opis/commands/server/CommandStart.java +++ b/mcp/mobius/opis/commands/server/CommandStart.java @@ -23,7 +23,7 @@ import net.minecraft.network.packet.Packet3Chat; import net.minecraft.server.MinecraftServer; import net.minecraft.server.dedicated.DedicatedServer; import net.minecraft.util.ChatMessageComponent; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; public class CommandStart extends CommandBase implements IOpisCommand { diff --git a/mcp/mobius/opis/commands/server/CommandStop.java b/mcp/mobius/opis/commands/server/CommandStop.java index 34fbdf7..3a0636c 100644 --- a/mcp/mobius/opis/commands/server/CommandStop.java +++ b/mcp/mobius/opis/commands/server/CommandStop.java @@ -15,7 +15,7 @@ import net.minecraft.network.packet.Packet3Chat; import net.minecraft.server.MinecraftServer; import net.minecraft.server.dedicated.DedicatedServer; import net.minecraft.util.ChatMessageComponent; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; public class CommandStop extends CommandBase implements IOpisCommand { diff --git a/mcp/mobius/opis/data/holders/newtypes/DataBlockTick.java b/mcp/mobius/opis/data/holders/newtypes/DataBlockTick.java index c3311a7..7ed4a06 100644 --- a/mcp/mobius/opis/data/holders/newtypes/DataBlockTick.java +++ b/mcp/mobius/opis/data/holders/newtypes/DataBlockTick.java @@ -7,7 +7,7 @@ import java.util.HashMap; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.profilers.ProfilerDimBlockTick; diff --git a/mcp/mobius/opis/data/holders/newtypes/DataDimension.java b/mcp/mobius/opis/data/holders/newtypes/DataDimension.java index ce0e328..150b6cf 100644 --- a/mcp/mobius/opis/data/holders/newtypes/DataDimension.java +++ b/mcp/mobius/opis/data/holders/newtypes/DataDimension.java @@ -8,7 +8,7 @@ import java.util.HashMap; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.profilers.ProfilerDimTick; import net.minecraft.entity.Entity; diff --git a/mcp/mobius/opis/data/holders/newtypes/DataEntity.java b/mcp/mobius/opis/data/holders/newtypes/DataEntity.java index f7e1511..cc0155c 100644 --- a/mcp/mobius/opis/data/holders/newtypes/DataEntity.java +++ b/mcp/mobius/opis/data/holders/newtypes/DataEntity.java @@ -10,7 +10,7 @@ import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import net.minecraft.entity.Entity; import net.minecraft.network.packet.Packet; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.managers.EntityManager; diff --git a/mcp/mobius/opis/data/holders/newtypes/DataHandler.java b/mcp/mobius/opis/data/holders/newtypes/DataHandler.java index 5e04c9f..8f70d80 100644 --- a/mcp/mobius/opis/data/holders/newtypes/DataHandler.java +++ b/mcp/mobius/opis/data/holders/newtypes/DataHandler.java @@ -5,7 +5,7 @@ import java.io.DataOutputStream; import java.io.IOException; import net.minecraft.network.packet.Packet; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.managers.TickHandlerManager; import mcp.mobius.opis.data.profilers.ProfilerHandlerServer; diff --git a/mcp/mobius/opis/data/holders/newtypes/DataTileEntity.java b/mcp/mobius/opis/data/holders/newtypes/DataTileEntity.java index 292982e..868e409 100644 --- a/mcp/mobius/opis/data/holders/newtypes/DataTileEntity.java +++ b/mcp/mobius/opis/data/holders/newtypes/DataTileEntity.java @@ -10,7 +10,7 @@ import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.profilers.ProfilerTileEntityUpdate; diff --git a/mcp/mobius/opis/data/managers/ChunkManager.java b/mcp/mobius/opis/data/managers/ChunkManager.java index 655215f..7e6dcaa 100644 --- a/mcp/mobius/opis/data/managers/ChunkManager.java +++ b/mcp/mobius/opis/data/managers/ChunkManager.java @@ -9,7 +9,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.api.IMessageHandler; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; diff --git a/mcp/mobius/opis/data/managers/EntityManager.java b/mcp/mobius/opis/data/managers/EntityManager.java index 56f8964..39b9747 100644 --- a/mcp/mobius/opis/data/managers/EntityManager.java +++ b/mcp/mobius/opis/data/managers/EntityManager.java @@ -30,7 +30,7 @@ import net.minecraft.world.World; import net.minecraft.world.WorldProvider; import net.minecraft.world.WorldServer; import net.minecraftforge.common.DimensionManager; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.data.holders.basetypes.AmountHolder; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk; diff --git a/mcp/mobius/opis/data/managers/MetaManager.java b/mcp/mobius/opis/data/managers/MetaManager.java index dfa65a5..9e68f7e 100644 --- a/mcp/mobius/opis/data/managers/MetaManager.java +++ b/mcp/mobius/opis/data/managers/MetaManager.java @@ -1,6 +1,6 @@ package mcp.mobius.opis.data.managers; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.events.OpisServerTickHandler; diff --git a/mcp/mobius/opis/data/managers/TickHandlerManager.java b/mcp/mobius/opis/data/managers/TickHandlerManager.java index 4480810..3c6e61d 100644 --- a/mcp/mobius/opis/data/managers/TickHandlerManager.java +++ b/mcp/mobius/opis/data/managers/TickHandlerManager.java @@ -7,7 +7,7 @@ import java.util.HashMap; import cpw.mods.fml.common.IScheduledTickHandler; import cpw.mods.fml.common.SingleIntervalHandler; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.data.holders.newtypes.DataHandler; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.profilers.ProfilerHandlerServer; diff --git a/mcp/mobius/opis/data/managers/TileEntityManager.java b/mcp/mobius/opis/data/managers/TileEntityManager.java index ebbce28..89ecd31 100644 --- a/mcp/mobius/opis/data/managers/TileEntityManager.java +++ b/mcp/mobius/opis/data/managers/TileEntityManager.java @@ -6,7 +6,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk; import mcp.mobius.opis.data.holders.newtypes.DataTileEntity; diff --git a/mcp/mobius/opis/data/profilers/ProfilerAbstract.java b/mcp/mobius/opis/data/profilers/ProfilerAbstract.java index 3dfbddd..651b54b 100644 --- a/mcp/mobius/opis/data/profilers/ProfilerAbstract.java +++ b/mcp/mobius/opis/data/profilers/ProfilerAbstract.java @@ -1,6 +1,6 @@ package mcp.mobius.opis.data.profilers; -import mcp.mobius.mobiuscore.profiler_v2.IProfilerBase; +import mcp.mobius.mobiuscore.profiler.IProfilerBase; public abstract class ProfilerAbstract implements IProfilerBase { diff --git a/mcp/mobius/opis/data/profilers/ProfilerDimBlockTick.java b/mcp/mobius/opis/data/profilers/ProfilerDimBlockTick.java index 65f529c..a6e34cd 100644 --- a/mcp/mobius/opis/data/profilers/ProfilerDimBlockTick.java +++ b/mcp/mobius/opis/data/profilers/ProfilerDimBlockTick.java @@ -6,7 +6,7 @@ import net.minecraftforge.common.DimensionManager; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; -import mcp.mobius.mobiuscore.profiler_v2.IProfilerBase; +import mcp.mobius.mobiuscore.profiler.IProfilerBase; public class ProfilerDimBlockTick extends ProfilerAbstract implements IProfilerBase { diff --git a/mcp/mobius/opis/data/profilers/ProfilerDimTick.java b/mcp/mobius/opis/data/profilers/ProfilerDimTick.java index 3180173..ce6420b 100644 --- a/mcp/mobius/opis/data/profilers/ProfilerDimTick.java +++ b/mcp/mobius/opis/data/profilers/ProfilerDimTick.java @@ -5,7 +5,7 @@ import java.util.HashMap; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import net.minecraft.world.World; -import mcp.mobius.mobiuscore.profiler_v2.IProfilerBase; +import mcp.mobius.mobiuscore.profiler.IProfilerBase; public class ProfilerDimTick extends ProfilerAbstract implements IProfilerBase { diff --git a/mcp/mobius/opis/data/profilers/ProfilerEntityUpdate.java b/mcp/mobius/opis/data/profilers/ProfilerEntityUpdate.java index f714e3f..1a6e582 100644 --- a/mcp/mobius/opis/data/profilers/ProfilerEntityUpdate.java +++ b/mcp/mobius/opis/data/profilers/ProfilerEntityUpdate.java @@ -7,7 +7,7 @@ import net.minecraft.entity.Entity; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; -import mcp.mobius.mobiuscore.profiler_v2.IProfilerBase; +import mcp.mobius.mobiuscore.profiler.IProfilerBase; public class ProfilerEntityUpdate extends ProfilerAbstract implements IProfilerBase { diff --git a/mcp/mobius/opis/events/OpisClientTickHandler.java b/mcp/mobius/opis/events/OpisClientTickHandler.java index 4862945..6e659af 100644 --- a/mcp/mobius/opis/events/OpisClientTickHandler.java +++ b/mcp/mobius/opis/events/OpisClientTickHandler.java @@ -3,7 +3,7 @@ package mcp.mobius.opis.events; import java.util.EnumSet; import java.util.logging.Level; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.modOpis; import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.TickType; diff --git a/mcp/mobius/opis/events/OpisServerTickHandler.java b/mcp/mobius/opis/events/OpisServerTickHandler.java index 46c4b63..3b93edc 100644 --- a/mcp/mobius/opis/events/OpisServerTickHandler.java +++ b/mcp/mobius/opis/events/OpisServerTickHandler.java @@ -40,7 +40,7 @@ import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; public class OpisServerTickHandler implements ITickHandler { diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index 4025e1c..d5ee184 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -8,7 +8,7 @@ import net.minecraft.network.packet.Packet; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.MinecraftForge; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.commands.client.CommandClientShowRenderTick; import mcp.mobius.opis.commands.client.CommandClientStart; import mcp.mobius.opis.commands.client.CommandOpis; diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index c86d270..95df308 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -9,7 +9,7 @@ import java.util.Date; import java.util.logging.Level; import mapwriter.Mw; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.api.MessageHandlerRegistrar; import mcp.mobius.opis.data.client.DataCache; diff --git a/mcp/mobius/opis/network/ServerMessageHandler.java b/mcp/mobius/opis/network/ServerMessageHandler.java index 919da9b..7dd72c7 100644 --- a/mcp/mobius/opis/network/ServerMessageHandler.java +++ b/mcp/mobius/opis/network/ServerMessageHandler.java @@ -10,7 +10,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.commands.server.CommandAmountEntities; import mcp.mobius.opis.data.client.DataCache; diff --git a/mcp/mobius/opis/proxy/ProxyClient.java b/mcp/mobius/opis/proxy/ProxyClient.java index ebe3e4e..a555be2 100644 --- a/mcp/mobius/opis/proxy/ProxyClient.java +++ b/mcp/mobius/opis/proxy/ProxyClient.java @@ -9,7 +9,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.ResourceLocation; import mapwriter.api.MwAPI; -import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.api.IMessageHandler; import mcp.mobius.opis.api.MessageHandlerRegistrar;