QModManager 2.1 RELEASE (#92)

Author: Alexejhero

.gitignore

@@ -3,17 +3,6 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
-assemblies/0Harmony.dll
-assemblies/Assembly-CSharp.dll
-assemblies/UnityEngine.dll
-assemblies/UnityEngine.UI.dll
-assemblies/Newtonsoft.Json.dll
-assemblies/Mono.Cecil.dll
-assemblies/Mono.Cecil.Mdb.dll
-assemblies/Mono.Cecil.Pdb.dll
-assemblies/Mono.Cecil.Rocks.dll
-assemblies/QModInstaller.dll
-
 # User-specific files
 *.suo
 *.user

Build/InstallerExtensions.dll

@@ -1 +1 @@
-2.0.1
+2.1

Build/QModInstaller.dll

@@ -1,25 +1,19 @@
-### Normal Dependencies
-These files are required and will be redistributed with QModManager
-- `0Harmony.dll` & `0Harmony-1.2.0.1.dll`: https://github.com/pardeike/Harmony
+## Dependencies
 
----
-
-### Game Dependencies
-These files are required, but are from the base game and will not be redistributed with QModManager
-- `Assembly-CSharp.dll` & `Assembly-CSharp-firstpass.dll`: https://github.com/unknownworlds
-- `Newtonsoft.JSON.dll`: https://github.com/JamesNK/Newtonsoft.Json
-- `UnityEngine.dll` & `UnityEngine.UI.dll`: https://github.com/Unity-Technologies/UnityCsReference
-
----
-
-### Injector Dependencies
-These files are required by the injector and will be redistributed with QModManager
-- `AssetsTools.NET`: https://github.com/nesrak1/AssetsTools.NET
-- `cldb.dat` & `cldb2018.dat`: https://github.com/DerPopo/UABE
-- `Mono.Cecil.dll`: https://github.com/jbevain/cecil
-
----
-
-### Installer Dependencies
-These files are required by the installer, but will not be redistributed with QModManager
-- `Carbon.vsf` & `VclStylesinno.dll`: https://github.com/RRUZ/vcl-styles-plugins
+|            Dependency           |                          Link                          |               Redistributed              |
+|:-------------------------------:|:------------------------------------------------------:|:----------------------------------------:|
+|          `0Harmony.dll`         |           https://github.com/pardeike/Harmony          |                  ☑                 |
+|      `0Harmony-1.2.0.1.dll`     |           https://github.com/pardeike/Harmony          |                  ☑                 |
+|      `Assembly-CSharp.dll`      |            https://github.com/unknownworlds            |           &#9744; <br>Game file          |
+| `Assembly-CSharp-firstpass.dll` |            https://github.com/unknownworlds            |           &#9744; <br>Game file          |
+|      `AssetsTools.NET.dll`      |       https://github.com/nesrak1/AssetsTools.NET       |                  &#9745;                 |
+|           `Carbon.vsf`          |       https://github.com/RRUZ/vcl-styles-plugins       |  &#9744; <br>Bundled with the installer  |
+|            `cldb.dat`           |             https://github.com/DerPopo/UABE            | &#9745; <br>Only for Subnautica installs |
+|          `cldb2018.dat`         |             https://github.com/DerPopo/UABE            | &#9745; <br>Only for Below Zero installs |
+|         `Mono.Cecil.dll`        |            https://github.com/jbevain/cecil            |                  &#9745;                 |
+|      `Netwonsoft.Json.dll`      |       https://github.com/JamesNK/Newtonsoft.Json       |           &#9744; <br>Game file          |
+| `RGiesecke.DllExport.Metadata.dll` | https://www.nuget.org/packages/UnmanagedExports | &#9744; |
+| `SemVer.dll` | https://github.com/adamreeve/semver.net | &#9745; |
+|        `UnityEngine.dll`        | https://github.com/Unity-Technologies/UnityCsReference |           &#9744; <br>Game file          |
+|       `UnityEngine.UI.dll`      | https://github.com/Unity-Technologies/UnityCsReference |           &#9744; <br>Game file          |
+|       `VclStylesinno.dll`       |       https://github.com/RRUZ/vcl-styles-plugins       |  &#9744; <br>Bundled with the installer  |

Build/QModInstaller.xml

@@ -8,11 +8,11 @@ namespace QModManager
 {
     internal class Injector
     {
-        private readonly string gameDirectory;
-        private readonly string managedDirectory;
-        private readonly string globalgamemanagers;
-        private readonly string mainFilename = "Assembly-CSharp.dll";
-        private const string installerFilename = "QModInstaller.dll";
+        internal readonly string gameDirectory;
+        internal readonly string managedDirectory;
+        internal readonly string globalgamemanagers;
+        internal readonly string mainFilename = "Assembly-CSharp.dll";
+        internal const string installerFilename = "QModInstaller.dll";
 
         internal Injector(string dir, string managedDir)
         {

Build/QModManager.exe

@@ -47,7 +47,7 @@ internal static void Main(string[] args)
                 string managedDirectory = Environment.CurrentDirectory;
                 string globalgamemanagers = Path.Combine(managedDirectory, "../globalgamemanagers");
 
-                if (!File.Exists(managedDirectory + "/Assembly-CSharp.dll"))
+                if (!File.Exists(Path.Combine(managedDirectory, "Assembly-CSharp.dll")))
                 {
                     Console.WriteLine("Could not find the assembly file.");
                     Console.WriteLine("Please make sure you have installed QModManager in the right folder.");
@@ -262,11 +262,11 @@ internal static void DisableExit()
             Console.TreatControlCAsInput = true;
         }
 
-        private static void DisableExitButton() => EnableMenuItem(GetSystemMenu(GetConsoleWindow(), false), 0xF060, 0x1);
-        private static void CancelKeyPress(object sender, ConsoleCancelEventArgs e) => e.Cancel = true;
-        [DllImport("user32.dll")] private static extern int EnableMenuItem(IntPtr tMenu, int targetItem, int targetStatus);
-        [DllImport("user32.dll")] private static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert);
-        [DllImport("kernel32.dll", ExactSpelling = true)] private static extern IntPtr GetConsoleWindow();
+        internal static void DisableExitButton() => EnableMenuItem(GetSystemMenu(GetConsoleWindow(), false), 0xF060, 0x1);
+        internal static void CancelKeyPress(object sender, ConsoleCancelEventArgs e) => e.Cancel = true;
+        [DllImport("user32.dll")] internal static extern int EnableMenuItem(IntPtr tMenu, int targetItem, int targetStatus);
+        [DllImport("user32.dll")] internal static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert);
+        [DllImport("kernel32.dll", ExactSpelling = true)] internal static extern IntPtr GetConsoleWindow();
 
         #endregion
     }

Build/QModManager_Setup.exe

@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("2.0.1")]
-[assembly: AssemblyFileVersion("2.0.1")]
+[assembly: AssemblyVersion("2.1")]
+[assembly: AssemblyFileVersion("2.1")]

