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

ip and port are now 1 val, other changes

This commit is contained in:
Bitl 2022-09-19 12:46:19 -07:00
parent 5bf54df1e0
commit 4ee80608aa
22 changed files with 222 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs
View File

@ -107,6 +107,8 @@ public class GlobalPaths
public static readonly string FileDeleteFilterName = "FileDeleteFilter.txt";
public static readonly string InitialFileListIgnoreFilterName = "InitialFileListIgnoreFilter.txt";
public static readonly string ServerInfoFileName = "serverinfo.txt";
public static readonly string ConsoleHelpFileName = "consolehelp.txt";
public static readonly string ClientScriptDocumentationFileName = "documentation.txt";
#endregion
}
#endregion

18
Novetus/NovetusCore/StorageAndFunctions/GlobalVars.cs
View File

@ -39,6 +39,24 @@ public class GameServer
return ServerIP + ":" + ServerPort.ToString();
}
public void SetValues(string input)
{
try
{
string[] vals = input.Split(':');
string ip = vals[0];
int port = Convert.ToInt32(vals[1]);
ServerIP = ip;
ServerPort = port;
}
catch (Exception)
{
ServerIP = input;
ServerPort = GlobalVars.DefaultRobloxPort;
}
}
public string ServerIP { get; set; }
public int ServerPort { get; set; }
}

5
Novetus/NovetusCore/StorageAndFunctions/NovetusFuncs.cs
View File

@ -189,10 +189,11 @@ public class NovetusFuncs
SecurityFuncs.Base64Encode(GlobalVars.UserConfiguration.SelectedClient)
};
string URI2 = "novetus://" + SecurityFuncs.Base64Encode(string.Join("|", lines2), true);
GameServer server = new GameServer((!string.IsNullOrWhiteSpace(GlobalVars.UserConfiguration.AlternateServerIP) ? GlobalVars.UserConfiguration.AlternateServerIP : GlobalVars.ExternalIP),
GlobalVars.UserConfiguration.RobloxPort);
string[] text = {
"Address: " + server.ToString(),
"Client: " + GlobalVars.UserConfiguration.SelectedClient,
"IP: " + (!string.IsNullOrWhiteSpace(GlobalVars.UserConfiguration.AlternateServerIP) ? GlobalVars.UserConfiguration.AlternateServerIP : GlobalVars.ExternalIP),
"Port: " + GlobalVars.UserConfiguration.RobloxPort.ToString(),
"Map: " + GlobalVars.UserConfiguration.Map,
"Players: " + GlobalVars.UserConfiguration.PlayerLimit,
"Version: Novetus " + GlobalVars.ProgramInformation.Version,

17
Novetus/NovetusCore/StorageAndFunctions/Util.cs
View File

@ -766,6 +766,23 @@ public static class Util
Console.Write(text);
}
}
public static void ReadTextFileWithColor(string path)
{
var lines = File.ReadLines(path);
foreach (var line in lines)
{
try
{
string[] vals = line.Split('|');
ConsolePrint(vals[0], Convert.ToInt32(vals[1]), true, true);
}
catch (Exception)
{
ConsolePrint(line, 1, true, true);
}
}
}
#endregion
#if !BASICLAUNCHER

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

