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

fixed uri/cmd events not triggering

This commit is contained in:
Bitl 2020-07-11 14:06:57 -07:00
parent 874fa296ef
commit 1a3b59663f
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Novetus/NovetusCMD/NovetusCMD.cs
View File

@ -317,10 +317,10 @@ namespace NovetusCMD
}
#endregion
#region Client Loading (TODO MAKE THIS METHOD GLOBAL)
#region Client Loading
static void StartServer(bool no3d)
{
GlobalFuncs.LaunchRBXClient(ScriptType.Server, no3d, false, ServerExited);
GlobalFuncs.LaunchRBXClient(ScriptType.Server, no3d, false, new EventHandler(ServerExited));
}
static void ServerExited(object sender, EventArgs e)

20
Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs
View File

@ -36,9 +36,13 @@ public class ScriptFuncs
rbxexe = GlobalPaths.ClientDir + @"\\" + GlobalVars.UserConfiguration.SelectedClient + @"\\RobloxApp_client.exe";
}
string md5dir = SecurityFuncs.GenerateMD5(Assembly.GetExecutingAssembly().Location);
string md5script = SecurityFuncs.GenerateMD5(GlobalPaths.ClientDir + @"\\" + GlobalVars.UserConfiguration.SelectedClient + @"\\content\\scripts\\" + GlobalPaths.ScriptName + ".lua");
string md5exe = SecurityFuncs.GenerateMD5(rbxexe);
#if LAUNCHER
string md5dir = !GlobalVars.SelectedClientInfo.AlreadyHasSecurity ? SecurityFuncs.GenerateMD5(Assembly.GetExecutingAssembly().Location) : "";
#else
string md5dir = !GlobalVars.SelectedClientInfo.AlreadyHasSecurity ? SecurityFuncs.GenerateMD5(GlobalPaths.RootPathLauncher + "\\Novetus.exe") : "";
#endif
string md5script = !GlobalVars.SelectedClientInfo.AlreadyHasSecurity ? SecurityFuncs.GenerateMD5(GlobalPaths.ClientDir + @"\\" + GlobalVars.UserConfiguration.SelectedClient + @"\\content\\scripts\\" + GlobalPaths.ScriptName + ".lua") : "";
string md5exe = !GlobalVars.SelectedClientInfo.AlreadyHasSecurity ? SecurityFuncs.GenerateMD5(rbxexe) : "";
string md5s = "'" + md5exe + "','" + md5dir + "','" + md5script + "'";
switch (type)
@ -104,9 +108,9 @@ public class ScriptFuncs
File.WriteAllLines(GlobalPaths.ClientDir + @"\\" + GlobalVars.UserConfiguration.SelectedClient + @"\\content\\scripts\\" + GlobalPaths.ScriptGenName + ".lua", convertedList);
}
}
#endregion
#endregion
#region ClientScript Parser
#region ClientScript Parser
public class ClientScript
{
public static string GetArgsFromTag(string code, string tag, string endtag)
@ -257,7 +261,11 @@ public class ScriptFuncs
return "";
}
#if LAUNCHER
string md5dir = !GlobalVars.SelectedClientInfo.AlreadyHasSecurity ? SecurityFuncs.GenerateMD5(Assembly.GetExecutingAssembly().Location) : "";
#else
string md5dir = !GlobalVars.SelectedClientInfo.AlreadyHasSecurity ? SecurityFuncs.GenerateMD5(GlobalPaths.RootPathLauncher + "\\Novetus.exe") : "";
#endif
string md5script = !GlobalVars.SelectedClientInfo.AlreadyHasSecurity ? SecurityFuncs.GenerateMD5(GlobalPaths.ClientDir + @"\\" + GlobalVars.UserConfiguration.SelectedClient + @"\\content\\scripts\\" + GlobalPaths.ScriptName + ".lua") : "";
string md5exe = !GlobalVars.SelectedClientInfo.AlreadyHasSecurity ? SecurityFuncs.GenerateMD5(rbxexe) : "";
string md5s = "'" + md5exe + "','" + md5dir + "','" + md5script + "'";
@ -319,6 +327,6 @@ public class ScriptFuncs
return compiled;
}
}
#endregion
#endregion
}
#endregion

3
Novetus/NovetusURI/Forms/LoaderForm.cs
View File

@ -75,7 +75,8 @@ namespace NovetusURI
void StartGame()
{
GlobalFuncs.LaunchRBXClient(ScriptType.Client, false, true, ClientExited, label1);
GlobalFuncs.LaunchRBXClient(ScriptType.Client, false, true, new EventHandler(ClientExited), label1);
Visible = false;
}
void ClientExited(object sender, EventArgs e)