blah

Rewrote logger for more flexible options
Complete client resource loading

.github/workflows/build-test.yaml

@@ -31,9 +31,9 @@ jobs:
     - name: Restore nuget packages
       run: nuget restore
     - name: Build client and installer
-      run: dotnet build RageCoop.Client.Installer/RageCoop.Client.Installer.csproj --configuration Release -o bin/Release/Client/RageCoop
+      run: dotnet build Client/Installer/RageCoop.Client.Installer.csproj --configuration Release -o bin/Release/Client
     - name: Build server win-x64
-      run: dotnet build RageCoop.Server/RageCoop.Server.csproj -o bin/Release/Server
+      run: dotnet build Server/RageCoop.Server.csproj -o bin/Release/Server
     - name: Upload server
       uses: actions/upload-artifact@v3
       with:

Client/Installer/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using RageCoop.Core;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -11,7 +12,6 @@ using System.Windows.Input;
 using MessageBox = System.Windows.MessageBox;
 using OpenFileDialog = Microsoft.Win32.OpenFileDialog;
 using Path = System.IO.Path;
-using RageCoop.Core;
 
 namespace RageCoop.Client.Installer
 {
@@ -58,64 +58,53 @@ namespace RageCoop.Client.Installer
         {
             UpdateStatus("Checking requirements");
             var shvPath = Path.Combine(root, "ScriptHookV.dll");
-            var shvdnPath = Path.Combine(root, "ScriptHookVDotNet3.dll");
             var scriptsPath = Path.Combine(root, "Scripts");
-            var lemonPath = Path.Combine(scriptsPath, "LemonUI.SHVDN3.dll");
-            var installPath = Path.Combine(scriptsPath, "RageCoop");
-            if (Directory.GetParent(Assembly.GetExecutingAssembly().Location).FullName == installPath)
+            var installPath = Path.Combine(root, "RageCoop", "Scripts");
+            var legacyPath = Path.Combine(scriptsPath, "RageCoop");
+            if (Directory.GetParent(Assembly.GetExecutingAssembly().Location).FullName.StartsWith(installPath))
             {
                 throw new InvalidOperationException("The installer is not meant to be run in the game folder, please extract the zip to somewhere else and run again.");
             }
-            Directory.CreateDirectory(installPath);
             if (!File.Exists(shvPath))
             {
                 MessageBox.Show("Please install ScriptHookV first!");
                 Environment.Exit(1);
             }
-            if (!File.Exists(shvdnPath))
-            {
-                MessageBox.Show("Please install ScriptHookVDotNet first!");
-                Environment.Exit(1);
-            }
-            var shvdnVer = GetVer(shvdnPath);
-            if (shvdnVer < new Version(3, 5, 1))
-            {
-                MessageBox.Show("Please update ScriptHookVDotNet to latest version!" +
-                    $"\nCurrent version is {shvdnVer}, 3.5.1 or higher is required");
-                Environment.Exit(1);
-            }
-            if (File.Exists(lemonPath))
-            {
-                var lemonVer = GetVer(lemonPath);
-                if (lemonVer < new Version(1, 7))
-                {
-                    UpdateStatus("Updating LemonUI");
-                    File.WriteAllBytes(lemonPath, getLemon());
-                }
-            }
+
+            Directory.CreateDirectory(installPath);
+
+            File.Copy("ScriptHookVDotNet.dll", Path.Combine(root, "ScriptHookVDotNet.asi"), true);
+            File.Copy("ScriptHookVDotNet3.dll", Path.Combine(root, "ScriptHookVDotNet3.dll"), true);
 
 
             UpdateStatus("Removing old versions");
 
             foreach (var f in Directory.GetFiles(scriptsPath, "RageCoop.*", SearchOption.AllDirectories))
             {
-                if (f.EndsWith("RageCoop.Client.Settings.xml")) { continue; }
                 File.Delete(f);
             }
+
+            // 1.5 installation check
+            if (Directory.Exists(legacyPath))
+            {
+                Directory.Delete(legacyPath, true);
+            }
+
             foreach (var f in Directory.GetFiles(installPath, "*.dll", SearchOption.AllDirectories))
             {
                 File.Delete(f);
             }
 
-            if (File.Exists("RageCoop.Core.dll") && File.Exists("RageCoop.Client.dll"))
+            if (File.Exists("RageCoop.Core.dll") && File.Exists("RageCoop.Client.dll") && File.Exists("RageCoop.Client.Loader.dll"))
             {
                 UpdateStatus("Installing...");
                 CoreUtils.CopyFilesRecursively(new DirectoryInfo(Directory.GetCurrentDirectory()), new DirectoryInfo(installPath));
+                File.Copy("RageCoop.Client.Loader.dll", Path.Combine(scriptsPath, "RageCoop.Client.Loader.dll"), true);
                 Finish();
             }
             else
             {
-                throw new Exception("Required files are missing, please re-download the zip from official website");
+                throw new Exception("Required files are missing, please re-download the installer from official website");
             }
 
             void Finish()
@@ -124,7 +113,7 @@ namespace RageCoop.Client.Installer
             checkKeys:
                 UpdateStatus("Checking conflicts");
                 var menyooConfig = Path.Combine(root, @"menyooStuff\menyooConfig.ini");
-                var settingsPath = Path.Combine(installPath, @"Data\RageCoop.Client.Settings.xml");
+                var settingsPath = Path.Combine(root, Util.SettingsPath);
                 Settings settings = null;
                 try
                 {
@@ -199,15 +188,5 @@ namespace RageCoop.Client.Installer
             Dispatcher.BeginInvoke(new Action(() => Status.Content = status));
         }
 
-        private Version GetVer(string location)
-        {
-            return Version.Parse(FileVersionInfo.GetVersionInfo(location).FileVersion);
-        }
-
-        private byte[] getLemon()
-        {
-            return (byte[])Resource.ResourceManager.GetObject("LemonUI_SHVDN3");
-        }
-
     }
 }

