Uptime R2 'Should' all be a part of MiscUtils now!

3 files changed, 94 insertions, 41 deletions

diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java
index af9a058378..e6ccf74fc2 100644
--- a/src/Java/miscutil/MiscUtils.java
+++ b/src/Java/miscutil/MiscUtils.java
@@ -14,6 +14,7 @@ import miscutil.core.util.Utils;
 import miscutil.core.util.debug.DEBUG_ScreenOverlay;
 import miscutil.core.util.uptime.Uptime;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
@@ -23,6 +24,9 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
+import cpw.mods.fml.common.eventhandler.EventPriority;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.gameevent.PlayerEvent;
 
 @Mod(modid=CORE.MODID, name="Misc. Utils", version=CORE.VERSION, dependencies="required-after:gregtech;")
 public class MiscUtils
@@ -47,7 +51,7 @@ implements ActionListener
 		proxy.registerTileEntities();
 		proxy.registerRenderThings();
 		proxy.preInit(event);
-		Uptime.preInit(event); //Integration of Uptime.
+		Uptime.preInit(); //Integration of Uptime.
 		//FMLInterModComms.sendMessage("Waila", "register", "miscutil.core.waila.WailaCompat.load");
 	}
 
@@ -64,7 +68,7 @@ implements ActionListener
 		}
 		FMLCommonHandler.instance().bus().register(this);
 		proxy.registerNetworkStuff();
-		Uptime.init(event); //Integration of Uptime.
+		Uptime.init(); //Integration of Uptime.
 	}
 
 	//Post-Init
@@ -79,14 +83,14 @@ implements ActionListener
 	public void serverStarting(FMLServerStartingEvent event)
 	{
 		event.registerServerCommand(new CommandMath());
-		Uptime.serverStarting(event); //Integration of Uptime.
+		Uptime.serverStarting(); //Integration of Uptime.
 
 	}
 
 	@Mod.EventHandler
 	public void serverStopping(FMLServerStoppingEvent event)
 	{
-		Uptime.serverStopping(event); //Integration of Uptime.
+		Uptime.serverStopping(); //Integration of Uptime.
 
 	}
 
@@ -95,5 +99,29 @@ implements ActionListener
 		Uptime.actionPerformed(arg0); //Integration of Uptime.
 
 	}
+	
+	@SubscribeEvent(priority=EventPriority.NORMAL, receiveCanceled=true)
+	public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event)
+	{
+		Uptime.onPlayerLogin(event);
+	}
+
+	@SubscribeEvent(priority=EventPriority.NORMAL, receiveCanceled=true)
+	public void onPlayerLogout(PlayerEvent.PlayerLoggedOutEvent event)
+	{
+		Uptime.onPlayerLogout(event);
+	}
+	
+	@SubscribeEvent(priority=EventPriority.NORMAL, receiveCanceled=true)
+	public void onPlayerDeath(LivingDeathEvent lde)
+	{
+		Uptime.onPlayerDeath(lde);
+	}
+
+	@SubscribeEvent(priority=EventPriority.NORMAL, receiveCanceled=true)
+	public void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event)
+	{
+		Uptime.onPlayerRespawn(event);
+	}
 
 }
diff --git a/src/Java/miscutil/core/util/uptime/Uptime.java b/src/Java/miscutil/core/util/uptime/Uptime.java
index 54abdbc163..865337d9f7 100644
--- a/src/Java/miscutil/core/util/uptime/Uptime.java
+++ b/src/Java/miscutil/core/util/uptime/Uptime.java
@@ -23,18 +23,9 @@ import com.google.common.io.Files;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.event.FMLServerStoppingEvent;
-import cpw.mods.fml.common.eventhandler.EventPriority;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent;
 