@ -47,10 +47,6 @@ namespace NovetusLauncher
this.tabPage1 = new System.Windows.Forms.TabPage();
this.button36 = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.button7 = new System.Windows.Forms.Button();
this.label31 = new System.Windows.Forms.Label();
this.button11 = new System.Windows.Forms.Button();
this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
this.button19 = new System.Windows.Forms.Button();
this.button10 = new System.Windows.Forms.Button();
this.label4 = new System.Windows.Forms.Label();
@ -162,7 +158,6 @@ namespace NovetusLauncher
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
this.tabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit();
@ -184,12 +179,14 @@ namespace NovetusLauncher
this.tabControl1.Controls.Add(this.tabPage8);
this.tabControl1.Controls.Add(this.tabPage5);
this.tabControl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tabControl1.ItemSize = new System.Drawing.Size(58, 18);
this.tabControl1.Location = new System.Drawing.Point(2, 79);
this.tabControl1.Multiline = true;
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.ShowToolTips = true;
this.tabControl1.Size = new System.Drawing.Size(413, 284);
this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.tabControl1.TabIndex = 1;
this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
//
@ -197,10 +194,6 @@ namespace NovetusLauncher
//
this.tabPage1.Controls.Add(this.button36);
this.tabPage1.Controls.Add(this.label1);
this.tabPage1.Controls.Add(this.button7);
this.tabPage1.Controls.Add(this.label31);
this.tabPage1.Controls.Add(this.button11);
this.tabPage1.Controls.Add(this.numericUpDown1);
this.tabPage1.Controls.Add(this.button19);
this.tabPage1.Controls.Add(this.button10);
this.tabPage1.Controls.Add(this.label4);
@ -219,11 +212,11 @@ namespace NovetusLauncher
//
// button36
//
this.button36.Location = new System.Drawing.Point(235, 32);
this.button36.Location = new System.Drawing.Point(235, 47);
this.button36.Name = "button36";
this.button36.Size = new System.Drawing.Size(164, 34);
this.button36.Size = new System.Drawing.Size(164, 19);
this.button36.TabIndex = 51;
this.button36.Text = "JOIN SERVER FROM SERVER BROWSER";
this.button36.Text = "BROWSE SERVERS";
this.button36.UseVisualStyleBackColor = true;
this.button36.Click += new System.EventHandler(this.button36_Click);
//
@ -235,63 +228,9 @@ namespace NovetusLauncher
this.label1.Size = new System.Drawing.Size(393, 2);
this.label1.TabIndex = 49;
//
// button7
//
this.button7.Location = new System.Drawing.Point(175, 47);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(54, 19);
this.button7.TabIndex = 48;
this.button7.Text = "RESET";
this.button7.UseVisualStyleBackColor = true;
this.button7.Click += new System.EventHandler(this.Button7Click);
//
// label31
//
this.label31.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.label31.Location = new System.Drawing.Point(109, 5);
this.label31.Name = "label31";
this.label31.Size = new System.Drawing.Size(120, 13);
this.label31.TabIndex = 47;
this.label31.Text = "Server Port";
this.label31.TextAlign = System.Drawing.ContentAlignment.TopCenter;
//
// button11
//
this.button11.Location = new System.Drawing.Point(109, 47);
this.button11.Name = "button11";
this.button11.Size = new System.Drawing.Size(60, 19);
this.button11.TabIndex = 46;
this.button11.Text = "SAVE";
this.button11.UseVisualStyleBackColor = true;
this.button11.Click += new System.EventHandler(this.Button11Click);
//
// numericUpDown1
//
this.numericUpDown1.Location = new System.Drawing.Point(109, 21);
this.numericUpDown1.Maximum = new decimal(new int[] {
65535,
0,
0,
0});
this.numericUpDown1.Minimum = new decimal(new int[] {
1,
0,
0,
0});
this.numericUpDown1.Name = "numericUpDown1";
this.numericUpDown1.Size = new System.Drawing.Size(120, 20);
this.numericUpDown1.TabIndex = 18;
this.numericUpDown1.Value = new decimal(new int[] {
53640,
0,
0,
0});
this.numericUpDown1.ValueChanged += new System.EventHandler(this.NumericUpDown1ValueChanged);
//
// button19
//
this.button19.Location = new System.Drawing.Point(109, 72);
this.button19.Location = new System.Drawing.Point(106, 72);
this.button19.Name = "button19";
this.button19.Size = new System.Drawing.Size(192, 29);
this.button19.TabIndex = 16;
@ -301,9 +240,9 @@ namespace NovetusLauncher
//
// button10
//
this.button10.Location = new System.Drawing.Point(7, 47);
this.button10.Location = new System.Drawing.Point(235, 21);
this.button10.Name = "button10";
this.button10.Size = new System.Drawing.Size(96, 19);
this.button10.Size = new System.Drawing.Size(164, 20);
this.button10.TabIndex = 15;
this.button10.Text = "SAVE SERVER";
this.button10.UseVisualStyleBackColor = true;
@ -322,9 +261,9 @@ namespace NovetusLauncher
//
// button1
//
this.button1.Location = new System.Drawing.Point(235, 6);
this.button1.Location = new System.Drawing.Point(6, 47);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(164, 23);
this.button1.Size = new System.Drawing.Size(223, 19);
this.button1.TabIndex = 3;
this.button1.Text = "JOIN SERVER FROM IP";
this.button1.UseVisualStyleBackColor = true;
@ -334,20 +273,20 @@ namespace NovetusLauncher
//
this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.label3.Location = new System.Drawing.Point(4, 5);
this.label3.Location = new System.Drawing.Point(67, 5);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(99, 13);
this.label3.TabIndex = 1;
this.label3.Text = "Server IP Address";
this.label3.Text = "Server Address";
this.label3.TextAlign = System.Drawing.ContentAlignment.TopCenter;
//
// textBox1
//
this.textBox1.Location = new System.Drawing.Point(6, 21);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(97, 20);
this.textBox1.Size = new System.Drawing.Size(223, 20);
this.textBox1.TabIndex = 0;
this.textBox1.Text = "localhost";
this.textBox1.Text = "localhost:53640";
this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.textBox1.TextChanged += new System.EventHandler(this.TextBox1TextChanged);
this.textBox1.Enter += new System.EventHandler(this.textBox1_GotFocus);
@ -1420,7 +1359,6 @@ namespace NovetusLauncher
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
this.tabPage2.ResumeLayout(false);
this.tabPage2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit();
@ -1479,7 +1417,6 @@ namespace NovetusLauncher
launcherForm.SelectedMapLabel = label28;
launcherForm.PlayerLimitBox = numericUpDown3;
launcherForm.HostPortBox = numericUpDown2;
launcherForm.JoinPortBox = numericUpDown1;
launcherForm.ClientWarningLabel = label30;
launcherForm.ClientDescriptionBox = textBox6;
launcherForm.IPBox = textBox1;
@ -1496,11 +1433,9 @@ namespace NovetusLauncher
private System.Windows.Forms.Label label7;
private System.Windows.Forms.TabPage tabPage5;
private System.Windows.Forms.Button button22;
private System.Windows.Forms.Button button7;
private System.Windows.Forms.PictureBox pictureBox2;
private System.Windows.Forms.NumericUpDown numericUpDown3;
private System.Windows.Forms.NumericUpDown numericUpDown2;
private System.Windows.Forms.NumericUpDown numericUpDown1;
private System.Windows.Forms.Button button21;
private System.Windows.Forms.Label label29;
private System.Windows.Forms.RichTextBox richTextBox2;
@ -1517,7 +1452,6 @@ namespace NovetusLauncher
private System.Windows.Forms.Label label37;
private System.Windows.Forms.Label label39;
private System.Windows.Forms.Label label38;
private System.Windows.Forms.Button button11;
private System.Windows.Forms.Button button10;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.Label label21;
@ -1588,7 +1522,6 @@ namespace NovetusLauncher
private System.Windows.Forms.CheckBox checkBox6;
private System.Windows.Forms.Panel panel5;
private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.Label label31;
private System.Windows.Forms.ComboBox comboBox2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.ComboBox comboBox3;

21
Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.cs
View File

@ -73,16 +73,7 @@ namespace NovetusLauncher
void TextBox1TextChanged(object sender, EventArgs e)
{
if (textBox1.Text.Contains("`"))
{
textBox1.Text = launcherForm.OldIP;
return;
}
GlobalVars.CurrentServer.ServerIP = textBox1.Text;
checkBox3.Enabled = false;
GlobalVars.LocalPlayMode = false;
label37.Text = GlobalVars.CurrentServer.ServerIP;
launcherForm.ChangeServerAddress();
}
void CheckBox1CheckedChanged(object sender, EventArgs e)
@ -180,11 +171,6 @@ namespace NovetusLauncher
launcherForm.AddIPPortListing(listBox4, GlobalPaths.ConfigDir + "\\ports.txt", GlobalVars.CurrentServer.ServerPort);
}
void NumericUpDown1ValueChanged(object sender, EventArgs e)
{
launcherForm.ChangeJoinPort();
}
void NumericUpDown2ValueChanged(object sender, EventArgs e)
{
launcherForm.ChangeServerPort();
@ -195,11 +181,6 @@ namespace NovetusLauncher
GlobalVars.UserConfiguration.PlayerLimit = Convert.ToInt32(numericUpDown3.Value);
}
void Button7Click(object sender, EventArgs e)
{
launcherForm.ResetCurPort(numericUpDown1, GlobalVars.CurrentServer.ServerPort);
}
void Button22Click(object sender, EventArgs e)
{
launcherForm.ResetCurPort(numericUpDown2, GlobalVars.UserConfiguration.RobloxPort);

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

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

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

@ -71,12 +71,8 @@ namespace NovetusLauncher
this.tabControl1 = new TabControlWithoutHeader();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.button37 = new System.Windows.Forms.Button();
this.label24 = new System.Windows.Forms.Label();
this.label23 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.button7 = new System.Windows.Forms.Button();
this.button11 = new System.Windows.Forms.Button();
this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
this.button19 = new System.Windows.Forms.Button();
this.button10 = new System.Windows.Forms.Button();
this.label4 = new System.Windows.Forms.Label();
@ -154,7 +150,6 @@ namespace NovetusLauncher
this.panel2.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
this.tabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit();
@ -448,12 +443,8 @@ namespace NovetusLauncher
// tabPage1
//
this.tabPage1.Controls.Add(this.button37);
this.tabPage1.Controls.Add(this.label24);
this.tabPage1.Controls.Add(this.label23);
this.tabPage1.Controls.Add(this.label1);
this.tabPage1.Controls.Add(this.button7);
this.tabPage1.Controls.Add(this.button11);
this.tabPage1.Controls.Add(this.numericUpDown1);
this.tabPage1.Controls.Add(this.button19);
this.tabPage1.Controls.Add(this.button10);
this.tabPage1.Controls.Add(this.label4);
@ -471,31 +462,22 @@ namespace NovetusLauncher
//
// button37
//
this.button37.Location = new System.Drawing.Point(311, 49);
this.button37.Location = new System.Drawing.Point(311, 50);
this.button37.Name = "button37";
this.button37.Size = new System.Drawing.Size(293, 21);
this.button37.Size = new System.Drawing.Size(293, 20);
this.button37.TabIndex = 53;
this.button37.Text = "JOIN SERVER FROM SERVER BROWSER";
this.button37.Text = "BROWSE SERVERS";
this.button37.UseVisualStyleBackColor = true;
this.button37.Click += new System.EventHandler(this.button37_Click);
//
// label24
//
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(224, 7);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(60, 13);
this.label24.TabIndex = 52;
this.label24.Text = "Server Port";
//
// label23
//
this.label23.AutoSize = true;
this.label23.Location = new System.Drawing.Point(59, 7);
this.label23.Location = new System.Drawing.Point(118, 7);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(92, 13);
this.label23.Size = new System.Drawing.Size(79, 13);
this.label23.TabIndex = 51;
this.label23.Text = "Server IP Address";
this.label23.Text = "Server Address";
//
// label1
//
@ -505,49 +487,6 @@ namespace NovetusLauncher
this.label1.Size = new System.Drawing.Size(612, 2);
this.label1.TabIndex = 49;
//
// button7
//
this.button7.Location = new System.Drawing.Point(254, 49);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(51, 21);
this.button7.TabIndex = 48;
this.button7.Text = "RESET";
this.button7.UseVisualStyleBackColor = true;
this.button7.Click += new System.EventHandler(this.Button7Click);
//
// button11
//
this.button11.Location = new System.Drawing.Point(203, 49);
this.button11.Name = "button11";
this.button11.Size = new System.Drawing.Size(45, 21);
this.button11.TabIndex = 46;
this.button11.Text = "SAVE";
this.button11.UseVisualStyleBackColor = true;
this.button11.Click += new System.EventHandler(this.Button11Click);
//
// numericUpDown1
//
this.numericUpDown1.Location = new System.Drawing.Point(203, 23);
this.numericUpDown1.Maximum = new decimal(new int[] {
65535,
0,
0,
0});
this.numericUpDown1.Minimum = new decimal(new int[] {
1,
0,
0,
0});
this.numericUpDown1.Name = "numericUpDown1";
this.numericUpDown1.Size = new System.Drawing.Size(102, 20);
this.numericUpDown1.TabIndex = 18;
this.numericUpDown1.Value = new decimal(new int[] {
53640,
0,
0,
0});
this.numericUpDown1.ValueChanged += new System.EventHandler(this.NumericUpDown1ValueChanged);
//
// button19
//
this.button19.Location = new System.Drawing.Point(163, 76);
@ -560,9 +499,9 @@ namespace NovetusLauncher
//
// button10
//
this.button10.Location = new System.Drawing.Point(8, 49);
this.button10.Location = new System.Drawing.Point(311, 23);
this.button10.Name = "button10";
this.button10.Size = new System.Drawing.Size(189, 21);
this.button10.Size = new System.Drawing.Size(293, 21);
this.button10.TabIndex = 15;
this.button10.Text = "SAVE SERVER";
this.button10.UseVisualStyleBackColor = true;
@ -581,9 +520,9 @@ namespace NovetusLauncher
//
// button1
//
this.button1.Location = new System.Drawing.Point(311, 23);
this.button1.Location = new System.Drawing.Point(8, 50);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(293, 20);
this.button1.Size = new System.Drawing.Size(297, 20);
this.button1.TabIndex = 3;
this.button1.Text = "JOIN SERVER FROM IP";
this.button1.UseVisualStyleBackColor = true;
@ -593,9 +532,9 @@ namespace NovetusLauncher
//
this.textBox1.Location = new System.Drawing.Point(8, 23);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(189, 20);
this.textBox1.Size = new System.Drawing.Size(297, 20);
this.textBox1.TabIndex = 0;
this.textBox1.Text = "localhost";
this.textBox1.Text = "localhost:53640";
this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.textBox1.TextChanged += new System.EventHandler(this.TextBox1TextChanged);
this.textBox1.Enter += new System.EventHandler(this.textBox1_GotFocus);
@ -1380,7 +1319,6 @@ namespace NovetusLauncher
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
this.tabPage2.ResumeLayout(false);
this.tabPage2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit();
@ -1442,7 +1380,6 @@ namespace NovetusLauncher
launcherForm.SelectedMapLabel = label28;
launcherForm.PlayerLimitBox = numericUpDown3;
launcherForm.HostPortBox = numericUpDown2;
launcherForm.JoinPortBox = numericUpDown1;
launcherForm.ClientWarningLabel = label30;
launcherForm.ClientDescriptionBox = textBox6;
launcherForm.IPBox = textBox1;
@ -1458,11 +1395,9 @@ namespace NovetusLauncher
private System.Windows.Forms.Label label7;
private System.Windows.Forms.TabPage tabPage5;
private System.Windows.Forms.Button button22;
private System.Windows.Forms.Button button7;
private System.Windows.Forms.PictureBox pictureBox2;
private System.Windows.Forms.NumericUpDown numericUpDown3;
private System.Windows.Forms.NumericUpDown numericUpDown2;
private System.Windows.Forms.NumericUpDown numericUpDown1;
private System.Windows.Forms.Label label29;
private System.Windows.Forms.RichTextBox richTextBox2;
private System.Windows.Forms.TabPage tabPage8;
@ -1478,7 +1413,6 @@ namespace NovetusLauncher
private System.Windows.Forms.Label label37;
private System.Windows.Forms.Label label39;
private System.Windows.Forms.Label label38;
private System.Windows.Forms.Button button11;
private System.Windows.Forms.Button button10;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.Label label21;
@ -1540,7 +1474,6 @@ namespace NovetusLauncher
private System.Windows.Forms.Panel panel3;
private System.Windows.Forms.Panel panel4;
private System.Windows.Forms.RichTextBox richTextBox3;
private System.Windows.Forms.Label label24;
private System.Windows.Forms.Label label23;
private System.Windows.Forms.Panel panel5;
private System.Windows.Forms.Label label5;

21
Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs
View File

@ -78,16 +78,7 @@ namespace NovetusLauncher
void TextBox1TextChanged(object sender, EventArgs e)
{
if (textBox1.Text.Contains("`"))
{
textBox1.Text = launcherForm.OldIP;
return;
}
GlobalVars.CurrentServer.ServerIP = textBox1.Text;
checkBox3.Enabled = false;
GlobalVars.LocalPlayMode = false;
label37.Text = GlobalVars.CurrentServer.ServerIP;
launcherForm.ChangeServerAddress();
}
void CheckBox1CheckedChanged(object sender, EventArgs e)
@ -184,11 +175,6 @@ namespace NovetusLauncher
{
launcherForm.AddIPPortListing(listBox4, GlobalPaths.ConfigDir + "\\ports.txt", GlobalVars.CurrentServer.ServerPort);
}
void NumericUpDown1ValueChanged(object sender, EventArgs e)
{
launcherForm.ChangeJoinPort();
}
void NumericUpDown2ValueChanged(object sender, EventArgs e)
{
@ -200,11 +186,6 @@ namespace NovetusLauncher
GlobalVars.UserConfiguration.PlayerLimit = Convert.ToInt32(numericUpDown3.Value);
}
void Button7Click(object sender, EventArgs e)
{
launcherForm.ResetCurPort(numericUpDown1, GlobalVars.CurrentServer.ServerPort);
}
void Button22Click(object sender, EventArgs e)
{
launcherForm.ResetCurPort(numericUpDown2, GlobalVars.UserConfiguration.RobloxPort);

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

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

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

@ -58,7 +58,7 @@ namespace NovetusLauncher
public ComboBox StyleSelectorBox = null;
public CheckBox CloseOnLaunchCheckbox, DiscordPresenceCheckbox, uPnPCheckBox, ShowServerNotifsCheckBox, LocalPlayCheckBox = null;
public Button RegeneratePlayerIDButton = null;
public NumericUpDown PlayerLimitBox, HostPortBox, JoinPortBox = null;
public NumericUpDown PlayerLimitBox, HostPortBox = null;
public string TabPageHost, TabPageMaps, TabPageClients, TabPageSaved, OldIP = "";
private ToolTip contextToolTip;
#endregion
@ -571,7 +571,7 @@ namespace NovetusLauncher
SelectedMapLabel.Text = GlobalVars.UserConfiguration.Map;
Tree.SelectedNode = TreeNodeHelper.SearchTreeView(GlobalVars.UserConfiguration.Map, Tree.Nodes);
Tree.Focus();
JoinPortBox.Value = Convert.ToDecimal(GlobalVars.CurrentServer.ServerPort);
IPBox.Text = GlobalVars.CurrentServer.ToString();
HostPortBox.Value = Convert.ToDecimal(GlobalVars.UserConfiguration.RobloxPort);
IPLabel.Text = GlobalVars.CurrentServer.ServerIP;
PortLabel.Text = GlobalVars.CurrentServer.ServerPort.ToString();
@ -906,16 +906,16 @@ namespace NovetusLauncher
public void SelectIPListing()
{
GlobalVars.CurrentServer.ServerIP = ServerBox.SelectedItem.ToString();
IPBox.Text = GlobalVars.CurrentServer.ServerIP;
LocalPlayCheckBox.Enabled = false;
GlobalVars.LocalPlayMode = false;
IPLabel.Text = GlobalVars.CurrentServer.ServerIP;
IPBox.Text = GlobalVars.CurrentServer.ToString();
}
public void SelectPortListing()
{
GlobalVars.CurrentServer.ServerPort = Convert.ToInt32(PortBox.SelectedItem.ToString());
JoinPortBox.Value = Convert.ToDecimal(GlobalVars.CurrentServer.ServerPort);
IPBox.Text = GlobalVars.CurrentServer.ToString();
}
public void ResetCurPort(NumericUpDown box, int value)
@ -924,10 +924,25 @@ namespace NovetusLauncher
value = GlobalVars.DefaultRobloxPort;
}
public void ChangeJoinPort()
public void ChangeServerAddress()
{
GlobalVars.CurrentServer.ServerPort = Convert.ToInt32(JoinPortBox.Value);
GlobalVars.CurrentServer.SetValues(IPBox.Text);
PortLabel.Text = GlobalVars.CurrentServer.ServerPort.ToString();
IPLabel.Text = GlobalVars.CurrentServer.ServerIP;
switch (GlobalVars.SelectedClientInfo.UsesID)
{
case true:
if (GlobalVars.CurrentServer.ServerIP.Equals("localhost"))
{
LocalPlayCheckBox.Enabled = true;
}
break;
case false:
LocalPlayCheckBox.Enabled = false;
GlobalVars.LocalPlayMode = false;
break;
}
}
public void ChangeServerPort()

1
Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylish.cs
View File

@ -115,7 +115,6 @@ namespace NovetusLauncher
launcherFormStylishInterface1.mapsBox.SelectedNode.BackColor = SystemColors.Highlight;
launcherFormStylishInterface1.mapsBox.SelectedNode.ForeColor = SystemColors.HighlightText;
}
launcherFormStylishInterface1.joinPortBox.Text = GlobalVars.CurrentServer.ServerPort.ToString();
launcherFormStylishInterface1.serverPortBox.Text = GlobalVars.UserConfiguration.RobloxPort.ToString();
launcherFormStylishInterface1.discordRichPresenceBox.IsChecked = GlobalVars.UserConfiguration.DiscordPresence;
launcherFormStylishInterface1.uPnPBox.IsChecked = GlobalVars.UserConfiguration.UPnP;