Client/Installer/RageCoop.Client.Installer.csproj

@@ -0,0 +1,54 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net48</TargetFramework>
+		<UseWPF>true</UseWPF>
+		<UseWindowsForms>true</UseWindowsForms>
+	</PropertyGroup>
+	<ItemGroup>
+		<None Remove="bg.png" />
+	</ItemGroup>
+
+	<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+		<OutDir>..\..\bin\Debug\Client</OutDir>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<DefineConstants>DEBUG</DefineConstants>
+		<WarningLevel>4</WarningLevel>
+		<NoWarn>1591</NoWarn>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)' == 'Release'">
+		<OutDir>..\..\bin\Release\Client</OutDir>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
+	</PropertyGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\..\Core\RageCoop.Core.csproj" />
+	  <ProjectReference Include="..\Loader\RageCoop.Client.Loader.csproj" />
+	  <ProjectReference Include="..\Scripts\RageCoop.Client.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Resource Include="bg.png" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Compile Update="Resource.Designer.cs">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Resource.resx</DependentUpon>
+		</Compile>
+	</ItemGroup>
+
+	<ItemGroup>
+		<EmbeddedResource Update="Resource.resx">
+			<Generator>ResXFileCodeGenerator</Generator>
+			<LastGenOutput>Resource.Designer.cs</LastGenOutput>
+		</EmbeddedResource>
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Folder Include="Resources\" />
+	</ItemGroup>
+
+</Project>

Client/Installer/RageCoop.Client.Installer.csproj.user

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+  <ItemGroup>
+    <EmbeddedResource Update="Resource.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+</Project>

Client/Installer/Resource.Designer.cs