-//@Mod(modid="Uptime.MODID", name="UptimeR2", version="2", acceptableRemoteVersions = "*")
 public class Uptime {
-	public static final String MODID = "UptimeR2";
 	private static MinecraftServer server;
 	//public static CommonProxy proxy;
 	private static Timer updater;
@@ -42,17 +33,16 @@ public class Uptime {
 	private static WorldInfo world_info;
 	private File uptime_file;
 	private File uptime_backup;
-	@Mod.Instance("Uptime")
-	public static Uptime instance;
 
-	public void preInit(FMLPreInitializationEvent event)
+	@SuppressWarnings("static-method")
+	public void preInit()
 	{
 		UptimeLog.log("INFO", "Conjumbobulating Time Synthesis.");
-		UptimeLog.initLogger();
+		//UptimeLog.initLogger();
 	}
 
 	
-	public void init(FMLInitializationEvent event)
+	public void init()
 	{
 		MinecraftForge.EVENT_BUS.register(this);
 		FMLCommonHandler.instance().bus().register(this);
@@ -60,7 +50,7 @@ public class Uptime {
 	}
 
 	
-	public void serverStarting(FMLServerStartingEvent event)
+	public void serverStarting()
 	{
 		uptime_data = null;
 
@@ -81,7 +71,7 @@ public class Uptime {
 		this.uptime_file = new File(file_path + "/uptime.txt");
 		if (this.uptime_backup.exists())
 		{
-			FMLLog.info("Uptime: Uptime has found a backup of the uptime file, trying to restore it.", new Object[0]);
+			UptimeLog.log("INFO","Uptime: Uptime has found a backup of the uptime file, trying to restore it.", new Object[0]);
 			try
 			{
 				this.uptime_file.delete();
@@ -91,24 +81,24 @@ public class Uptime {
 
 				uptime_data = new UptimeData(this.uptime_file, false);
 
-				FMLLog.info("Uptime: Uptime restored the backup.", new Object[0]);
+				UptimeLog.log("INFO","Uptime: Uptime restored the backup.", new Object[0]);
 			}
 			catch (IOException ioe)
 			{
-				FMLLog.warning("Uptime: Failed to restore backup of uptime file, uptime has been reset and the backup removed.", new Object[] { ioe });
+				UptimeLog.log("WARNING","Uptime: Failed to restore backup of uptime file, uptime has been reset and the backup removed.", new Object[] { ioe });
 				this.uptime_backup.delete();
 				uptime_data = new UptimeData(this.uptime_file, true);
 			}
 			catch (NumberFormatException npe)
 			{
-				FMLLog.warning("Uptime: Backup file is corrupt, uptime has been reset and the backup removed.", new Object[0]);
+				UptimeLog.log("WARNING","Uptime: Backup file is corrupt, uptime has been reset and the backup removed.", new Object[0]);
 				this.uptime_backup.delete();
 				uptime_data = new UptimeData(this.uptime_file, true);
 			}
 		}
 		else if (this.uptime_file.exists())
 		{
-			FMLLog.info("Uptime: Found uptime file, restoring it.", new Object[0]);
+			UptimeLog.log("INFO","Uptime: Found uptime file, restoring it.", new Object[0]);
 			if (this.uptime_file.length() > 1L)
 			{
 				try
@@ -117,19 +107,19 @@ public class Uptime {
 				}
 				catch (NumberFormatException npe)
 				{
-					FMLLog.warning("Uptime: Uptime file is corrupt, uptime has been reset.", new Object[0]);
+					UptimeLog.log("WARNING","Uptime: Uptime file is corrupt, uptime has been reset.", new Object[0]);
 					uptime_data = new UptimeData(this.uptime_file, true);
 				}
 			}
 			else
 			{
-				FMLLog.warning("Uptime: Uptime file is empty, uptime has been reset.", new Object[0]);
+				UptimeLog.log("WARNING","Uptime: Uptime file is empty, uptime has been reset.", new Object[0]);
 				uptime_data = new UptimeData(this.uptime_file, true);
 			}
 		}
 		else
 		{
-			FMLLog.info("Uptime: No uptime or backup found, creating a new one.", new Object[0]);
+			UptimeLog.log("INFO","Uptime: No uptime or backup found, creating a new one.", new Object[0]);
 
 
 			uptime_data = new UptimeData(this.uptime_file, true);
@@ -148,7 +138,7 @@ public class Uptime {
 	}
 
 	
-	public void serverStopping(FMLServerStoppingEvent event)
+	public void serverStopping()
 	{
 		UptimeLog.log("INFO", "upTime is going to stop.");
 		if (updater.isRunning())
@@ -191,12 +181,12 @@ public class Uptime {
 		}
 		catch (IOException ioe)
 		{
-			FMLLog.warning("Uptime: Failed while perpairing to save uptime file.", new Object[] { ioe });
+			UptimeLog.log("WARNING","Uptime: Failed while perpairing to save uptime file.", new Object[] { ioe });
 		}
 		FMLLog.finer("Uptime: Uptime has finished saving it's data.", new Object[0]);
 	}
 
-	@SubscribeEvent(priority=EventPriority.NORMAL, receiveCanceled=true)
+	@SuppressWarnings("static-method")
 	public void onPlayerDeath(LivingDeathEvent lde)
 	{
 		if ((lde.entity instanceof EntityPlayerMP))
@@ -268,19 +258,19 @@ public class Uptime {
 		}
 	}
 
-	@SubscribeEvent(priority=EventPriority.NORMAL, receiveCanceled=true)
+	@SuppressWarnings("static-method")
 	public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event)
 	{
 		uptime_data.playerLoggedOn(event.player.getCommandSenderName());
 	}
 
-	@SubscribeEvent(priority=EventPriority.NORMAL, receiveCanceled=true)
+	@SuppressWarnings("static-method")
 	public void onPlayerLogout(PlayerEvent.PlayerLoggedOutEvent event)
 	{
 		uptime_data.playerLoggedOff(event.player.getCommandSenderName());
 	}
 
-	@SubscribeEvent(priority=EventPriority.NORMAL, receiveCanceled=true)
+	@SuppressWarnings("static-method")
 	public void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event)
 	{
 		uptime_data.playerRespawned(event.player.getCommandSenderName());
diff --git a/src/Java/miscutil/core/util/uptime/UptimeLog.java b/src/Java/miscutil/core/util/uptime/UptimeLog.java
index 902bf38672..717a82e3dc 100644
--- a/src/Java/miscutil/core/util/uptime/UptimeLog.java
+++ b/src/Java/miscutil/core/util/uptime/UptimeLog.java
@@ -1,23 +1,24 @@
 package miscutil.core.util.uptime;
 
 import java.util.logging.Level;
-
-
 import java.util.logging.Logger;
 
+import miscutil.core.lib.CORE;
+import miscutil.core.util.Utils;
 import cpw.mods.fml.common.FMLLog;
 
 public class UptimeLog {
-	
+
 	//UptimeLog.log("INFO", "text");
 	//(ALL, CONFIG, FINE, FINER, FINEST, INFO, OFF, SEVERE and WARNING)
-	
-	private static Logger logger = Logger.getLogger(Uptime.MODID);
-	
+
+	private static Logger logger = Logger.getLogger(CORE.MODID);
+
 	public static void initLogger() {
 		logger.setParent((Logger) FMLLog.getLogger());
 	}
-
+	
+	
 	public static void log(String logLevel, String message) {
 		Level logNotif;
 		if (logLevel.equals("INFO")){
@@ -32,7 +33,41 @@ public class UptimeLog {
 		else {
 			logNotif = Level.CONFIG;
 		}
-		logger.log(logNotif, message);
+		logWrapper(logLevel, message);
 	}
 	
+	public static void log(String logLevel, String message, Object[] objectF) {
+		Level logNotif;
+		if (logLevel.equals("INFO")){
+			logNotif = Level.INFO;
+		}
+		else if (logLevel.equals("WARNING")){
+			logNotif = Level.WARNING;
+		}
+		else if (logLevel.equals("SEVERE")){
+			logNotif = Level.SEVERE;
+		}
+		else {
+			logNotif = Level.CONFIG;
+		}
+		logWrapper(logLevel, message);
+	}
+
+	private static void logWrapper(String level, String msg){
+		if (level.equals("INFO")){
+			Utils.LOG_INFO(msg);
+		}
+		else if (level.equals("WARNING")){
+			Utils.LOG_WARNING(msg);
+		} 
+		else if (level.equals("SEVERE")){
+			Utils.LOG_ERROR(msg);
+		}
+		else {
+			Utils.LOG_INFO("Something Broke - "+msg);
+		}
+	}
+
+
+
 }