Bitl
/
Novetus_src
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

reverted back to old ini file system. bug fixes.

This commit is contained in:
Bitl 2020-07-20 17:58:44 -07:00
parent 43bd27ecc2
commit 3007b50be0
21 changed files with 366 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Novetus/Novetus.ClientScriptTester/ClientScriptTester.cs
View File

@ -1,8 +1,10 @@
#region Usings #region Usings
using NLog; using NLog;
using System; using System;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
#endregion #endregion
@ -11,6 +13,54 @@ namespace Novetus.ClientScriptTester
#region ClientScript Tester #region ClientScript Tester
static class ClientScriptTester static class ClientScriptTester
{ {
#region Exeption Helpers
//https://github.com/AlexMelw/EasySharp/blob/master/NHelpers/ExceptionsDealing/Extensions/ExceptionExtensions.cs
/// <summary>
/// Gets the entire stack trace consisting of exception's footprints (File, Method, LineNumber)
/// </summary>
/// <param name="exception">Source <see cref="Exception" /></param>
/// <returns>
/// <see cref="string" /> that represents the entire stack trace consisting of exception's footprints (File,
/// Method, LineNumber)
/// </returns>
public static string GetExceptionFootprints(this Exception exception)
{
StackTrace stackTrace = new StackTrace(exception, true);
StackFrame[] frames = stackTrace.GetFrames();
if (ReferenceEquals(frames, null))
{
return string.Empty;
}
var traceStringBuilder = new StringBuilder();
for (var i = 0; i < frames.Length; i++)
{
StackFrame frame = frames[i];
if (frame.GetFileLineNumber() < 1)
continue;
traceStringBuilder.AppendLine($"File: {frame.GetFileName()}");
traceStringBuilder.AppendLine($"Method: {frame.GetMethod().Name}");
traceStringBuilder.AppendLine($"LineNumber: {frame.GetFileLineNumber()}");
if (i == frames.Length - 1)
break;
traceStringBuilder.AppendLine(" ---> ");
}
string stackTraceFootprints = traceStringBuilder.ToString();
if (string.IsNullOrWhiteSpace(stackTraceFootprints))
return "NO DETECTED FOOTPRINTS";
return stackTraceFootprints;
}
#endregion
/// <summary> /// <summary>
/// The main entry point for the application. /// The main entry point for the application.
/// </summary> /// </summary>
@ -31,6 +81,7 @@ namespace Novetus.ClientScriptTester
log.Error("INNER EXCEPTION: " + (eventArgs.Exception.InnerException != null ? eventArgs.Exception.InnerException.ToString() : "N/A")); log.Error("INNER EXCEPTION: " + (eventArgs.Exception.InnerException != null ? eventArgs.Exception.InnerException.ToString() : "N/A"));
log.Error("STACK TRACE: " + (!string.IsNullOrWhiteSpace(eventArgs.Exception.StackTrace) ? eventArgs.Exception.StackTrace : "N/A")); log.Error("STACK TRACE: " + (!string.IsNullOrWhiteSpace(eventArgs.Exception.StackTrace) ? eventArgs.Exception.StackTrace : "N/A"));
log.Error("TARGET SITE: " + (eventArgs.Exception.TargetSite != null ? eventArgs.Exception.TargetSite.ToString() : "N/A")); log.Error("TARGET SITE: " + (eventArgs.Exception.TargetSite != null ? eventArgs.Exception.TargetSite.ToString() : "N/A"));
log.Error("FOOTPRINTS: " + (!string.IsNullOrWhiteSpace(eventArgs.Exception.GetExceptionFootprints()) ? eventArgs.Exception.GetExceptionFootprints() : "N/A"));
}; };
Application.EnableVisualStyles(); Application.EnableVisualStyles();

67
Novetus/Novetus.ReleasePreparer/INIFile.cs Normal file
View File

@ -0,0 +1,67 @@
#region Usings
using System;
using System.Runtime.InteropServices;
using System.Text;
#endregion
#region INI File Parser
//modified from https://www.codeproject.com/articles/1966/an-ini-file-handling-class-using-c?fid=425860&df=90&mpp=25&prof=True&sort=Position&view=Normal&spc=Relaxed&fr=51
public class INIFile
{
public string path;
[DllImport("kernel32")]
private static extern long WritePrivateProfileString(string section,
string key, string val, string filePath);
[DllImport("kernel32")]
private static extern int GetPrivateProfileString(string section,
string key, string def, StringBuilder retVal,
int size, string filePath);
/// <summary>
/// INIFile Constructor.
/// </summary>
/// <PARAM name="INIPath"></PARAM>
public INIFile(string INIPath)
{
path = INIPath;
}
/// <summary>
/// Write Data to the INI File
/// </summary>
/// <PARAM name="Section"></PARAM>
/// Section name
/// <PARAM name="Key"></PARAM>
/// Key Name
/// <PARAM name="Value"></PARAM>
/// Value Name
public void IniWriteValue(string Section, string Key, string Value)
{
WritePrivateProfileString(Section, Key, Value, this.path);
}
/// <summary>
/// Read Data Value From the Ini File
/// </summary>
/// <PARAM name="Section"></PARAM>
/// <PARAM name="Key"></PARAM>
/// <PARAM name="Default Value. Optional for creating values in case they are invalid."></PARAM>
/// <returns></returns>
public string IniReadValue(string Section, string Key, string DefaultValue = "")
{
try
{
StringBuilder temp = new StringBuilder(255);
int i = GetPrivateProfileString(Section, Key, "", temp,
255, this.path);
return temp.ToString();
}
catch (Exception)
{
IniWriteValue(Section, Key, DefaultValue);
return IniReadValue(Section, Key);
}
}
}
#endregion

7
Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.csproj
View File

@ -35,9 +35,6 @@
<ApplicationIcon>NovetusIcon.ico</ApplicationIcon> <ApplicationIcon>NovetusIcon.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Nini, Version=1.1.0.0, Culture=neutral, PublicKeyToken=691faec150a7fa7b, processorArchitecture=MSIL">
<HintPath>..\packages\Trove.Nini.1.1.0.0\lib\net20\Nini.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
@ -47,12 +44,10 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="INIFile.cs" />
<Compile Include="ReleasePreparer.cs" /> <Compile Include="ReleasePreparer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="NovetusIcon.ico" /> <Content Include="NovetusIcon.ico" />
</ItemGroup> </ItemGroup>

12
Novetus/Novetus.ReleasePreparer/ReleasePreparer.cs
View File

