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

better tripcodes

This commit is contained in:
Bitl 2021-11-19 12:45:23 -07:00
parent ba6747ec0e
commit 8544f4c25e
12 changed files with 55 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj
View File

@ -44,6 +44,7 @@
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Management" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" />

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

@ -107,6 +107,7 @@
<HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Management" />
<Reference Include="System.Net" />
<Reference Include="System.Runtime, Version=2.6.8.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll</HintPath>

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

@ -9,12 +9,11 @@ using System.Drawing;
using System.Drawing.Imaging;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Management;
using System.Net;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Xml;
@ -140,10 +139,6 @@ public class GlobalFuncs
ini.IniWriteValue(section, "PlayerLimit", GlobalVars.UserConfiguration.PlayerLimit.ToString());
ini.IniWriteValue(section, "UPnP", GlobalVars.UserConfiguration.UPnP.ToString());
ini.IniWriteValue(section, "ItemMakerDisableHelpMessage", GlobalVars.UserConfiguration.DisabledItemMakerHelp.ToString());
if (string.IsNullOrWhiteSpace(ini.IniReadValue(section, "PlayerTripcode", GenerateAndReturnTripcode())))
{
ini.IniWriteValue(section, "PlayerTripcode", SecurityFuncs.Base64Encode(GlobalVars.UserConfiguration.PlayerTripcode.ToString()));
}
ini.IniWriteValue(section, "DiscordRichPresence", GlobalVars.UserConfiguration.DiscordPresence.ToString());
ini.IniWriteValue(section, "MapPath", GlobalVars.UserConfiguration.MapPath.ToString());
ini.IniWriteValue(section, "MapPathSnip", GlobalVars.UserConfiguration.MapPathSnip.ToString());
@ -168,7 +163,7 @@ public class GlobalFuncs
//READ
string closeonlaunch, userid, name, selectedclient,
map, port, limit, upnp,
disablehelpmessage, tripcode, discord, mappath, mapsnip,
disablehelpmessage, discord, mappath, mapsnip,
graphics, reshade, qualitylevel, style, savebackups, altIP,
disReshadeDel, showNotifs, SB_Name, SB_Address, priority, initialBootup,
firstServerLaunch;
@ -186,7 +181,6 @@ public class GlobalFuncs
limit = ini.IniReadValue(section, "PlayerLimit", GlobalVars.UserConfiguration.PlayerLimit.ToString());
upnp = ini.IniReadValue(section, "UPnP", GlobalVars.UserConfiguration.UPnP.ToString());
disablehelpmessage = ini.IniReadValue(section, "ItemMakerDisableHelpMessage", GlobalVars.UserConfiguration.DisabledItemMakerHelp.ToString());
tripcode = ini.IniReadValue(section, "PlayerTripcode", GenerateAndReturnTripcode());
discord = ini.IniReadValue(section, "DiscordRichPresence", GlobalVars.UserConfiguration.DiscordPresence.ToString());
mappath = ini.IniReadValue(section, "MapPath", GlobalVars.UserConfiguration.MapPath.ToString());
mapsnip = ini.IniReadValue(section, "MapPathSnip", GlobalVars.UserConfiguration.MapPathSnip.ToString());
@ -223,17 +217,6 @@ public class GlobalFuncs
GlobalVars.UserConfiguration.PlayerLimit = Convert.ToInt32(limit);
GlobalVars.UserConfiguration.UPnP = Convert.ToBoolean(upnp);
GlobalVars.UserConfiguration.DisabledItemMakerHelp = Convert.ToBoolean(disablehelpmessage);
if (string.IsNullOrWhiteSpace(SecurityFuncs.Base64Decode(tripcode)))
{
GlobalVars.UserConfiguration.PlayerTripcode = GenerateAndReturnTripcode();
Config(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigName, true);
}
else
{
GlobalVars.UserConfiguration.PlayerTripcode = SecurityFuncs.Base64Decode(tripcode);
}
GlobalVars.UserConfiguration.DiscordPresence = Convert.ToBoolean(discord);
GlobalVars.UserConfiguration.MapPathSnip = mapsnip;
GlobalVars.UserConfiguration.GraphicsMode = (Settings.Mode)Convert.ToInt32(graphics);
@ -279,6 +262,12 @@ public class GlobalFuncs
}
}
string curval = GenerateAndReturnTripcode();
if (!GlobalVars.UserConfiguration.PlayerTripcode.Equals(curval))
{
GlobalVars.UserConfiguration.PlayerTripcode = curval;
}
if (!File.Exists(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigNameCustomization))
{
Customization(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigNameCustomization, true);
@ -1088,7 +1077,6 @@ public class GlobalFuncs
GlobalVars.UserConfiguration.LauncherStyle = style;
#endif
GeneratePlayerID();
GlobalVars.UserConfiguration.PlayerTripcode = GlobalFuncs.GenerateAndReturnTripcode();
ResetCustomizationValues();
}
@ -1292,7 +1280,27 @@ public class GlobalFuncs
public static string GenerateAndReturnTripcode()
{
return SecurityFuncs.RandomString(20);
//https://stackoverflow.com/questions/10546055/how-to-generate-a-system-pc-laptop-hardware-unique-id-in-c/50907399#50907399
ManagementObjectCollection mbsList = null;
ManagementObjectSearcher mbs = new ManagementObjectSearcher("Select * From Win32_processor");
mbsList = mbs.Get();
string id = "";
foreach (ManagementObject mo in mbsList)
{
id = mo["ProcessorID"].ToString();
}
ManagementObjectSearcher mos = new ManagementObjectSearcher("SELECT * FROM Win32_BaseBoard");
ManagementObjectCollection moc = mos.Get();
string motherBoard = "";
foreach (ManagementObject mo in moc)
{
motherBoard = (string)mo["SerialNumber"];
}
string uniqueSystemId = id + motherBoard;
return uniqueSystemId;
}
public static GlobalVars.LauncherState GetStateForType(ScriptType type)