17
Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml
View File

@ -761,20 +761,18 @@
<Rectangle x:Name="userInfoGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="83" Margin="0,47,0,0" Stroke="Black" VerticalAlignment="Top" Width="169" Grid.ColumnSpan="2"/>
<Button x:Name="regenerateIDButton" Content="Regenerate ID" HorizontalAlignment="Left" Margin="19,106,0,0" VerticalAlignment="Top" Width="136" Height="20" Click="regenerateIDButton_Click" Grid.ColumnSpan="2"/>
<TextBox x:Name="userNameBox" HorizontalAlignment="Left" Height="20" Margin="60,53,0,0" Text="Player" VerticalAlignment="Top" Width="95" Grid.ColumnSpan="2" TextChanged="userNameBox_TextChanged"/>
<Rectangle x:Name="joinServerGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="120" Margin="0,135,0,0" Stroke="Black" VerticalAlignment="Top" Width="169" Grid.ColumnSpan="2"/>
<Rectangle x:Name="joinServerGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="82" Margin="0,135,0,0" Stroke="Black" VerticalAlignment="Top" Width="169" Grid.ColumnSpan="2"/>
<Rectangle x:Name="joinServerLabelBox" Fill="#FFAAA8A8" HorizontalAlignment="Left" Height="30" Margin="0,135,0,0" Stroke="Black" VerticalAlignment="Top" Width="169" Grid.ColumnSpan="2"/>
<Label x:Name="userName" Content="Name:" HorizontalAlignment="Left" Margin="10,47,0,0" VerticalAlignment="Top" FontSize="12" Height="29" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<TextBox x:Name="userIDBox" HorizontalAlignment="Left" Height="20" Margin="60,81,0,0" Text="1" VerticalAlignment="Top" Width="95" Grid.ColumnSpan="2" TextChanged="userIDBox_TextChanged"/>
<Label x:Name="userID" Content="ID:" HorizontalAlignment="Left" Margin="20,75,0,0" VerticalAlignment="Top" FontSize="12" Height="29" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Label x:Name="joinServerLabel" Content="Join Server" HorizontalAlignment="Left" Margin="35,134,0,0" VerticalAlignment="Top" FontSize="15" Width="102" Grid.ColumnSpan="2"/>
<TextBox x:Name="ipAddressBox" HorizontalAlignment="Left" Height="20" Margin="7,185,0,0" Text="localhost" VerticalAlignment="Top" Width="156" Grid.ColumnSpan="2" TextChanged="ipAddressBox_TextChanged"/>
<Label x:Name="ipAddressLabel" Content="Server IP Address:" HorizontalAlignment="Left" Margin="20,163,0,0" VerticalAlignment="Top" FontSize="12" Height="29" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Grid.ColumnSpan="2" Width="135"/>
<TextBox x:Name="joinPortBox" HorizontalAlignment="Left" Height="20" Margin="7,220,0,0" Text="53640" VerticalAlignment="Top" Width="156" Grid.ColumnSpan="2" TextChanged="joinPortBox_TextChanged"/>
<Label x:Name="joinPortLabel" Content="Join Port" HorizontalAlignment="Left" Margin="20,199,0,0" VerticalAlignment="Top" FontSize="12" Height="27" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Width="134" Grid.ColumnSpan="2"/>
<Button x:Name="joinButton" Style="{DynamicResource JoinButton}" Content="" HorizontalAlignment="Left" Margin="100,222,0,0" VerticalAlignment="Top" Width="91" Height="33" Grid.Column="1" RenderTransformOrigin="0.227,0.54" Click="joinButton_Click" Grid.ColumnSpan="2"/>
<TextBox x:Name="ipAddressBox" HorizontalAlignment="Left" Height="20" Margin="7,185,0,0" Text="localhost:53640" VerticalAlignment="Top" Width="156" Grid.ColumnSpan="2" TextChanged="ipAddressBox_TextChanged"/>
<Label x:Name="ipAddressLabel" Content="Server Address:" HorizontalAlignment="Left" Margin="20,163,0,0" VerticalAlignment="Top" FontSize="12" Height="29" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Grid.ColumnSpan="2" Width="135"/>
<Button x:Name="joinButton" Style="{DynamicResource JoinButton}" Content="" HorizontalAlignment="Left" Margin="40,222,0,0" VerticalAlignment="Top" Width="92" Height="33" RenderTransformOrigin="0.227,0.54" Click="joinButton_Click" Grid.ColumnSpan="2"/>
<Button x:Name="serverBrowserButton" Style="{DynamicResource ImportantButton}" Content="Browse Servers" HorizontalAlignment="Left" Margin="253,224,0,0" VerticalAlignment="Top" Width="171" Height="30" Grid.Column="2" RenderTransformOrigin="0.645,-0.075" Click="serverBrowserButton_Click"/>
<Button x:Name="playSoloButton" Style="{DynamicResource SoloButton}" Content="" HorizontalAlignment="Left" Margin="61,223,0,0" VerticalAlignment="Top" Width="92" Height="32" Grid.Column="2" RenderTransformOrigin="1.3,0.863" Click="playSoloButton_Click"/>
<Button x:Name="StudioButton" Style="{DynamicResource StudioButton}" Content="" HorizontalAlignment="Left" Margin="158,224,0,0" VerticalAlignment="Top" Width="90" Height="32" Grid.Column="2" RenderTransformOrigin="1.3,0.863" Click="StudioButton_Click"/>
<Button x:Name="playSoloButton" Style="{DynamicResource SoloButton}" Content="" HorizontalAlignment="Left" Margin="97,223,0,0" VerticalAlignment="Top" Width="92" Height="32" Grid.Column="1" RenderTransformOrigin="1.3,0.863" Click="playSoloButton_Click" Grid.ColumnSpan="2"/>
<Button x:Name="StudioButton" Style="{DynamicResource StudioButton}" Content="" HorizontalAlignment="Left" Margin="59,223,0,0" VerticalAlignment="Top" Width="92" Height="32" Grid.Column="2" RenderTransformOrigin="1.3,0.863" Click="StudioButton_Click"/>
<Rectangle x:Name="mapsGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="207" Margin="73,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="509" Grid.Column="1" Grid.ColumnSpan="2"/>
<Rectangle x:Name="mapsLabelBox" Fill="#FFAAA8A8" HorizontalAlignment="Left" Height="30" Margin="73,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="509" Grid.Column="1" Grid.ColumnSpan="2"/>
@ -788,6 +786,7 @@
<Button x:Name="refreshButton" Style="{DynamicResource RefreshButton}" Content="" Grid.Column="2" HorizontalAlignment="Left" Margin="334,44,0,0" VerticalAlignment="Top" Width="26" Height="17" Click="refreshButton_Click"/>
<Button x:Name="addMapButton" Content="Add Place" Grid.Column="2" HorizontalAlignment="Left" Margin="365,45,0,0" VerticalAlignment="Top" Width="72" Click="addMapButton_Click"/>
<Button x:Name="customizeButton" Style="{DynamicResource ImportantButton}" Content="Customize Player" HorizontalAlignment="Left" Margin="0,10,0,0" VerticalAlignment="Top" Width="169" Click="customizeButton_Click" Height="32" Grid.ColumnSpan="2"/>
<Button x:Name="ServerButton" Style="{DynamicResource HostButton}" Content="" HorizontalAlignment="Left" Margin="156,223,0,0" VerticalAlignment="Top" Width="92" Height="32" RenderTransformOrigin="1.3,0.863" Click="ServerOptionsButton_Click" Grid.Column="2"/>
</Grid>
</TabItem>
<TabItem x:Name="serverTab" Style="{DynamicResource TabItemStyleSeperatorsInbetween}" Header="HOST" BorderBrush="{x:Null}" Foreground="White">
@ -798,7 +797,7 @@
<Rectangle x:Name="hostGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="203" Margin="0,11,0,0" Stroke="Black" VerticalAlignment="Top" Width="169"/>
<Rectangle x:Name="hostLabelBox" Fill="#FFAAA8A8" HorizontalAlignment="Left" Height="30" Margin="0,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="169"/>
<Label x:Name="hostLabel" Content="Host Settings" HorizontalAlignment="Left" Margin="28,9,0,0" VerticalAlignment="Top" FontSize="15" Width="113" RenderTransformOrigin="0.561,0.175"/>
<Button x:Name="ServerOptionsButton" Style="{DynamicResource ImportantButton}" Content="Start Server" HorizontalAlignment="Left" Margin="0,219,0,0" VerticalAlignment="Top" Width="169" Height="36" RenderTransformOrigin="1.3,0.863" Click="ServerButton_Click"/>
<Button x:Name="ServerStartButton" Style="{DynamicResource ImportantButton}" Content="Start Server" HorizontalAlignment="Left" Margin="0,219,0,0" VerticalAlignment="Top" Width="169" Height="36" RenderTransformOrigin="1.3,0.863" Click="ServerButton_Click"/>
<Label x:Name="serverPortLabel" Content="Host Port:" HorizontalAlignment="Left" Margin="3,40,0,0" VerticalAlignment="Top" Width="68"/>
<TextBox x:Name="serverPortBox" HorizontalAlignment="Left" Height="20" Margin="84,45,0,0" Text="53640" VerticalAlignment="Top" Width="76" TextChanged="serverPortBox_TextChanged"/>
<Label x:Name="maxPlayersLabel" Content="Max Players:" HorizontalAlignment="Left" Margin="1,63,0,0" VerticalAlignment="Top" Width="86"/>

16
Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml.cs
View File

@ -245,6 +245,13 @@ namespace NovetusLauncher
launcherForm.StartGame(ScriptType.Server);
}
private void ServerOptionsButton_Click(object sender, RoutedEventArgs e)
{
//https://stackoverflow.com/questions/7929646/how-to-programmatically-select-a-tabitem-in-wpf-tabcontrol
// 1 is host tab.
Dispatcher.BeginInvoke((Action)(() => tabControl.SelectedIndex = 1));
}
private void regenerateIDButton_Click(object sender, RoutedEventArgs e)
{
NovetusFuncs.GeneratePlayerID();
@ -325,14 +332,7 @@ namespace NovetusLauncher
{
if (!IsLoaded)
return;
GlobalVars.CurrentServer.ServerIP = ipAddressBox.Text;
}
private void joinPortBox_TextChanged(object sender, TextChangedEventArgs e)
{
if (!IsLoaded)
return;
GlobalVars.CurrentServer.ServerPort = Convert.ToInt32(joinPortBox.Text);
GlobalVars.CurrentServer.SetValues(ipAddressBox.Text);
}
private void serverPortBox_TextChanged(object sender, TextChangedEventArgs e)

105
Novetus/NovetusLauncher/Forms/NovetusConsole.cs
View File

@ -90,16 +90,7 @@ namespace NovetusLauncher
Util.ConsolePrint(error, 2);
}
if (ConsoleArgs["map"] != null)
{
GlobalVars.UserConfiguration.Map = ConsoleArgs["map"];
GlobalVars.UserConfiguration.MapPath = ConsoleArgs["map"];
Util.ConsolePrint("Novetus will now launch the client with the map " + GlobalVars.UserConfiguration.MapPath, 4);
}
else
{
Util.ConsolePrint("Novetus will launch the sclient with the map defined in the INI file.", 4);
}
if (ConsoleArgs["client"] != null)
{
@ -114,7 +105,10 @@ namespace NovetusLauncher
{
case ScriptType.Client:
{
if (ConsoleArgs["join"] != null)
{
GlobalVars.CurrentServer.SetValues(ConsoleArgs["join"]);
}
}
break;
case ScriptType.Server:
@ -175,6 +169,8 @@ namespace NovetusLauncher
{
GlobalVars.UserConfiguration.ServerBrowserServerAddress = ConsoleArgs["serverbrowseraddress"];
}
MapArg(ConsoleArgs);
}
break;
case ScriptType.Studio:
@ -184,8 +180,18 @@ namespace NovetusLauncher
nomap = true;
Util.ConsolePrint("Novetus will now launch Studio with no map.", 4);
}
else
{
MapArg(ConsoleArgs);
}
}
break;
case ScriptType.Solo:
{
MapArg(ConsoleArgs);
}
break;
case ScriptType.EasterEgg:
default:
break;
}
@ -195,6 +201,20 @@ namespace NovetusLauncher
}
}
public void MapArg (CommandLineArguments.Arguments ConsoleArgs)
{
if (ConsoleArgs["map"] != null)
{
GlobalVars.UserConfiguration.Map = ConsoleArgs["map"];
GlobalVars.UserConfiguration.MapPath = ConsoleArgs["map"];
Util.ConsolePrint("Novetus will now launch the client with the map " + GlobalVars.UserConfiguration.MapPath, 4);
}
else
{
Util.ConsolePrint("Novetus will launch the sclient with the map defined in the INI file.", 4);
}
}
public void ConsoleProcessCommands(string cmd)
{
if (disableCommands)
@ -284,6 +304,9 @@ namespace NovetusLauncher
case string help when string.Compare(help, "help", true, CultureInfo.InvariantCulture) == 0:
ConsoleHelp();
break;
case string documentation when string.Compare(documentation, "documentation", true, CultureInfo.InvariantCulture) == 0:
ClientScriptDoc();
break;
case string sdk when string.Compare(sdk, "sdk", true, CultureInfo.InvariantCulture) == 0:
ConsoleForm.LoadLauncher();
break;
@ -342,60 +365,20 @@ namespace NovetusLauncher
public void ConsoleHelp()
{
ClearConsole();
Util.ConsolePrint("Help:", 3, true);
Util.ConsolePrint("---------", 1, true);
Util.ConsolePrint("Commands:", 3, true);
Util.ConsolePrint("---------", 1, true);
Util.ConsolePrint("+ client | Launches client with launcher settings", 4, true);
Util.ConsolePrint("+ solo | Launches client in Play Solo mode with launcher settings", 4, true);
Util.ConsolePrint("+ server 3d | Launches server with launcher settings", 4, true);
Util.ConsolePrint("+ server no3d | Launches server in NoGraphics mode with launcher settings", 4, true);
Util.ConsolePrint("+ studio map | Launches Roblox Studio with the selected map", 4, true);
Util.ConsolePrint("+ studio nomap | Launches Roblox Studio without the selected map", 4, true);
Util.ConsolePrint("+ sdk | Launches the Novetus SDK Launcher", 4, true);
Util.ConsolePrint("+ dlldelete | Toggle the deletion of opengl32.dll when ReShade is off.", 4, true);
Util.ConsolePrint("+ altserverip <IP> | Sets the alternate server IP for server info. Replace <IP> with your specified IP or specify 'none' to remove the current alternate server IP", 4, true);
Util.ConsolePrint("+ clear | Clears all text in this window.", 4, true);
Util.ConsolePrint("+ help | Clears all text and shows this list.", 4, true);
Util.ConsolePrint("+ config save | Saves the config file", 4, true);
Util.ConsolePrint("+ config load | Reloads the config file", 4, true);
Util.ConsolePrint("+ config reset | Resets the config file", 4, true);
Util.ConsolePrint("---------", 1, true);
Util.ConsolePrint("Command-Line Parameters:", 3, true);
Util.ConsolePrint("---------", 1, true);
Util.ConsolePrint("GLOBAL - Affects launcher session.", 5, true);
Util.ConsolePrint("---------", 1, true);
Util.ConsolePrint("- sdk | Launches the Novetus SDK Launcher", 4, true);
Util.ConsolePrint("- cmdonly | Launches the Novetus Console only.", 4, true);
Util.ConsolePrint("- nofilelist | Disables file list generation", 4, true);
Util.ConsolePrint("- nocmd | Don't launch the Novetus Console", 4, true);
Util.ConsolePrint("---------", 1, true);
Util.ConsolePrint("CONSOLE - Affects console only.", 5, true);
Util.ConsolePrint("---------", 1, true);
Util.ConsolePrint("- help | Clears all text and shows this list.", 4, true);
Util.ConsolePrint("- cmdmode | Puts the console into NovetusCMD mode.", 4, true);
Util.ConsolePrint("---------", 1, true);
Util.ConsolePrint("CMDMODE - Affects console in NovetusCMD mode.", 5, true);
Util.ConsolePrint("---------", 1, true);
Util.ConsolePrint("- load <Client, Server, Solo, Studio, EasterEgg> | The type of client script to load. ", 4, true);
Util.ConsolePrint("- headless | Hides the console window upon launch.", 4, true);
Util.ConsolePrint("---------", 1, true);
Util.ConsolePrint("LOAD - Parameters for loading clients in NovetusCMD mode.", 5, true);
Util.ConsolePrint("---------", 1, true);
Util.ConsolePrint("- map <Map Path in Quotation Marks> | Specifies the path to a map.", 4, true);
Util.ConsolePrint("- client <Client Name in Quotation Marks> | Specifies the client for Novetus to load.", 4, true);
Util.ConsolePrint("- no3d | Server Only. Puts the server into No Graphics mode.", 4, true);
Util.ConsolePrint("- hostport <Port> | Server Only. Specifies the port the server should host on.", 4, true);
Util.ConsolePrint("- upnp <True/False> | Server Only. Toggles UPnP (Universal Plug and Play).", 4, true);
Util.ConsolePrint("- notifications <True/False> | Server Only. Toggle player join/leave notifications.", 4, true);
Util.ConsolePrint("- maxplayers <Player Count> | Server Only. Specifies the server's player count.", 4, true);
Util.ConsolePrint("- serverbrowsername <Name in Quotation Marks> | Server Only. Specifies the name the server should use on the Server Browser.", 4, true);
Util.ConsolePrint("- serverbrowseraddress <Address in Quotation Marks> | Server Only. Specifies the Master Server the server should use.", 4, true);
Util.ConsolePrint("- nomap | Studio Only. Loads Studio without a map.", 4, true);
Util.ConsolePrint("Help:", 3, true, true);
Util.ReadTextFileWithColor(GlobalPaths.BasePath + "\\" + GlobalPaths.ConsoleHelpFileName);
Util.ConsolePrint(GlobalVars.Important2, 0, true, true);
ScrollToTop();
}
public void ClientScriptDoc()
{
ClearConsole();
Util.ConsolePrint("ClientScript Documentation:", 3, true, true);
Util.ReadTextFileWithColor(GlobalPaths.BasePath + "\\" + GlobalPaths.ClientScriptDocumentationFileName);
ScrollToTop();
}
private void ProcessConsole(object sender, KeyEventArgs e)
{
if (helpMode)

2
Novetus/NovetusLauncher/NovetusLauncherEntryPoint.cs
View File

@ -150,7 +150,7 @@ namespace NovetusLauncher
formsOpen = true;
}
Thread.Sleep(100);
Thread.Sleep(1);
}
System.Windows.Forms.Application.Exit();

