From 9e3fd050c1b2010aff517c30aeda4a3b6cb194e8 Mon Sep 17 00:00:00 2001 From: Bitl Date: Wed, 6 Jul 2022 11:23:44 -0700 Subject: [PATCH] better method --- Novetus/NovetusCMD/Classes/LocalFuncs.cs | 1 - Novetus/NovetusCMD/NovetusCMD.cs | 13 ---- .../StorageAndFunctions/GlobalFuncs.cs | 1 - .../StorageAndFunctions/GlobalPaths.cs | 4 -- .../StorageAndFunctions/ScriptFuncs.cs | 2 - .../Forms/SDK/ClientinfoCreator.Designer.cs | 60 ++++++++----------- changelog.txt | 3 +- documentation.txt | 1 - scripts/game/2006S-Shaders/CSMPFunctions.lua | 3 + scripts/game/2006S/CSMPFunctions.lua | 3 + scripts/game/2007E-Shaders/CSMPFunctions.lua | 3 + scripts/game/2007E/CSMPFunctions.lua | 3 + scripts/game/2007M-Shaders/CSMPFunctions.lua | 3 + scripts/game/2007M/CSMPFunctions.lua | 3 + scripts/game/2008M/CSMPFunctions.lua | 3 + scripts/game/2009E-HD/CSMPFunctions.lua | 3 + scripts/game/2009E/CSMPFunctions.lua | 3 + scripts/game/2010L/CSMPFunctions.lua | 3 + scripts/game/2011E/CSMPFunctions.lua | 3 + scripts/game/2011M/CSMPFunctions.lua | 3 + 20 files changed, 63 insertions(+), 58 deletions(-) diff --git a/Novetus/NovetusCMD/Classes/LocalFuncs.cs b/Novetus/NovetusCMD/Classes/LocalFuncs.cs index 52ec61c..e6fa483 100644 --- a/Novetus/NovetusCMD/Classes/LocalFuncs.cs +++ b/Novetus/NovetusCMD/Classes/LocalFuncs.cs @@ -22,7 +22,6 @@ namespace NovetusCMD GlobalFuncs.ConsolePrint("---------", 1, true, true); GlobalFuncs.ConsolePrint("-help | Displays the help.", 4, true, true); GlobalFuncs.ConsolePrint("-no3d | Launches server in NoGraphics mode", 4, true, true); - GlobalFuncs.ConsolePrint("-script | Loads an additional server script.", 4, true, true); GlobalFuncs.ConsolePrint("-outputinfo | Outputs all information about the running server to a text file.", 4, true, true); GlobalFuncs.ConsolePrint("-debug | Disables launching of the server for debugging purposes.", 4, true, true); GlobalFuncs.ConsolePrint("---------", 1, true, true); diff --git a/Novetus/NovetusCMD/NovetusCMD.cs b/Novetus/NovetusCMD/NovetusCMD.cs index 7530c32..0271959 100644 --- a/Novetus/NovetusCMD/NovetusCMD.cs +++ b/Novetus/NovetusCMD/NovetusCMD.cs @@ -260,19 +260,6 @@ namespace NovetusCMD { LocalVars.DebugMode = true; } - - if (CommandLine["script"] != null) - { - if (CommandLine["script"].Contains("rbxasset:") || CommandLine["script"].Contains("http:")) - { - GlobalPaths.AddonScriptPath = CommandLine["script"].Replace(@"\", @"\\"); - GlobalFuncs.ConsolePrint("NovetusCMD detected a custom script. Loading " + GlobalPaths.AddonScriptPath, 4); - } - else - { - GlobalFuncs.ConsolePrint("NovetusCMD cannot load '" + CommandLine["script"] + "' as it doesn't use a rbxasset path or URL.", 2); - } - } } } diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs index e950e03..b2fecff 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs @@ -2233,7 +2233,6 @@ public class GlobalFuncs + mapfile + "\" -script \" dofile('" + luafile + "'); " + ScriptFuncs.Generator.GetScriptFuncForType(ClientName, type) - + ((!string.IsNullOrWhiteSpace(GlobalPaths.AddonScriptPath) && type != ScriptType.Client) ? " dofile('" + GlobalPaths.AddonScriptPath + "');" : "") + quote + (no3d ? " -no3d" : ""); } diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs index 39314a5..c920c14 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs @@ -118,9 +118,5 @@ public class GlobalPaths public static readonly string PartColorXMLName = "PartColors.xml"; public static readonly string FileDeleteFilterName = "FileDeleteFilter.txt"; #endregion - - #region Empty Paths (automatically changed) - public static string AddonScriptPath = "rbxasset://scripts/addon.lua"; - #endregion } #endregion diff --git a/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs index 0424bb0..9b4427b 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs @@ -168,7 +168,6 @@ public class ScriptFuncs execScriptMethod + "('rbxasset://../../content/scripts/" + GlobalPaths.ScriptName + ".lua')" + (shouldUseLoadFile ? "()" : "") : execScriptMethod + "('rbxasset://scripts/" + GlobalPaths.ScriptName + ".lua')" + (shouldUseLoadFile ? "()" : "")), GetScriptFuncForType(type), - (!string.IsNullOrWhiteSpace(GlobalPaths.AddonScriptPath) && type != ScriptType.Client) ? "dofile('" + GlobalPaths.AddonScriptPath + "')" : "" }; if (GlobalVars.SelectedClientInfo.SeperateFolders) @@ -420,7 +419,6 @@ public class ScriptFuncs .Replace("%mapfilec%", extractedCode.Contains("%mapfilec%") ? GlobalFuncs.CopyMapToRBXAsset() : "") .Replace("%tripcode%", GlobalVars.PlayerTripcode) .Replace("%scripttype%", Generator.GetNameForType(type)) - .Replace("%addonscriptpath%", GlobalPaths.AddonScriptPath) .Replace("%notifications%", GlobalVars.UserConfiguration.ShowServerNotifications.ToString().ToLower()) .Replace("%loadout%", code.Contains("") ? GlobalVars.soloLoadout : GlobalVars.Loadout) .Replace("%doublequote%", "\"") diff --git a/Novetus/NovetusLauncher/Forms/SDK/ClientinfoCreator.Designer.cs b/Novetus/NovetusLauncher/Forms/SDK/ClientinfoCreator.Designer.cs index 873cb24..79afdee 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/ClientinfoCreator.Designer.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/ClientinfoCreator.Designer.cs @@ -72,7 +72,6 @@ partial class ClientinfoEditor this.mapfilecToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.luafileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.addonscriptpathToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.scripttypeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.versionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.doublequoteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -82,6 +81,8 @@ partial class ClientinfoEditor this.newguiToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.signgeneratedjoinscriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.usenewsignformatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.useloadfileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.userbxassetforgenerationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.serverToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.limitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.notificationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -164,8 +165,6 @@ partial class ClientinfoEditor this.checkBox8 = new System.Windows.Forms.CheckBox(); this.textBox2 = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); - this.useloadfileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.userbxassetforgenerationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -443,7 +442,6 @@ partial class ClientinfoEditor this.mapfilecToolStripMenuItem, this.luafileToolStripMenuItem, this.ipToolStripMenuItem, - this.addonscriptpathToolStripMenuItem, this.scripttypeToolStripMenuItem, this.versionToolStripMenuItem, this.doublequoteToolStripMenuItem, @@ -494,13 +492,6 @@ partial class ClientinfoEditor this.ipToolStripMenuItem.Text = "%ip%"; this.ipToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // - // addonscriptpathToolStripMenuItem - // - this.addonscriptpathToolStripMenuItem.Name = "addonscriptpathToolStripMenuItem"; - this.addonscriptpathToolStripMenuItem.Size = new System.Drawing.Size(227, 22); - this.addonscriptpathToolStripMenuItem.Text = "%addonscriptpath%"; - this.addonscriptpathToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); - // // scripttypeToolStripMenuItem // this.scripttypeToolStripMenuItem.Name = "scripttypeToolStripMenuItem"; @@ -564,6 +555,20 @@ partial class ClientinfoEditor this.usenewsignformatToolStripMenuItem.Text = "%usenewsignformat%"; this.usenewsignformatToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // + // useloadfileToolStripMenuItem + // + this.useloadfileToolStripMenuItem.Name = "useloadfileToolStripMenuItem"; + this.useloadfileToolStripMenuItem.Size = new System.Drawing.Size(227, 22); + this.useloadfileToolStripMenuItem.Text = "%useloadfile%"; + this.useloadfileToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); + // + // userbxassetforgenerationToolStripMenuItem + // + this.userbxassetforgenerationToolStripMenuItem.Name = "userbxassetforgenerationToolStripMenuItem"; + this.userbxassetforgenerationToolStripMenuItem.Size = new System.Drawing.Size(227, 22); + this.userbxassetforgenerationToolStripMenuItem.Text = "%userbxassetforgeneration%"; + this.userbxassetforgenerationToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); + // // serverToolStripMenuItem1 // this.serverToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -612,49 +617,49 @@ partial class ClientinfoEditor // md5launcherToolStripMenuItem // this.md5launcherToolStripMenuItem.Name = "md5launcherToolStripMenuItem"; - this.md5launcherToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.md5launcherToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.md5launcherToolStripMenuItem.Text = "%md5launcher%"; this.md5launcherToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // md5scriptToolStripMenuItem // this.md5scriptToolStripMenuItem.Name = "md5scriptToolStripMenuItem"; - this.md5scriptToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.md5scriptToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.md5scriptToolStripMenuItem.Text = "%md5script%"; this.md5scriptToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // md5exeToolStripMenuItem // this.md5exeToolStripMenuItem.Name = "md5exeToolStripMenuItem"; - this.md5exeToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.md5exeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.md5exeToolStripMenuItem.Text = "%md5exe%"; this.md5exeToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // md5scriptdToolStripMenuItem // this.md5scriptdToolStripMenuItem.Name = "md5scriptdToolStripMenuItem"; - this.md5scriptdToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.md5scriptdToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.md5scriptdToolStripMenuItem.Text = "%md5scriptd%"; this.md5scriptdToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // md5exedToolStripMenuItem // this.md5exedToolStripMenuItem.Name = "md5exedToolStripMenuItem"; - this.md5exedToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.md5exedToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.md5exedToolStripMenuItem.Text = "%md5exed%"; this.md5exedToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // md5sToolStripMenuItem // this.md5sToolStripMenuItem.Name = "md5sToolStripMenuItem"; - this.md5sToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.md5sToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.md5sToolStripMenuItem.Text = "%md5s%"; this.md5sToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // md5sdToolStripMenuItem // this.md5sdToolStripMenuItem.Name = "md5sdToolStripMenuItem"; - this.md5sdToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.md5sdToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.md5sdToolStripMenuItem.Text = "%md5sd%"; this.md5sdToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // @@ -1085,14 +1090,14 @@ partial class ClientinfoEditor // donothingToolStripMenuItem // this.donothingToolStripMenuItem.Name = "donothingToolStripMenuItem"; - this.donothingToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.donothingToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.donothingToolStripMenuItem.Text = "%donothing%"; this.donothingToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // // disabledToolStripMenuItem // this.disabledToolStripMenuItem.Name = "disabledToolStripMenuItem"; - this.disabledToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.disabledToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.disabledToolStripMenuItem.Text = "%disabled%"; this.disabledToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); // @@ -1263,20 +1268,6 @@ partial class ClientinfoEditor this.label3.TabIndex = 37; this.label3.Text = "EXE Name:"; // - // useloadfileToolStripMenuItem - // - this.useloadfileToolStripMenuItem.Name = "useloadfileToolStripMenuItem"; - this.useloadfileToolStripMenuItem.Size = new System.Drawing.Size(227, 22); - this.useloadfileToolStripMenuItem.Text = "%useloadfile%"; - this.useloadfileToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); - // - // userbxassetforgenerationToolStripMenuItem - // - this.userbxassetforgenerationToolStripMenuItem.Name = "userbxassetforgenerationToolStripMenuItem"; - this.userbxassetforgenerationToolStripMenuItem.Size = new System.Drawing.Size(227, 22); - this.userbxassetforgenerationToolStripMenuItem.Text = "%userbxassetforgeneration%"; - this.userbxassetforgenerationToolStripMenuItem.Click += new System.EventHandler(this.variableToolStripMenuItem_Click); - // // ClientinfoEditor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1351,7 +1342,6 @@ partial class ClientinfoEditor private System.Windows.Forms.ToolStripMenuItem mapfiledToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem luafileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem ipToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem addonscriptpathToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem serverToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem limitToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem securityToolStripMenuItem; diff --git a/changelog.txt b/changelog.txt index cbb1d8c..88b0a82 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,8 +1,9 @@ 1.3 Snapshot v22.8222.19775.1 Enhancements: -- Every client now has support for custom addon scripts (like NovetusCMD)! +- Every client now has support for custom addon scripts! - Install it to clients/[Client Name]/scripts/addon.lua. - Client side scripts are unsupported due to security issues. Scripts will only execute serverside, or in Play Solo and/or Studio modes. + - The old -script command line argument in NovetusCMD and the ClientScript variable %addonscriptpath% have both been removed to support this. ---------------------------------------------------------------------------- 1.3 Snapshot v22.8220.23140.1 Enhancements: diff --git a/documentation.txt b/documentation.txt index 4f9ccf7..062edc9 100644 --- a/documentation.txt +++ b/documentation.txt @@ -18,7 +18,6 @@ General: %args% - Default arguments provided by Novetus for launching clients. Use only this without any tags (except for ) if you want default Novetus arguments. %argstring% - Gets the default script arguments for a tag. %ip% - Current IP address. -%addonscriptpath% - The path to an additional server script used by NovetusCMD. %scripttype% - Returns the type of script we are using as a string. %version% - Returns Novetus' version. %doublequote% - Returns a double-quote character. Use in place of a normal double quote ("). diff --git a/scripts/game/2006S-Shaders/CSMPFunctions.lua b/scripts/game/2006S-Shaders/CSMPFunctions.lua index 12ba65f..da0cfc4 100644 --- a/scripts/game/2006S-Shaders/CSMPFunctions.lua +++ b/scripts/game/2006S-Shaders/CSMPFunctions.lua @@ -228,6 +228,7 @@ end print("ROBLOX Client version '0.3.368.0' loaded.") function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications) + dofile("rbxasset://scripts//Addon.lua") Server = game:service("NetworkServer") RunService = game:service("RunService") PlayerService = game:service("Players") @@ -392,6 +393,7 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He end function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID) + dofile("rbxasset://scripts//Addon.lua") game:service("RunService"):run() local plr = game.Players:createLocalPlayer(UserID) game.Workspace:insertContent("rbxasset://Fonts//libraries.rbxm") @@ -420,6 +422,7 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID, end function CSStudio() + dofile("rbxasset://scripts//Addon.lua") end _G.CSServer=CSServer diff --git a/scripts/game/2006S/CSMPFunctions.lua b/scripts/game/2006S/CSMPFunctions.lua index 12e1496..98fa580 100644 --- a/scripts/game/2006S/CSMPFunctions.lua +++ b/scripts/game/2006S/CSMPFunctions.lua @@ -228,6 +228,7 @@ end print("ROBLOX Client version '0.3.368.0' loaded.") function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications) + dofile("rbxasset://scripts//Addon.lua") Server = game:service("NetworkServer") RunService = game:service("RunService") PlayerService = game:service("Players") @@ -392,6 +393,7 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He end function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID) + dofile("rbxasset://scripts//Addon.lua") game:service("RunService"):run() local plr = game.Players:createLocalPlayer(UserID) game.Workspace:insertContent("rbxasset://Fonts//libraries.rbxm") @@ -420,6 +422,7 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID, end function CSStudio() + dofile("rbxasset://scripts//Addon.lua") end _G.CSServer=CSServer diff --git a/scripts/game/2007E-Shaders/CSMPFunctions.lua b/scripts/game/2007E-Shaders/CSMPFunctions.lua index 4be6ca7..5e1e40a 100644 --- a/scripts/game/2007E-Shaders/CSMPFunctions.lua +++ b/scripts/game/2007E-Shaders/CSMPFunctions.lua @@ -290,6 +290,7 @@ end print("ROBLOX Client version '0.3.368.0' loaded.") function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications) + dofile("rbxasset://scripts//Addon.lua") Server = game:service("NetworkServer") RunService = game:service("RunService") PlayerService = game:service("Players") @@ -450,6 +451,7 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He end function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID) + dofile("rbxasset://scripts//Addon.lua") game:service("RunService"):run() local plr = game.Players:createLocalPlayer(UserID) game.Workspace:insertContent("rbxasset://Fonts//libraries.rbxm") @@ -478,6 +480,7 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID, end function CSStudio() + dofile("rbxasset://scripts//Addon.lua") end _G.CSServer=CSServer diff --git a/scripts/game/2007E/CSMPFunctions.lua b/scripts/game/2007E/CSMPFunctions.lua index 4be6ca7..5e1e40a 100644 --- a/scripts/game/2007E/CSMPFunctions.lua +++ b/scripts/game/2007E/CSMPFunctions.lua @@ -290,6 +290,7 @@ end print("ROBLOX Client version '0.3.368.0' loaded.") function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications) + dofile("rbxasset://scripts//Addon.lua") Server = game:service("NetworkServer") RunService = game:service("RunService") PlayerService = game:service("Players") @@ -450,6 +451,7 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He end function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID) + dofile("rbxasset://scripts//Addon.lua") game:service("RunService"):run() local plr = game.Players:createLocalPlayer(UserID) game.Workspace:insertContent("rbxasset://Fonts//libraries.rbxm") @@ -478,6 +480,7 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID, end function CSStudio() + dofile("rbxasset://scripts//Addon.lua") end _G.CSServer=CSServer diff --git a/scripts/game/2007M-Shaders/CSMPFunctions.lua b/scripts/game/2007M-Shaders/CSMPFunctions.lua index 9a9bc15..3ed1006 100644 --- a/scripts/game/2007M-Shaders/CSMPFunctions.lua +++ b/scripts/game/2007M-Shaders/CSMPFunctions.lua @@ -350,6 +350,7 @@ end print("ROBLOX Client version '0.3.512.0' loaded.") function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications) + dofile("rbxasset://scripts//Addon.lua") Server = game:GetService("NetworkServer") RunService = game:GetService("RunService") PlayerService = game:GetService("Players") @@ -509,6 +510,7 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He end function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID) + dofile("rbxasset://scripts//Addon.lua") game:GetService("RunService"):run() local plr = game.Players:CreateLocalPlayer(UserID) game.Workspace:InsertContent("rbxasset://Fonts//libraries.rbxm") @@ -536,6 +538,7 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID, end function CSStudio() + dofile("rbxasset://scripts//Addon.lua") end _G.CSServer=CSServer diff --git a/scripts/game/2007M/CSMPFunctions.lua b/scripts/game/2007M/CSMPFunctions.lua index 4cfb384..fab357f 100644 --- a/scripts/game/2007M/CSMPFunctions.lua +++ b/scripts/game/2007M/CSMPFunctions.lua @@ -350,6 +350,7 @@ end print("ROBLOX Client version '0.3.512.0' loaded.") function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications) + dofile("rbxasset://scripts//Addon.lua") Server = game:GetService("NetworkServer") RunService = game:GetService("RunService") PlayerService = game:GetService("Players") @@ -509,6 +510,7 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He end function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID) + dofile("rbxasset://scripts//Addon.lua") game:GetService("RunService"):run() local plr = game.Players:CreateLocalPlayer(UserID) game.Workspace:InsertContent("rbxasset://Fonts//libraries.rbxm") @@ -536,6 +538,7 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID, end function CSStudio() + dofile("rbxasset://scripts//Addon.lua") end _G.CSServer=CSServer diff --git a/scripts/game/2008M/CSMPFunctions.lua b/scripts/game/2008M/CSMPFunctions.lua index d9073da..2a7ce66 100644 --- a/scripts/game/2008M/CSMPFunctions.lua +++ b/scripts/game/2008M/CSMPFunctions.lua @@ -468,6 +468,7 @@ rbxversion = version() print("ROBLOX Client version '" .. rbxversion .. "' loaded.") function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications) + dofile("rbxasset://scripts//Addon.lua") Server = game:GetService("NetworkServer") RunService = game:GetService("RunService") Server:start(Port, 20) @@ -627,6 +628,7 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He end function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID) + dofile("rbxasset://scripts//Addon.lua") game:GetService("RunService"):run() local plr = game.Players:CreateLocalPlayer(UserID) game.Workspace:InsertContent("rbxasset://Fonts//libraries.rbxm") @@ -655,6 +657,7 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID, end function CSStudio() + dofile("rbxasset://scripts//Addon.lua") end _G.CSServer=CSServer diff --git a/scripts/game/2009E-HD/CSMPFunctions.lua b/scripts/game/2009E-HD/CSMPFunctions.lua index d31ba8b..f1a6b1d 100644 --- a/scripts/game/2009E-HD/CSMPFunctions.lua +++ b/scripts/game/2009E-HD/CSMPFunctions.lua @@ -549,6 +549,7 @@ rbxversion = version() print("ROBLOX Client version '" .. rbxversion .. "' loaded.") function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications) + dofile("rbxasset://scripts//Addon.lua") Server = game:GetService("NetworkServer") RunService = game:GetService("RunService") Server:start(Port, 20) @@ -721,6 +722,7 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He end function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID) + dofile("rbxasset://scripts//Addon.lua") game:GetService("RunService"):run() local plr = game.Players:CreateLocalPlayer(UserID) game.Workspace:InsertContent("rbxasset://Fonts//libraries.rbxm") @@ -749,6 +751,7 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID, end function CSStudio() + dofile("rbxasset://scripts//Addon.lua") end _G.CSServer=CSServer diff --git a/scripts/game/2009E/CSMPFunctions.lua b/scripts/game/2009E/CSMPFunctions.lua index d31ba8b..f1a6b1d 100644 --- a/scripts/game/2009E/CSMPFunctions.lua +++ b/scripts/game/2009E/CSMPFunctions.lua @@ -549,6 +549,7 @@ rbxversion = version() print("ROBLOX Client version '" .. rbxversion .. "' loaded.") function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications) + dofile("rbxasset://scripts//Addon.lua") Server = game:GetService("NetworkServer") RunService = game:GetService("RunService") Server:start(Port, 20) @@ -721,6 +722,7 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He end function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID) + dofile("rbxasset://scripts//Addon.lua") game:GetService("RunService"):run() local plr = game.Players:CreateLocalPlayer(UserID) game.Workspace:InsertContent("rbxasset://Fonts//libraries.rbxm") @@ -749,6 +751,7 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID, end function CSStudio() + dofile("rbxasset://scripts//Addon.lua") end _G.CSServer=CSServer diff --git a/scripts/game/2010L/CSMPFunctions.lua b/scripts/game/2010L/CSMPFunctions.lua index 3406c21..5b1ec0e 100644 --- a/scripts/game/2010L/CSMPFunctions.lua +++ b/scripts/game/2010L/CSMPFunctions.lua @@ -554,6 +554,7 @@ rbxversion = version() print("ROBLOX Client version '" .. rbxversion .. "' loaded.") function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications) + dofile("rbxasset://scripts//Addon.lua") assert((type(Port)~="number" or tonumber(Port)~=nil or Port==nil),"CSRun Error: Port must be nil or a number.") local NetworkServer=game:GetService("NetworkServer") local RunService = game:GetService("RunService") @@ -743,6 +744,7 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He end function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID) + dofile("rbxasset://scripts//Addon.lua") game:GetService("RunService"):Run() local plr = game.Players:CreateLocalPlayer(UserID) plr.Name = PlayerName @@ -774,6 +776,7 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID, end function CSStudio() + dofile("rbxasset://scripts//Addon.lua") end _G.CSServer=CSServer diff --git a/scripts/game/2011E/CSMPFunctions.lua b/scripts/game/2011E/CSMPFunctions.lua index 0d21523..4c3f91a 100644 --- a/scripts/game/2011E/CSMPFunctions.lua +++ b/scripts/game/2011E/CSMPFunctions.lua @@ -578,6 +578,7 @@ rbxversion = version() print("ROBLOX Client version '" .. rbxversion .. "' loaded.") function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ValidatedScripts) + dofile("rbxasset://scripts//Addon.lua") assert((type(Port)~="number" or tonumber(Port)~=nil or Port==nil),"CSRun Error: Port must be nil or a number.") local NetworkServer=game:GetService("NetworkServer") local RunService = game:GetService("RunService") @@ -776,6 +777,7 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He end function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID) + dofile("rbxasset://scripts//Addon.lua") game:GetService("RunService"):Run() local plr = game.Players:CreateLocalPlayer(UserID) plr.Name = PlayerName @@ -814,6 +816,7 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID, end function CSStudio() + dofile("rbxasset://scripts//Addon.lua") end _G.CSServer=CSServer diff --git a/scripts/game/2011M/CSMPFunctions.lua b/scripts/game/2011M/CSMPFunctions.lua index 62ead73..aff6ac1 100644 --- a/scripts/game/2011M/CSMPFunctions.lua +++ b/scripts/game/2011M/CSMPFunctions.lua @@ -576,6 +576,7 @@ rbxversion = version() print("ROBLOX Client version '" .. rbxversion .. "' loaded.") function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ValidatedScripts,NewGUI) + dofile("rbxasset://scripts//Addon.lua") pcall(function() id = -1 if NewGUI == true then @@ -780,6 +781,7 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He end function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID,NewGUI) + dofile("rbxasset://scripts//Addon.lua") pcall(function() id = -1 if NewGUI == true then @@ -827,6 +829,7 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID, end function CSStudio(NewGUI) + dofile("rbxasset://scripts//Addon.lua") pcall(function() id = -1 if NewGUI == true then