15
Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs generated
View File

@ -978,9 +978,9 @@ namespace NovetusLauncher
//
// label18
//
this.label18.Location = new System.Drawing.Point(113, 237);
this.label18.Location = new System.Drawing.Point(6, 221);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(155, 16);
this.label18.Size = new System.Drawing.Size(389, 16);
this.label18.TabIndex = 58;
this.label18.Text = "qwertyuiopasdfghjklz";
this.label18.TextAlign = System.Drawing.ContentAlignment.TopCenter;
@ -988,7 +988,7 @@ namespace NovetusLauncher
// label11
//
this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label11.Location = new System.Drawing.Point(6, 222);
this.label11.Location = new System.Drawing.Point(6, 205);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(389, 15);
this.label11.TabIndex = 50;
@ -1008,11 +1008,12 @@ namespace NovetusLauncher
//
// label7
//
this.label7.Location = new System.Drawing.Point(274, 237);
this.label7.Location = new System.Drawing.Point(214, 237);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(121, 16);
this.label7.Size = new System.Drawing.Size(181, 16);
this.label7.TabIndex = 54;
this.label7.Text = "PROJECT STARLIGHT";
this.label7.TextAlign = System.Drawing.ContentAlignment.TopCenter;
//
// label10
//
@ -1026,7 +1027,7 @@ namespace NovetusLauncher
//
this.label8.Location = new System.Drawing.Point(8, 237);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(99, 16);
this.label8.Size = new System.Drawing.Size(182, 16);
this.label8.TabIndex = 48;
this.label8.Text = "0.13333337";
this.label8.TextAlign = System.Drawing.ContentAlignment.TopCenter;
@ -1073,7 +1074,7 @@ namespace NovetusLauncher
this.richTextBox3.Location = new System.Drawing.Point(6, 70);
this.richTextBox3.Name = "richTextBox3";
this.richTextBox3.ReadOnly = true;
this.richTextBox3.Size = new System.Drawing.Size(389, 149);
this.richTextBox3.Size = new System.Drawing.Size(389, 132);
this.richTextBox3.TabIndex = 60;
this.richTextBox3.Text = "credits text";
//

2
Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.resx
View File

@ -136,7 +136,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0
CQAAAk1TRnQBSQFMAgEBAgEAAVgBAAFYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CQAAAk1TRnQBSQFMAgEBAgEAAWABAAFgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

12
Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.Designer.cs generated
View File