Data/latest-version.txt

@@ -14,5 +14,5 @@
 
 [assembly: Guid("8c6c9a0b-80c4-43d2-89f2-749e6f09fdda")]
 
-[assembly: AssemblyVersion("2.0.1")]
-[assembly: AssemblyFileVersion("2.0.1")]
+[assembly: AssemblyVersion("2.1")]
+[assembly: AssemblyFileVersion("2.1")]

Dependencies/README.md

@@ -5,7 +5,7 @@
 #endif
 
 #define Name "QModManager" ; The name of the game will be added after it
-#define Version "2.0.1"
+#define Version "2.1"
 #define Author "the QModManager dev team"
 #define URL "https://github.com/QModManager/QModManager"
 #define SupportURL "https://discord.gg/UpWuWwq"
@@ -64,7 +64,9 @@ Source: "..\Dependencies\0Harmony-1.2.0.1.dll"; DestDir: "{app}\Subnautica_Data\
 Source: "..\Dependencies\AssetsTools.NET.dll"; DestDir: "{app}\Subnautica_Data\Managed"; Flags: IgnoreVersion; Check: IsSubnauticaApp
 Source: "..\Dependencies\cldb.dat"; DestDir: "{app}\Subnautica_Data\Managed"; Flags: IgnoreVersion; Check: IsSubnauticaApp
 Source: "..\Dependencies\Mono.Cecil.dll"; DestDir: "{app}\Subnautica_Data\Managed"; Flags: IgnoreVersion; Check: IsSubnauticaApp