@ -1,5 +1,4 @@
#region Usings #region Usings
using Nini.Config;
using System; using System;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -138,9 +137,9 @@ namespace Novetus.ReleasePreparer
{ {
//READ //READ
string versionbranch; string versionbranch;
IniConfigSource ini = new IniConfigSource(infopath); INIFile ini = new INIFile(infopath);
string section = "ProgramInfo"; string section = "ProgramInfo";
versionbranch = ini.Configs[section].Get("Branch", "0.0"); versionbranch = ini.IniReadValue(section, "Branch", "0.0");
return versionbranch; return versionbranch;
} }
@ -149,18 +148,17 @@ namespace Novetus.ReleasePreparer
//READ //READ
string versionbranch; string versionbranch;
IniConfigSource ini = new IniConfigSource(infopath); INIFile ini = new INIFile(infopath);
string section = "ProgramInfo"; string section = "ProgramInfo";
versionbranch = ini.Configs[section].Get("Branch", "0.0"); versionbranch = ini.IniReadValue(section, "Branch", "0.0");
try try
{ {
if (!versionbranch.Contains("(Lite)")) if (!versionbranch.Contains("(Lite)"))
{ {
ini.Configs[section].Set("Branch", versionbranch + " (Lite)"); ini.IniWriteValue(section, "Branch", versionbranch + " (Lite)");
ini.Save();
} }
} }
catch (Exception) catch (Exception)

4
Novetus/Novetus.ReleasePreparer/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Trove.Nini" version="1.1.0.0" targetFramework="net40" />
</packages>

3
Novetus/NovetusCMD/Novetus.CMD.csproj
View File

@ -88,9 +88,6 @@
<Reference Include="Mono.Nat"> <Reference Include="Mono.Nat">
<HintPath>..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll</HintPath> <HintPath>..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll</HintPath>
</Reference> </Reference>
<Reference Include="Nini, Version=1.1.0.0, Culture=neutral, PublicKeyToken=691faec150a7fa7b, processorArchitecture=MSIL">
<HintPath>..\packages\Trove.Nini.1.1.0.0\lib\net20\Nini.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.2\lib\net40-client\NLog.dll</HintPath> <HintPath>..\packages\NLog.4.7.2\lib\net40-client\NLog.dll</HintPath>
</Reference> </Reference>

1
Novetus/NovetusCMD/NovetusCMD.cs
View File

@ -171,6 +171,7 @@ namespace NovetusCMD
log.Error("INNER EXCEPTION: " + (eventArgs.Exception.InnerException != null ? eventArgs.Exception.InnerException.ToString() : "N/A")); log.Error("INNER EXCEPTION: " + (eventArgs.Exception.InnerException != null ? eventArgs.Exception.InnerException.ToString() : "N/A"));
log.Error("STACK TRACE: " + (!string.IsNullOrWhiteSpace(eventArgs.Exception.StackTrace) ? eventArgs.Exception.StackTrace : "N/A")); log.Error("STACK TRACE: " + (!string.IsNullOrWhiteSpace(eventArgs.Exception.StackTrace) ? eventArgs.Exception.StackTrace : "N/A"));
log.Error("TARGET SITE: " + (eventArgs.Exception.TargetSite != null ? eventArgs.Exception.TargetSite.ToString() : "N/A")); log.Error("TARGET SITE: " + (eventArgs.Exception.TargetSite != null ? eventArgs.Exception.TargetSite.ToString() : "N/A"));
log.Error("FOOTPRINTS: " + (!string.IsNullOrWhiteSpace(eventArgs.Exception.GetExceptionFootprints()) ? eventArgs.Exception.GetExceptionFootprints() : "N/A"));
}; };
if (args.Length > 0) if (args.Length > 0)

1
Novetus/NovetusCMD/packages.config
View File

@ -5,5 +5,4 @@
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" /> <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" />
<package id="Mono.Nat" version="1.2.24.0" targetFramework="net40" /> <package id="Mono.Nat" version="1.2.24.0" targetFramework="net40" />
<package id="NLog" version="4.7.2" targetFramework="net40" /> <package id="NLog" version="4.7.2" targetFramework="net40" />
<package id="Trove.Nini" version="1.1.0.0" targetFramework="net40" />
</packages> </packages>

67
Novetus/NovetusCore/Classes/INIFile.cs Normal file
View File

@ -0,0 +1,67 @@
#region Usings
using System;
using System.Runtime.InteropServices;
using System.Text;
#endregion
#region INI File Parser
//modified from https://www.codeproject.com/articles/1966/an-ini-file-handling-class-using-c?fid=425860&df=90&mpp=25&prof=True&sort=Position&view=Normal&spc=Relaxed&fr=51
public class INIFile
{
public string path;
[DllImport("kernel32")]
private static extern long WritePrivateProfileString(string section,
string key, string val, string filePath);
[DllImport("kernel32")]
private static extern int GetPrivateProfileString(string section,
string key, string def, StringBuilder retVal,
int size, string filePath);
/// <summary>
/// INIFile Constructor.
/// </summary>
/// <PARAM name="INIPath"></PARAM>
public INIFile(string INIPath)
{
path = INIPath;
}
/// <summary>
/// Write Data to the INI File
/// </summary>
/// <PARAM name="Section"></PARAM>
/// Section name
/// <PARAM name="Key"></PARAM>
/// Key Name
/// <PARAM name="Value"></PARAM>
/// Value Name
public void IniWriteValue(string Section, string Key, string Value)
{
WritePrivateProfileString(Section, Key, Value, this.path);
}
/// <summary>
/// Read Data Value From the Ini File
/// </summary>
/// <PARAM name="Section"></PARAM>
/// <PARAM name="Key"></PARAM>
/// <PARAM name="Default Value. Optional for creating values in case they are invalid."></PARAM>
/// <returns></returns>
public string IniReadValue(string Section, string Key, string DefaultValue = "")
{
try
{
StringBuilder temp = new StringBuilder(255);
int i = GetPrivateProfileString(Section, Key, "", temp,
255, this.path);
return temp.ToString();
}
catch (Exception)
{
IniWriteValue(Section, Key, DefaultValue);
return IniReadValue(Section, Key);
}
}
}
#endregion

1
Novetus/NovetusCore/NovetusCore.projitems
View File

@ -15,6 +15,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Classes\CryptoRandom.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Classes\CryptoRandom.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Classes\FileFormat.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Classes\FileFormat.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Classes\IDiscordRPC.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Classes\IDiscordRPC.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Classes\INIFile.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Classes\RobloxXML.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Classes\RobloxXML.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Classes\Settings.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Classes\Settings.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Classes\SimpleHTTPServer.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Classes\SimpleHTTPServer.cs" />

32
Novetus/NovetusCore/SDK/Forms/ClientinfoCreator.cs
View File