@@ -59,15 +59,5 @@ namespace RageCoop.Client.Installer {
                 resourceCulture = value;
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
-        /// </summary>
-        internal static byte[] LemonUI_SHVDN3 {
-            get {
-                object obj = ResourceManager.GetObject("LemonUI_SHVDN3", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
     }
 }

Client/Installer/Resource.resx

@@ -118,7 +118,4 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="LemonUI_SHVDN3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\LemonUI.SHVDN3.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
 </root>

Client/Loader/Main.cs

@@ -0,0 +1,69 @@
+using GTA;
+using System;
+using System.Collections.Concurrent;
+using System.IO;
+using System.Threading;
+using Console = GTA.Console;
+namespace RageCoop.Client.Loader
+{
+    public class Main : GTA.Script
+    {
+        private static readonly string GameDir = Directory.GetParent(typeof(SHVDN.ScriptDomain).Assembly.Location).FullName;
+        private static readonly string ScriptsLocation = Path.Combine(GameDir, "RageCoop", "Scripts");
+        private static readonly ConcurrentQueue<Action> TaskQueue = new ConcurrentQueue<Action>();
+        private static int MainThreadID;
+        public Main()
+        {
+            if (LoaderContext.PrimaryDomain != null) { throw new InvalidOperationException("Improperly placed loader assembly, please re-install to fix this issue"); }
+            Tick += OnTick;
+            SHVDN.ScriptDomain.CurrentDomain.Tick += DomainTick;
+            Aborted += (s, e) => LoaderContext.UnloadAll();
+        }
+
+        private void OnTick(object sender, EventArgs e)
+        {
+            while (Game.IsLoading)
+            {
+                GTA.Script.Yield();
+            }
+            LoaderContext.CheckForUnloadRequest();
+            if (!LoaderContext.IsLoaded(ScriptsLocation))
+            {
+                if (!File.Exists(Path.Combine(ScriptsLocation, "RageCoop.Client.dll")))
+                {
+                    GTA.UI.Notification.Show("~r~Main assembly is missing, please re-install the client");
+                    Abort();
+                }
+                LoaderContext.Load(ScriptsLocation);
+            }
+        }
+
+        internal static void QueueToMainThread(Action task)
+        {
+            if (Thread.CurrentThread.ManagedThreadId != MainThreadID)
+            {
+                TaskQueue.Enqueue(task);
+            }
+            else
+            {
+                task();
+            }
+        }
+
+        private static void DomainTick()
+        {
+            if (MainThreadID == default) { MainThreadID = Thread.CurrentThread.ManagedThreadId; }
+            while (TaskQueue.TryDequeue(out var task))
+            {
+                try
+                {
+                    task.Invoke();
+                }
+                catch (Exception ex)
+                {
+                    Console.Error(ex.ToString());
+                }
+            }
+        }
+    }
+}

Client/Loader/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("RageCoop.Client.Loader")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("RageCoop.Client.Loader")]
+[assembly: AssemblyCopyright("Copyright ©  2022")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("fc8cbdbb-6dc3-43af-b34d-092e476410a5")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Client/Loader/RageCoop.Client.Loader.csproj

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{FC8CBDBB-6DC3-43AF-B34D-092E476410A5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>RageCoop.Client.Loader</RootNamespace>
+    <AssemblyName>RageCoop.Client.Loader</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutPutPath>..\..\bin\Debug\Client.Loader</OutPutPath>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutPutPath>..\..\bin\Release\Client.Loader</OutPutPath>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="ScriptHookVDotNet">
+      <HintPath>..\..\libs\ScriptHookVDotNet.dll</HintPath>
+    </Reference>
+    <Reference Include="ScriptHookVDotNet3">
+      <HintPath>..\..\libs\ScriptHookVDotNet3.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="LoaderContext.cs" />
+    <Compile Include="Main.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

Client/Scripts/DevTools/DevTool.cs

@@ -7,6 +7,7 @@ using System.Windows.Forms;
 
 namespace RageCoop.Client
 {
+    [ScriptAttributes(Author = "RageCoop", NoDefaultInstance = false, SupportURL = "https://github.com/RAGECOOP/RAGECOOP-V")]
     internal class DevTool : Script
     {
         public static Vehicle ToMark;
@@ -14,10 +15,14 @@ namespace RageCoop.Client
         public static int Current = 0;
         public static int Secondary = 0;
         public static MuzzleDir Direction = MuzzleDir.Forward;
+        public static Script Instance;
         public DevTool()
         {
+            Util.StartUpCheck();
+            Instance = this;
             Tick += OnTick;
             KeyDown += OnKeyDown;
+            Pause();
         }
 
         private void OnKeyDown(object sender, KeyEventArgs e)
@@ -73,7 +78,7 @@ namespace RageCoop.Client
             }
             DevToolMenu.secondaryBoneIndexItem.AltTitle = Secondary.ToString();
         }
-        private static void OnTick(object sender, EventArgs e)
+        private void OnTick(object sender, EventArgs e)
         {
             if (ToMark == null || !ToMark.Exists()) { return; }
             Update();