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

update test

This commit is contained in:
Bitl 2020-03-16 10:38:29 -07:00
parent cdbf821d77
commit ea806050c6
10 changed files with 57 additions and 2529 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NovetusLauncher/NovetusCMD/Program.cs
View File

@ -189,7 +189,8 @@ namespace NovetusCMD
public static void Main(string[] args)
{
string[] lines = File.ReadAllLines(GlobalVars.ConfigDir + "\\info.txt"); //File is in System.IO
GlobalVars.PublicIP = SecurityFuncs.GetExternalIPAddress();
string[] lines = File.ReadAllLines(GlobalVars.ConfigDir + "\\info.txt"); //File is in System.IO
string version = lines[0];
GlobalVars.DefaultClient = lines[1];
GlobalVars.DefaultMap = lines[2];
@ -417,7 +418,7 @@ namespace NovetusCMD
{
if (LocalVars.RequestToOutputInfo)
{
string IP = SecurityFuncs.GetExternalIPAddress();
string IP = GlobalVars.PublicIP;
string[] lines1 = {
SecurityFuncs.Base64Encode(IP),
SecurityFuncs.Base64Encode(GlobalVars.RobloxPort.ToString()),

3
NovetusLauncher/NovetusFuncs/GlobalVars.cs
View File

@ -130,7 +130,8 @@ public static class GlobalVars
public static AssetCacheDef ItemPantsTexture { get { return new AssetCacheDef("Pants", new string[] { "PantsTemplate" }, new string[] { ".png" }, new string[] { pantsdirTextures }, new string[] { pantsGameDirTextures }); } }
public static string IP = "localhost";
public static string Version = "";
public static string PublicIP = "";
public static string Version = "";
public static string SharedArgs = "";
public static readonly string ScriptName = "CSMPFunctions";
public static readonly string ScriptGenName = "CSMPBoot";

11
NovetusLauncher/NovetusLauncher/MainForm.cs
View File

@ -211,7 +211,7 @@ namespace NovetusLauncher
{
if (tabControl1.SelectedTab == tabControl1.TabPages["tabPage2"])//your specific tabname
{
string IP = SecurityFuncs.GetExternalIPAddress();
string IP = GlobalVars.PublicIP;
string[] lines1 = {
SecurityFuncs.Base64Encode(IP),
SecurityFuncs.Base64Encode(GlobalVars.RobloxPort.ToString()),
@ -355,7 +355,8 @@ namespace NovetusLauncher
void MainFormLoad(object sender, EventArgs e)
{
string[] lines = File.ReadAllLines(GlobalVars.ConfigDir + "\\info.txt"); //File is in System.IO
GlobalVars.PublicIP = SecurityFuncs.GetExternalIPAddress();
string[] lines = File.ReadAllLines(GlobalVars.ConfigDir + "\\info.txt"); //File is in System.IO
string version = lines[0];
GlobalVars.DefaultClient = lines[1];
GlobalVars.DefaultMap = lines[2];
@ -741,12 +742,6 @@ namespace NovetusLauncher
}
}
void Button20Click(object sender, EventArgs e)
{
ServerInfo infopanel = new ServerInfo();
infopanel.Show();
}
void richTextBox1_KeyDown(object sender, KeyEventArgs e)
{
//Command proxy

9
NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj
View File

@ -144,12 +144,6 @@
<Compile Include="URI\QuickConfigure.Designer.cs">
<DependentUpon>QuickConfigure.cs</DependentUpon>
</Compile>
<Compile Include="ServerInfo.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ServerInfo.Designer.cs">
<DependentUpon>ServerInfo.cs</DependentUpon>
</Compile>
<Compile Include="MainForm.cs">
<SubType>Form</SubType>
</Compile>
@ -197,9 +191,6 @@
<EmbeddedResource Include="URI\QuickConfigure.resx">
<DependentUpon>QuickConfigure.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ServerInfo.resx">
<DependentUpon>ServerInfo.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />

2
NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.Designer.cs generated
View File

@ -63,7 +63,7 @@
"ClientScript Documentation",
"Asset Localizer",
"Splash Tester",
"OBJ2MeshV1 GUI"});
"RBXMeshConverter GUI"});
this.listBox1.Location = new System.Drawing.Point(12, 70);
this.listBox1.Name = "listBox1";
this.listBox1.Size = new System.Drawing.Size(260, 95);

53
NovetusLauncher/NovetusLauncher/SDK/Obj2MeshV1GUI.Designer.cs generated
View File

@ -31,13 +31,16 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Obj2MeshV1GUI));
this.button1 = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
this.SuspendLayout();
//
// button1
//
this.button1.Location = new System.Drawing.Point(12, 12);
this.button1.Location = new System.Drawing.Point(12, 34);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(204, 23);
this.button1.Size = new System.Drawing.Size(239, 23);
this.button1.TabIndex = 0;
this.button1.Text = "Browse for mesh and convert...";
this.button1.UseVisualStyleBackColor = true;
@ -46,24 +49,58 @@
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(45, 38);
this.label1.Location = new System.Drawing.Point(47, 60);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(138, 13);
this.label1.Size = new System.Drawing.Size(167, 13);
this.label1.TabIndex = 1;
this.label1.Text = "OBJ2MeshV1 built by coke.";
this.label1.Text = "RBXMeshConverter built by coke.";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(64, 10);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(74, 13);
this.label2.TabIndex = 2;
this.label2.Text = "Mesh Version:";
//
// numericUpDown1
//
this.numericUpDown1.Location = new System.Drawing.Point(144, 8);
this.numericUpDown1.Maximum = new decimal(new int[] {
2,
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(56, 20);
this.numericUpDown1.TabIndex = 3;
this.numericUpDown1.Value = new decimal(new int[] {
1,
0,
0,
0});
//
// Obj2MeshV1GUI
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(228, 58);
this.ClientSize = new System.Drawing.Size(263, 82);
this.Controls.Add(this.numericUpDown1);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.button1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "Obj2MeshV1GUI";
this.Text = "OBJ2MeshV1 GUI";
this.Text = "RBXMeshConverter";
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@ -73,5 +110,7 @@
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.NumericUpDown numericUpDown1;
}
}

4
NovetusLauncher/NovetusLauncher/SDK/Obj2MeshV1GUI.cs
View File

@ -25,7 +25,7 @@ namespace NovetusLauncher
{
if (openFileDialog1.ShowDialog() == DialogResult.OK)
{
ProcessOBJ(GlobalVars.ConfigDir + "\\obj2meshv1.exe", openFileDialog1.FileName);
ProcessOBJ(GlobalVars.ConfigDir + "\\RBXMeshConverter.exe", openFileDialog1.FileName);
}
}
@ -33,7 +33,7 @@ namespace NovetusLauncher
{
Process proc = new Process();
proc.StartInfo.FileName = EXEName;
proc.StartInfo.Arguments = FileName;
proc.StartInfo.Arguments = "-f " + FileName + " -v " + numericUpDown1.Value;
proc.StartInfo.CreateNoWindow = true;
proc.StartInfo.UseShellExecute = false;
proc.EnableRaisingEvents = true;

77
NovetusLauncher/NovetusLauncher/ServerInfo.Designer.cs generated
View File

@ -1,77 +0,0 @@
/*
* Created by SharpDevelop.
* User: BITL
* Date: 5/14/2017
* Time: 9:14 AM
*
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
namespace NovetusLauncher
{
partial class ServerInfo
{
/// <summary>
/// Designer variable used to keep track of non-visual components.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Disposes resources used by the form.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing) {
if (components != null) {
components.Dispose();
}
}
base.Dispose(disposing);
}
/// <summary>
/// This method is required for Windows Forms designer support.
/// Do not change the method contents inside the source code editor. The Forms designer might
/// not be able to load this method if it was changed manually.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServerInfo));
this.textBox1 = new System.Windows.Forms.TextBox();
this.SuspendLayout();
//
// textBox1
//
this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.textBox1.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.textBox1.Location = new System.Drawing.Point(2, 3);
this.textBox1.Multiline = true;
this.textBox1.Name = "textBox1";
this.textBox1.ReadOnly = true;
this.textBox1.Size = new System.Drawing.Size(511, 266);
this.textBox1.TabIndex = 0;
//
// ServerInfo
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScroll = true;
this.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.ClientSize = new System.Drawing.Size(514, 272);
this.Controls.Add(this.textBox1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimumSize = new System.Drawing.Size(520, 300);
this.Name = "ServerInfo";
this.Text = "Server Info";
this.Load += new System.EventHandler(this.ServerInfoLoad);
this.ResumeLayout(false);
this.PerformLayout();
}
private System.Windows.Forms.TextBox textBox1;
}
}

76
NovetusLauncher/NovetusLauncher/ServerInfo.cs
View File

@ -1,76 +0,0 @@
/*
* Created by SharpDevelop.
* User: BITL
* Date: 5/14/2017
* Time: 9:14 AM
*
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System;
using System.Windows.Forms;
using System.Net;
namespace NovetusLauncher
{
/// <summary>
/// Description of ServerInfo.
/// </summary>
public partial class ServerInfo : Form
{
public ServerInfo()
{
//
// The InitializeComponent() call is required for Windows Forms designer support.
//
InitializeComponent();
//
// TODO: Add constructor code after the InitializeComponent() call.
//
}
void ServerInfoLoad(object sender, EventArgs e)
{
string IP = SecurityFuncs.GetExternalIPAddress();
string[] lines1 = {
SecurityFuncs.Base64Encode(IP),
SecurityFuncs.Base64Encode(GlobalVars.RobloxPort.ToString()),
SecurityFuncs.Base64Encode(GlobalVars.SelectedClient)
};
string URI = "novetus://" + SecurityFuncs.Base64Encode(string.Join("|", lines1));
string[] lines2 = {
SecurityFuncs.Base64Encode("localhost"),
SecurityFuncs.Base64Encode(GlobalVars.RobloxPort.ToString()),
SecurityFuncs.Base64Encode(GlobalVars.SelectedClient)
};
string URI2 = "novetus://" + SecurityFuncs.Base64Encode(string.Join("|", lines2));
string[] text = {
"Client: " + GlobalVars.SelectedClient,
"IP: " + IP,
"Port: " + GlobalVars.RobloxPort.ToString(),
"Map: " + GlobalVars.Map,
"Players: " + GlobalVars.PlayerLimit,
"Version: Novetus " + GlobalVars.Version,
"Online URI Link:",
URI,
"Local URI Link:",
URI2,
GlobalVars.IsWebServerOn == true ? "Web Server URL:" : "",
GlobalVars.IsWebServerOn == true ? "http://" + IP + ":" + GlobalVars.WebServer.Port.ToString() : "",
GlobalVars.IsWebServerOn == true ? "Local Web Server URL:" : "",
GlobalVars.IsWebServerOn == true ? GlobalVars.LocalWebServerURI : ""
};
foreach (string str in text)
{
if (!string.IsNullOrWhiteSpace(str))
{
textBox1.AppendText(str);
textBox1.AppendText(Environment.NewLine);
}
}
}
}
}

2346
NovetusLauncher/NovetusLauncher/ServerInfo.resx
View File

File diff suppressed because it is too large Load Diff