@ -3,7 +3,6 @@ using System;
using System.Windows.Forms; using System.Windows.Forms;
using System.IO; using System.IO;
using System.Globalization; using System.Globalization;
using Nini.Config;
#endregion #endregion
#region Client SDK #region Client SDK
@ -391,26 +390,21 @@ public partial class ClientinfoEditor : Form
if (sfd.ShowDialog() == DialogResult.OK) if (sfd.ShowDialog() == DialogResult.OK)
{ {
//WRITE //WRITE
IniConfigSource ini = new IniConfigSource(); INIFile ini = new INIFile(sfd.FileName);
string section = "ClientInfo"; string section = "ClientInfo";
ini.IniWriteValue(section, "UsesPlayerName", SelectedClientInfo.UsesPlayerName.ToString());
ini.AddConfig(section); ini.IniWriteValue(section, "UsesID", SelectedClientInfo.UsesID.ToString());
ini.IniWriteValue(section, "Warning", SelectedClientInfo.Warning.ToString());
ini.Configs[section].Set("UsesPlayerName", SelectedClientInfo.UsesPlayerName.ToString()); ini.IniWriteValue(section, "LegacyMode", SelectedClientInfo.LegacyMode.ToString());
ini.Configs[section].Set("UsesID", SelectedClientInfo.UsesID.ToString()); ini.IniWriteValue(section, "ClientMD5", SelectedClientInfo.ClientMD5.ToString());
ini.Configs[section].Set("Warning", SelectedClientInfo.Warning.ToString()); ini.IniWriteValue(section, "ScriptMD5", SelectedClientInfo.ScriptMD5.ToString());
ini.Configs[section].Set("LegacyMode", SelectedClientInfo.LegacyMode.ToString()); ini.IniWriteValue(section, "Description", SelectedClientInfo.Description.ToString());
ini.Configs[section].Set("ClientMD5", SelectedClientInfo.ClientMD5.ToString()); ini.IniWriteValue(section, "Locked", Locked.ToString());
ini.Configs[section].Set("ScriptMD5", SelectedClientInfo.ScriptMD5.ToString()); ini.IniWriteValue(section, "Fix2007", SelectedClientInfo.Fix2007.ToString());
ini.Configs[section].Set("Description", SelectedClientInfo.Description.ToString()); ini.IniWriteValue(section, "AlreadyHasSecurity", SelectedClientInfo.AlreadyHasSecurity.ToString());
ini.Configs[section].Set("Locked", Locked.ToString()); ini.IniWriteValue(section, "ClientLoadOptions", Settings.GraphicsOptions.GetIntForClientLoadOptions(SelectedClientInfo.ClientLoadOptions).ToString());
ini.Configs[section].Set("Fix2007", SelectedClientInfo.Fix2007.ToString()); ini.IniWriteValue(section, "CommandLineArgs", SelectedClientInfo.CommandLineArgs.ToString());
ini.Configs[section].Set("AlreadyHasSecurity", SelectedClientInfo.AlreadyHasSecurity.ToString());
ini.Configs[section].Set("ClientLoadOptions", Settings.GraphicsOptions.GetIntForClientLoadOptions(SelectedClientInfo.ClientLoadOptions).ToString());
ini.Configs[section].Set("CommandLineArgs", SelectedClientInfo.CommandLineArgs.ToString());
ini.Save(sfd.FileName);
} }
} }
} }

240
Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs
View File

