aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-04-26 22:34:25 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-04-26 22:34:25 +1000
commit3a44b3dd0ae168dded254fcea3ac5b6604ee2b1f (patch)
tree71bd9f4f0cdedff56796a1bb2e30487f8a37b237
parent2f978919dc7d1b368c6ada9c1abd8f084cd87f42 (diff)
downloadGT5-Unofficial-3a44b3dd0ae168dded254fcea3ac5b6604ee2b1f.tar.gz
GT5-Unofficial-3a44b3dd0ae168dded254fcea3ac5b6604ee2b1f.tar.bz2
GT5-Unofficial-3a44b3dd0ae168dded254fcea3ac5b6604ee2b1f.zip
More Uptime integration, simple test.
-rw-r--r--src/Java/miscutil/MiscUtils.java2
-rw-r--r--src/Java/miscutil/core/util/uptime/Uptime.java4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java
index 3ee9f1f2fd..9cf136a2ac 100644
--- a/src/Java/miscutil/MiscUtils.java
+++ b/src/Java/miscutil/MiscUtils.java
@@ -12,6 +12,7 @@ import miscutil.core.lib.LoadedMods;
import miscutil.core.util.PlayerCache;
import miscutil.core.util.Utils;
import miscutil.core.util.debug.DEBUG_ScreenOverlay;
+import miscutil.core.util.uptime.Uptime;
import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod;
@@ -45,6 +46,7 @@ implements ActionListener
proxy.registerTileEntities();
proxy.registerRenderThings();
proxy.preInit(event);
+ Uptime.preInit(event); //Integration of Uptime.
//FMLInterModComms.sendMessage("Waila", "register", "miscutil.core.waila.WailaCompat.load");
}
diff --git a/src/Java/miscutil/core/util/uptime/Uptime.java b/src/Java/miscutil/core/util/uptime/Uptime.java
index bd853f5b67..a6751cf156 100644
--- a/src/Java/miscutil/core/util/uptime/Uptime.java
+++ b/src/Java/miscutil/core/util/uptime/Uptime.java
@@ -45,7 +45,7 @@ public class Uptime {
@Mod.Instance("Uptime")
public static Uptime instance;
- public void preInit(FMLPreInitializationEvent event)
+ public static void preInit(FMLPreInitializationEvent event)
{
UptimeLog.log("INFO", "Conjumbobulating Time Synthesis.");
UptimeLog.initLogger();
@@ -285,4 +285,6 @@ public class Uptime {
{
uptime_data.playerRespawned(event.player.getCommandSenderName());
}
+
+
}