Initial Commit

Author: ItsBrank

Forms/MainFrm.cs

@@ -203,7 +203,7 @@ private void ManualInjectBtn_Click(object sender, EventArgs e)
 
         private void ReloadSessionsBtn_OnButtonClick(object sender, EventArgs e)
         {
-            Sessions.ReloadSessions();
+            Sessions.ParseSessions();
         }
 
         private void AutoCheckUpdatesBx_OnCheckChanged(object sender, EventArgs e)
@@ -815,8 +815,17 @@ private async Task<bool> CheckForUpdates(bool bInvalidate)
 
                             if (LibraryManager.AnyProcessRunning())
                             {
-                                UpdatePopupCtrl.ButtonLayout = CRPopup.ButtonLayouts.TYPE_SINGLE;
-                                UpdatePopupCtrl.DisplayDescription = "A new version of both the module and launcher were found, but Rocket League needs to be closed in order to install it first! Please close the game and try again.";
+                                List<Process> processes = ProcessManager.GetFilteredProcesses(LibraryManager.Settings.ProcessName);
+
+                                if (processes.Count > 0 && LibraryManager.IsModuleLoaded(processes[0], true))
+                                {
+                                    UpdatePopupCtrl.ButtonLayout = CRPopup.ButtonLayouts.TYPE_SINGLE;
+                                    UpdatePopupCtrl.DisplayDescription = "A new version of both the module and launcher were found, but Rocket League needs to be closed in order to install it first! Please close the game and try again.";
+                                }
+                                else
+                                {
+                                    UpdatePopupCtrl.DisplayDescription = "A new version of both the module and launcher were found, would you like to automatically install both now?";
+                                }
                             }
                             else
                             {
@@ -832,8 +841,17 @@ private async Task<bool> CheckForUpdates(bool bInvalidate)
 
                             if (LibraryManager.AnyProcessRunning())
                             {
-                                UpdatePopupCtrl.ButtonLayout = CRPopup.ButtonLayouts.TYPE_DOUBLE;
-                                UpdatePopupCtrl.DisplayDescription = "A new version of the module was found, but Rocket League needs to be closed in order to install it first! Please close the game and try again.";
+                                List<Process> processes = ProcessManager.GetFilteredProcesses(LibraryManager.Settings.ProcessName);
+
+                                if (processes.Count > 0 && LibraryManager.IsModuleLoaded(processes[0], true))
+                                {
+                                    UpdatePopupCtrl.ButtonLayout = CRPopup.ButtonLayouts.TYPE_DOUBLE;
+                                    UpdatePopupCtrl.DisplayDescription = "A new version of the module was found, but Rocket League needs to be closed in order to install it first! Please close the game and try again.";
+                                }
+                                else
+                                {
+                                    UpdatePopupCtrl.DisplayDescription = "A new version of the module was found, would you like to automatically install it now?";
+                                }
                             }
                             else
                             {

Framework/Sessions.cs

@@ -9,40 +9,50 @@
 
 namespace CodeRedLauncher
 {
-    public class MatchObject
+    public class MatchData
     {
-        public UInt64 Timestamp { get; set; }
+        public UInt32 Score { get; set; }
+        public UInt32 Goals { get; set; }
+        public UInt32 Assists { get; set; }
+        public UInt32 Saves { get; set; }
+        public UInt32 Shots { get; set; }
+        public UInt32 Clears { get; set; }
+        public UInt32 Demolishes { get; set; }
+        public UInt32 DropshotDamage { get; set; }
+        public UInt32 Knockouts { get; set; }
+        public UInt32 KnockoutAssists { get; set; }
+        public UInt32 KnockoutDeaths { get; set; }
+        public UInt32 KnockoutDamage { get; set; }
+        public UInt32 KnockoutHits { get; set; }
+        public UInt32 KnockoutGrabs { get; set; }
+        public UInt32 KnockoutBlocks { get; set; }
+        public UInt64 StartTime { get; set; }
+        public UInt64 EndTime { get; set; }
         public float StartSkill { get; set; }
         public float EndSkill { get; set; }
-        public Int32 Score { get; set; }
-        public Int32 Goals { get; set; }
-        public Int32 Assists { get; set; }
-        public Int32 Saves { get; set; }
-        public Int32 Shots { get; set; }
-        public Int32 Damage { get; set; }
-        public Int32 Demolishes { get; set; }
-        public bool Partied { get; set; }
+        public bool StartCached { get; set; }
+        public bool EndCached { get; set; }
         public bool LeftEarly { get; set; }
         public bool Won { get; set; }
     }
 
-    public class SessionObject
+    public class SessionInfo
     {
         public Int32 Playlist { get; set; }
-        public Int32 Wins { get; set; }
-        public Int32 Losses { get; set; }
-        public Int32 Streak { get; set; }
+        public UInt32 Wins { get; set; }
+        public UInt32 Losses { get; set; }
+        public UInt32 Streak { get; set; }
         public bool OnFire { get; set; }
-        public Int32 Matches { get; set; }
-        public MatchObject[] MatchData { get; set; }
+        public UInt64 Matches { get; set; }
+        public MatchData[] MatchData { get; set; }
     }
 
     public static class Sessions
     {
-        private static List<SessionObject> ParsedSessions = new List<SessionObject>();
+        private static List<SessionInfo> ParsedSessions = new List<SessionInfo>();
         public static Architecture.Range32 Timeframe = new Architecture.Range32(0, 30); // Current day, to thirty days back.
 
-        public static void ReloadSessions()
+        public static void ParseSessions()
         {
             Architecture.Path sessionsFolder = Storage.GetModulePath() / "Sessions";
 
@@ -54,11 +64,11 @@ public static void ReloadSessions()
 
                 foreach (Architecture.Path sessionsFile in sessionsFiles)
                 {
-                    List<SessionObject> sessionObjects = JsonSerializer.Deserialize<List<SessionObject>>(File.ReadAllText(sessionsFile.GetPath()));
+                    List<SessionInfo> sessionObjects = JsonSerializer.Deserialize<List<SessionInfo>>(File.ReadAllText(sessionsFile.GetPath()));
 
                     if (sessionObjects.Count > 0)
                     {
-                        foreach (SessionObject sessionObject in sessionObjects)
+                        foreach (SessionInfo sessionObject in sessionObjects)
                         {
                             ParsedSessions.Add(sessionObject);
                         }