diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-05-23 08:58:56 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-05-23 08:58:56 +1000 |
| commit | 83595f2379850fadcd17d91dfec49c87fdfd02a3 (patch) | |
| tree | 3883d7fdcd748d41c7c4a2a6507bf30f62f7b0a9 /src/Java/miscutil/MiscUtils.java | |
| parent | 12ced6d3ea25823190453b4db9b7b905cc759a69 (diff) | |
| download | GT5-Unofficial-83595f2379850fadcd17d91dfec49c87fdfd02a3.tar.gz GT5-Unofficial-83595f2379850fadcd17d91dfec49c87fdfd02a3.tar.bz2 GT5-Unofficial-83595f2379850fadcd17d91dfec49c87fdfd02a3.zip | |
Removed WAILA and UpTime Support.
Diffstat (limited to 'src/Java/miscutil/MiscUtils.java')
| -rw-r--r-- | src/Java/miscutil/MiscUtils.java | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java index 7681e6a581..2b286a28b3 100644 --- a/src/Java/miscutil/MiscUtils.java +++ b/src/Java/miscutil/MiscUtils.java @@ -13,10 +13,8 @@ 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 miscutil.gregtech.common.GregtechRecipeAdder; 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; @@ -26,9 +24,6 @@ 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 @@ -37,7 +32,6 @@ 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; @@ -62,8 +56,6 @@ implements ActionListener proxy.registerTileEntities(); proxy.registerRenderThings(); proxy.preInit(event); - Uptime.preInit(); //Integration of Uptime. - //FMLInterModComms.sendMessage("Waila", "register", "miscutil.core.waila.WailaCompat.load"); } //Init @@ -78,7 +70,6 @@ implements ActionListener } FMLCommonHandler.instance().bus().register(this); proxy.registerNetworkStuff(); - Uptime.init(); //Integration of Uptime. } //Post-Init @@ -95,45 +86,18 @@ implements ActionListener public void serverStarting(FMLServerStartingEvent event) { event.registerServerCommand(new CommandMath()); - Uptime.serverStarting(); //Integration of Uptime. } @Mod.EventHandler public void serverStopping(FMLServerStoppingEvent event) { - Uptime.serverStopping(); //Integration of Uptime. } @Override public void actionPerformed(ActionEvent arg0) { - 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); - } } |