diff --git a/Build/InstallerExtensions.dll b/Build/InstallerExtensions.dll index 6c0d6fa5..40104eb9 100644 Binary files a/Build/InstallerExtensions.dll and b/Build/InstallerExtensions.dll differ diff --git a/Build/QModInstaller.dll b/Build/QModInstaller.dll index 25a60828..1c1be742 100644 Binary files a/Build/QModInstaller.dll and b/Build/QModInstaller.dll differ diff --git a/Build/QModManager.exe b/Build/QModManager.exe index 5189fa30..28f2532b 100644 Binary files a/Build/QModManager.exe and b/Build/QModManager.exe differ diff --git a/Build/QModManager_Setup.exe b/Build/QModManager_Setup.exe index cb4d5763..03498b64 100644 Binary files a/Build/QModManager_Setup.exe and b/Build/QModManager_Setup.exe differ diff --git a/Dependencies/AssetsTools.NET.dll b/Dependencies/AssetsTools.NET.dll deleted file mode 100644 index bb399405..00000000 Binary files a/Dependencies/AssetsTools.NET.dll and /dev/null differ diff --git a/Executable/AudioFixer.cs b/Executable/AudioFixer.cs index 5f914c05..a967b3de 100644 --- a/Executable/AudioFixer.cs +++ b/Executable/AudioFixer.cs @@ -16,7 +16,7 @@ internal static void ChangeDisableUnityAudio(string path, bool newValue, QModGam AssetsManager am = new AssetsManager(); AssetsFileInstance afi = am.LoadAssetsFile(path, false); am.LoadClassDatabase("cldb.dat"); - AssetFileInfoEx audioInfo = afi.table.getAssetInfo(4); + AssetFileInfoEx audioInfo = afi.table.GetAssetInfo(4); AssetTypeInstance audioAti = am.GetATI(afi.file, audioInfo); AssetTypeValueField audioBaseField = audioAti.GetBaseField(); audioBaseField.Get("m_DisableAudio").GetValue().Set(newValue); @@ -32,7 +32,7 @@ internal static void ChangeDisableUnityAudio(string path, bool newValue, QModGam using (MemoryStream memStream = new MemoryStream()) using (AssetsFileWriter writer = new AssetsFileWriter(memStream)) { - afi.file.Write(writer, 0, rep.ToArray(), 0); + afi.file.Write(writer, 0, rep, 0); afi.stream.Close(); File.WriteAllBytes(path, memStream.ToArray()); } diff --git a/Executable/Executable.csproj b/Executable/Executable.csproj index 30f2aac8..6782914f 100644 --- a/Executable/Executable.csproj +++ b/Executable/Executable.csproj @@ -82,8 +82,8 @@ MinimumRecommendedRules.ruleset - - ..\Dependencies\AssetsTools.NET.dll + + ..\packages\AssetsTools.NET.2.0.3\lib\net35\AssetsTools.NET.dll False @@ -119,6 +119,7 @@ + diff --git a/Executable/Injector.cs b/Executable/Injector.cs index 67392add..1d861aeb 100644 --- a/Executable/Injector.cs +++ b/Executable/Injector.cs @@ -17,7 +17,7 @@ internal class Injector internal Injector(string dir, string managedDir) { gameDirectory = dir; - managedDirectory = managedDir; + managedDirectory = managedDir; mainFilename = Path.Combine(managedDirectory, mainFilename); globalgamemanagers = Path.Combine(managedDirectory, "../globalgamemanagers"); } @@ -45,7 +45,6 @@ internal void Inject() File.Delete(backupFilePath); AssemblyDefinition game = AssemblyDefinition.ReadAssembly(mainFilename); - AssemblyDefinition installer = AssemblyDefinition.ReadAssembly(installerFilename); MethodDefinition patchMethod = installer.MainModule.GetType("QModInstaller.QModPatcher").Methods.First(x => x.Name == "Patch"); diff --git a/Executable/packages.config b/Executable/packages.config new file mode 100644 index 00000000..76f7717a --- /dev/null +++ b/Executable/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Installer/QModsInstallerScript.iss b/Installer/QModsInstallerScript.iss index e3739f08..6b1e652c 100644 --- a/Installer/QModsInstallerScript.iss +++ b/Installer/QModsInstallerScript.iss @@ -60,7 +60,7 @@ Source: "..\Build\InstallerExtensions.dll"; Flags: DontCopy ; Subnautica Source: "..\Dependencies\0Harmony.dll"; DestDir: "{app}\Subnautica_Data\Managed"; Flags: IgnoreVersion; Check: IsSubnauticaApp Source: "..\Dependencies\0Harmony-1.2.0.1.dll"; DestDir: "{app}\Subnautica_Data\Managed"; Flags: IgnoreVersion; Check: IsSubnauticaApp -Source: "..\Dependencies\AssetsTools.NET.dll"; DestDir: "{app}\Subnautica_Data\Managed"; Flags: IgnoreVersion; Check: IsSubnauticaApp +Source: "..\packages\AssetsTools.NET.2.0.3\lib\net35\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: "..\Build\QModInstaller.dll"; DestDir: "{app}\Subnautica_Data\Managed"; Flags: IgnoreVersion; Check: IsSubnauticaApp @@ -69,7 +69,7 @@ Source: "..\Build\QModManager.exe"; DestDir: "{app}\Subnautica_Data\Managed"; Fl ; Below Zero Source: "..\Dependencies\0Harmony.dll"; DestDir: "{app}\SubnauticaZero_Data\Managed"; Flags: IgnoreVersion; Check: IsBelowZeroApp Source: "..\Dependencies\0Harmony-1.2.0.1.dll"; DestDir: "{app}\SubnauticaZero_Data\Managed"; Flags: IgnoreVersion; Check: IsBelowZeroApp -Source: "..\Dependencies\AssetsTools.NET.dll"; DestDir: "{app}\SubnauticaZero_Data\Managed"; Flags: IgnoreVersion; Check: IsBelowZeroApp +Source: "..\packages\AssetsTools.NET.2.0.3\lib\net35\AssetsTools.NET.dll"; DestDir: "{app}\SubnauticaZero_Data\Managed"; Flags: IgnoreVersion; Check: IsBelowZeroApp Source: "..\Dependencies\cldb.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: "..\Build\QModInstaller.dll"; DestDir: "{app}\SubnauticaZero_Data\Managed"; Flags: IgnoreVersion; Check: IsBelowZeroApp