Revert "Merged with development"

This reverts commit 0d2023df945a99309688a3dd457ca2055a505e34, reversing
changes made to bb11c5d5c40356e589584db370930c64c98be798.

Artemis/Artemis/ArtemisBootstrapper.cs

@@ -1,93 +1,92 @@
-using System.Diagnostics;
+using System.Diagnostics;
-using System.Linq;
+using System.Linq;
-using System.Reflection;
+using System.Windows;
-using System.Windows;
+using System.Windows.Controls;
-using System.Windows.Controls;
+using System.Windows.Forms;
-using System.Windows.Forms;
+using Artemis.ViewModels;
-using Artemis.ViewModels;
+using Autofac;
-using Autofac;
+using Caliburn.Micro;
-using Caliburn.Micro;
+using Caliburn.Micro.Autofac;
-using Caliburn.Micro.Autofac;
+using Application = System.Windows.Application;
-using Application = System.Windows.Application;
+using MessageBox = System.Windows.Forms.MessageBox;
-using MessageBox = System.Windows.Forms.MessageBox;
+
-
+namespace Artemis
-namespace Artemis
+{
-{
+    public class ArtemisBootstrapper : AutofacBootstrapper<SystemTrayViewModel>
-    public class ArtemisBootstrapper : AutofacBootstrapper<SystemTrayViewModel>
+    {
-    {
+        public ArtemisBootstrapper()
-        public ArtemisBootstrapper()
+        {
-        {
+            CheckDuplicateInstances();
-            CheckDuplicateInstances();
+
-
+            Initialize();
-            Initialize();
+
-
+            MessageBinder.SpecialValues.Add("$scaledmousex", (ctx) =>
-            MessageBinder.SpecialValues.Add("$scaledmousex", (ctx) =>
+            {
-            {
+                var img = ctx.Source as Image;
-                var img = ctx.Source as Image;
+                var input = ctx.Source as IInputElement;
-                var input = ctx.Source as IInputElement;
+                var e = ctx.EventArgs as System.Windows.Input.MouseEventArgs;
-                var e = ctx.EventArgs as System.Windows.Input.MouseEventArgs;
+
-
+                // If there is an image control, get the scaled position
-                // If there is an image control, get the scaled position
+                if (img != null && e != null)
-                if (img != null && e != null)
+                {
-                {
+                    Point position = e.GetPosition(img);
-                    Point position = e.GetPosition(img);
+                    return (int)(img.Source.Width * (position.X / img.ActualWidth));
-                    return (int)(img.Source.Width * (position.X / img.ActualWidth));
+                }
-                }
+
-
+                // If there is another type of of IInputControl get the non-scaled position - or do some processing to get a scaled position, whatever needs to happen
-                // If there is another type of of IInputControl get the non-scaled position - or do some processing to get a scaled position, whatever needs to happen
+                if (e != null && input != null)
-                if (e != null && input != null)
+                    return e.GetPosition(input).X;
-                    return e.GetPosition(input).X;
+
-
+                // Return 0 if no processing could be done
-                // Return 0 if no processing could be done
+                return 0;
-                return 0;
+            });
-            });
+            MessageBinder.SpecialValues.Add("$scaledmousey", (ctx) =>
-            MessageBinder.SpecialValues.Add("$scaledmousey", (ctx) =>
+            {
-            {
+                var img = ctx.Source as Image;
-                var img = ctx.Source as Image;
+                var input = ctx.Source as IInputElement;
-                var input = ctx.Source as IInputElement;
+                var e = ctx.EventArgs as System.Windows.Input.MouseEventArgs;
-                var e = ctx.EventArgs as System.Windows.Input.MouseEventArgs;
+
-
+                // If there is an image control, get the scaled position
-                // If there is an image control, get the scaled position
+                if (img != null && e != null)
-                if (img != null && e != null)
+                {
-                {
+                    Point position = e.GetPosition(img);
-                    Point position = e.GetPosition(img);
+                    return (int)(img.Source.Width * (position.Y / img.ActualWidth));
-                    return (int)(img.Source.Width * (position.Y / img.ActualWidth));
+                }
-                }
+
-
+                // If there is another type of of IInputControl get the non-scaled position - or do some processing to get a scaled position, whatever needs to happen
-                // If there is another type of of IInputControl get the non-scaled position - or do some processing to get a scaled position, whatever needs to happen
+                if (e != null && input != null)
-                if (e != null && input != null)
+                    return e.GetPosition(input).Y;
-                    return e.GetPosition(input).Y;
+
-
+                // Return 0 if no processing could be done
-                // Return 0 if no processing could be done
+                return 0;
-                return 0;
+            });
-            });
+        }
-        }
+
-
+        protected override void ConfigureContainer(ContainerBuilder builder)
-        protected override void ConfigureContainer(ContainerBuilder builder)
+        {
-        {
+            base.ConfigureContainer(builder);
-            base.ConfigureContainer(builder);
+
-
+            // create a window manager instance to be used by everyone asking for one (including Caliburn.Micro)
-            // create a window manager instance to be used by everyone asking for one (including Caliburn.Micro)
+            builder.RegisterInstance<IWindowManager>(new WindowManager());
-            builder.RegisterInstance<IWindowManager>(new WindowManager());
+            builder.RegisterType<SystemTrayViewModel>();
-            builder.RegisterType<SystemTrayViewModel>();
+            builder.RegisterType<ShellViewModel>();
-            builder.RegisterType<ShellViewModel>();
+        }
-        }
+
-
+        protected override void OnStartup(object sender, StartupEventArgs e)
-        protected override void OnStartup(object sender, StartupEventArgs e)
+        {
-        {
+            DisplayRootViewFor<SystemTrayViewModel>();
-            DisplayRootViewFor<SystemTrayViewModel>();
+        }
-        }
+
-
+        private void CheckDuplicateInstances()
-        private void CheckDuplicateInstances()
+        {
-        {
+            var processes = Process.GetProcesses();
-            if (Process.GetProcesses().Count(p => p.ProcessName.Contains(Assembly.GetExecutingAssembly()
+            if (processes.Count(p => p.ProcessName == "Artemis") < 2)
-                .FullName.Split(',')[0]) && !p.Modules[0].FileName.Contains("vshost")) < 2)
+                return;
-                return;
+
-
+            MessageBox.Show("An instance of Artemis is already running (check your system tray).",
-            MessageBox.Show("An instance of Artemis is already running (check your system tray).",
+                "Artemis  (╯°□°）╯︵ ┻━┻", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                "Artemis  (╯°□°）╯︵ ┻━┻", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+            Application.Current.Shutdown();
-            Application.Current.Shutdown();
+        }
-        }
+
-
+    }
-    }
 }

pointers.json

@@ -2,17 +2,17 @@
 [
    {
       "Game":"RocketLeague",
-      "GameVersion":"1.16",
+      "GameVersion":"1.15",
       "GameAddresses":[
          {
             "Description":"Boost",
             "BasePointer":{
-               "value":22411984
+               "value":22555396
             },
             "Offsets":[
-               1632,
+               180,
-               64,
+               260,
-               1636,
+               800,
                1800,
                540
             ]