16
changelog.txt
View File

@ -1,3 +1,17 @@
1.3 Snapshot v22.8297.22678.1
Enhancements:
- Added most NovetusCMD server command line parameters to the Novetus Console.
- The NovetusCMD is now considered deprecated and unsupported.
- 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 -join <IP:Port. Port is optional.> | Client Only. Specifies the server for the Client to connect to.
Fixes:
- Fixed a bug where required config files didn't get created when loading Novetus without the console.
- Fixed the launcher and console feeling slow and sluggish.
----------------------------------------------------------------------------
1.3 Snapshot v22.8296.19696.1
Fixes:
- Fixed an issue where Discord, UPnP and other features wouldn't work without the console.
@ -14,7 +28,7 @@ Fixes:
1.3 Snapshot v22.8296.15106.1
Enhancements:
- Novetus Console now doesn't load with the Novetus launcher by default via the bootstrapper/legacy launcher.
- Added -nocmd to launching the launcher without the Novetus Console.
- Added -nocmd to launch the launcher without the Novetus Console.
Fixes:
- Fixed an issue where you couldn't respawn in 2009L Play Solo.

51
consolehelp.txt Normal file
View File

@ -0,0 +1,51 @@
---------|1
Commands:|3
---------|1
+ client - Launches client with launcher settings|4
+ solo - Launches client in Play Solo mode with launcher settings|4
+ server 3d - Launches server with launcher settings|4
+ server no3d - Launches server in NoGraphics mode with launcher settings|4
+ studio map - Launches Roblox Studio with the selected map|4
+ studio nomap - Launches Roblox Studio without the selected map|4
+ sdk - Launches the Novetus SDK Launcher|4
+ dlldelete - Toggle the deletion of opengl32.dll when ReShade is off.|4
+ altserverip <IP> - Sets the alternate server IP for server info. Replace <IP> with your specified IP or specify 'none' to remove the current alternate server IP|4
+ clear - Clears all text in this window.|4
+ help - Clears all text and shows this list.|4
+ documentation - Clears all text and shows the ClientScript documentation.|4
+ config save - Saves the config file|4
+ config load - Reloads the config file|4
+ config reset - Resets the config file|4
---------|1
Command-Line Parameters:|3
---------|1
GLOBAL - Affects launcher session.|5
---------|1
- sdk - Launches the Novetus SDK Launcher|4
- cmdonly - Launches the Novetus Console only.|4
- nofilelist - Disables file list generation|4
- nocmd - Don't launch the Novetus Console|4
---------|1
CONSOLE - Affects console only.|5
---------|1
- help - Clears all text and shows this list.|4
- cmdmode - Puts the console into NovetusCMD mode.|4
---------|1
CMDMODE - Affects console in NovetusCMD mode.|5
---------|1
- load <Client, Server, Solo, Studio, EasterEgg> - The type of client script to load. |4
- headless - Hides the console window upon launch.|4
---------|1
LOAD - Parameters for loading clients in NovetusCMD mode.|5
---------|1
- client <Client Name in Quotation Marks> - Specifies the client for Novetus to load.|4
- map <Map Path in Quotation Marks> - Server, Solo, and Studio Only. Specifies the path to a map.|4
- join <IP:Port. Port is optional.> - Client Only. Specifies the server for the Client to connect to.|4
- no3d - Server Only. Puts the server into No Graphics mode.|4
- hostport <Port> - Server Only. Specifies the port the server should host on.|4
- upnp <True/False> - Server Only. Toggles UPnP (Universal Plug and Play).|4
- notifications <True/False> - Server Only. Toggle player join/leave notifications.|4
- maxplayers <Player Count> - Server Only. Specifies the server's player count.|4
- serverbrowsername <Name in Quotation Marks> - Server Only. Specifies the name the server should use on the Server Browser.|4
- serverbrowseraddress <Address in Quotation Marks> - Server Only. Specifies the Master Server the server should use.|4
- nomap - Studio Only. Loads Studio without a map. -map will not function with this option enabled.|4

