add net version string, deprecate lite more

Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net481.csproj

@@ -41,46 +41,16 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.8.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
-      <HintPath>C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Portable.BouncyCastle.1.8.8\lib\net40\BouncyCastle.Crypto.dll</HintPath>
-    </Reference>
-    <Reference Include="BrotliSharpLib, Version=0.3.2.0, Culture=neutral, PublicKeyToken=3f4e2a1cd615fcb7, processorArchitecture=MSIL">
-      <HintPath>C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\BrotliSharpLib.0.3.3\lib\net451\BrotliSharpLib.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Win32.Registry, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
-    </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.5\lib\net35\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Management" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
-    </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Security.AccessControl, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Security.AccessControl.5.0.0\lib\net461\System.Security.AccessControl.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
-    </Reference>
     <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

Novetus/NovetusCore/StorageAndFunctions/FileManagement.cs

@@ -11,6 +11,7 @@ using System.Drawing.Imaging;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using System.Xml.Serialization;
+using System.Runtime.Versioning;
 #endregion
 
 #region File Formats
@@ -193,7 +194,12 @@ public class FileFormat
             RegisterClient1 = "";
             RegisterClient2 = "";
             DefaultMap = "";
-            IsLite = false;
+            //HACK
+#if NET4
+            NetVersion = ".NET 4.0";
+#elif NET481
+            NetVersion = ".NET 4.8";
+#endif
             InitialBootup = true;
         }
 
@@ -203,7 +209,7 @@ public class FileFormat
         public string RegisterClient1 { get; set; }
         public string RegisterClient2 { get; set; }
         public string DefaultMap { get; set; }
-        public bool IsLite { get; set; }
+        public string NetVersion { get; set; }
         public bool InitialBootup { get; set; }
     }
     #endregion
@@ -624,8 +630,6 @@ public class FileManagement
         isLite = ini.IniReadValue(section, "IsLite", "False");
         initialBootup = ini.IniReadValue(section, "InitialBootup", "True");
 
-        GlobalVars.ProgramInformation.IsLite = Convert.ToBoolean(isLite);
-
         try
         {
             GlobalVars.ExtendedVersionNumber = Convert.ToBoolean(extendedversionnumber);
@@ -639,8 +643,7 @@ public class FileManagement
                         GlobalVars.ProgramInformation.Version = extendedversiontemplate.Replace("%version%", versionbranch)
                             .Replace("%build%", versionInfo.ProductBuildPart.ToString())
                             .Replace("%revision%", versionInfo.FilePrivatePart.ToString())
-                            .Replace("%extended-revision%", (!extendedversionrevision.Equals("-1") ? extendedversionrevision : ""))
+                            .Replace("%extended-revision%", (!extendedversionrevision.Equals("-1") ? extendedversionrevision : ""));
-                            .Replace("%lite%", (GlobalVars.ProgramInformation.IsLite ? " (Lite)" : ""));
                     }
                     else
                     {
@@ -652,8 +655,7 @@ public class FileManagement
                     GlobalVars.ProgramInformation.Version = extendedversiontemplate.Replace("%version%", versionbranch)
                         .Replace("%build%", Assembly.GetExecutingAssembly().GetName().Version.Build.ToString())
                         .Replace("%revision%", Assembly.GetExecutingAssembly().GetName().Version.Revision.ToString())
-                        .Replace("%extended-revision%", (!extendedversionrevision.Equals("-1") ? extendedversionrevision : ""))
+                        .Replace("%extended-revision%", (!extendedversionrevision.Equals("-1") ? extendedversionrevision : ""));
-                        .Replace("%lite%", (GlobalVars.ProgramInformation.IsLite ? " (Lite)" : ""));
                 }
 
                 bool changelogedit = Convert.ToBoolean(extendedversioneditchangelog);

Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs

@@ -115,7 +115,7 @@ namespace NovetusLauncher
 
             if (FormStyle != Settings.Style.Stylish)
             {
-                ProductVersionLabel.Text = Application.ProductVersion;
+                ProductVersionLabel.Text = GetProductVersion();
                 NovetusVersionLabel.Text = GlobalVars.ProgramInformation.Version;
                 
                 ReadConfigValues(true);
@@ -127,6 +127,11 @@ namespace NovetusLauncher
             }
         }
 
+        public string GetProductVersion()
+        {
+            return Application.ProductVersion + " (" + GlobalVars.ProgramInformation.NetVersion + ")";
+        }
+
         public void CloseEvent(CancelEventArgs e)
         {
             if (GlobalVars.GameOpened != ScriptType.None)

Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylish.cs

@@ -63,7 +63,7 @@ namespace NovetusLauncher
                 }
 
                 launcherFormStylishInterface1.versionLabel.Content = Application.ProductVersion;
-                launcherFormStylishInterface1.versionNovetusLabel.Content = GlobalVars.ProgramInformation.Version;
+                launcherFormStylishInterface1.versionNovetusLabel.Content = launcherFormStylishInterface1.launcherForm.GetProductVersion();
 
                 ReadConfigValues(true);
 

Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.cs

