Organizational refactoring

SceneManager/ConsoleCommands.cs

@@ -1,36 +0,0 @@
-using Rage;
-using Rage.Attributes;
-using Rage.ConsoleCommands.AutoCompleters;
-using System.Linq;
-
-namespace SceneManager
-{
-    internal static class ConsoleCommands
-    {
-        [ConsoleCommand]
-        internal static void Command_ShowCollectedVehicleInfo([ConsoleCommandParameter(AutoCompleterType = typeof(ConsoleCommandAutoCompleterVehicle))] Vehicle vehicle)
-        {
-            foreach(Path path in PathMainMenu.paths)
-            {
-                var collectedVehicle = path.CollectedVehicles.Where(v => v.Vehicle == vehicle).FirstOrDefault();
-                if(collectedVehicle != null)
-                {
-                    Game.LogTrivial($"Vehicle: {collectedVehicle.Vehicle.Model.Name} [{collectedVehicle.Vehicle.Handle}]");
-                    Rage.Native.NativeFunction.Natives.xA6E9C38DB51D7748(collectedVehicle.Vehicle, out uint script);
-                    Game.LogTrivial($"Vehicle spawned by: {script}");
-                    Game.LogTrivial($"Driver handle: {collectedVehicle.Driver.Handle}");
-                    Game.LogTrivial($"Path: {collectedVehicle.Path.Number}");
-                    Game.LogTrivial($"Current waypoint: {collectedVehicle.CurrentWaypoint.Number}");
-                    Game.LogTrivial($"StoppedAtWaypoint: {collectedVehicle.StoppedAtWaypoint}");
-                    Game.LogTrivial($"SkipWaypoint: {collectedVehicle.SkipWaypoint}");
-                    Game.LogTrivial($"ReadyForDirectTasks: {collectedVehicle.ReadyForDirectTasks}");
-                    Game.LogTrivial($"Directed: {collectedVehicle.Directed}");
-                    Game.LogTrivial($"Dismissed: {collectedVehicle.Dismissed}");
-                    Game.LogTrivial($"Task status: {collectedVehicle.Driver.Tasks.CurrentTaskStatus}");
-                    return;
-                }
-            }
-            Game.LogTrivial($"{vehicle.Model.Name} [{vehicle.Handle}] was not found collected by any path.");
-        }
-    }
-}

SceneManager/GetUserInput.cs