1
documentation.txt
View File

@ -30,6 +30,7 @@ General:
%useloadfile% - Uses the "loadfile" function instead of "dofile" for generated join scripts if "Generate scripts and fix map loading for 2007/2012+" is enabled or %generatescript% is added.
%userbxassetforgeneration% - When "Generate scripts and fix map loading for 2007/2012+" is enabled or %generatescript% is added, use "rbxasset" as the main path we should get the file from.
%generatescript% - Allows non-2007 clients to generate scripts. Equivalent to the script generator used with the "Generate scripts and fix map loading for 2007/2012+" option.
%server% - Returns the full server string with IP:port.
Server:
%limit% - Max Player limit.

1
scripts/batch/clean_junk.bat
View File

@ -103,6 +103,7 @@ del /s /q Novetus\clients\ClientScriptTester\content\temp.rbxl
del /s /q Novetus\config\servers.txt
del /s /q Novetus\config\ports.txt
del /s /q Novetus\config\saved.txt
del /s /q Novetus\config\ReShade.ini
del /s /q Novetus\config\config.ini
del /s /q Novetus\config\config_customization.ini

1
scripts/batch/github_sync.bat
View File

@ -150,6 +150,7 @@ XCOPY "%cd%\Novetus\Novetus_dependency_installer.bat" "%scriptsdir%\batch" /y
XCOPY "%cd%\litefiles\Novetus_dependency_installer.bat" "%scriptsdir%\batch\Novetus_dependency_installer_lite.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
XCOPY /c "%cd%\Novetus\.itch.toml" "%dest%" /y
XCOPY "%cd%\Novetus\masterserver\list.php" "%dest%" /y
XCOPY "%cd%\Novetus\masterserver\delist.php" "%dest%" /y

2
scripts/launcher/info.ini
View File

@ -10,4 +10,4 @@ ExtendedVersionEditChangelog=True
ExtendedVersionTemplate=%version% Snapshot v22.%build%.%revision%.%extended-revision%
ExtendedVersionRevision=1
IsLite=False
InitialBootup=True
InitialBootup=False