From f8f700c6ae1ad6124aed7d1dd6b7475b229465e6 Mon Sep 17 00:00:00 2001 From: Bitl Date: Thu, 22 Jun 2023 13:10:29 -0700 Subject: [PATCH] fixes --- .../Novetus.Bootstrapper.csproj | 27 ++++++++++++++++++ Novetus/Novetus.Bootstrapper/app.config | 12 ++++++-- Novetus/Novetus.Bootstrapper/packages.config | 9 ++++++ .../StorageAndFunctions/FileManagement.cs | 28 ++----------------- .../StorageAndFunctions/GlobalVars.cs | 2 +- .../NovetusLauncher/Novetus.Launcher.csproj | 4 +-- Novetus/NovetusLauncher/packages.config | 2 +- Novetus/NovetusURI/Novetus.URI.csproj | 4 +-- Novetus/NovetusURI/packages.config | 2 +- 9 files changed, 55 insertions(+), 35 deletions(-) diff --git a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj index 88b9687..9333d5f 100644 --- a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj +++ b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj @@ -43,6 +43,9 @@ app.manifest + + ..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll True @@ -57,6 +60,9 @@ True True + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + @@ -112,6 +118,9 @@ True + + ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll True @@ -123,6 +132,9 @@ True + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + ..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll True @@ -133,6 +145,9 @@ True True + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll True @@ -170,12 +185,24 @@ True + + ..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll + + + ..\packages\System.Text.Json.7.0.3\lib\net462\System.Text.Json.dll + ..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll True True + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + diff --git a/Novetus/Novetus.Bootstrapper/app.config b/Novetus/Novetus.Bootstrapper/app.config index 1de3e0d..27f653e 100644 --- a/Novetus/Novetus.Bootstrapper/app.config +++ b/Novetus/Novetus.Bootstrapper/app.config @@ -1,10 +1,18 @@ - + - + + + + + + + + + diff --git a/Novetus/Novetus.Bootstrapper/packages.config b/Novetus/Novetus.Bootstrapper/packages.config index ce8134e..387d921 100644 --- a/Novetus/Novetus.Bootstrapper/packages.config +++ b/Novetus/Novetus.Bootstrapper/packages.config @@ -1,10 +1,12 @@  + + @@ -20,15 +22,18 @@ + + + @@ -40,10 +45,14 @@ + + + + \ No newline at end of file diff --git a/Novetus/NovetusCore/StorageAndFunctions/FileManagement.cs b/Novetus/NovetusCore/StorageAndFunctions/FileManagement.cs index 62e09af..09c3646 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/FileManagement.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/FileManagement.cs @@ -13,6 +13,7 @@ using System.Windows.Forms; using System.Xml.Serialization; using System.Xml; using System.Xml.Linq; +using System.Text.Json; #endregion namespace Novetus.Core @@ -120,13 +121,6 @@ namespace Novetus.Core SaveSetting(key, value); } } - - GenerateDefaultsEvent(); - } - - public virtual void GenerateDefaultsEvent() - { - //generate default event goes in here. } public void LoadAllSettings(string inputPath) @@ -272,7 +266,7 @@ namespace Novetus.Core {"MapPathSnip", ""}, {"GraphicsMode", Util.IntValue((int)Settings.Mode.Automatic)}, {"QualityLevel", Util.IntValue((int)Settings.Level.Automatic)}, - {"LauncherStyle", Util.IntValue((int)Settings.Style.Stylish)}, + {"LauncherStyle", (Util.IsWineRunning() ? Util.IntValue((int)Settings.Style.Stylish) : Util.IntValue((int)Settings.Style.Extended))}, {"AssetSDKFixerSaveBackups", Util.BoolValue(true)}, {"AlternateServerIP", ""}, {"ShowServerNotifications", Util.BoolValue(false)}, @@ -287,14 +281,6 @@ namespace Novetus.Core {"WebProxyEnabled", Util.BoolValue(false)} }; } - - public override void GenerateDefaultsEvent() - { - if (Util.IsWineRunning()) - { - SaveSettingInt("LauncherStyle", (int)Settings.Style.Extended); - } - } } #endregion @@ -884,16 +870,6 @@ namespace Novetus.Core } } - public static void GenerateTripcode() - { - //Powered by https://github.com/davcs86/csharp-uhwid - string curval = UHWIDEngine.AdvancedUid; - if (!GlobalVars.PlayerTripcode.Equals(curval)) - { - GlobalVars.PlayerTripcode = curval; - } - } - public static bool ResetMapIfNecessary() { if (!File.Exists(GlobalVars.UserConfiguration.ReadSetting("MapPath"))) diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalVars.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalVars.cs index 693ab78..7ded1d8 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalVars.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalVars.cs @@ -99,7 +99,7 @@ namespace Novetus.Core public static GameServer CurrentServer = new GameServer(DefaultIP, DefaultRobloxPort); public static string ExternalIP = NovetusFuncs.GetExternalIPAddress(); public static ScriptType GameOpened = ScriptType.None; - public static string PlayerTripcode = ""; + public static string PlayerTripcode = UHWIDEngine.AdvancedUid; #if LAUNCHER || URI public static WebProxy Proxy = new WebProxy(); #endif diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj index 994687e..a1aafdd 100644 --- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj +++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj @@ -267,8 +267,8 @@ ..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.7.0.1\lib\net462\System.Text.Json.dll + + ..\packages\System.Text.Json.7.0.3\lib\net462\System.Text.Json.dll ..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll diff --git a/Novetus/NovetusLauncher/packages.config b/Novetus/NovetusLauncher/packages.config index d3bc10c..69daf68 100644 --- a/Novetus/NovetusLauncher/packages.config +++ b/Novetus/NovetusLauncher/packages.config @@ -54,7 +54,7 @@ - + diff --git a/Novetus/NovetusURI/Novetus.URI.csproj b/Novetus/NovetusURI/Novetus.URI.csproj index 744aabd..3d3d642 100644 --- a/Novetus/NovetusURI/Novetus.URI.csproj +++ b/Novetus/NovetusURI/Novetus.URI.csproj @@ -214,8 +214,8 @@ ..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.7.0.1\lib\net462\System.Text.Json.dll + + ..\packages\System.Text.Json.7.0.3\lib\net462\System.Text.Json.dll ..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll diff --git a/Novetus/NovetusURI/packages.config b/Novetus/NovetusURI/packages.config index 9cbb4c8..2f93a62 100644 --- a/Novetus/NovetusURI/packages.config +++ b/Novetus/NovetusURI/packages.config @@ -53,7 +53,7 @@ - +