+Source: "..\Dependencies\SemVer.dll"; DestDir: "{app}\Subnautica_Data\Managed"; Flags: IgnoreVersion; Check: IsSubnauticaApp
 Source: "..\Build\QModInstaller.dll"; DestDir: "{app}\Subnautica_Data\Managed"; Flags: IgnoreVersion; Check: IsSubnauticaApp
+Source: "..\Build\QModInstaller.xml"; DestDir: "{app}\Subnautica_Data\Managed"; Flags: IgnoreVersion; Check: IsSubnauticaApp
 Source: "..\Build\QModManager.exe"; DestDir: "{app}\Subnautica_Data\Managed"; Flags: IgnoreVersion; Check: IsSubnauticaApp
 Source: "..\Assets\QModManagerAssets.unity3d"; DestDir: "{app}\Subnautica_Data\Managed"; Flags: IgnoreVersion; Check: IsSubnauticaApp
 ; Below Zero
@@ -73,7 +75,9 @@ Source: "..\Dependencies\0Harmony-1.2.0.1.dll"; DestDir: "{app}\SubnauticaZero_D
 Source: "..\Dependencies\AssetsTools.NET.dll"; DestDir: "{app}\SubnauticaZero_Data\Managed"; Flags: IgnoreVersion; Check: IsBelowZeroApp
 Source: "..\Dependencies\cldb2018.dat"; DestDir: "{app}\SubnauticaZero_Data\Managed"; Flags: IgnoreVersion; Check: IsBelowZeroApp
 Source: "..\Dependencies\Mono.Cecil.dll"; DestDir: "{app}\SubnauticaZero_Data\Managed"; Flags: IgnoreVersion; Check: IsBelowZeroApp
+Source: "..\Dependencies\SemVer.dll"; DestDir: "{app}\SubnauticaZero_Data\Managed"; Flags: IgnoreVersion; Check: IsBelowZeroApp
 Source: "..\Build\QModInstaller.dll"; DestDir: "{app}\SubnauticaZero_Data\Managed"; Flags: IgnoreVersion; Check: IsBelowZeroApp
+Source: "..\Build\QModInstaller.xml"; DestDir: "{app}\SubnauticaZero_Data\Managed"; Flags: IgnoreVersion; Check: IsBelowZeroApp
 Source: "..\Build\QModManager.exe"; DestDir: "{app}\SubnauticaZero_Data\Managed"; Flags: IgnoreVersion; Check: IsBelowZeroApp
 Source: "..\Assets\QModManagerAssets.unity3d"; DestDir: "{app}\SubnauticaZero_Data\Managed"; Flags: IgnoreVersion; Check: IsBelowZeroApp
 
@@ -111,7 +115,7 @@ Name: "qmm\bz"; Description: "Install for Below Zero"; Flags: exclusive fixed
 
 [Code]
 // Import stuff from InstallerExtensions.dll
-function PathsEqual(pathone, pathtwo: WideString): Boolean; external 'PathsEqual@files:InstallerExtensions.dll stdcall';
+function PathsEqual(pathone, pathtwo: WideString): Boolean; external 'PathsEqual@files:InstallerExtensions.dll stdcall delayload';
 
 function IsSubnautica(path: String): Boolean;
 begin
@@ -157,7 +161,7 @@ begin
   end
   else if (IsBelowZeroApp()) then
   begin
-    Result := '{#Name} (Below zero)'
+    Result := '{#Name} (Below Zero)'
   end
   else
   begin
@@ -457,8 +461,99 @@ end;
 procedure LoadVCLStyle(VClStyleFile: String); external 'LoadVCLStyleW@files:VclStylesInno.dll stdcall';
 procedure UnLoadVCLStyles; external 'UnLoadVCLStyles@files:VclStylesInno.dll stdcall';
 