@ -1,5 +1,4 @@
#region Usings #region Usings
using Nini.Config;
using NLog; using NLog;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -10,6 +9,7 @@ using System.Drawing.Imaging;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
@ -25,19 +25,19 @@ public class GlobalFuncs
string versionbranch, defaultclient, defaultmap, regclient1, string versionbranch, defaultclient, defaultmap, regclient1,
regclient2, issnapshot, snapshottemplate, snapshotrevision; regclient2, issnapshot, snapshottemplate, snapshotrevision;
IniConfigSource ini = new IniConfigSource(infopath); INIFile ini = new INIFile(infopath);
string section = "ProgramInfo"; string section = "ProgramInfo";
//not using the GlobalVars definitions as those are empty until we fill them in. //not using the GlobalVars definitions as those are empty until we fill them in.
versionbranch = ini.Configs[section].Get("Branch", "0.0"); versionbranch = ini.IniReadValue(section, "Branch", "0.0");
defaultclient = ini.Configs[section].Get("DefaultClient", "2009E"); defaultclient = ini.IniReadValue(section, "DefaultClient", "2009E");
defaultmap = ini.Configs[section].Get("DefaultMap", "Dev - Baseplate2048.rbxl"); defaultmap = ini.IniReadValue(section, "DefaultMap", "Dev - Baseplate2048.rbxl");
regclient1 = ini.Configs[section].Get("UserAgentRegisterClient1", "2007M"); regclient1 = ini.IniReadValue(section, "UserAgentRegisterClient1", "2007M");
regclient2 = ini.Configs[section].Get("UserAgentRegisterClient2", "2009L"); regclient2 = ini.IniReadValue(section, "UserAgentRegisterClient2", "2009L");
issnapshot = ini.Configs[section].Get("IsSnapshot", "False"); issnapshot = ini.IniReadValue(section, "IsSnapshot", "False");
snapshottemplate = ini.Configs[section].Get("SnapshotTemplate", "%version% Snapshot (%build%.%revision%.%snapshot-revision%)"); snapshottemplate = ini.IniReadValue(section, "SnapshotTemplate", "%version% Snapshot (%build%.%revision%.%snapshot-revision%)");
snapshotrevision = ini.Configs[section].Get("SnapshotRevision", "1"); snapshotrevision = ini.IniReadValue(section, "SnapshotRevision", "1");
try try
{ {
@ -96,39 +96,29 @@ public class GlobalFuncs
{ {
if (write) if (write)
{ {
if (!File.Exists(cfgpath))
{
IniConfigSource createINI = new IniConfigSource();
createINI.AddConfig("Config");
createINI.Save(cfgpath);
Config(cfgpath, true);
}
//WRITE //WRITE
IniConfigSource ini = new IniConfigSource(cfgpath); INIFile ini = new INIFile(cfgpath);
string section = "Config"; string section = "Config";
ini.Configs[section].Set("CloseOnLaunch", GlobalVars.UserConfiguration.CloseOnLaunch.ToString()); ini.IniWriteValue(section, "CloseOnLaunch", GlobalVars.UserConfiguration.CloseOnLaunch.ToString());
ini.Configs[section].Set("UserID", GlobalVars.UserConfiguration.UserID.ToString()); ini.IniWriteValue(section, "UserID", GlobalVars.UserConfiguration.UserID.ToString());
ini.Configs[section].Set("PlayerName", GlobalVars.UserConfiguration.PlayerName.ToString()); ini.IniWriteValue(section, "PlayerName", GlobalVars.UserConfiguration.PlayerName.ToString());
ini.Configs[section].Set("SelectedClient", GlobalVars.UserConfiguration.SelectedClient.ToString()); ini.IniWriteValue(section, "SelectedClient", GlobalVars.UserConfiguration.SelectedClient.ToString());
ini.Configs[section].Set("Map", GlobalVars.UserConfiguration.Map.ToString()); ini.IniWriteValue(section, "Map", GlobalVars.UserConfiguration.Map.ToString());
ini.Configs[section].Set("RobloxPort", GlobalVars.UserConfiguration.RobloxPort.ToString()); ini.IniWriteValue(section, "RobloxPort", GlobalVars.UserConfiguration.RobloxPort.ToString());
ini.Configs[section].Set("PlayerLimit", GlobalVars.UserConfiguration.PlayerLimit.ToString()); ini.IniWriteValue(section, "PlayerLimit", GlobalVars.UserConfiguration.PlayerLimit.ToString());
ini.Configs[section].Set("UPnP", GlobalVars.UserConfiguration.UPnP.ToString()); ini.IniWriteValue(section, "UPnP", GlobalVars.UserConfiguration.UPnP.ToString());
ini.Configs[section].Set("ItemMakerDisableHelpMessage", GlobalVars.UserConfiguration.DisabledItemMakerHelp.ToString()); ini.IniWriteValue(section, "ItemMakerDisableHelpMessage", GlobalVars.UserConfiguration.DisabledItemMakerHelp.ToString());
ini.Configs[section].Set("PlayerTripcode", SecurityFuncs.Base64Encode(GlobalVars.UserConfiguration.PlayerTripcode.ToString())); ini.IniWriteValue(section, "PlayerTripcode", SecurityFuncs.Base64Encode(GlobalVars.UserConfiguration.PlayerTripcode.ToString()));
ini.Configs[section].Set("DiscordRichPresence", GlobalVars.UserConfiguration.DiscordPresence.ToString()); ini.IniWriteValue(section, "DiscordRichPresence", GlobalVars.UserConfiguration.DiscordPresence.ToString());
ini.Configs[section].Set("MapPath", GlobalVars.UserConfiguration.MapPath.ToString()); ini.IniWriteValue(section, "MapPath", GlobalVars.UserConfiguration.MapPath.ToString());
ini.Configs[section].Set("MapPathSnip", GlobalVars.UserConfiguration.MapPathSnip.ToString()); ini.IniWriteValue(section, "MapPathSnip", GlobalVars.UserConfiguration.MapPathSnip.ToString());
ini.Configs[section].Set("GraphicsMode", Settings.GraphicsOptions.GetIntForMode(GlobalVars.UserConfiguration.GraphicsMode).ToString()); ini.IniWriteValue(section, "GraphicsMode", Settings.GraphicsOptions.GetIntForMode(GlobalVars.UserConfiguration.GraphicsMode).ToString());
ini.Configs[section].Set("ReShade", GlobalVars.UserConfiguration.ReShade.ToString()); ini.IniWriteValue(section, "ReShade", GlobalVars.UserConfiguration.ReShade.ToString());
ini.Configs[section].Set("QualityLevel", Settings.GraphicsOptions.GetIntForLevel(GlobalVars.UserConfiguration.QualityLevel).ToString()); ini.IniWriteValue(section, "QualityLevel", Settings.GraphicsOptions.GetIntForLevel(GlobalVars.UserConfiguration.QualityLevel).ToString());
ini.Configs[section].Set("Style", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherStyle).ToString()); ini.IniWriteValue(section, "Style", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherStyle).ToString());
ini.Configs[section].Set("AssetLocalizerSaveBackups", GlobalVars.UserConfiguration.AssetLocalizerSaveBackups.ToString()); ini.IniWriteValue(section, "AssetLocalizerSaveBackups", GlobalVars.UserConfiguration.AssetLocalizerSaveBackups.ToString());
ini.Save();
} }
else else
{ {
@ -140,28 +130,28 @@ public class GlobalFuncs
disablehelpmessage, tripcode, discord, mappath, mapsnip, disablehelpmessage, tripcode, discord, mappath, mapsnip,
graphics, reshade, qualitylevel, style, savebackups; graphics, reshade, qualitylevel, style, savebackups;
IniConfigSource ini = new IniConfigSource(cfgpath); INIFile ini = new INIFile(cfgpath);
string section = "Config"; string section = "Config";
closeonlaunch = ini.Configs[section].Get("CloseOnLaunch", GlobalVars.UserConfiguration.CloseOnLaunch.ToString()); closeonlaunch = ini.IniReadValue(section, "CloseOnLaunch", GlobalVars.UserConfiguration.CloseOnLaunch.ToString());
userid = ini.Configs[section].Get("UserID", GlobalVars.UserConfiguration.UserID.ToString()); userid = ini.IniReadValue(section, "UserID", GlobalVars.UserConfiguration.UserID.ToString());
name = ini.Configs[section].Get("PlayerName", GlobalVars.UserConfiguration.PlayerName.ToString()); name = ini.IniReadValue(section, "PlayerName", GlobalVars.UserConfiguration.PlayerName.ToString());
selectedclient = ini.Configs[section].Get("SelectedClient", GlobalVars.UserConfiguration.SelectedClient.ToString()); selectedclient = ini.IniReadValue(section, "SelectedClient", GlobalVars.UserConfiguration.SelectedClient.ToString());
map = ini.Configs[section].Get("Map", GlobalVars.UserConfiguration.Map.ToString()); map = ini.IniReadValue(section, "Map", GlobalVars.UserConfiguration.Map.ToString());
port = ini.Configs[section].Get("RobloxPort", GlobalVars.UserConfiguration.RobloxPort.ToString()); port = ini.IniReadValue(section, "RobloxPort", GlobalVars.UserConfiguration.RobloxPort.ToString());
limit = ini.Configs[section].Get("PlayerLimit", GlobalVars.UserConfiguration.PlayerLimit.ToString()); limit = ini.IniReadValue(section, "PlayerLimit", GlobalVars.UserConfiguration.PlayerLimit.ToString());
upnp = ini.Configs[section].Get("UPnP", GlobalVars.UserConfiguration.UPnP.ToString()); upnp = ini.IniReadValue(section, "UPnP", GlobalVars.UserConfiguration.UPnP.ToString());
disablehelpmessage = ini.Configs[section].Get("ItemMakerDisableHelpMessage", GlobalVars.UserConfiguration.DisabledItemMakerHelp.ToString()); disablehelpmessage = ini.IniReadValue(section, "ItemMakerDisableHelpMessage", GlobalVars.UserConfiguration.DisabledItemMakerHelp.ToString());
tripcode = ini.Configs[section].Get("PlayerTripcode", GenerateAndReturnTripcode()); tripcode = ini.IniReadValue(section, "PlayerTripcode", GenerateAndReturnTripcode());
discord = ini.Configs[section].Get("DiscordRichPresence", GlobalVars.UserConfiguration.DiscordPresence.ToString()); discord = ini.IniReadValue(section, "DiscordRichPresence", GlobalVars.UserConfiguration.DiscordPresence.ToString());
mappath = ini.Configs[section].Get("MapPath", GlobalVars.UserConfiguration.MapPath.ToString()); mappath = ini.IniReadValue(section, "MapPath", GlobalVars.UserConfiguration.MapPath.ToString());
mapsnip = ini.Configs[section].Get("MapPathSnip", GlobalVars.UserConfiguration.MapPathSnip.ToString()); mapsnip = ini.IniReadValue(section, "MapPathSnip", GlobalVars.UserConfiguration.MapPathSnip.ToString());
graphics = ini.Configs[section].Get("GraphicsMode", Settings.GraphicsOptions.GetIntForMode(GlobalVars.UserConfiguration.GraphicsMode).ToString()); graphics = ini.IniReadValue(section, "GraphicsMode", Settings.GraphicsOptions.GetIntForMode(GlobalVars.UserConfiguration.GraphicsMode).ToString());
reshade = ini.Configs[section].Get("ReShade", GlobalVars.UserConfiguration.ReShade.ToString()); reshade = ini.IniReadValue(section, "ReShade", GlobalVars.UserConfiguration.ReShade.ToString());
qualitylevel = ini.Configs[section].Get("QualityLevel", Settings.GraphicsOptions.GetIntForLevel(GlobalVars.UserConfiguration.QualityLevel).ToString()); qualitylevel = ini.IniReadValue(section, "QualityLevel", Settings.GraphicsOptions.GetIntForLevel(GlobalVars.UserConfiguration.QualityLevel).ToString());
style = ini.Configs[section].Get("Style", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherStyle).ToString()); style = ini.IniReadValue(section, "Style", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherStyle).ToString());
savebackups = ini.Configs[section].Get("AssetLocalizerSaveBackups", GlobalVars.UserConfiguration.AssetLocalizerSaveBackups.ToString()); savebackups = ini.IniReadValue(section, "AssetLocalizerSaveBackups", GlobalVars.UserConfiguration.AssetLocalizerSaveBackups.ToString());
GlobalVars.UserConfiguration.CloseOnLaunch = Convert.ToBoolean(closeonlaunch); GlobalVars.UserConfiguration.CloseOnLaunch = Convert.ToBoolean(closeonlaunch);
@ -235,54 +225,42 @@ public class GlobalFuncs
{ {
if (write) if (write)
{ {
if (!File.Exists(cfgpath))
{
IniConfigSource createINI = new IniConfigSource();
createINI.AddConfig("Items");
createINI.AddConfig("Colors");
createINI.AddConfig("Other");
createINI.Save(cfgpath);
Customization(cfgpath, true);
}
//WRITE //WRITE
IniConfigSource ini = new IniConfigSource(cfgpath); INIFile ini = new INIFile(cfgpath);
string section = "Items"; string section = "Items";
ini.Configs[section].Set("Hat1", GlobalVars.UserCustomization.Hat1.ToString()); ini.IniWriteValue(section, "Hat1", GlobalVars.UserCustomization.Hat1.ToString());
ini.Configs[section].Set("Hat2", GlobalVars.UserCustomization.Hat2.ToString()); ini.IniWriteValue(section, "Hat2", GlobalVars.UserCustomization.Hat2.ToString());
ini.Configs[section].Set("Hat3", GlobalVars.UserCustomization.Hat3.ToString()); ini.IniWriteValue(section, "Hat3", GlobalVars.UserCustomization.Hat3.ToString());
ini.Configs[section].Set("Face", GlobalVars.UserCustomization.Face.ToString()); ini.IniWriteValue(section, "Face", GlobalVars.UserCustomization.Face.ToString());
ini.Configs[section].Set("Head", GlobalVars.UserCustomization.Head.ToString()); ini.IniWriteValue(section, "Head", GlobalVars.UserCustomization.Head.ToString());
ini.Configs[section].Set("TShirt", GlobalVars.UserCustomization.TShirt.ToString()); ini.IniWriteValue(section, "TShirt", GlobalVars.UserCustomization.TShirt.ToString());
ini.Configs[section].Set("Shirt", GlobalVars.UserCustomization.Shirt.ToString()); ini.IniWriteValue(section, "Shirt", GlobalVars.UserCustomization.Shirt.ToString());
ini.Configs[section].Set("Pants", GlobalVars.UserCustomization.Pants.ToString()); ini.IniWriteValue(section, "Pants", GlobalVars.UserCustomization.Pants.ToString());
ini.Configs[section].Set("Icon", GlobalVars.UserCustomization.Icon.ToString()); ini.IniWriteValue(section, "Icon", GlobalVars.UserCustomization.Icon.ToString());
ini.Configs[section].Set("Extra", GlobalVars.UserCustomization.Extra.ToString()); ini.IniWriteValue(section, "Extra", GlobalVars.UserCustomization.Extra.ToString());
string section2 = "Colors"; string section2 = "Colors";
ini.Configs[section2].Set("HeadColorID", GlobalVars.UserCustomization.HeadColorID.ToString()); ini.IniWriteValue(section2, "HeadColorID", GlobalVars.UserCustomization.HeadColorID.ToString());
ini.Configs[section2].Set("HeadColorString", GlobalVars.UserCustomization.HeadColorString.ToString()); ini.IniWriteValue(section2, "HeadColorString", GlobalVars.UserCustomization.HeadColorString.ToString());
ini.Configs[section2].Set("TorsoColorID", GlobalVars.UserCustomization.TorsoColorID.ToString()); ini.IniWriteValue(section2, "TorsoColorID", GlobalVars.UserCustomization.TorsoColorID.ToString());
ini.Configs[section2].Set("TorsoColorString", GlobalVars.UserCustomization.TorsoColorString.ToString()); ini.IniWriteValue(section2, "TorsoColorString", GlobalVars.UserCustomization.TorsoColorString.ToString());
ini.Configs[section2].Set("LeftArmColorID", GlobalVars.UserCustomization.LeftArmColorID.ToString()); ini.IniWriteValue(section2, "LeftArmColorID", GlobalVars.UserCustomization.LeftArmColorID.ToString());
ini.Configs[section2].Set("LeftArmColorString", GlobalVars.UserCustomization.LeftArmColorString.ToString()); ini.IniWriteValue(section2, "LeftArmColorString", GlobalVars.UserCustomization.LeftArmColorString.ToString());
ini.Configs[section2].Set("RightArmColorID", GlobalVars.UserCustomization.RightArmColorID.ToString()); ini.IniWriteValue(section2, "RightArmColorID", GlobalVars.UserCustomization.RightArmColorID.ToString());
ini.Configs[section2].Set("RightArmColorString", GlobalVars.UserCustomization.RightArmColorString.ToString()); ini.IniWriteValue(section2, "RightArmColorString", GlobalVars.UserCustomization.RightArmColorString.ToString());
ini.Configs[section2].Set("LeftLegColorID", GlobalVars.UserCustomization.LeftLegColorID.ToString()); ini.IniWriteValue(section2, "LeftLegColorID", GlobalVars.UserCustomization.LeftLegColorID.ToString());
ini.Configs[section2].Set("LeftLegColorString", GlobalVars.UserCustomization.LeftLegColorString.ToString()); ini.IniWriteValue(section2, "LeftLegColorString", GlobalVars.UserCustomization.LeftLegColorString.ToString());
ini.Configs[section2].Set("RightLegColorID", GlobalVars.UserCustomization.RightLegColorID.ToString()); ini.IniWriteValue(section2, "RightLegColorID", GlobalVars.UserCustomization.RightLegColorID.ToString());
ini.Configs[section2].Set("RightLegColorString", GlobalVars.UserCustomization.RightLegColorString.ToString()); ini.IniWriteValue(section2, "RightLegColorString", GlobalVars.UserCustomization.RightLegColorString.ToString());
string section3 = "Other"; string section3 = "Other";
ini.Configs[section3].Set("CharacterID", GlobalVars.UserCustomization.CharacterID.ToString()); ini.IniWriteValue(section3, "CharacterID", GlobalVars.UserCustomization.CharacterID.ToString());
ini.Configs[section3].Set("ExtraSelectionIsHat", GlobalVars.UserCustomization.ExtraSelectionIsHat.ToString()); ini.IniWriteValue(section3, "ExtraSelectionIsHat", GlobalVars.UserCustomization.ExtraSelectionIsHat.ToString());
ini.Configs[section3].Set("ShowHatsOnExtra", GlobalVars.UserCustomization.ShowHatsInExtra.ToString()); ini.IniWriteValue(section3, "ShowHatsOnExtra", GlobalVars.UserCustomization.ShowHatsInExtra.ToString());
ini.Save();
} }
else else
{ {
@ -296,41 +274,41 @@ public class GlobalFuncs
larmid, larmstring, rarmid, rarmstring, llegid, larmid, larmstring, rarmid, rarmstring, llegid,
llegstring, rlegid, rlegstring, characterid, extraishat, showhatsonextra; llegstring, rlegid, rlegstring, characterid, extraishat, showhatsonextra;
IniConfigSource ini = new IniConfigSource(cfgpath); INIFile ini = new INIFile(cfgpath);
string section = "Items"; string section = "Items";
hat1 = ini.Configs[section].Get("Hat1", GlobalVars.UserCustomization.Hat1.ToString()); hat1 = ini.IniReadValue(section, "Hat1", GlobalVars.UserCustomization.Hat1.ToString());
hat2 = ini.Configs[section].Get("Hat2", GlobalVars.UserCustomization.Hat2.ToString()); hat2 = ini.IniReadValue(section, "Hat2", GlobalVars.UserCustomization.Hat2.ToString());
hat3 = ini.Configs[section].Get("Hat3", GlobalVars.UserCustomization.Hat3.ToString()); hat3 = ini.IniReadValue(section, "Hat3", GlobalVars.UserCustomization.Hat3.ToString());
face = ini.Configs[section].Get("Face", GlobalVars.UserCustomization.Face.ToString()); face = ini.IniReadValue(section, "Face", GlobalVars.UserCustomization.Face.ToString());
head = ini.Configs[section].Get("Head", GlobalVars.UserCustomization.Head.ToString()); head = ini.IniReadValue(section, "Head", GlobalVars.UserCustomization.Head.ToString());
tshirt = ini.Configs[section].Get("TShirt", GlobalVars.UserCustomization.TShirt.ToString()); tshirt = ini.IniReadValue(section, "TShirt", GlobalVars.UserCustomization.TShirt.ToString());
shirt = ini.Configs[section].Get("Shirt", GlobalVars.UserCustomization.Shirt.ToString()); shirt = ini.IniReadValue(section, "Shirt", GlobalVars.UserCustomization.Shirt.ToString());
pants = ini.Configs[section].Get("Pants", GlobalVars.UserCustomization.Pants.ToString()); pants = ini.IniReadValue(section, "Pants", GlobalVars.UserCustomization.Pants.ToString());
icon = ini.Configs[section].Get("Icon", GlobalVars.UserCustomization.Icon.ToString()); icon = ini.IniReadValue(section, "Icon", GlobalVars.UserCustomization.Icon.ToString());
extra = ini.Configs[section].Get("Extra", GlobalVars.UserCustomization.Extra.ToString()); extra = ini.IniReadValue(section, "Extra", GlobalVars.UserCustomization.Extra.ToString());
string section2 = "Colors"; string section2 = "Colors";
headcolorid = ini.Configs[section2].Get("HeadColorID", GlobalVars.UserCustomization.HeadColorID.ToString()); headcolorid = ini.IniReadValue(section2, "HeadColorID", GlobalVars.UserCustomization.HeadColorID.ToString());
headcolorstring = ini.Configs[section2].Get("HeadColorString", GlobalVars.UserCustomization.HeadColorString.ToString()); headcolorstring = ini.IniReadValue(section2, "HeadColorString", GlobalVars.UserCustomization.HeadColorString.ToString());
torsocolorid = ini.Configs[section2].Get("TorsoColorID", GlobalVars.UserCustomization.TorsoColorID.ToString()); torsocolorid = ini.IniReadValue(section2, "TorsoColorID", GlobalVars.UserCustomization.TorsoColorID.ToString());
torsocolorstring = ini.Configs[section2].Get("TorsoColorString", GlobalVars.UserCustomization.TorsoColorString.ToString()); torsocolorstring = ini.IniReadValue(section2, "TorsoColorString", GlobalVars.UserCustomization.TorsoColorString.ToString());
larmid = ini.Configs[section2].Get("LeftArmColorID", GlobalVars.UserCustomization.LeftArmColorID.ToString()); larmid = ini.IniReadValue(section2, "LeftArmColorID", GlobalVars.UserCustomization.LeftArmColorID.ToString());
larmstring = ini.Configs[section2].Get("LeftArmColorString", GlobalVars.UserCustomization.LeftArmColorString.ToString()); larmstring = ini.IniReadValue(section2, "LeftArmColorString", GlobalVars.UserCustomization.LeftArmColorString.ToString());
rarmid = ini.Configs[section2].Get("RightArmColorID", GlobalVars.UserCustomization.RightArmColorID.ToString()); rarmid = ini.IniReadValue(section2, "RightArmColorID", GlobalVars.UserCustomization.RightArmColorID.ToString());
rarmstring = ini.Configs[section2].Get("RightArmColorString", GlobalVars.UserCustomization.RightArmColorString.ToString()); rarmstring = ini.IniReadValue(section2, "RightArmColorString", GlobalVars.UserCustomization.RightArmColorString.ToString());
llegid = ini.Configs[section2].Get("LeftLegColorID", GlobalVars.UserCustomization.LeftLegColorID.ToString()); llegid = ini.IniReadValue(section2, "LeftLegColorID", GlobalVars.UserCustomization.LeftLegColorID.ToString());
llegstring = ini.Configs[section2].Get("LeftLegColorString", GlobalVars.UserCustomization.LeftLegColorString.ToString()); llegstring = ini.IniReadValue(section2, "LeftLegColorString", GlobalVars.UserCustomization.LeftLegColorString.ToString());
rlegid = ini.Configs[section2].Get("RightLegColorID", GlobalVars.UserCustomization.RightLegColorID.ToString()); rlegid = ini.IniReadValue(section2, "RightLegColorID", GlobalVars.UserCustomization.RightLegColorID.ToString());
rlegstring = ini.Configs[section2].Get("RightLegColorString", GlobalVars.UserCustomization.RightLegColorString.ToString()); rlegstring = ini.IniReadValue(section2, "RightLegColorString", GlobalVars.UserCustomization.RightLegColorString.ToString());
string section3 = "Other"; string section3 = "Other";
characterid = ini.Configs[section3].Get("CharacterID", GlobalVars.UserCustomization.CharacterID.ToString()); characterid = ini.IniReadValue(section3, "CharacterID", GlobalVars.UserCustomization.CharacterID.ToString());
extraishat = ini.Configs[section3].Get("ExtraSelectionIsHat", GlobalVars.UserCustomization.ExtraSelectionIsHat.ToString()); extraishat = ini.IniReadValue(section3, "ExtraSelectionIsHat", GlobalVars.UserCustomization.ExtraSelectionIsHat.ToString());
showhatsonextra = ini.Configs[section3].Get("ShowHatsOnExtra", GlobalVars.UserCustomization.ShowHatsInExtra.ToString()); showhatsonextra = ini.IniReadValue(section3, "ShowHatsOnExtra", GlobalVars.UserCustomization.ShowHatsInExtra.ToString());
GlobalVars.UserCustomization.Hat1 = hat1; GlobalVars.UserCustomization.Hat1 = hat1;
GlobalVars.UserCustomization.Hat2 = hat2; GlobalVars.UserCustomization.Hat2 = hat2;
@ -430,32 +408,30 @@ public class GlobalFuncs
if (write) if (write)
{ {
//WRITE //WRITE
IniConfigSource ini = new IniConfigSource(cfgpath); INIFile ini = new INIFile(cfgpath);
string section = "GENERAL"; string section = "GENERAL";
int FPS = GlobalVars.UserConfiguration.ReShadeFPSDisplay ? 1 : 0; int FPS = GlobalVars.UserConfiguration.ReShadeFPSDisplay ? 1 : 0;
ini.Configs[section].Set("ShowFPS", FPS.ToString()); ini.IniWriteValue(section, "ShowFPS", FPS.ToString());
ini.Configs[section].Set("ShowFrameTime", FPS.ToString()); ini.IniWriteValue(section, "ShowFrameTime", FPS.ToString());
int PerformanceMode = GlobalVars.UserConfiguration.ReShadePerformanceMode ? 1 : 0; int PerformanceMode = GlobalVars.UserConfiguration.ReShadePerformanceMode ? 1 : 0;
ini.Configs[section].Set("PerformanceMode", PerformanceMode.ToString()); ini.IniWriteValue(section, "PerformanceMode", PerformanceMode.ToString());
ini.Save();
} }
else else
{ {
//READ //READ
string framerate, frametime, performance; string framerate, frametime, performance;
IniConfigSource ini = new IniConfigSource(cfgpath); INIFile ini = new INIFile(cfgpath);
string section = "GENERAL"; string section = "GENERAL";
int FPS = GlobalVars.UserConfiguration.ReShadeFPSDisplay ? 1 : 0; int FPS = GlobalVars.UserConfiguration.ReShadeFPSDisplay ? 1 : 0;
framerate = ini.Configs[section].Get("ShowFPS", FPS.ToString()); framerate = ini.IniReadValue(section, "ShowFPS", FPS.ToString());
frametime = ini.Configs[section].Get("ShowFrameTime", FPS.ToString()); frametime = ini.IniReadValue(section, "ShowFrameTime", FPS.ToString());
int PerformanceMode = GlobalVars.UserConfiguration.ReShadePerformanceMode ? 1 : 0; int PerformanceMode = GlobalVars.UserConfiguration.ReShadePerformanceMode ? 1 : 0;
performance = ini.Configs[section].Get("PerformanceMode", PerformanceMode.ToString()); performance = ini.IniReadValue(section, "PerformanceMode", PerformanceMode.ToString());
if (setglobals) if (setglobals)
{ {

48
Novetus/NovetusCore/StorageAndFunctions/NETExt.cs
View File

@ -161,5 +161,53 @@ public static class NETExt
return Encoding.Unicode.GetString(outputBuffer); return Encoding.Unicode.GetString(outputBuffer);
} }
#endregion #endregion
#region Exeption Helpers
//https://github.com/AlexMelw/EasySharp/blob/master/NHelpers/ExceptionsDealing/Extensions/ExceptionExtensions.cs
/// <summary>
/// Gets the entire stack trace consisting of exception's footprints (File, Method, LineNumber)
/// </summary>
/// <param name="exception">Source <see cref="Exception" /></param>
/// <returns>
/// <see cref="string" /> that represents the entire stack trace consisting of exception's footprints (File,
/// Method, LineNumber)
/// </returns>
public static string GetExceptionFootprints(this Exception exception)
{
StackTrace stackTrace = new StackTrace(exception, true);
StackFrame[] frames = stackTrace.GetFrames();
if (ReferenceEquals(frames, null))
{
return string.Empty;
}
var traceStringBuilder = new StringBuilder();
for (var i = 0; i < frames.Length; i++)
{
StackFrame frame = frames[i];
if (frame.GetFileLineNumber() < 1)
continue;
traceStringBuilder.AppendLine($"File: {frame.GetFileName()}");
traceStringBuilder.AppendLine($"Method: {frame.GetMethod().Name}");
traceStringBuilder.AppendLine($"LineNumber: {frame.GetFileLineNumber()}");
if (i == frames.Length - 1)
break;
traceStringBuilder.AppendLine(" ---> ");
}
string stackTraceFootprints = traceStringBuilder.ToString();
if (string.IsNullOrWhiteSpace(stackTraceFootprints))
return "NO DETECTED FOOTPRINTS";
return stackTraceFootprints;
}
#endregion
} }
#endregion #endregion

1
Novetus/NovetusCore/StorageAndFunctions/SecurityFuncs.cs
View File

@ -180,6 +180,7 @@ public class SecurityFuncs
{ {
int time = 500; int time = 500;
BackgroundWorker worker = new BackgroundWorker(); BackgroundWorker worker = new BackgroundWorker();
worker.WorkerSupportsCancellation = true;
worker.DoWork += (obj, e) => WorkerDoWork(exe, type, time, worker, clientname, mapname); worker.DoWork += (obj, e) => WorkerDoWork(exe, type, time, worker, clientname, mapname);
worker.RunWorkerAsync(); worker.RunWorkerAsync();
} }

1
Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.cs
View File

@ -1164,6 +1164,7 @@ namespace NovetusLauncher
void SettingsButtonClick(object sender, EventArgs e) void SettingsButtonClick(object sender, EventArgs e)
{ {
WriteConfigValues();
LauncherFormCompactSettings im = new LauncherFormCompactSettings(); LauncherFormCompactSettings im = new LauncherFormCompactSettings();
im.FormClosing += SettingsExited; im.FormClosing += SettingsExited;
im.Show(); im.Show();

3
Novetus/NovetusLauncher/Novetus.Launcher.csproj
View File

@ -92,9 +92,6 @@
<Reference Include="Mono.Nat"> <Reference Include="Mono.Nat">
<HintPath>..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll</HintPath> <HintPath>..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll</HintPath>
</Reference> </Reference>
<Reference Include="Nini, Version=1.1.0.0, Culture=neutral, PublicKeyToken=691faec150a7fa7b, processorArchitecture=MSIL">
<HintPath>..\packages\Trove.Nini.1.1.0.0\lib\net20\Nini.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.2\lib\net40-client\NLog.dll</HintPath> <HintPath>..\packages\NLog.4.7.2\lib\net40-client\NLog.dll</HintPath>
</Reference> </Reference>

2
Novetus/NovetusLauncher/NovetusLauncher.cs
View File

@ -1,7 +1,6 @@
#region Usings #region Usings
using NLog; using NLog;
using System; using System;
using System.IO;
using System.Windows.Forms; using System.Windows.Forms;
#endregion #endregion
@ -30,6 +29,7 @@ namespace NovetusLauncher
log.Error("INNER EXCEPTION: " + (eventArgs.Exception.InnerException != null ? eventArgs.Exception.InnerException.ToString() : "N/A")); log.Error("INNER EXCEPTION: " + (eventArgs.Exception.InnerException != null ? eventArgs.Exception.InnerException.ToString() : "N/A"));
log.Error("STACK TRACE: " + (!string.IsNullOrWhiteSpace(eventArgs.Exception.StackTrace) ? eventArgs.Exception.StackTrace : "N/A")); log.Error("STACK TRACE: " + (!string.IsNullOrWhiteSpace(eventArgs.Exception.StackTrace) ? eventArgs.Exception.StackTrace : "N/A"));
log.Error("TARGET SITE: " + (eventArgs.Exception.TargetSite != null ? eventArgs.Exception.TargetSite.ToString() : "N/A")); log.Error("TARGET SITE: " + (eventArgs.Exception.TargetSite != null ? eventArgs.Exception.TargetSite.ToString() : "N/A"));
log.Error("FOOTPRINTS: " + (!string.IsNullOrWhiteSpace(eventArgs.Exception.GetExceptionFootprints()) ? eventArgs.Exception.GetExceptionFootprints() : "N/A"));
}; };
Application.EnableVisualStyles(); Application.EnableVisualStyles();

1
Novetus/NovetusLauncher/packages.config
View File

@ -6,5 +6,4 @@
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" /> <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" />
<package id="Mono.Nat" version="1.2.24.0" targetFramework="net40" /> <package id="Mono.Nat" version="1.2.24.0" targetFramework="net40" />
<package id="NLog" version="4.7.2" targetFramework="net40" /> <package id="NLog" version="4.7.2" targetFramework="net40" />
<package id="Trove.Nini" version="1.1.0.0" targetFramework="net40" />
</packages> </packages>

3
Novetus/NovetusURI/Novetus.URI.csproj
View File

@ -56,9 +56,6 @@
<HintPath>..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll</HintPath> <HintPath>..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Nini, Version=1.1.0.0, Culture=neutral, PublicKeyToken=691faec150a7fa7b, processorArchitecture=MSIL">
<HintPath>..\packages\Trove.Nini.1.1.0.0\lib\net20\Nini.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.2\lib\net40-client\NLog.dll</HintPath> <HintPath>..\packages\NLog.4.7.2\lib\net40-client\NLog.dll</HintPath>
</Reference> </Reference>

1
Novetus/NovetusURI/NovetusURI.cs
View File

@ -30,6 +30,7 @@ namespace NovetusURI
log.Error("INNER EXCEPTION: " + (eventArgs.Exception.InnerException != null ? eventArgs.Exception.InnerException.ToString() : "N/A")); log.Error("INNER EXCEPTION: " + (eventArgs.Exception.InnerException != null ? eventArgs.Exception.InnerException.ToString() : "N/A"));
log.Error("STACK TRACE: " + (!string.IsNullOrWhiteSpace(eventArgs.Exception.StackTrace) ? eventArgs.Exception.StackTrace : "N/A")); log.Error("STACK TRACE: " + (!string.IsNullOrWhiteSpace(eventArgs.Exception.StackTrace) ? eventArgs.Exception.StackTrace : "N/A"));
log.Error("TARGET SITE: " + (eventArgs.Exception.TargetSite != null ? eventArgs.Exception.TargetSite.ToString() : "N/A")); log.Error("TARGET SITE: " + (eventArgs.Exception.TargetSite != null ? eventArgs.Exception.TargetSite.ToString() : "N/A"));
log.Error("FOOTPRINTS: " + (!string.IsNullOrWhiteSpace(eventArgs.Exception.GetExceptionFootprints()) ? eventArgs.Exception.GetExceptionFootprints() : "N/A"));
}; };
Application.EnableVisualStyles(); Application.EnableVisualStyles();

1
Novetus/NovetusURI/packages.config
View File

@ -5,5 +5,4 @@
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" /> <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" />
<package id="Mono.Nat" version="1.2.24.0" targetFramework="net40" /> <package id="Mono.Nat" version="1.2.24.0" targetFramework="net40" />
<package id="NLog" version="4.7.2" targetFramework="net40" /> <package id="NLog" version="4.7.2" targetFramework="net40" />
<package id="Trove.Nini" version="1.1.0.0" targetFramework="net40" />
</packages> </packages>