diff --git a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net6.csproj b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net6.csproj new file mode 100644 index 0000000..8af7186 --- /dev/null +++ b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net6.csproj @@ -0,0 +1,8 @@ + + + WinExe + net6.0-windows + true + false + + \ No newline at end of file diff --git a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj index 9834ddf..bb9fede 100644 --- a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj +++ b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj @@ -38,8 +38,8 @@ app.manifest - - ..\packages\NLog.4.7.2\lib\net40-client\NLog.dll + + ..\packages\NLog.5.0.4\lib\net35\NLog.dll diff --git a/Novetus/Novetus.Bootstrapper/packages.config b/Novetus/Novetus.Bootstrapper/packages.config index 9ae8f0f..9250ec9 100644 --- a/Novetus/Novetus.Bootstrapper/packages.config +++ b/Novetus/Novetus.Bootstrapper/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.Net6.csproj b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.Net6.csproj new file mode 100644 index 0000000..dbd212a --- /dev/null +++ b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.Net6.csproj @@ -0,0 +1,20 @@ + + + WinExe + net6.0-windows + true + false + $(MSBuildProjectName.Replace(".Net6", "").Replace("Novetus.", "")) + $(MSBuildProjectName.Replace(".Net6", "")) + NovetusIcon.ico + + + + + + + + + + + \ No newline at end of file diff --git a/Novetus/Novetus.Net6.sln b/Novetus/Novetus.Net6.sln new file mode 100644 index 0000000..20d3b35 --- /dev/null +++ b/Novetus/Novetus.Net6.sln @@ -0,0 +1,53 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32630.192 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.Launcher", "NovetusLauncher\Novetus.Launcher.csproj", "{F92FFBED-2767-4676-9711-BB89CDA58A43}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.URI", "NovetusURI\Novetus.URI.csproj", "{2070EAA6-7606-4006-A628-5705C24A3644}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Novetus.Core", "NovetusCore\Novetus.Core.shproj", "{DEBCC57D-9A3B-4D7C-8693-FA4AEC56C8C1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.Bootstrapper", "Novetus.Bootstrapper\Novetus.Bootstrapper.csproj", "{D7B467EE-A4B9-42FB-AA83-F487DA0F5CB1}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F92FFBED-2767-4676-9711-BB89CDA58A43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F92FFBED-2767-4676-9711-BB89CDA58A43}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F92FFBED-2767-4676-9711-BB89CDA58A43}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F92FFBED-2767-4676-9711-BB89CDA58A43}.Release|Any CPU.Build.0 = Release|Any CPU + {2070EAA6-7606-4006-A628-5705C24A3644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2070EAA6-7606-4006-A628-5705C24A3644}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2070EAA6-7606-4006-A628-5705C24A3644}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2070EAA6-7606-4006-A628-5705C24A3644}.Release|Any CPU.Build.0 = Release|Any CPU + {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Release|Any CPU.Build.0 = Release|Any CPU + {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Debug|Any CPU.Build.0 = Debug|Any CPU + {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Release|Any CPU.ActiveCfg = Release|Any CPU + {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Release|Any CPU.Build.0 = Release|Any CPU + {D7B467EE-A4B9-42FB-AA83-F487DA0F5CB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D7B467EE-A4B9-42FB-AA83-F487DA0F5CB1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D7B467EE-A4B9-42FB-AA83-F487DA0F5CB1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D7B467EE-A4B9-42FB-AA83-F487DA0F5CB1}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {66CA6CE5-670E-48AA-A2DA-9347371D4CA0} + EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + NovetusCore\NovetusCore.projitems*{2070eaa6-7606-4006-a628-5705c24a3644}*SharedItemsImports = 4 + NovetusCore\NovetusCore.projitems*{d7b467ee-a4b9-42fb-aa83-f487da0f5cb1}*SharedItemsImports = 4 + NovetusCore\NovetusCore.projitems*{debcc57d-9a3b-4d7c-8693-fa4aec56c8c1}*SharedItemsImports = 13 + NovetusCore\NovetusCore.projitems*{f92ffbed-2767-4676-9711-bb89cda58a43}*SharedItemsImports = 4 + EndGlobalSection +EndGlobal diff --git a/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.Net6.csproj b/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.Net6.csproj new file mode 100644 index 0000000..7d61dca --- /dev/null +++ b/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.Net6.csproj @@ -0,0 +1,26 @@ + + + WinExe + net6.0-windows + true + false + NovetusIcon.ico + $(MSBuildProjectName.Replace(".Net6", "").Replace("Novetus.", "")) + $(MSBuildProjectName.Replace(".Net6", "")) + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Novetus/Novetus.Tools.Net6.sln b/Novetus/Novetus.Tools.Net6.sln new file mode 100644 index 0000000..e7748c9 --- /dev/null +++ b/Novetus/Novetus.Tools.Net6.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32630.192 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Novetus.ClientScriptTester.Net6", "G:\Projects\GitHub\Novetus\Novetus_src\Novetus\Novetus.ClientScriptTester\Novetus.ClientScriptTester.Net6.csproj", "{ADE30CA3-DBD5-440A-8804-663BC7240A65}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Novetus.ReleasePreparer.Net6", "G:\Projects\GitHub\Novetus\Novetus_src\Novetus\Novetus.ReleasePreparer\Novetus.ReleasePreparer.Net6.csproj", "{392954DC-C92B-4418-BC79-E817C8CDF2F7}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {ADE30CA3-DBD5-440A-8804-663BC7240A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ADE30CA3-DBD5-440A-8804-663BC7240A65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ADE30CA3-DBD5-440A-8804-663BC7240A65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ADE30CA3-DBD5-440A-8804-663BC7240A65}.Release|Any CPU.Build.0 = Release|Any CPU + {392954DC-C92B-4418-BC79-E817C8CDF2F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {392954DC-C92B-4418-BC79-E817C8CDF2F7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {392954DC-C92B-4418-BC79-E817C8CDF2F7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {392954DC-C92B-4418-BC79-E817C8CDF2F7}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {66CA6CE5-670E-48AA-A2DA-9347371D4CA0} + EndGlobalSection +EndGlobal diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs index 63e508a..bb357f5 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs @@ -112,6 +112,7 @@ public class GlobalPaths public static readonly string ConsoleHelpFileName = "consolehelp.txt"; public static readonly string ClientScriptDocumentationFileName = "documentation.txt"; public static readonly string AddonLoaderFileName = "AddonLoader.lua"; + public static readonly string AssetFixerPatternFileName = "assetfixer_pattern.txt"; #endregion } #endregion diff --git a/Novetus/NovetusCore/StorageAndFunctions/NovetusFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/NovetusFuncs.cs index 06b7e7b..3b247af 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/NovetusFuncs.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/NovetusFuncs.cs @@ -275,7 +275,14 @@ public class NovetusFuncs .Replace(baseurl + "/item.aspx?id=", str2); //...because scripts mess it up. + string id = fixedUrl.After("id="); + if (id.Contains("&version=")) + { + string ver = id.After("&version="); + id = id.Replace("&version=" + ver, ""); + } + string fixedID = Regex.Replace(id, "[^0-9]", ""); //really fucking hacky. diff --git a/Novetus/NovetusCore/StorageAndFunctions/Util.cs b/Novetus/NovetusCore/StorageAndFunctions/Util.cs index 0fc6dfe..b9f5dd4 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/Util.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/Util.cs @@ -584,7 +584,11 @@ public static class Util #if LAUNCHER || URI || BASICLAUNCHER public static void LogExceptions(Exception ex) { - LogPrint("EXCEPTION|MESSAGE: " + (ex.Message != null ? ex.Message.ToString() : "N/A"), 2); + string message = (ex.Message != null ? ex.Message.ToString() : "N/A"); + + ConsolePrint(ex.Source + " Exception: " + message, 2, false, true); + + LogPrint("EXCEPTION|MESSAGE: " + message, 2); LogPrint("EXCEPTION|STACK TRACE: " + (!string.IsNullOrWhiteSpace(ex.StackTrace) ? ex.StackTrace : "N/A"), 2); LogPrint("EXCEPTION|ADDITIONAL INFO: " + (ex != null ? ex.ToString() : "N/A"), 2); } diff --git a/Novetus/NovetusLauncher/Forms/SDK/AssetFixer.cs b/Novetus/NovetusLauncher/Forms/SDK/AssetFixer.cs index e1fd694..d6689ac 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/AssetFixer.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/AssetFixer.cs @@ -202,58 +202,64 @@ public partial class AssetFixer : Form { //https://stackoverflow.com/questions/10576686/c-sharp-regex-pattern-to-extract-urls-from-given-string-not-full-html-urls-but List links = new List(); - var linkParser = new Regex(@"https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=;\[\]]*)", RegexOptions.Compiled | RegexOptions.IgnoreCase); - foreach (Match m in linkParser.Matches(line)) + + if (File.Exists(GlobalPaths.ConfigDir + "\\" + GlobalPaths.AssetFixerPatternFileName)) { - string link = m.Value; - links.Add(link); - } + string pattern = File.ReadAllText(GlobalPaths.ConfigDir + "\\" + GlobalPaths.AssetFixerPatternFileName); - foreach (string link in links) - { - if (link.Contains(".png") || link.Contains(".jpg") || link.Contains(".jpeg")) + var linkParser = new Regex(pattern, RegexOptions.Compiled | RegexOptions.IgnoreCase); + foreach (Match m in linkParser.Matches(line)) { - continue; + string link = m.Value; + links.Add(link); } - if (link.Contains("my-roblox-character-item")) + foreach (string link in links) { - continue; - } + if (link.Contains(".png") || link.Contains(".jpg") || link.Contains(".jpeg")) + { + continue; + } - string urlFixed = ""; + if (link.Contains("my-roblox-character-item")) + { + continue; + } - if (useURLs) - { - string oldurl = line; - urlFixed = NovetusFuncs.FixURLString(oldurl, url); - } - else - { - string newurl = ((!link.Contains("http://") || !link.Contains("https://")) ? "https://" : "") - + "assetdelivery.roblox.com/v1/asset/?id="; - string urlReplaced = newurl.Contains("https://") ? link.Replace("http://", "").Replace("https://", "") : link.Replace("http://", "https://"); - urlFixed = NovetusFuncs.FixURLString(urlReplaced, newurl); - } + string urlFixed = ""; - string peram = "id="; - - if (urlFixed.Contains(peram)) - { if (useURLs) { - file[index - 1] = file[index - 1].Replace(link, urlFixed); + string oldurl = line; + urlFixed = NovetusFuncs.FixURLString(oldurl, url); } else { - string IDVal = urlFixed.After(peram); - RobloxXML.DownloadFilesFromNode(urlFixed, savefilepath, "", IDVal); - file[index - 1] = file[index - 1].Replace(link, inGameDir + IDVal); + string newurl = ((!link.Contains("http://") || !link.Contains("https://")) ? "https://" : "") + + "assetdelivery.roblox.com/v1/asset/?id="; + string urlReplaced = newurl.Contains("https://") ? link.Replace("http://", "").Replace("https://", "") : link.Replace("http://", "https://"); + urlFixed = NovetusFuncs.FixURLString(urlReplaced, newurl); + } + + string peram = "id="; + + if (urlFixed.Contains(peram)) + { + if (useURLs) + { + file[index - 1] = file[index - 1].Replace(link, urlFixed); + } + else + { + string IDVal = urlFixed.After(peram); + RobloxXML.DownloadFilesFromNode(urlFixed, savefilepath, "", IDVal); + file[index - 1] = file[index - 1].Replace(link, inGameDir + IDVal); + } } } - } - ProgressChangedEvent(); + ProgressChangedEvent(); + } } else { diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.Net6.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.Net6.csproj new file mode 100644 index 0000000..b680382 --- /dev/null +++ b/Novetus/NovetusLauncher/Novetus.Launcher.Net6.csproj @@ -0,0 +1,9 @@ + + + WinExe + net6.0-windows + true + true + false + + \ No newline at end of file diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj index ddc320a..672e6cd 100644 --- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj +++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj @@ -82,8 +82,8 @@ - - ..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll + + ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll @@ -101,8 +101,8 @@ ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll - - ..\packages\NLog.4.7.2\lib\net40-client\NLog.dll + + ..\packages\NLog.5.0.4\lib\net35\NLog.dll @@ -117,21 +117,18 @@ 3.5 - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll - True + + ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll - True + + ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll - True + + ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll @@ -450,9 +447,11 @@ if not exist "%25path%25"\bin mkdir "%25path%25"\bin move "%25path2%25"\* "%25path%25"\bin rd /s /q "%25path2%25" - - - - + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + \ No newline at end of file diff --git a/Novetus/NovetusLauncher/app.config b/Novetus/NovetusLauncher/app.config index 7540e2d..c3517cc 100644 --- a/Novetus/NovetusLauncher/app.config +++ b/Novetus/NovetusLauncher/app.config @@ -7,11 +7,11 @@ - + - + diff --git a/Novetus/NovetusLauncher/packages.config b/Novetus/NovetusLauncher/packages.config index d68baea..e2b9597 100644 --- a/Novetus/NovetusLauncher/packages.config +++ b/Novetus/NovetusLauncher/packages.config @@ -1,9 +1,9 @@  - - + + - + - + \ No newline at end of file diff --git a/Novetus/NovetusURI/App.config b/Novetus/NovetusURI/App.config index df667cb..5ad9b05 100644 --- a/Novetus/NovetusURI/App.config +++ b/Novetus/NovetusURI/App.config @@ -7,11 +7,11 @@ - + - + diff --git a/Novetus/NovetusURI/Novetus.URI.Net6.csproj b/Novetus/NovetusURI/Novetus.URI.Net6.csproj new file mode 100644 index 0000000..8af7186 --- /dev/null +++ b/Novetus/NovetusURI/Novetus.URI.Net6.csproj @@ -0,0 +1,8 @@ + + + WinExe + net6.0-windows + true + false + + \ No newline at end of file diff --git a/Novetus/NovetusURI/Novetus.URI.csproj b/Novetus/NovetusURI/Novetus.URI.csproj index 54e6218..61f69f3 100644 --- a/Novetus/NovetusURI/Novetus.URI.csproj +++ b/Novetus/NovetusURI/Novetus.URI.csproj @@ -13,6 +13,8 @@ 512 true + + x86 @@ -58,29 +60,25 @@ ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll - True - - ..\packages\NLog.4.7.2\lib\net40-client\NLog.dll + + ..\packages\NLog.5.0.4\lib\net35\NLog.dll - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll - True + + ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll - True + + ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll - True + + ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll @@ -197,10 +195,12 @@ if not exist "%25path%25"\bin mkdir "%25path%25"\bin move "%25path2%25"\* "%25path%25"\bin rd /s /q "%25path2%25" - - - - + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + +