diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-04-27 03:39:39 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-04-27 03:39:39 +1000 |
| commit | 260d520a054f9093375e3ec752f1df5b5866c728 (patch) | |
| tree | d0447aa5cc1698c441db2d726d11362193257d11 | |
| parent | 3a44b3dd0ae168dded254fcea3ac5b6604ee2b1f (diff) | |
| download | GT5-Unofficial-260d520a054f9093375e3ec752f1df5b5866c728.tar.gz GT5-Unofficial-260d520a054f9093375e3ec752f1df5b5866c728.tar.bz2 GT5-Unofficial-260d520a054f9093375e3ec752f1df5b5866c728.zip | |
Easier to integrate if it's not static :D
| -rw-r--r-- | src/Java/miscutil/MiscUtils.java | 7 | ||||
| -rw-r--r-- | src/Java/miscutil/core/util/uptime/Uptime.java | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java index 9cf136a2ac..af9a058378 100644 --- a/src/Java/miscutil/MiscUtils.java +++ b/src/Java/miscutil/MiscUtils.java @@ -31,6 +31,7 @@ implements ActionListener @Mod.Instance(CORE.MODID) public static MiscUtils instance; + public static Uptime Uptime = new Uptime(); @SidedProxy(clientSide="miscutil.core.proxy.ClientProxy", serverSide="miscutil.core.proxy.ServerProxy") public static CommonProxy proxy; @@ -63,6 +64,7 @@ implements ActionListener } FMLCommonHandler.instance().bus().register(this); proxy.registerNetworkStuff(); + Uptime.init(event); //Integration of Uptime. } //Post-Init @@ -77,19 +79,20 @@ implements ActionListener public void serverStarting(FMLServerStartingEvent event) { event.registerServerCommand(new CommandMath()); + Uptime.serverStarting(event); //Integration of Uptime. } @Mod.EventHandler public void serverStopping(FMLServerStoppingEvent event) { - + Uptime.serverStopping(event); //Integration of Uptime. } @Override public void actionPerformed(ActionEvent arg0) { - // TODO Auto-generated method stub + Uptime.actionPerformed(arg0); //Integration of Uptime. } diff --git a/src/Java/miscutil/core/util/uptime/Uptime.java b/src/Java/miscutil/core/util/uptime/Uptime.java index a6751cf156..54abdbc163 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 static void preInit(FMLPreInitializationEvent event) + public void preInit(FMLPreInitializationEvent event) { UptimeLog.log("INFO", "Conjumbobulating Time Synthesis."); UptimeLog.initLogger(); |