@@ -1,67 +0,0 @@
-using Rage;
-
-namespace SceneManager
-{
-    class GetUserInput
-    {
-        internal static void LoopForUserInput()
-        {
-            while (true)
-            {
-                GetKeyboardInput();
-                GetControllerInput();
-
-#if DEBUG
-                if (MenuManager.menuPool.IsAnyMenuOpen())
-                {
-                    Game.DisplaySubtitle($"You are using a test build of Scene Manager.  Please report any bugs/crashes in the Discord server.");
-                }
-#endif
-                MenuManager.menuPool.ProcessMenus();
-                GameFiber.Yield();
-            }
-        }
-        
-        private static void GetControllerInput()
-        {
-            if (Settings.ModifierButton == ControllerButtons.None)
-            {
-                if (Game.IsControllerButtonDown(Settings.ToggleButton) && AreMenusClosed())
-                {
-                    MainMenu.mainMenu.Visible = !MainMenu.mainMenu.Visible;
-                }
-            }
-            else if (Game.IsControllerButtonDownRightNow(Settings.ModifierButton) && Game.IsControllerButtonDown(Settings.ToggleButton) && AreMenusClosed())
-            {
-                MainMenu.mainMenu.Visible = !MainMenu.mainMenu.Visible;
-            }
-        }
-
-        private static void GetKeyboardInput()
-        {
-            if (Settings.ModifierKey == System.Windows.Forms.Keys.None)
-            {
-                if (Game.IsKeyDown(Settings.ToggleKey) && AreMenusClosed())
-                {
-                    MainMenu.mainMenu.Visible = !MainMenu.mainMenu.Visible;
-                }
-            }
-            else if (Game.IsKeyDownRightNow(Settings.ModifierKey) && Game.IsKeyDown(Settings.ToggleKey) && AreMenusClosed())
-            {
-                MainMenu.mainMenu.Visible = !MainMenu.mainMenu.Visible;
-            }
-        }
-
-        private static bool AreMenusClosed()
-        {
-            if(!BarrierMenu.barrierMenu.Visible && !PathMainMenu.pathMainMenu.Visible && !PathCreationMenu.pathCreationMenu.Visible && !EditPathMenu.editPathMenu.Visible && !EditWaypointMenu.editWaypointMenu.Visible && !SettingsMenu.settingsMenu.Visible)
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-    }
-}

SceneManager/MousePositionInWorld.cs

@@ -1,42 +0,0 @@
-using Rage;
-using RAGENativeUI.Elements;
-
-namespace SceneManager
-{
-    internal static class MousePositionInWorld
-    {
-        internal static Vector3 GetPosition { get { return GetMousePositionInWorld(); } }
-        internal static Vector3 GetPositionForBarrier { get { return GetMousePositionInWorld(Settings.BarrierPlacementDistance); } }
-
-        private static Vector3 GetMousePositionInWorld(float maxDistance = 100f)
-        {
-            HitResult TracePlayerView(float maxTraceDistance = 100f, TraceFlags flags = TraceFlags.IntersectWorld) => TracePlayerView2(out Vector3 v1, out Vector3 v2, maxTraceDistance, flags);
-
-            HitResult TracePlayerView2(out Vector3 start, out Vector3 end, float maxTraceDistance, TraceFlags flags)
-            {
-                Vector3 direction = GetPlayerLookingDirection(out start);
-                end = start + (maxTraceDistance * direction);
-                return World.TraceLine(start, end, flags);
-            }
-
-            Vector3 GetPlayerLookingDirection(out Vector3 camPosition)
-            {
-                if (Camera.RenderingCamera)
-                {
-                    camPosition = Camera.RenderingCamera.Position;
-                    return Camera.RenderingCamera.Direction;
-                }
-                else
-                {
-                    float pitch = Rage.Native.NativeFunction.Natives.GET_GAMEPLAY_CAM_RELATIVE_PITCH<float>();
-                    float heading = Rage.Native.NativeFunction.Natives.GET_GAMEPLAY_CAM_RELATIVE_HEADING<float>();
-
-                    camPosition = Rage.Native.NativeFunction.Natives.GET_GAMEPLAY_CAM_COORD<Vector3>();
-                    return (Game.LocalPlayer.Character.Rotation + new Rotator(pitch, 0, heading)).ToVector().ToNormalized();
-                }
-            }
-
-            return TracePlayerView(maxDistance, TraceFlags.IntersectWorld).HitPosition;
-        }
-    }
-}

SceneManager/PNWUserInput.cs

@@ -1,28 +0,0 @@
-using Rage;
-using Rage.Native;
-
-namespace SceneManager 
-{
-    internal static class PNWUserInput
-    {
-        public static string GetUserInput(string windowTitle, string defaultText, int maxLength)
-        {
-            NativeFunction.Natives.DISABLE_ALL_CONTROL_ACTIONS(2);
-
-            NativeFunction.Natives.DISPLAY_ONSCREEN_KEYBOARD(true, windowTitle, 0, defaultText, 0, 0, 0, maxLength);
-            Game.DisplayHelp("Enter the filename you would like to save your path as\n~INPUT_FRONTEND_ACCEPT~    Export path\n~INPUT_FRONTEND_CANCEL~    Cancel", true);
-            Game.DisplaySubtitle(windowTitle, 100000);
-
-            while (NativeFunction.Natives.UPDATE_ONSCREEN_KEYBOARD<int>() == 0)
-            {
-                GameFiber.Yield();
-            }
-
-            NativeFunction.Natives.ENABLE_ALL_CONTROL_ACTIONS(2);
-            Game.DisplaySubtitle("", 5);
-            Game.HideHelp();
-
-            return NativeFunction.Natives.GET_ONSCREEN_KEYBOARD_RESULT<string>();
-        }
-    }
-}

SceneManager/RNUIMouseInputHandler.cs

@@ -1,130 +0,0 @@
-using InputManager;
-using Rage;
-using RAGENativeUI;
-using RAGENativeUI.Elements;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Forms;
-
-namespace SceneManager
-{
-    internal class RNUIMouseInputHandler
-    {
-        internal delegate void Function();
-
-        internal static void Initialize(UIMenu menu, List<UIMenuScrollerItem> scrollerItems)
-        {
-            GameFiber.StartNew(() =>
-            {
-                while (menu.Visible)
-                {
-                    var selectedScroller = menu.MenuItems.Where(x => scrollerItems.Contains(x) && x.Selected && x.Enabled).FirstOrDefault();
-                    if (selectedScroller != null)
-                    {
-                        OnWheelScroll(menu, selectedScroller, scrollerItems);
-                    }
-
-                    if (Game.IsKeyDown(Keys.LButton) && Rage.Native.NativeFunction.Natives.UPDATE_ONSCREEN_KEYBOARD<int>() != 0)
-                    {
-                        Keyboard.KeyDown(Keys.Enter);
-                        GameFiber.Wait(1);
-                        Keyboard.KeyUp(Keys.Enter);
-                    }
-
-                    if (menu.SubtitleText.Contains("Path Creation Menu"))
-                    {
-                        DrawWaypointMarker();
-                    }
-                    GameFiber.Yield();
-                }
-            });
-        }
-
-        internal static void OnWheelScroll(UIMenu menu, UIMenuItem selectedScroller, List<UIMenuScrollerItem> scrollerItems)
-        {
-            var menuScrollingDisabled = false;
-            var menuItems = menu.MenuItems.Where(x => x != selectedScroller);
-
-            while (Game.IsShiftKeyDownRightNow)
-            {
-                menu.ResetKey(Common.MenuControls.Up);
-                menu.ResetKey(Common.MenuControls.Down);
-                menuScrollingDisabled = true;
-                ScrollMenuItem();
-                if (menu.SubtitleText.Contains("Path Creation Menu") || menu.SubtitleText.Contains("Edit Waypoint"))
-                {
-                    CompareScrollerValues();
-                }
-                if(menu.SubtitleText.Contains("Path Creation Menu"))
-                {
-                    DrawWaypointMarker();
-                }
-                GameFiber.Yield();
-            }
-
-            if (menuScrollingDisabled)
-            {
-                menuScrollingDisabled = false;
-                menu.SetKey(Common.MenuControls.Up, GameControl.CursorScrollUp);
-                menu.SetKey(Common.MenuControls.Up, GameControl.CellphoneUp);
-                menu.SetKey(Common.MenuControls.Down, GameControl.CursorScrollDown);
-                menu.SetKey(Common.MenuControls.Down, GameControl.CellphoneDown);
-            }
-
-            void ScrollMenuItem()
-            {
-                if (Game.GetMouseWheelDelta() > 0)
-                {
-                    Keyboard.KeyDown(Keys.Right);
-                    GameFiber.Wait(1);
-                    Keyboard.KeyUp(Keys.Right);
-                }
-                else if (Game.GetMouseWheelDelta() < 0)
-                {
-                    Keyboard.KeyDown(Keys.Left);
-                    GameFiber.Wait(1);
-                    Keyboard.KeyUp(Keys.Left);
-                }
-            }
-
-            void CompareScrollerValues()
-            {
-                var collectorRadius = (UIMenuNumericScrollerItem<int>)scrollerItems.Where(x => x.Text == "Collection Radius").FirstOrDefault();
-                var speedZoneRadius = (UIMenuNumericScrollerItem<int>)scrollerItems.Where(x => x.Text == "Speed Zone Radius").FirstOrDefault();
-
-                if (selectedScroller.Text == "Collection Radius" || selectedScroller.Text == "Speed Zone Radius")
-                {
-                    if (selectedScroller == collectorRadius && collectorRadius.Value > speedZoneRadius.Value)
-                    {
-                        while (collectorRadius.Value > speedZoneRadius.Value)
-                        {
-                            speedZoneRadius.ScrollToNextOption();
-                        }
-                    }
-                    if (selectedScroller == speedZoneRadius && speedZoneRadius.Value < collectorRadius.Value)
-                    {
-                        collectorRadius.Value = speedZoneRadius.Value;
-                    }
-                }
-            }
-        }
-
-        private static void DrawWaypointMarker()
-        {
-            var waypointPosition = MousePositionInWorld.GetPosition;
-            if (SettingsMenu.threeDWaypoints.Checked && PathCreationMenu.collectorWaypoint.Checked)
-            {
-                Rage.Native.NativeFunction.Natives.DRAW_MARKER(1, waypointPosition, 0, 0, 0, 0, 0, 0, (float)PathCreationMenu.collectorRadius.Value * 2, (float)PathCreationMenu.collectorRadius.Value * 2, 1f, 80, 130, 255, 80, false, false, 2, false, 0, 0, false);
-                Rage.Native.NativeFunction.Natives.DRAW_MARKER(1, waypointPosition, 0, 0, 0, 0, 0, 0, (float)PathCreationMenu.speedZoneRadius.Value * 2, (float)PathCreationMenu.speedZoneRadius.Value * 2, 1f, 255, 185, 80, 80, false, false, 2, false, 0, 0, false);
-            }
-            else if (PathCreationMenu.stopWaypointType.Checked)
-            {
-                Rage.Native.NativeFunction.Natives.DRAW_MARKER(1, waypointPosition, 0, 0, 0, 0, 0, 0, 1f, 1f, 1f, 255, 65, 65, 80, false, false, 2, false, 0, 0, false);
-            }
-            else
-            {
-                Rage.Native.NativeFunction.Natives.DRAW_MARKER(1, waypointPosition, 0, 0, 0, 0, 0, 0, 1f, 1f, 1f, 65, 255, 65, 80, false, false, 2, false, 0, 0, false);
-            }
-        }
-    }
-}

SceneManager/SceneManager.csproj

@@ -12,6 +12,8 @@
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -32,20 +34,28 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="InputManager, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\InputManager.1.0.0\lib\InputManager.dll</HintPath>
-      <HintPath>bin\Debug\InputManager.dll</HintPath>
     </Reference>
     <Reference Include="RAGENativeUI">
       <HintPath>D:\Program Files\Rockstar Games\Grand Theft Auto V\RAGENativeUI.dll</HintPath>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="RagePluginHookSDK">
+    <Reference Include="RagePluginHook">
-      <HintPath>D:\Program Files\Rockstar Games\Grand Theft Auto V\plugins\LSPDFR\RagePluginHookSDK.dll</HintPath>
+      <HintPath>..\..\Modding Resources\References\RagePluginHook.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
     <Reference Include="System.Management" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Reflection" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -54,27 +64,37 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ConsoleCommands.cs" />
+    <Compile Include="Utils\ConsoleCommands.cs" />
-    <Compile Include="MousePositionInWorld.cs" />
+    <Compile Include="Utils\Enums.cs" />
-    <Compile Include="Object Classes\CollectedVehicle.cs" />
+    <Compile Include="Utils\Extensions.cs" />
-    <Compile Include="Object Classes\Barrier.cs" />
+    <Compile Include="Utils\MousePositionInWorld.cs" />
+    <Compile Include="Objects\CollectedVehicle.cs" />
+    <Compile Include="Objects\Barrier.cs" />
     <Compile Include="Hints.cs" />
     <Compile Include="Menus\BarrierMenu.cs" />
     <Compile Include="Menus\EditPathMenu.cs" />
     <Compile Include="Menus\EditWaypointMenu.cs" />
     <Compile Include="EntryPoint.cs" />
-    <Compile Include="GetUserInput.cs" />
+    <Compile Include="Utils\GetUserInput.cs" />
     <Compile Include="Menus\MainMenu.cs" />
     <Compile Include="Menus\MenuManager.cs" />
-    <Compile Include="Object Classes\Path.cs" />
+    <Compile Include="Objects\Path.cs" />
     <Compile Include="Menus\PathCreationMenu.cs" />
-    <Compile Include="PNWUserInput.cs" />
+    <Compile Include="Utils\PathXMLManager.cs" />
+    <Compile Include="Utils\PNWUserInput.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Menus\PathMainMenu.cs" />
     <Compile Include="Menus\SettingsMenu.cs" />
-    <Compile Include="RNUIMouseInputHandler.cs" />
+    <Compile Include="Utils\RNUIMouseInputHandler.cs" />
     <Compile Include="Settings.cs" />
-    <Compile Include="Object Classes\Waypoint.cs" />
+    <Compile Include="Objects\Waypoint.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="AfterCompile">
+    <Exec Command="if &quot;$(ConfigurationName)&quot; == &quot;Release&quot; (&quot;$(ProjectDir)_ConfuserEx\Confuser.CLI.exe&quot; &quot;$(ProjectDir)_ConfuserEx\c.crproj&quot;)&#xD;&#xA;" />
+  </Target>
 </Project>

SceneManager/SceneManager.obproj

@@ -0,0 +1,18 @@
+<Project ProjectFileVersion="4" UseRelativePaths="True" CheckVersionsWhileResolvingAssemblies="True" DisabledFromMSBuild="False" ID="{b35d9f3f-3f2b-4c66-9dbe-4b237999d6ba}">
+  <SearchDirectories />
+  <OutputSettings OutputPath=".\CryptoObfuscator_Output" MainAssemblyPath="" RunAssemblyPath="" SNPath="" SignToolPath="" LicensingDLLPath="" OverwriteInputFiles="False" BuildID="" MapFilesLocation="" FullParamNamesInMappingFile="False">
+    <AdditionalAssemblies />
+  </OutputSettings>
+  <ExceptionReporting ExceptionReportingServiceURL="" TryToContinueOnException="True" LocalReportPath=".\SceneManager_ExceptionReports" ApplicationName="" CompanyName="" ShowUI="True" EnableSaveToFileButton="True" EnableSendReportButton="True" DeleteDownloadedReportsFromServer="True" />
+  <ObfuscationSettings RenamingScheme="0" UseOverloadedFieldNames="False" UseOverloadedMethodNames="False" HonorObfuscationAttributes="True" ExcludeSerializedTypes="True" ProcessInlineStrings="True" ForceXAMLProcessingModeExclude="False" ForceRenameParams="False" SymbolPrefix="" SymbolSuffix="" FakeFields="" FakeTypes="" FakeMethods="" EncryptionActive="True" CompressionActive="True" RemoveAccessedThroughPropertyAttribute="False" UseSaltForCryptographicRenaming="False" />
+  <ObfuscationRules />
+  <InclusionExclusionRules />
+  <Assembly Load="true" Path="D:\Program Files\Rockstar Games\Grand Theft Auto V\plugins\SceneManager.dll" XapEntryName="" KeyFilePath="" KeyFileContainsPublicKeyOnly="False" CertFilePath="" TimeStampURL="" Rfc3161TimestampURL="False" SHA256SigningAlgorithm="False" Embed="True" AddExceptionReporting="False" PfxPassword="" PfxPasswordCert="" IsWinRTAssembly="False">
+    <ObfuscationSettings EncryptStrings="True" EncryptMethods="False" EncryptConstants="False" SuppressReflector="False" ReduceMetaData="False" ObfuscationDisposition="1" FlowObfuscation="2" CodeMasking="0" SuppressILDASM="True" SuppressReflection="False" CombineResources="True" EncryptResources="True" CompressResources="True" MarkAsSealed="False" EnableTamperDetection="True" EnableAntiDebugging="False" SymbolRenaming="True" HideExternalCalls="False" HideInternalCalls="False" GeneratePdbFile="True" ObfuscatePdbFileNames="True" IncludeLocalVariablesInPdbFile="False" Encrypt="False" Compress="False" MSBuild="False" ObfuscatedNamespace="A" RetainNamespace="False" ModuleInitializationMethod="" LicensingMerge="False" RemoveConstants="False" ProcessSatelliteAssemblies="True">
+      <Watermarks Watermark0="" Watermark1="" Watermark2="" Watermark3="" Watermark4="" Watermark5="" Watermark6="" Watermark7="" Watermark8="" Watermark9="" />
+    </ObfuscationSettings>
+  </Assembly>
+  <WarningSuppressions />
+  <Warnings SaveWarningsToFile="" FailOnUnsuppressedWarning="False" SaveSuppressedWarnings="True" SaveUnsuppressedWarnings="True" />
+  <Filters />
+</Project>

SceneManager/app.config

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Resources.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

SceneManager/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="InputManager" version="1.0.0" targetFramework="net48" />
+</packages>

SceneManager/smprotected.crproj

@@ -0,0 +1,3 @@
+<project outputDir="C:\Users\Rich\Desktop\Mod Stuff\Mod Development\SceneManager\SceneManager\Confused" baseDir="C:\Users\Rich\Desktop\Mod Stuff\Mod Development\SceneManager\SceneManager" xmlns="http://confuser.codeplex.com">
+  <rule pattern="true" preset="maximum" inherit="false" />
+</project>