@@ -98,11 +98,7 @@ public partial class NovetusSDK : Form
 
         if (appItem.Text.Contains("Disabled"))
         {
-            string errorText = GlobalVars.ProgramInformation.IsLite ?
+            MessageBox.Show("This application has been disabled.", "Novetus SDK - App Disabled", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                "This application has been disabled to save space. Please download the Full version of Novetus to use all SDK tools." :
-                "This application has been disabled.";
-
-            MessageBox.Show(errorText, "Novetus SDK - App Disabled", MessageBoxButtons.OK, MessageBoxIcon.Error);
             return;
         }
 

changelog.txt

@@ -1,73 +1,7 @@
-1.3 v11.2022.1
+1.3 Snapshot v22.8340.31641.1
-Changes from 1.3 v8.2022.1:
-Notes:
-- The Novetus/Roblox soundtrack has been removed to respect the rights of the original copyright holders.
-
-Congratualtions to the following contest entries for getting added in this release:
-- Ironman_45 - MW2
-- Zork and Lachrymogenic - Bowlarama
-- Lachrymogenic - Lachrys Disorderly Deathmatch
-- Atomic and tobu.fi - Spooking Out
-
 Enhancements:
-- Made the Novetus URI Player Configuration UI more user friendly.
+- Upgraded to .NET Framework 4.8!
-- You can now skip the Novetus URI Player Configuration menu. Click "Don't Show Again" to make it stop showing up upon joining a server URI.
+	- Note that .NET Framework 4.0 binaries will be provided upon release.
-	- To re-enable the Novetus URI Player Configuration menu, set URIQuickConfigure to True in config/config.ini.
-- You can now change the "blank" place that loads up when studio loads with no map. Just replace "Place1.rbxl" in the config folder with one of your choice!
-- Added a notice to the settings panel regarding clients that need a secondary restart after applying settings.
-- Improved the Media Feature Pack/Windows Media Player installation instructions in the Dependency Installer.
-- Added the ability to skip the Bootstrapper on the next Novetus launch.
-	- To re-enable the Bootstrapper, set BootstrapperShowUI to True in config/config.ini.
-- Novetus now uses a baseplate as its default place when launching Studio with no map.
-- Added %generatescript% - Allows non-2007 clients to generate scripts. Equivalent to the "Generate scripts and fix map loading for 2007/2012+" option.
-	- The ClientScript Tester will use this for testing purposes.
-- Reverted the safechat.xml in all clients to the original version distributed in each client for accuracy reasons.
-- Re-added and updated 2009L!
-	- Thanks to MenderMan and Coke/Natalie for fixes!
-- Made exception logging less verbose.
-- The launcher now has a new standalone console (Novetus Console)!
-    - The console can be used to launch clients directly, alongside normal console and NovetusCMD behavior. See the help list for info.
-    - NovetusCMD has been replaced by the new Novetus Console
-- Changed the "Settings" button to read "Graphics Settings".
-- Added a new Rise of the Killbots map: Haunted Mansion!
-- You may now specify a custom folder name for assets to download to with the Asset Fixer!
-- Redesigned the Asset Fixer to be easier to use.
-- Added %server% - Returns the full server string with IP:Port.
-- IP and Port are now 1 value.
-	- When just pasting an IP in the Server Address field, the default Novetus port will be applied automatically.
-- Changed the design of the launcher forms for better ease of use.
-- Added the ability to install Addon Scripts with the "Install Mod Package" feature.
-- Redesigned the Custom Graphics Settings window to be smaller.
-- The Custom Graphics Settings button is now disablued UNTIL the user selects custom graphics quality.
-- Added a note about ReShade's system requirements.
-- The Asset Fixer's Regex pattern is now accessible in config/assetfixer_pattern.txt.
-
-Fixes:
-- Made it so Novetus closes any open client process after 1 minute of not showing a window
-    - This should fix issues with older clients staying open in the background after closing.
-- Fixed an issue where 2010L kicks players after rejoining.
-- Removed "TEST" text in the Console on the Compact style.
-- Fixed the Novetus URI not properly closing after an error.
-- Fixed Truss Detail settings not working.
-- Fixed texture issues with OpenGL Stable in 2009E-HD
-- Lowered the volume of the jump sound in 2009E-HD
-- Fixed the Sapphire Eye not loading properly.
-- Fixed issues with regenerating structures in Universal - Crossroads.
-- Fixed an issue where assetdelivery links wouldn't work well with the Asset Fixer or other SDK tools that use downloading.
-- Fixed a few grammatical errors with the Asset Fixer.
-- Fixed an exploit where players were able to inject places into online games.
-- Fixed a design mistake on the Extended Style.
-- Fixed Universal - Haunted Mansion not working properly (Credits to MenderMan)
-- Updated the Legacy Launcher.
-- Fixed an issue where Novetus was using abnormal CPU usage.
-- Fixed an issue where the Asset Fixer wouldn't be able to replace or fix some links.
-- Fixed an issue where the SDK would load with an error if the console is generating the initial file list.
-- Fixed the Oh Noes hat's collision model.
-- Fixed the Asset Fixer incorrectly removing end quotes in scripts. (")
-
-Items:
-T-Shirts:
-- Added buildermanShirt.png
 ----------------------------------------------------------------------------
 1.3 Snapshot v22.8337.30163.1
 Enhancements:

scripts/batch/clean_junk.bat

@@ -1,5 +1,6 @@
 @ECHO OFF
 del /S Novetus\*.pdb
+del /S Novetus\*.exe.config
 del /S Novetus\*.log
 del /S Novetus\*.bak
 

scripts/batch/create_lite.bat

@@ -1,4 +1,4 @@
 @ECHO OFF
 call clean_junk.bat
-ReleasePreparer.exe -lite
+ReleasePreparer.exe -Net40
 pause

scripts/batch/dev_menu.bat

@@ -8,9 +8,9 @@ ECHO -----------------------------------------------
 ECHO Novetus Release Utility
 ECHO -----------------------------------------------
 ECHO.
-ECHO 1 - Release
+ECHO 1 - Release (4.8)
 ECHO 2 - Release Beta
-ECHO 3 - Release Lite
+ECHO 3 - Release (4.0)
 ECHO 4 - Validate manifest
 ECHO 5 - itch.io build status.
 ECHO 6 - Push File List.
@@ -34,9 +34,9 @@ ECHO -----------------------------------------------
 ECHO Push File List for:
 ECHO -----------------------------------------------
 ECHO.
-ECHO 1 - Release
+ECHO 1 - Release (4.8)
 ECHO 2 - Release Beta
-ECHO 3 - Release Lite
+ECHO 3 - Release (4.0)
 ECHO 4 - Back
 ECHO.
 SET /P M=Option:
@@ -91,7 +91,7 @@ GOTO MENU
 
 :RELEASENOMAPS
 CLS
-ReleasePreparer.exe -lite
+ReleasePreparer.exe -Net40
 butler push Novetus-Lite bitl/novetus:windows-lite --if-changed --userversion-file releasenomapsversion.txt
 pause
 GOTO MENU
@@ -112,7 +112,7 @@ GOTO MENU
 
 :RELEASENOMAPS_DRY
 CLS
-ReleasePreparer.exe -lite
+ReleasePreparer.exe -Net40
 butler push Novetus-Lite bitl/novetus:windows-lite --if-changed --userversion-file releasenomapsversion.txt --dry-run
 pause
 GOTO MENU
@@ -132,9 +132,9 @@ GOTO MENU
 
 :STATUS
 CLS
-echo RELEASE
+echo RELEASE NET48
 butler status bitl/novetus:windows
-echo LITE
+echo RELEASE NET40
 butler status bitl/novetus:windows-lite
 echo BETA
 butler status bitl/novetus:windows-beta

scripts/batch/github_sync.bat

@@ -148,7 +148,7 @@ XCOPY "%cd%\create_lite.bat" "%scriptsdir%\batch" /y
 XCOPY "%cd%\liteexclude.txt" "%scriptsdir%\batch" /y
 XCOPY "%cd%\assetfixer_gauntlet.lua" "%scriptsdir%" /y
 XCOPY "%cd%\Novetus\Novetus_dependency_installer.bat" "%scriptsdir%\batch" /y
-XCOPY "%cd%\litefiles\Novetus_dependency_installer.bat" "%scriptsdir%\batch\Novetus_dependency_installer_4.0.bat*" /y
+XCOPY "%cd%\Net40files\Novetus_dependency_installer.bat" "%scriptsdir%\batch\Novetus_dependency_installer_4.0.bat*" /y
 XCOPY "%cd%\Novetus\Novetus_launcher_legacy.bat" "%scriptsdir%\batch" /y
 XCOPY "%cd%\Novetus\documentation.txt" "%dest%" /y
 XCOPY "%cd%\Novetus\consolehelp.txt" "%dest%" /y

scripts/launcher/info.ini

@@ -9,5 +9,4 @@ ExtendedVersionEditChangelog=True
 //ExtendedVersionTemplate=%version% v11.2022.%extended-revision%%lite%
 ExtendedVersionTemplate=%version% Snapshot v22.%build%.%revision%.%extended-revision%
 ExtendedVersionRevision=1
-IsLite=False
 InitialBootup=False

scripts/launcher/splashes.txt

@@ -103,7 +103,7 @@ Builderman for president!
 Check out DUNGEONBLADE: HK!|Bitl's randomized text-based adventure!
 ALL YOUR BASE ARE BELONG TO US!|You are on the way to destruction.
 roflcopter go soisoisoi...|Microsoft Sam.
-Runs under Windows XP!|Just install the dependencies!
+Runs under Windows XP*!|*Run the .NET Framework 4.0 version and install the dependencies!
 Check out the Novetus SDK!
 MSMSMSMSMSMSMSMSMSMSMSM|RIP SOPHIE.
 It's okay to cry.|RIP SOPHIE.