+// Check for .NET version -- code from http://www.kynosarges.de/DotNetVersion.html
+function IsDotNetDetected(version: string; service: cardinal): boolean;
+// Indicates whether the specified version and service pack of the .NET Framework is installed.
+//
+// version -- Specify one of these strings for the required .NET Framework version:
+//    'v1.1'          .NET Framework 1.1
+//    'v2.0'          .NET Framework 2.0
+//    'v3.0'          .NET Framework 3.0
+//    'v3.5'          .NET Framework 3.5
+//    'v4\Client'     .NET Framework 4.0 Client Profile
+//    'v4\Full'       .NET Framework 4.0 Full Installation
+//    'v4.5'          .NET Framework 4.5
+//    'v4.5.1'        .NET Framework 4.5.1
+//    'v4.5.2'        .NET Framework 4.5.2
+//    'v4.6'          .NET Framework 4.6
+//    'v4.6.1'        .NET Framework 4.6.1
+//    'v4.6.2'        .NET Framework 4.6.2
+//    'v4.7'          .NET Framework 4.7
+//
+// service -- Specify any non-negative integer for the required service pack level:
+//    0               No service packs required
+//    1, 2, etc.      Service pack 1, 2, etc. required
+var
+    key, versionKey: string;
+    install, release, serviceCount, versionRelease: cardinal;
+    success: boolean;
+begin
+    versionKey := version;
+    versionRelease := 0;
+
+    // .NET 1.1 and 2.0 embed release number in version key
+    if version = 'v1.1' then begin
+        versionKey := 'v1.1.4322';
+    end else if version = 'v2.0' then begin
+        versionKey := 'v2.0.50727';
+    end
+
+    // .NET 4.5 and newer install as update to .NET 4.0 Full
+    else if Pos('v4.', version) = 1 then begin
+        versionKey := 'v4\Full';
+        case version of
+          'v4.5':   versionRelease := 378389;
+          'v4.5.1': versionRelease := 378675; // 378758 on Windows 8 and older
+          'v4.5.2': versionRelease := 379893;
+          'v4.6':   versionRelease := 393295; // 393297 on Windows 8.1 and older
+          'v4.6.1': versionRelease := 394254; // 394271 before Win10 November Update
+          'v4.6.2': versionRelease := 394802; // 394806 before Win10 Anniversary Update
+          'v4.7':   versionRelease := 460798; // 460805 before Win10 Creators Update
+        end;
+    end;
+
+    // installation key group for all .NET versions
+    key := 'SOFTWARE\Microsoft\NET Framework Setup\NDP\' + versionKey;
+
+    // .NET 3.0 uses value InstallSuccess in subkey Setup
+    if Pos('v3.0', version) = 1 then begin
+        success := RegQueryDWordValue(HKLM, key + '\Setup', 'InstallSuccess', install);
+    end else begin
+        success := RegQueryDWordValue(HKLM, key, 'Install', install);
+    end;
+
+    // .NET 4.0 and newer use value Servicing instead of SP
+    if Pos('v4', version) = 1 then begin
+        success := success and RegQueryDWordValue(HKLM, key, 'Servicing', serviceCount);
+    end else begin
+        success := success and RegQueryDWordValue(HKLM, key, 'SP', serviceCount);
+    end;
+
+    // .NET 4.5 and newer use additional value Release
+    if versionRelease > 0 then begin
+        success := success and RegQueryDWordValue(HKLM, key, 'Release', release);
+        success := success and (release >= versionRelease);
+    end;
+
+    result := success and (install = 1) and (serviceCount >= service);
+end;
+
 function InitializeSetup(): Boolean;
+var
+  ErrCode: Integer;
 begin
+  if not IsDotNetDetected('v3.5', 0) then 
+  begin
+    if MsgBox('QModManager requires Microsoft .NET Framework 3.5.' + #13#10 + 'Would you like to install it now?', mbCriticalError, MB_YESNO) = IDYES then
+    begin
+      if not ShellExec('open', 'https://docs.microsoft.com/en-us/dotnet/framework/install/dotnet-35-windows-10', '', '', SW_SHOW, ewNoWait, ErrCode) then
+      begin
+        SysErrorMessage(ErrCode);
+      end
+    end;
+    result := false;
+    Exit
+  end;
   appIsSet := false
   if IsAppRunning('Subnautica.exe') or IsAppRunning('SubnauticaZero.exe') then
   begin
@@ -524,4 +619,4 @@ procedure DeinitializeSetup();
 begin
   // Unload skin
   UnLoadVCLStyles;
-end;
+end;

Dependencies/SemVer.dll

@@ -0,0 +1,7 @@
+Welcome to the QModManager installer!
+
+This will install QModManager v2.1 on your computer.
+
+Please close Subnautica and Subnautica: Below Zero before installing!
+
+Click Next to continue, or click Cancel to exit the installer.