mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-20 04:09:41 +00:00
Refactoring
This commit is contained in:
1 parent
e5a969cd48
commit
ed4ce6f930
30 files changed
+85
-71
No files matched your search
+3
-2
@@ -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;
|
||||
+2
-1
@@ -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;
|
||||
+3
-2
@@ -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;
|
||||
+3
-2
@@ -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;
|
||||
+2
-1
@@ -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;
|
||||
+3
-2
@@ -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;
|
||||
+2
-1
@@ -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;
|
||||
+2
-1
@@ -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;
|
||||
+3
-2
@@ -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;
|
||||
+3
-2
@@ -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;
|
||||
+5
-4
@@ -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;
|
||||
+8
-7
@@ -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;
|
||||
+2
-1
@@ -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;
|
||||
+2
-1
@@ -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;
|
||||
+2
-1
@@ -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;
|
||||
+3
-2
@@ -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;
|
||||
+3
-2
@@ -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;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mcp.mobius.opis.data;
|
||||
package mcp.mobius.opis.data.server;
|
||||
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mcp.mobius.opis.data;
|
||||
package mcp.mobius.opis.data.server;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
+1
-1
@@ -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;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mcp.mobius.opis.data;
|
||||
package mcp.mobius.opis.data.server;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mcp.mobius.opis.data;
|
||||
package mcp.mobius.opis.data.server;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mcp.mobius.opis.data;
|
||||
package mcp.mobius.opis.data.server;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
+1
-1
@@ -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;
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user