mirror of
https://github.com/ModOrganizer2/modorganizer-NCC.git
synced 2026-07-27 14:00:52 -07:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8bf91045b5 | ||
|
|
f342dae9ba | ||
|
|
afeffdc1e9 |
@@ -1,6 +1,6 @@
|
||||
using Nexus.Client.Mods;
|
||||
using Nexus.Client.Mods.Formats.FOMod;
|
||||
using Nexus.Client.Mods.Formats.OMod;
|
||||
//using Nexus.Client.Mods.Formats.FOMod;
|
||||
//using Nexus.Client.Mods.Formats.OMod;
|
||||
using Nexus.Client.Util;
|
||||
using SevenZip;
|
||||
using System;
|
||||
@@ -85,11 +85,11 @@ namespace Extensions
|
||||
/// <param name="p_outStream">The stream to write to.</param>
|
||||
/// <exception cref="System.IO.FileNotFoundException">Thrown if the specified file
|
||||
/// is not in the mod.</exception>
|
||||
public static void ExtractFileTo(this OMod mod, string p_strFile, Stream p_outStream)
|
||||
/* public static void ExtractFileTo(this OMod mod, string p_strFile, Stream p_outStream)
|
||||
{
|
||||
byte[] data = mod.GetFile(p_strFile);
|
||||
p_outStream.Write(data, 0, data.Length);
|
||||
}
|
||||
} */
|
||||
|
||||
/// <summary>
|
||||
/// write the specified file to a stream
|
||||
@@ -100,7 +100,8 @@ namespace Extensions
|
||||
/// is not in the mod.</exception>
|
||||
public static void ExtractFileTo<T>(this T mod, string p_strFile, Stream p_outStream)
|
||||
{
|
||||
if (!(bool) mod.GetType().GetMethod("ContainsFile").Invoke(mod, new object[] { p_strFile }))
|
||||
string realPath = (string) mod.CallPrivateMethod<string>("GetRealPath", new object[] { p_strFile });
|
||||
if (!(bool) mod.GetType().GetMethod("ContainsFile").Invoke(mod, new object[] { realPath }))
|
||||
{
|
||||
if (Path.GetFileNameWithoutExtension(p_strFile).ToLower() == "screenshot")
|
||||
{
|
||||
@@ -112,7 +113,7 @@ namespace Extensions
|
||||
throw new FileNotFoundException("File doesn't exist in FOMod", p_strFile);
|
||||
}
|
||||
|
||||
mod.GetPrivateField<Archive>("m_arcFile").ExtractFileContents(p_strFile, p_outStream);
|
||||
mod.GetPrivateField<Archive>("m_arcFile").ExtractFileContents(realPath, p_outStream);
|
||||
}
|
||||
}
|
||||
class ModExtension
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -63,6 +63,7 @@
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<RunCodeAnalysis>true</RunCodeAnalysis>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ManifestCertificateThumbprint>5BAE3112B789DE525238306EB42F614854F1C292</ManifestCertificateThumbprint>
|
||||
@@ -179,8 +180,9 @@
|
||||
<Compile Include="Util\NexusFileUtil.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="app.config" />
|
||||
<None Include="Properties\app.manifest" />
|
||||
<None Include="app.config">
|
||||
<SubType>Designer</SubType>
|
||||
</None>
|
||||
<None Include="Properties\Settings.settings">
|
||||
<Generator>SettingsSingleFileGenerator</Generator>
|
||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
||||
@@ -191,11 +193,6 @@
|
||||
<Project>{E824ACBB-90C8-4C60-9D52-9C8020E98E3E}</Project>
|
||||
<Name>ChinhDo.Transactions.FileManager</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\nmm\FOMod\FOMod.csproj">
|
||||
<Project>{34b04f6b-0d64-455f-b20f-1c3e080ae601}</Project>
|
||||
<Name>FOMod</Name>
|
||||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\NMM\GamebryoBase\GamebryoBase.csproj">
|
||||
<Project>{0055FB79-3587-486E-A87E-70304A61D7A4}</Project>
|
||||
<Name>GamebryoBase</Name>
|
||||
@@ -212,11 +209,6 @@
|
||||
<Project>{D586E7D8-9C8E-48F0-B20C-31A52B37E9D3}</Project>
|
||||
<Name>NexusClient.Interface</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\nmm\OMod\OMod.csproj">
|
||||
<Project>{0b0e3c6e-c51d-473d-8605-7d7679338aa1}</Project>
|
||||
<Name>OMod</Name>
|
||||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\NMM\Scripting\Scripting.csproj">
|
||||
<Project>{66DC8748-2DC2-4E6E-B645-080E0CFDC831}</Project>
|
||||
<Name>Scripting</Name>
|
||||
|
||||
@@ -11,11 +11,13 @@
|
||||
<VerifyUploadedFiles>false</VerifyUploadedFiles>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
|
||||
<StartArguments>-g FalloutNV -p "D:\Tannin_Documents\Projects\ModOrganizer_sf\output\profiles\gna2\plugins.txt" -i "D:\Tannin\Downloads\Advanced Recon Thermal Nightvision.fomod" "D:\Tannin_Documents\Projects\ModOrganizer_sf\output\mods\Advanced Recon Gear"</StartArguments>
|
||||
<StartArguments>-g Skyrim -p "E:\Documents\Projects\ModOrganizer_sf\output\profiles\adminowned\plugins.txt" -i "E:\Documents\Projects\ModOrganizer_sf\output\downloads\Caliente Female Body Mod BBE v3-2-2666-3-2-3.7z" "E:\Documents\Projects\ModOrganizer_sf\output\mods\cbbe"</StartArguments>
|
||||
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
|
||||
<StartWorkingDirectory>E:\Documents\Projects\ModOrganizer_sf\source\NCC\nmm\bin\Debug\</StartWorkingDirectory>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
|
||||
<StartArguments>-g Skyrim -p "D:\Tannin_Documents\Projects\ModOrganizer_sf\output\profiles\gna2\plugins.txt" -i "D:\Tannin_Documents\Projects\ModOrganizer_sf\output\downloads\Skyrim Immersive Creatures v6_5_2 NMM BAIN-24913-v6-5-2.7z" "D:\Tannin_Documents\Projects\ModOrganizer_sf\output\mods\Skyrim Immersive Creatures"</StartArguments>
|
||||
<StartArguments>-g Skyrim -p "E:\Documents\Projects\ModOrganizer_sf\output\profiles\adminowned\plugins.txt" -i "E:\Documents\Projects\ModOrganizer_sf\output\downloads\Caliente Female Body Mod BBE v3-2-2666-3-2-3.7z" "E:\Documents\Projects\ModOrganizer_sf\output\mods\cbbe"</StartArguments>
|
||||
<StartWorkingDirectory />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
|
||||
<StartArguments>-g Skyrim -p "D:\Tannin_Documents\Projects\ModOrganizer_sf\output\profiles\Default\plugins.txt" -i "D:\Tannin_Documents\Projects\ModOrganizer_sf\output\downloads\SMIM v1-43-8655-1-43.7z" "D:\Tannin_Documents\Projects\ModOrganizer_sf\output\mods\SMIM"</StartArguments>
|
||||
|
||||
+13
-13
@@ -204,21 +204,9 @@ namespace Nexus.Client.CLI.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("\r\n <PerGameModeSettingsOfKeyedSettingsOfString />\r\n ")]
|
||||
public global::Nexus.Client.Settings.PerGameModeSettings<Nexus.Client.Settings.KeyedSettings<string>> DelayedSettings {
|
||||
get {
|
||||
return ((global::Nexus.Client.Settings.PerGameModeSettings<Nexus.Client.Settings.KeyedSettings<string>>)(this["DelayedSettings"]));
|
||||
}
|
||||
set {
|
||||
this["DelayedSettings"] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.ApplicationScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("http://skyrim.nexusmods.com/downloads/file.php?id=1334x")]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("http://skyrim.nexusmods.com/downloads/file.php?id=1334")]
|
||||
public string ModManagerUrl {
|
||||
get {
|
||||
return ((string)(this["ModManagerUrl"]));
|
||||
@@ -653,5 +641,17 @@ namespace Nexus.Client.CLI.Properties {
|
||||
this["RepositoryUsernames"] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("\r\n <PerGameModeSettingsOfKeyedSettingsOfString />\r\n ")]
|
||||
public global::Nexus.Client.Settings.PerGameModeSettings<Nexus.Client.Settings.KeyedSettings<string>> DelayedSettings {
|
||||
get {
|
||||
return ((global::Nexus.Client.Settings.PerGameModeSettings<Nexus.Client.Settings.KeyedSettings<string>>)(this["DelayedSettings"]));
|
||||
}
|
||||
set {
|
||||
this["DelayedSettings"] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,14 +53,8 @@
|
||||
<PerGameModeSettingsOfKeyedSettingsOfAddModDescriptor />
|
||||
</Value>
|
||||
</Setting>
|
||||
<Setting Name="DelayedSettings" Type="Nexus.Client.Settings.PerGameModeSettings`1[Nexus.Client.Settings.KeyedSettings`1[System.String]]" Scope="User">
|
||||
<Value Profile="(Default)">
|
||||
<?xml version="1.0" encoding="utf-16"?>
|
||||
<PerGameModeSettingsOfKeyedSettingsOfString />
|
||||
</Value>
|
||||
</Setting>
|
||||
<Setting Name="ModManagerUrl" Type="System.String" Scope="Application">
|
||||
<Value Profile="(Default)">http://skyrim.nexusmods.com/downloads/file.php?id=1334x</Value>
|
||||
<Value Profile="(Default)">http://skyrim.nexusmods.com/downloads/file.php?id=1334</Value>
|
||||
</Setting>
|
||||
<Setting Name="CheckForUpdatesOnStartup" Type="System.Boolean" Scope="User">
|
||||
<Value Profile="(Default)">False</Value>
|
||||
@@ -200,5 +194,10 @@
|
||||
<KeyedSettingsOfString />
|
||||
</Value>
|
||||
</Setting>
|
||||
<Setting Name="DelayedSettings" Type="Nexus.Client.Settings.PerGameModeSettings`1[Nexus.Client.Settings.KeyedSettings`1[System.String]]" Scope="User">
|
||||
<Value Profile="(Default)">
|
||||
<PerGameModeSettingsOfKeyedSettingsOfString />
|
||||
</Value>
|
||||
</Setting>
|
||||
</Settings>
|
||||
</SettingsFile>
|
||||
@@ -179,12 +179,17 @@
|
||||
<KeyedSettingsOfString />
|
||||
</value>
|
||||
</setting>
|
||||
<setting name="DelayedSettings" serializeAs="Xml">
|
||||
<value>
|
||||
<PerGameModeSettingsOfKeyedSettingsOfString />
|
||||
</value>
|
||||
</setting>
|
||||
</Nexus.Client.CLI.Properties.Settings>
|
||||
</userSettings>
|
||||
<applicationSettings>
|
||||
<Nexus.Client.CLI.Properties.Settings>
|
||||
<setting name="ModManagerUrl" serializeAs="String">
|
||||
<value>http://skyrim.nexusmods.com/downloads/file.php?id=1334x</value>
|
||||
<value>http://skyrim.nexusmods.com/downloads/file.php?id=1334</value>
|
||||
</setting>
|
||||
<setting name="HelpLinks" serializeAs="Xml">
|
||||
<value>
|
||||
|
||||
Reference in New Issue
Block a user