@ -1310,15 +1310,15 @@ namespace NovetusLauncher
this.richTextBox3.Location = new System.Drawing.Point(11, 67);
this.richTextBox3.Name = "richTextBox3";
this.richTextBox3.ReadOnly = true;
this.richTextBox3.Size = new System.Drawing.Size(601, 175);
this.richTextBox3.Size = new System.Drawing.Size(601, 156);
this.richTextBox3.TabIndex = 60;
this.richTextBox3.Text = "credits text";
//
// label18
//
this.label18.Location = new System.Drawing.Point(232, 247);
this.label18.Location = new System.Drawing.Point(11, 226);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(155, 16);
this.label18.Size = new System.Drawing.Size(601, 16);
this.label18.TabIndex = 58;
this.label18.Text = "qwertyuiopasdfghjklz";
this.label18.TextAlign = System.Drawing.ContentAlignment.TopCenter;
@ -1327,7 +1327,7 @@ namespace NovetusLauncher
//
this.label8.Location = new System.Drawing.Point(8, 247);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(122, 16);
this.label8.Size = new System.Drawing.Size(295, 16);
this.label8.TabIndex = 48;
this.label8.Text = "0.13333337";
this.label8.TextAlign = System.Drawing.ContentAlignment.TopCenter;
@ -1335,9 +1335,9 @@ namespace NovetusLauncher
//
// label7
//
this.label7.Location = new System.Drawing.Point(484, 247);
this.label7.Location = new System.Drawing.Point(309, 247);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(128, 16);
this.label7.Size = new System.Drawing.Size(303, 16);
this.label7.TabIndex = 54;
this.label7.Text = "PROJECT STARLIGHT";
this.label7.TextAlign = System.Drawing.ContentAlignment.TopCenter;

2
Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.resx
View File

@ -136,7 +136,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0
CQAAAk1TRnQBSQFMAgEBAgEAAZABAAGQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CQAAAk1TRnQBSQFMAgEBAgEAAZgBAAGYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

3
Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
View File

@ -853,7 +853,6 @@ namespace NovetusLauncher
}
break;
case 2:
default:
if (FormStyle != Settings.Style.Stylish)
{
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Stylish;
@ -862,6 +861,8 @@ namespace NovetusLauncher
Application.Exit();
}
break;
default:
break;
}
}

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

@ -116,6 +116,7 @@
<HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Management" />
<Reference Include="System.Net" />
<Reference Include="System.Runtime, Version=2.6.8.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll</HintPath>

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

@ -70,6 +70,7 @@
<HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Management" />
<Reference Include="System.Net" />
<Reference Include="System.Runtime, Version=2.6.8.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll</HintPath>

2
changelog.txt
View File

@ -18,6 +18,7 @@ Enhancements:
- The server browser no longer requires a server to be the same exact version as the current running version of Novetus.
- The server browser now displays versions in red if they're not the same exact version.
- The master server security warning will now show up once for every Novetus session.
- Novetus now bases your tripcode off of your computer's hardware information.
Fixes:
- Fixed the URL Override box in the Asset SDK not being functional.
@ -30,6 +31,7 @@ Fixes:
- Fixed the Stylish interface not pinging the master server.
- Fixed some clients not functioning properly with Wine (Credits to man-of-eel in pull request #27).
- Fixed small issues with tripcodes.
- Fixed a bug where Novetus would switch the style to Stylish even after saving.
Lite version changes:
- Removed the following clients:

3
scripts/launcher/splashes.txt
View File

@ -175,4 +175,5 @@ I AM GONNA TAKE YOUR COAT|SAY THANKS
[normal]Wear your heart on your sleeve!|It's the only way to live! Everything will fall into place, you'll see!
[stylish]Wear your heart on your sleeve! It's the only way to live!|Everything will fall into place, you'll see!
[normal]If the entire world is getting banned by admins...|I'm taking a physgun with me.
[stylish]If the entire world is getting banned by admins, I'm taking a physgun with me.
[stylish]If the entire world is getting banned by admins, I'm taking a physgun with me.
After all, what fun is there in making sense?|I'm not a fan of puppeteers, but I've got a nagging fear that someone else is pulling at the strings!