This commit is contained in:
Bitl 2020-05-14 23:02:12 -07:00
parent 6e7d792f2e
commit 756c51f087
5 changed files with 73 additions and 14 deletions

View File

@ -42,7 +42,19 @@ public class SecurityFuncs
return RandomString(20); return RandomString(20);
} }
//REMOVE OLD FORMAT ON RELEASE //these 2 methods are for the clientinfo creator.
public static string Base64DecodeNew(string base64EncodedData)
{
return base64EncodedData.Decrypt();
}
public static string Base64DecodeOld(string base64EncodedData)
{
var base64EncodedBytes = Convert.FromBase64String(base64EncodedData);
return System.Text.Encoding.UTF8.GetString(base64EncodedBytes);
}
//this is for everything else
public static string Base64Decode(string base64EncodedData) public static string Base64Decode(string base64EncodedData)
{ {
try try

View File

@ -56,6 +56,7 @@ namespace NovetusLauncher
this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveAsTextFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.addToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.addToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tagsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tagsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.clientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.clientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -139,7 +140,8 @@ namespace NovetusLauncher
this.label6 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label();
this.textBox5 = new System.Windows.Forms.TextBox(); this.textBox5 = new System.Windows.Forms.TextBox();
this.label7 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label();
this.saveAsTextFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.label8 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -300,24 +302,31 @@ namespace NovetusLauncher
// newToolStripMenuItem // newToolStripMenuItem
// //
this.newToolStripMenuItem.Name = "newToolStripMenuItem"; this.newToolStripMenuItem.Name = "newToolStripMenuItem";
this.newToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.newToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.newToolStripMenuItem.Text = "New"; this.newToolStripMenuItem.Text = "New";
this.newToolStripMenuItem.Click += new System.EventHandler(this.NewToolStripMenuItemClick); this.newToolStripMenuItem.Click += new System.EventHandler(this.NewToolStripMenuItemClick);
// //
// loadToolStripMenuItem // loadToolStripMenuItem
// //
this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; this.loadToolStripMenuItem.Name = "loadToolStripMenuItem";
this.loadToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.loadToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.loadToolStripMenuItem.Text = "Load"; this.loadToolStripMenuItem.Text = "Load";
this.loadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItemClick); this.loadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItemClick);
// //
// saveToolStripMenuItem // saveToolStripMenuItem
// //
this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
this.saveToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.saveToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.saveToolStripMenuItem.Text = "Save"; this.saveToolStripMenuItem.Text = "Save";
this.saveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItemClick); this.saveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItemClick);
// //
// saveAsTextFileToolStripMenuItem
//
this.saveAsTextFileToolStripMenuItem.Name = "saveAsTextFileToolStripMenuItem";
this.saveAsTextFileToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.saveAsTextFileToolStripMenuItem.Text = "Save as Text File";
this.saveAsTextFileToolStripMenuItem.Click += new System.EventHandler(this.saveAsTextFileToolStripMenuItem_Click);
//
// addToolStripMenuItem // addToolStripMenuItem
// //
this.addToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.addToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -986,19 +995,32 @@ namespace NovetusLauncher
this.label7.TabIndex = 28; this.label7.TabIndex = 28;
this.label7.Text = "Warning (if needed)"; this.label7.Text = "Warning (if needed)";
// //
// saveAsTextFileToolStripMenuItem // label8
// //
this.saveAsTextFileToolStripMenuItem.Name = "saveAsTextFileToolStripMenuItem"; this.label8.AutoSize = true;
this.saveAsTextFileToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.label8.Location = new System.Drawing.Point(234, 340);
this.saveAsTextFileToolStripMenuItem.Text = "Save as Text File"; this.label8.Name = "label8";
this.saveAsTextFileToolStripMenuItem.Click += new System.EventHandler(this.saveAsTextFileToolStripMenuItem_Click); this.label8.Size = new System.Drawing.Size(92, 13);
this.label8.TabIndex = 29;
this.label8.Text = "ClientInfo Version:";
//
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(323, 340);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(63, 13);
this.label9.TabIndex = 30;
this.label9.Text = "Not Loaded";
// //
// ClientinfoEditor // ClientinfoEditor
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlLightLight; this.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.ClientSize = new System.Drawing.Size(632, 341); this.ClientSize = new System.Drawing.Size(632, 362);
this.Controls.Add(this.label9);
this.Controls.Add(this.label8);
this.Controls.Add(this.label7); this.Controls.Add(this.label7);
this.Controls.Add(this.textBox5); this.Controls.Add(this.textBox5);
this.Controls.Add(this.label6); this.Controls.Add(this.label6);
@ -1135,5 +1157,7 @@ namespace NovetusLauncher
private System.Windows.Forms.ToolStripMenuItem charappToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem charappToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem documentationToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem documentationToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem saveAsTextFileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem saveAsTextFileToolStripMenuItem;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.Label label9;
} }
} }

View File

@ -250,7 +250,19 @@ namespace NovetusLauncher
line1 = reader.ReadLine(); line1 = reader.ReadLine();
} }
string ConvertedLine = SecurityFuncs.Base64Decode(line1); string ConvertedLine = "";
try
{
label9.Text = "v2";
ConvertedLine = SecurityFuncs.Base64DecodeNew(line1);
}
catch(Exception)
{
label9.Text = "v1";
ConvertedLine = SecurityFuncs.Base64DecodeOld(line1);
}
string[] result = ConvertedLine.Split('|'); string[] result = ConvertedLine.Split('|');
Decryptline1 = SecurityFuncs.Base64Decode(result[0]); Decryptline1 = SecurityFuncs.Base64Decode(result[0]);
Decryptline2 = SecurityFuncs.Base64Decode(result[1]); Decryptline2 = SecurityFuncs.Base64Decode(result[1]);
@ -352,6 +364,8 @@ namespace NovetusLauncher
SelectedClientInfoPath = Path.GetDirectoryName(sfd.FileName); SelectedClientInfoPath = Path.GetDirectoryName(sfd.FileName);
} }
} }
label9.Text = "v2";
} }
void TextBox4TextChanged(object sender, EventArgs e) void TextBox4TextChanged(object sender, EventArgs e)

View File

@ -64,7 +64,8 @@
"Asset Localizer", "Asset Localizer",
"Splash Tester", "Splash Tester",
"RBXMeshConverter GUI", "RBXMeshConverter GUI",
"ROBLOX Script Generator"}); "ROBLOX Script Generator",
"ROBLOX Legacy Place Converter"});
this.listBox1.Location = new System.Drawing.Point(12, 70); this.listBox1.Location = new System.Drawing.Point(12, 70);
this.listBox1.Name = "listBox1"; this.listBox1.Name = "listBox1";
this.listBox1.Size = new System.Drawing.Size(260, 95); this.listBox1.Size = new System.Drawing.Size(260, 95);

View File

@ -100,6 +100,14 @@ namespace NovetusLauncher
proc.StartInfo.UseShellExecute = false; proc.StartInfo.UseShellExecute = false;
proc.Start(); proc.Start();
} }
else if (listBox1.SelectedIndex == 7)
{
Process proc = new Process();
proc.StartInfo.FileName = GlobalVars.ConfigDirData + "\\RSG_1_4.exe";
proc.StartInfo.CreateNoWindow = false;
proc.StartInfo.UseShellExecute = false;
proc.Start();
}
} }
} }
} }