diff --git a/Novetus/NovetusFuncs/GlobalPaths.cs b/Novetus/NovetusFuncs/GlobalPaths.cs deleted file mode 100644 index 3494e43..0000000 --- a/Novetus/NovetusFuncs/GlobalPaths.cs +++ /dev/null @@ -1,54 +0,0 @@ -#region Usings -using System.IO; -using System.Reflection; -#endregion - -#region Global Paths - -public class GlobalPaths -{ - public static readonly string RootPathLauncher = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - public static readonly string BasePathLauncher = RootPathLauncher.Replace(@"\", @"\\"); - public static readonly string RootPath = Directory.GetParent(RootPathLauncher).ToString(); - public static readonly string BasePath = RootPath.Replace(@"\", @"\\"); - public static readonly string DataPath = BasePath + @"\\shareddata"; - public static readonly string ServerDir = DataPath + "\\server"; - public static readonly string ConfigDir = BasePath + @"\\config"; - public static readonly string ConfigDirData = BasePathLauncher + @"\\data"; - public static readonly string ClientDir = BasePath + @"\\clients"; - public static readonly string MapsDir = BasePath + @"\\maps"; - public static readonly string MapsDirBase = "maps"; - public static readonly string BaseGameDir = "rbxasset://../../../"; - public static readonly string SharedDataGameDir = BaseGameDir + "shareddata/"; - - //customization - public static readonly string CustomPlayerDir = DataPath + "\\charcustom"; - public static readonly string hatdir = CustomPlayerDir + "\\hats"; - public static readonly string facedir = CustomPlayerDir + "\\faces"; - public static readonly string headdir = CustomPlayerDir + "\\heads"; - public static readonly string tshirtdir = CustomPlayerDir + "\\tshirts"; - public static readonly string shirtdir = CustomPlayerDir + "\\shirts"; - public static readonly string pantsdir = CustomPlayerDir + "\\pants"; - public static readonly string extradir = CustomPlayerDir + "\\custom"; - public static readonly string extradirIcons = extradir + "\\icons"; - - public static readonly string CharCustomGameDir = SharedDataGameDir + "charcustom/"; - public static readonly string hatGameDir = CharCustomGameDir + "hats/"; - public static readonly string faceGameDir = CharCustomGameDir + "faces/"; - public static readonly string headGameDir = CharCustomGameDir + "heads/"; - public static readonly string tshirtGameDir = CharCustomGameDir + "tshirts/"; - public static readonly string shirtGameDir = CharCustomGameDir + "shirts/"; - public static readonly string pantsGameDir = CharCustomGameDir + "pants/"; - public static readonly string extraGameDir = CharCustomGameDir + "custom/"; - - //webserver - public static string WebServer_CustomPlayerDir = GlobalVars.WebServerURI + "/charcustom/"; - public static string WebServer_HatDir = WebServer_CustomPlayerDir + "hats/"; - public static string WebServer_FaceDir = WebServer_CustomPlayerDir + "faces/"; - public static string WebServer_HeadDir = WebServer_CustomPlayerDir + "heads/"; - public static string WebServer_TShirtDir = WebServer_CustomPlayerDir + "tshirts/"; - public static string WebServer_ShirtDir = WebServer_CustomPlayerDir + "shirts/"; - public static string WebServer_PantsDir = WebServer_CustomPlayerDir + "pants/"; - public static string WebServer_ExtraDir = WebServer_CustomPlayerDir + "custom/"; -} -#endregion diff --git a/Novetus/NovetusLauncher/Classes/Launcher/AddonLoader.cs b/Novetus/NovetusFuncs/Launcher/AddonLoader.cs similarity index 100% rename from Novetus/NovetusLauncher/Classes/Launcher/AddonLoader.cs rename to Novetus/NovetusFuncs/Launcher/AddonLoader.cs diff --git a/Novetus/NovetusLauncher/Classes/CharCustom/IconLoader.cs b/Novetus/NovetusFuncs/Launcher/Charcustom/IconLoader.cs similarity index 100% rename from Novetus/NovetusLauncher/Classes/CharCustom/IconLoader.cs rename to Novetus/NovetusFuncs/Launcher/Charcustom/IconLoader.cs diff --git a/Novetus/NovetusLauncher/Classes/SDK/Downloader.cs b/Novetus/NovetusFuncs/Launcher/SDK/Downloader.cs similarity index 100% rename from Novetus/NovetusLauncher/Classes/SDK/Downloader.cs rename to Novetus/NovetusFuncs/Launcher/SDK/Downloader.cs diff --git a/Novetus/NovetusLauncher/Classes/SDK/RobloxXMLLocalizer.cs b/Novetus/NovetusFuncs/Launcher/SDK/RobloxXMLLocalizer.cs similarity index 79% rename from Novetus/NovetusLauncher/Classes/SDK/RobloxXMLLocalizer.cs rename to Novetus/NovetusFuncs/Launcher/SDK/RobloxXMLLocalizer.cs index 249c503..3d37383 100644 --- a/Novetus/NovetusLauncher/Classes/SDK/RobloxXMLLocalizer.cs +++ b/Novetus/NovetusFuncs/Launcher/SDK/RobloxXMLLocalizer.cs @@ -1,5 +1,4 @@ #region Usings -using NovetusLauncher; using System; using System.IO; using System.Linq; @@ -35,8 +34,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("SpecialMesh", new string[] { "MeshId", "TextureId" }, new string[] { ".mesh", ".png" }, - new string[] { LocalPaths.AssetCacheDirFonts, LocalPaths.AssetCacheDirTextures }, - new string[] { LocalPaths.AssetCacheFontsGameDir, LocalPaths.AssetCacheTexturesGameDir }); + new string[] { GlobalPaths.AssetCacheDirFonts, GlobalPaths.AssetCacheDirTextures }, + new string[] { GlobalPaths.AssetCacheFontsGameDir, GlobalPaths.AssetCacheTexturesGameDir }); } } @@ -47,8 +46,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("Sky", new string[] { "SkyboxBk", "SkyboxDn", "SkyboxFt", "SkyboxLf", "SkyboxRt", "SkyboxUp" }, new string[] { ".png" }, - new string[] { LocalPaths.AssetCacheDirSky }, - new string[] { LocalPaths.AssetCacheSkyGameDir }); + new string[] { GlobalPaths.AssetCacheDirSky }, + new string[] { GlobalPaths.AssetCacheSkyGameDir }); } } @@ -59,8 +58,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("Decal", new string[] { "Texture" }, new string[] { ".png" }, - new string[] { LocalPaths.AssetCacheDirTextures }, - new string[] { LocalPaths.AssetCacheTexturesGameDir }); + new string[] { GlobalPaths.AssetCacheDirTextures }, + new string[] { GlobalPaths.AssetCacheTexturesGameDir }); } } @@ -71,8 +70,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("Texture", new string[] { "Texture" }, new string[] { ".png" }, - new string[] { LocalPaths.AssetCacheDirTextures }, - new string[] { LocalPaths.AssetCacheTexturesGameDir }); + new string[] { GlobalPaths.AssetCacheDirTextures }, + new string[] { GlobalPaths.AssetCacheTexturesGameDir }); } } @@ -83,8 +82,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("HopperBin", new string[] { "TextureId" }, new string[] { ".png" }, - new string[] { LocalPaths.AssetCacheDirTextures }, - new string[] { LocalPaths.AssetCacheTexturesGameDir }); + new string[] { GlobalPaths.AssetCacheDirTextures }, + new string[] { GlobalPaths.AssetCacheTexturesGameDir }); } } @@ -95,8 +94,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("Tool", new string[] { "TextureId" }, new string[] { ".png" }, - new string[] { LocalPaths.AssetCacheDirTextures }, - new string[] { LocalPaths.AssetCacheTexturesGameDir }); + new string[] { GlobalPaths.AssetCacheDirTextures }, + new string[] { GlobalPaths.AssetCacheTexturesGameDir }); } } @@ -107,8 +106,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("Sound", new string[] { "SoundId" }, new string[] { ".wav" }, - new string[] { LocalPaths.AssetCacheDirSounds }, - new string[] { LocalPaths.AssetCacheSoundsGameDir }); + new string[] { GlobalPaths.AssetCacheDirSounds }, + new string[] { GlobalPaths.AssetCacheSoundsGameDir }); } } @@ -119,8 +118,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("ImageLabel", new string[] { "Image" }, new string[] { ".png" }, - new string[] { LocalPaths.AssetCacheDirTextures }, - new string[] { LocalPaths.AssetCacheTexturesGameDir }); + new string[] { GlobalPaths.AssetCacheDirTextures }, + new string[] { GlobalPaths.AssetCacheTexturesGameDir }); } } @@ -131,8 +130,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("Shirt", new string[] { "ShirtTemplate" }, new string[] { ".png" }, - new string[] { LocalPaths.AssetCacheDirTextures }, - new string[] { LocalPaths.AssetCacheTexturesGameDir }); + new string[] { GlobalPaths.AssetCacheDirTextures }, + new string[] { GlobalPaths.AssetCacheTexturesGameDir }); } } @@ -143,8 +142,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("ShirtGraphic", new string[] { "Graphic" }, new string[] { ".png" }, - new string[] { LocalPaths.AssetCacheDirTextures }, - new string[] { LocalPaths.AssetCacheTexturesGameDir }); + new string[] { GlobalPaths.AssetCacheDirTextures }, + new string[] { GlobalPaths.AssetCacheTexturesGameDir }); } } @@ -155,8 +154,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("Pants", new string[] { "PantsTemplate" }, new string[] { ".png" }, - new string[] { LocalPaths.AssetCacheDirTextures }, - new string[] { LocalPaths.AssetCacheTexturesGameDir }); + new string[] { GlobalPaths.AssetCacheDirTextures }, + new string[] { GlobalPaths.AssetCacheTexturesGameDir }); } } @@ -167,8 +166,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("Script", new string[] { "LinkedSource" }, new string[] { ".lua" }, - new string[] { LocalPaths.AssetCacheDirScripts }, - new string[] { LocalPaths.AssetCacheScriptsGameDir }); + new string[] { GlobalPaths.AssetCacheDirScripts }, + new string[] { GlobalPaths.AssetCacheScriptsGameDir }); } } @@ -179,8 +178,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("LocalScript", new string[] { "LinkedSource" }, new string[] { ".lua" }, - new string[] { LocalPaths.AssetCacheDirScripts }, - new string[] { LocalPaths.AssetCacheScriptsGameDir }); + new string[] { GlobalPaths.AssetCacheDirScripts }, + new string[] { GlobalPaths.AssetCacheScriptsGameDir }); } } @@ -192,8 +191,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("SpecialMesh", new string[] { "MeshId", "TextureId" }, new string[] { ".mesh", ".png" }, - new string[] { LocalPaths.hatdirFonts, LocalPaths.hatdirTextures }, - new string[] { LocalPaths.hatGameDirFonts, LocalPaths.hatGameDirTextures }); + new string[] { GlobalPaths.hatdirFonts, GlobalPaths.hatdirTextures }, + new string[] { GlobalPaths.hatGameDirFonts, GlobalPaths.hatGameDirTextures }); } } @@ -204,8 +203,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("Sound", new string[] { "SoundId" }, new string[] { ".wav" }, - new string[] { LocalPaths.hatdirSounds }, - new string[] { LocalPaths.hatGameDirSounds }); + new string[] { GlobalPaths.hatdirSounds }, + new string[] { GlobalPaths.hatGameDirSounds }); } } @@ -216,8 +215,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("Script", new string[] { "LinkedSource" }, new string[] { ".lua" }, - new string[] { LocalPaths.hatdirScripts }, - new string[] { LocalPaths.hatGameDirScripts }); + new string[] { GlobalPaths.hatdirScripts }, + new string[] { GlobalPaths.hatGameDirScripts }); } } @@ -228,8 +227,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("LocalScript", new string[] { "LinkedSource" }, new string[] { ".lua" }, - new string[] { LocalPaths.hatdirScripts }, - new string[] { LocalPaths.hatGameDirScripts }); + new string[] { GlobalPaths.hatdirScripts }, + new string[] { GlobalPaths.hatGameDirScripts }); } } @@ -240,8 +239,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("SpecialMesh", new string[] { "MeshId", "TextureId" }, new string[] { ".mesh", ".png" }, - new string[] { LocalPaths.headdirFonts, LocalPaths.headdirTextures }, - new string[] { LocalPaths.headGameDirFonts, LocalPaths.headGameDirTextures }); + new string[] { GlobalPaths.headdirFonts, GlobalPaths.headdirTextures }, + new string[] { GlobalPaths.headGameDirFonts, GlobalPaths.headGameDirTextures }); } } @@ -252,8 +251,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("Decal", new string[] { "Texture" }, new string[] { ".png" }, - new string[] { LocalPaths.facedirTextures }, - new string[] { LocalPaths.faceGameDirTextures }); + new string[] { GlobalPaths.facedirTextures }, + new string[] { GlobalPaths.faceGameDirTextures }); } } @@ -264,8 +263,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("Shirt", new string[] { "ShirtTemplate" }, new string[] { ".png" }, - new string[] { LocalPaths.shirtdirTextures }, - new string[] { LocalPaths.shirtGameDirTextures }); + new string[] { GlobalPaths.shirtdirTextures }, + new string[] { GlobalPaths.shirtGameDirTextures }); } } @@ -276,8 +275,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("ShirtGraphic", new string[] { "Graphic" }, new string[] { ".png" }, - new string[] { LocalPaths.tshirtdirTextures }, - new string[] { LocalPaths.tshirtGameDirTextures }); + new string[] { GlobalPaths.tshirtdirTextures }, + new string[] { GlobalPaths.tshirtGameDirTextures }); } } @@ -288,8 +287,8 @@ public struct RobloxDefs return new VarStorage.AssetCacheDef("Pants", new string[] { "PantsTemplate" }, new string[] { ".png" }, - new string[] { LocalPaths.pantsdirTextures }, - new string[] { LocalPaths.pantsGameDirTextures }); + new string[] { GlobalPaths.pantsdirTextures }, + new string[] { GlobalPaths.pantsGameDirTextures }); } } } diff --git a/Novetus/NovetusLauncher/Classes/Launcher/SplashLoader.cs b/Novetus/NovetusFuncs/Launcher/SplashLoader.cs similarity index 100% rename from Novetus/NovetusLauncher/Classes/Launcher/SplashLoader.cs rename to Novetus/NovetusFuncs/Launcher/SplashLoader.cs diff --git a/Novetus/NovetusLauncher/Classes/WinForms/FormExt.cs b/Novetus/NovetusFuncs/Main/Extentions/FormExt.cs similarity index 100% rename from Novetus/NovetusLauncher/Classes/WinForms/FormExt.cs rename to Novetus/NovetusFuncs/Main/Extentions/FormExt.cs diff --git a/Novetus/NovetusFuncs/NETExt.cs b/Novetus/NovetusFuncs/Main/Extentions/NETExt.cs similarity index 100% rename from Novetus/NovetusFuncs/NETExt.cs rename to Novetus/NovetusFuncs/Main/Extentions/NETExt.cs diff --git a/Novetus/NovetusFuncs/LauncherFuncs.cs b/Novetus/NovetusFuncs/Main/FunctionClasses/LauncherFuncs.cs similarity index 100% rename from Novetus/NovetusFuncs/LauncherFuncs.cs rename to Novetus/NovetusFuncs/Main/FunctionClasses/LauncherFuncs.cs diff --git a/Novetus/NovetusFuncs/NetFuncs.cs b/Novetus/NovetusFuncs/Main/FunctionClasses/NetFuncs.cs similarity index 100% rename from Novetus/NovetusFuncs/NetFuncs.cs rename to Novetus/NovetusFuncs/Main/FunctionClasses/NetFuncs.cs diff --git a/Novetus/NovetusFuncs/ScriptFuncs.cs b/Novetus/NovetusFuncs/Main/FunctionClasses/ScriptFuncs.cs similarity index 100% rename from Novetus/NovetusFuncs/ScriptFuncs.cs rename to Novetus/NovetusFuncs/Main/FunctionClasses/ScriptFuncs.cs diff --git a/Novetus/NovetusFuncs/SecurityFuncs.cs b/Novetus/NovetusFuncs/Main/FunctionClasses/SecurityFuncs.cs similarity index 100% rename from Novetus/NovetusFuncs/SecurityFuncs.cs rename to Novetus/NovetusFuncs/Main/FunctionClasses/SecurityFuncs.cs diff --git a/Novetus/NovetusFuncs/Main/GlobalPaths.cs b/Novetus/NovetusFuncs/Main/GlobalPaths.cs new file mode 100644 index 0000000..4317088 --- /dev/null +++ b/Novetus/NovetusFuncs/Main/GlobalPaths.cs @@ -0,0 +1,105 @@ +#region Usings +using System.IO; +using System.Reflection; +#endregion + +#region Global Paths + +public class GlobalPaths +{ + public static readonly string RootPathLauncher = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); + public static readonly string BasePathLauncher = RootPathLauncher.Replace(@"\", @"\\"); + public static readonly string RootPath = Directory.GetParent(RootPathLauncher).ToString(); + public static readonly string BasePath = RootPath.Replace(@"\", @"\\"); + public static readonly string DataPath = BasePath + @"\\shareddata"; + public static readonly string ServerDir = DataPath + "\\server"; + public static readonly string ConfigDir = BasePath + @"\\config"; + public static readonly string ConfigDirData = BasePathLauncher + @"\\data"; + public static readonly string ClientDir = BasePath + @"\\clients"; + public static readonly string MapsDir = BasePath + @"\\maps"; + public static readonly string MapsDirBase = "maps"; + public static readonly string BaseGameDir = "rbxasset://../../../"; + public static readonly string SharedDataGameDir = BaseGameDir + "shareddata/"; + + //customization + public static readonly string CustomPlayerDir = DataPath + "\\charcustom"; + public static readonly string hatdir = CustomPlayerDir + "\\hats"; + public static readonly string facedir = CustomPlayerDir + "\\faces"; + public static readonly string headdir = CustomPlayerDir + "\\heads"; + public static readonly string tshirtdir = CustomPlayerDir + "\\tshirts"; + public static readonly string shirtdir = CustomPlayerDir + "\\shirts"; + public static readonly string pantsdir = CustomPlayerDir + "\\pants"; + public static readonly string extradir = CustomPlayerDir + "\\custom"; + public static readonly string extradirIcons = extradir + "\\icons"; + + public static readonly string CharCustomGameDir = SharedDataGameDir + "charcustom/"; + public static readonly string hatGameDir = CharCustomGameDir + "hats/"; + public static readonly string faceGameDir = CharCustomGameDir + "faces/"; + public static readonly string headGameDir = CharCustomGameDir + "heads/"; + public static readonly string tshirtGameDir = CharCustomGameDir + "tshirts/"; + public static readonly string shirtGameDir = CharCustomGameDir + "shirts/"; + public static readonly string pantsGameDir = CharCustomGameDir + "pants/"; + public static readonly string extraGameDir = CharCustomGameDir + "custom/"; + + //webserver + public static string WebServer_CustomPlayerDir = GlobalVars.WebServerURI + "/charcustom/"; + public static string WebServer_HatDir = WebServer_CustomPlayerDir + "hats/"; + public static string WebServer_FaceDir = WebServer_CustomPlayerDir + "faces/"; + public static string WebServer_HeadDir = WebServer_CustomPlayerDir + "heads/"; + public static string WebServer_TShirtDir = WebServer_CustomPlayerDir + "tshirts/"; + public static string WebServer_ShirtDir = WebServer_CustomPlayerDir + "shirts/"; + public static string WebServer_PantsDir = WebServer_CustomPlayerDir + "pants/"; + public static string WebServer_ExtraDir = WebServer_CustomPlayerDir + "custom/"; + + //public static readonly string PluginPath = GlobalPaths.BasePath + "\\plugins"; + + //assetcache + public static readonly string DirFonts = "\\fonts"; + public static readonly string DirSounds = "\\sounds"; + public static readonly string DirTextures = "\\textures"; + public static readonly string DirScripts = "\\scripts"; + public static readonly string FontsGameDir = "fonts/"; + public static readonly string SoundsGameDir = "sounds/"; + public static readonly string TexturesGameDir = "textures/"; + public static readonly string ScriptsGameDir = "scripts/"; + + //item asset dirs + public static readonly string hatdirFonts = hatdir + DirFonts; + public static readonly string hatdirTextures = hatdir + DirTextures; + public static readonly string hatdirSounds = hatdir + DirSounds; + public static readonly string hatdirScripts = hatdir + DirScripts; + public static readonly string facedirTextures = facedir + DirTextures; + public static readonly string headdirFonts = headdir + DirFonts; + public static readonly string headdirTextures = headdir + DirTextures; + public static readonly string tshirtdirTextures = tshirtdir + DirTextures; + public static readonly string shirtdirTextures = shirtdir + DirTextures; + public static readonly string pantsdirTextures = pantsdir + DirTextures; + + public static readonly string hatGameDirFonts = hatGameDir + FontsGameDir; + public static readonly string hatGameDirTextures = hatGameDir + TexturesGameDir; + public static readonly string hatGameDirSounds = hatGameDir + SoundsGameDir; + public static readonly string hatGameDirScripts = hatGameDir + ScriptsGameDir; + public static readonly string faceGameDirTextures = faceGameDir + TexturesGameDir; + public static readonly string headGameDirFonts = headGameDir + FontsGameDir; + public static readonly string headGameDirTextures = headGameDir + TexturesGameDir; + public static readonly string tshirtGameDirTextures = tshirtGameDir + TexturesGameDir; + public static readonly string shirtGameDirTextures = shirtGameDir + TexturesGameDir; + public static readonly string pantsGameDirTextures = pantsGameDir + TexturesGameDir; + + public static readonly string AssetCacheDir = DataPath + "\\assetcache"; + public static readonly string AssetCacheDirSky = AssetCacheDir + "\\sky"; + public static readonly string AssetCacheDirFonts = AssetCacheDir + DirFonts; + public static readonly string AssetCacheDirSounds = AssetCacheDir + DirSounds; + public static readonly string AssetCacheDirTextures = AssetCacheDir + DirTextures; + public static readonly string AssetCacheDirTexturesGUI = AssetCacheDirTextures + "\\gui"; + public static readonly string AssetCacheDirScripts = AssetCacheDir + DirScripts; + + public static readonly string AssetCacheGameDir = SharedDataGameDir + "assetcache/"; + public static readonly string AssetCacheFontsGameDir = AssetCacheGameDir + FontsGameDir; + public static readonly string AssetCacheSkyGameDir = AssetCacheGameDir + "sky/"; + public static readonly string AssetCacheSoundsGameDir = AssetCacheGameDir + SoundsGameDir; + public static readonly string AssetCacheTexturesGameDir = AssetCacheGameDir + TexturesGameDir; + public static readonly string AssetCacheTexturesGUIGameDir = AssetCacheTexturesGameDir + "gui/"; + public static readonly string AssetCacheScriptsGameDir = AssetCacheGameDir + ScriptsGameDir; +} +#endregion diff --git a/Novetus/NovetusFuncs/GlobalVars.cs b/Novetus/NovetusFuncs/Main/GlobalVars.cs similarity index 93% rename from Novetus/NovetusFuncs/GlobalVars.cs rename to Novetus/NovetusFuncs/Main/GlobalVars.cs index d425ebd..a140c74 100644 --- a/Novetus/NovetusFuncs/GlobalVars.cs +++ b/Novetus/NovetusFuncs/Main/GlobalVars.cs @@ -27,6 +27,9 @@ public static class GlobalVars public static bool IsSnapshot = false; //misc vars public static string FullMapPath = ""; + //these are from the launcher. we are putting these values here so we can expose them to plugins. + public static int DefaultRobloxPort = 53640; + public static bool LocalPlayMode = false; //weebserver public static int WebServerPort = 40735; public static string LocalWebServerURI = "http://localhost:" + (WebServerPort).ToString(); diff --git a/Novetus/NovetusFuncs/INIFile.cs b/Novetus/NovetusFuncs/Main/IO/INIFile.cs similarity index 100% rename from Novetus/NovetusFuncs/INIFile.cs rename to Novetus/NovetusFuncs/Main/IO/INIFile.cs diff --git a/Novetus/NovetusFuncs/IDiscordRPC.cs b/Novetus/NovetusFuncs/Main/Interfaces/IDiscordRPC.cs similarity index 100% rename from Novetus/NovetusFuncs/IDiscordRPC.cs rename to Novetus/NovetusFuncs/Main/Interfaces/IDiscordRPC.cs diff --git a/Novetus/NovetusFuncs/CryptoRandom.cs b/Novetus/NovetusFuncs/Main/SpecialTypes/CryptoRandom.cs similarity index 100% rename from Novetus/NovetusFuncs/CryptoRandom.cs rename to Novetus/NovetusFuncs/Main/SpecialTypes/CryptoRandom.cs diff --git a/Novetus/NovetusFuncs/SimpleHTTPServer.cs b/Novetus/NovetusFuncs/Main/SpecialTypes/SimpleHTTPServer.cs similarity index 100% rename from Novetus/NovetusFuncs/SimpleHTTPServer.cs rename to Novetus/NovetusFuncs/Main/SpecialTypes/SimpleHTTPServer.cs diff --git a/Novetus/NovetusFuncs/TextLineRemover.cs b/Novetus/NovetusFuncs/Main/SpecialTypes/TextLineRemover.cs similarity index 100% rename from Novetus/NovetusFuncs/TextLineRemover.cs rename to Novetus/NovetusFuncs/Main/SpecialTypes/TextLineRemover.cs diff --git a/Novetus/NovetusFuncs/FileFormat.cs b/Novetus/NovetusFuncs/Main/VariableStorage/FileFormat.cs similarity index 100% rename from Novetus/NovetusFuncs/FileFormat.cs rename to Novetus/NovetusFuncs/Main/VariableStorage/FileFormat.cs diff --git a/Novetus/NovetusFuncs/Settings.cs b/Novetus/NovetusFuncs/Main/VariableStorage/Settings.cs similarity index 100% rename from Novetus/NovetusFuncs/Settings.cs rename to Novetus/NovetusFuncs/Main/VariableStorage/Settings.cs diff --git a/Novetus/NovetusFuncs/VarStorage.cs b/Novetus/NovetusFuncs/Main/VariableStorage/VarStorage.cs similarity index 100% rename from Novetus/NovetusFuncs/VarStorage.cs rename to Novetus/NovetusFuncs/Main/VariableStorage/VarStorage.cs diff --git a/Novetus/NovetusLauncher/Classes/WinForms/TabControlWithoutHeader.cs b/Novetus/NovetusFuncs/Main/WinForms/TabControlWithoutHeader.cs similarity index 100% rename from Novetus/NovetusLauncher/Classes/WinForms/TabControlWithoutHeader.cs rename to Novetus/NovetusFuncs/Main/WinForms/TabControlWithoutHeader.cs diff --git a/Novetus/NovetusLauncher/Classes/WinForms/TreeNodeHelper.cs b/Novetus/NovetusFuncs/Main/WinForms/TreeNodeHelper.cs similarity index 100% rename from Novetus/NovetusLauncher/Classes/WinForms/TreeNodeHelper.cs rename to Novetus/NovetusFuncs/Main/WinForms/TreeNodeHelper.cs diff --git a/Novetus/NovetusFuncs/NovetusFuncs.projitems b/Novetus/NovetusFuncs/NovetusFuncs.projitems index 2e15436..957b396 100644 --- a/Novetus/NovetusFuncs/NovetusFuncs.projitems +++ b/Novetus/NovetusFuncs/NovetusFuncs.projitems @@ -9,20 +9,30 @@ NovetusFuncs + + + + + + + + Component + + \ No newline at end of file diff --git a/Novetus/NovetusLauncher/Classes/LocalPaths.cs b/Novetus/NovetusLauncher/Classes/LocalPaths.cs deleted file mode 100644 index cc67ca8..0000000 --- a/Novetus/NovetusLauncher/Classes/LocalPaths.cs +++ /dev/null @@ -1,56 +0,0 @@ - -namespace NovetusLauncher -{ - class LocalPaths - { - //public static readonly string PluginPath = GlobalPaths.BasePath + "\\plugins"; - - //assetcache - public static readonly string DirFonts = "\\fonts"; - public static readonly string DirSounds = "\\sounds"; - public static readonly string DirTextures = "\\textures"; - public static readonly string DirScripts = "\\scripts"; - public static readonly string FontsGameDir = "fonts/"; - public static readonly string SoundsGameDir = "sounds/"; - public static readonly string TexturesGameDir = "textures/"; - public static readonly string ScriptsGameDir = "scripts/"; - //item asset dirs - public static readonly string hatdirFonts = GlobalPaths.hatdir + DirFonts; - public static readonly string hatdirTextures = GlobalPaths.hatdir + DirTextures; - public static readonly string hatdirSounds = GlobalPaths.hatdir + DirSounds; - public static readonly string hatdirScripts = GlobalPaths.hatdir + DirScripts; - public static readonly string facedirTextures = GlobalPaths.facedir + DirTextures; - public static readonly string headdirFonts = GlobalPaths.headdir + DirFonts; - public static readonly string headdirTextures = GlobalPaths.headdir + DirTextures; - public static readonly string tshirtdirTextures = GlobalPaths.tshirtdir + DirTextures; - public static readonly string shirtdirTextures = GlobalPaths.shirtdir + DirTextures; - public static readonly string pantsdirTextures = GlobalPaths.pantsdir + DirTextures; - - public static readonly string hatGameDirFonts = GlobalPaths.hatGameDir + FontsGameDir; - public static readonly string hatGameDirTextures = GlobalPaths.hatGameDir + TexturesGameDir; - public static readonly string hatGameDirSounds = GlobalPaths.hatGameDir + SoundsGameDir; - public static readonly string hatGameDirScripts = GlobalPaths.hatGameDir + ScriptsGameDir; - public static readonly string faceGameDirTextures = GlobalPaths.faceGameDir + TexturesGameDir; - public static readonly string headGameDirFonts = GlobalPaths.headGameDir + FontsGameDir; - public static readonly string headGameDirTextures = GlobalPaths.headGameDir + TexturesGameDir; - public static readonly string tshirtGameDirTextures = GlobalPaths.tshirtGameDir + TexturesGameDir; - public static readonly string shirtGameDirTextures = GlobalPaths.shirtGameDir + TexturesGameDir; - public static readonly string pantsGameDirTextures = GlobalPaths.pantsGameDir + TexturesGameDir; - - public static readonly string AssetCacheDir = GlobalPaths.DataPath + "\\assetcache"; - public static readonly string AssetCacheDirSky = AssetCacheDir + "\\sky"; - public static readonly string AssetCacheDirFonts = AssetCacheDir + DirFonts; - public static readonly string AssetCacheDirSounds = AssetCacheDir + DirSounds; - public static readonly string AssetCacheDirTextures = AssetCacheDir + DirTextures; - public static readonly string AssetCacheDirTexturesGUI = AssetCacheDirTextures + "\\gui"; - public static readonly string AssetCacheDirScripts = AssetCacheDir + DirScripts; - - public static readonly string AssetCacheGameDir = GlobalPaths.SharedDataGameDir + "assetcache/"; - public static readonly string AssetCacheFontsGameDir = AssetCacheGameDir + FontsGameDir; - public static readonly string AssetCacheSkyGameDir = AssetCacheGameDir + "sky/"; - public static readonly string AssetCacheSoundsGameDir = AssetCacheGameDir + SoundsGameDir; - public static readonly string AssetCacheTexturesGameDir = AssetCacheGameDir + TexturesGameDir; - public static readonly string AssetCacheTexturesGUIGameDir = AssetCacheTexturesGameDir + "gui/"; - public static readonly string AssetCacheScriptsGameDir = AssetCacheGameDir + ScriptsGameDir; - } -} diff --git a/Novetus/NovetusLauncher/Classes/Launcher/LocalVars.cs b/Novetus/NovetusLauncher/Classes/LocalVars.cs similarity index 64% rename from Novetus/NovetusLauncher/Classes/Launcher/LocalVars.cs rename to Novetus/NovetusLauncher/Classes/LocalVars.cs index 304793b..5145183 100644 --- a/Novetus/NovetusLauncher/Classes/Launcher/LocalVars.cs +++ b/Novetus/NovetusLauncher/Classes/LocalVars.cs @@ -6,8 +6,6 @@ namespace NovetusLauncher { public static int Clicks = 0; public static string prevsplash = ""; - public static int DefaultRobloxPort = 53640; - public static bool LocalPlayMode = false; } #endregion } diff --git a/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.cs b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.cs index 13305d0..8589176 100644 --- a/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.cs +++ b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.cs @@ -322,7 +322,7 @@ namespace NovetusLauncher void Button1Click(object sender, EventArgs e) { - if (LocalVars.LocalPlayMode) + if (GlobalVars.LocalPlayMode) { GeneratePlayerID(); GenerateTripcode(); @@ -445,29 +445,29 @@ namespace NovetusLauncher File.Create(GlobalPaths.ConfigDir + "\\ports.txt").Dispose(); } - if (!Directory.Exists(LocalPaths.AssetCacheDirFonts)) + if (!Directory.Exists(GlobalPaths.AssetCacheDirFonts)) { - Directory.CreateDirectory(LocalPaths.AssetCacheDirFonts); + Directory.CreateDirectory(GlobalPaths.AssetCacheDirFonts); } - if (!Directory.Exists(LocalPaths.AssetCacheDirSky)) + if (!Directory.Exists(GlobalPaths.AssetCacheDirSky)) { - Directory.CreateDirectory(LocalPaths.AssetCacheDirSky); + Directory.CreateDirectory(GlobalPaths.AssetCacheDirSky); } - if (!Directory.Exists(LocalPaths.AssetCacheDirSounds)) + if (!Directory.Exists(GlobalPaths.AssetCacheDirSounds)) { - Directory.CreateDirectory(LocalPaths.AssetCacheDirSounds); + Directory.CreateDirectory(GlobalPaths.AssetCacheDirSounds); } - if (!Directory.Exists(LocalPaths.AssetCacheDirTexturesGUI)) + if (!Directory.Exists(GlobalPaths.AssetCacheDirTexturesGUI)) { - Directory.CreateDirectory(LocalPaths.AssetCacheDirTexturesGUI); + Directory.CreateDirectory(GlobalPaths.AssetCacheDirTexturesGUI); } - if (!Directory.Exists(LocalPaths.AssetCacheDirScripts)) + if (!Directory.Exists(GlobalPaths.AssetCacheDirScripts)) { - Directory.CreateDirectory(LocalPaths.AssetCacheDirScripts); + Directory.CreateDirectory(GlobalPaths.AssetCacheDirScripts); } label8.Text = Application.ProductVersion; @@ -485,7 +485,7 @@ namespace NovetusLauncher void MainFormClose(object sender, CancelEventArgs e) { - if (LocalVars.LocalPlayMode != true) + if (GlobalVars.LocalPlayMode != true) { WriteConfigValues(); } @@ -584,7 +584,7 @@ namespace NovetusLauncher textBox5.Enabled = false; button4.Enabled = false; checkBox3.Enabled = false; - LocalVars.LocalPlayMode = false; + GlobalVars.LocalPlayMode = false; break; } @@ -620,7 +620,7 @@ namespace NovetusLauncher { GlobalVars.IP = textBox1.Text; checkBox3.Enabled = false; - LocalVars.LocalPlayMode = false; + GlobalVars.LocalPlayMode = false; label37.Text = GlobalVars.IP; } @@ -654,7 +654,7 @@ namespace NovetusLauncher void CheckBox3CheckedChanged(object sender, EventArgs e) { - LocalVars.LocalPlayMode = checkBox3.Checked; + GlobalVars.LocalPlayMode = checkBox3.Checked; } void TextBox5TextChanged(object sender, EventArgs e) @@ -694,7 +694,7 @@ namespace NovetusLauncher GlobalVars.IP = listBox3.SelectedItem.ToString(); textBox1.Text = GlobalVars.IP; checkBox3.Enabled = false; - LocalVars.LocalPlayMode = false; + GlobalVars.LocalPlayMode = false; label37.Text = GlobalVars.IP; } @@ -1299,9 +1299,9 @@ namespace NovetusLauncher void Button7Click(object sender, EventArgs e) { - numericUpDown1.Value = Convert.ToDecimal(LocalVars.DefaultRobloxPort); - numericUpDown2.Value = Convert.ToDecimal(LocalVars.DefaultRobloxPort); - GlobalVars.UserConfiguration.RobloxPort = LocalVars.DefaultRobloxPort; + numericUpDown1.Value = Convert.ToDecimal(GlobalVars.DefaultRobloxPort); + numericUpDown2.Value = Convert.ToDecimal(GlobalVars.DefaultRobloxPort); + GlobalVars.UserConfiguration.RobloxPort = GlobalVars.DefaultRobloxPort; } void Button23Click(object sender, EventArgs e) @@ -1311,9 +1311,9 @@ namespace NovetusLauncher void Button22Click(object sender, EventArgs e) { - numericUpDown1.Value = Convert.ToDecimal(LocalVars.DefaultRobloxPort); - numericUpDown2.Value = Convert.ToDecimal(LocalVars.DefaultRobloxPort); - GlobalVars.UserConfiguration.RobloxPort = LocalVars.DefaultRobloxPort; + numericUpDown1.Value = Convert.ToDecimal(GlobalVars.DefaultRobloxPort); + numericUpDown2.Value = Convert.ToDecimal(GlobalVars.DefaultRobloxPort); + GlobalVars.UserConfiguration.RobloxPort = GlobalVars.DefaultRobloxPort; } void TreeView1AfterSelect(object sender, TreeViewEventArgs e) @@ -1398,9 +1398,9 @@ namespace NovetusLauncher private void button26_Click(object sender, EventArgs e) { - if (Directory.Exists(LocalPaths.AssetCacheDir)) + if (Directory.Exists(GlobalPaths.AssetCacheDir)) { - Directory.Delete(LocalPaths.AssetCacheDir, true); + Directory.Delete(GlobalPaths.AssetCacheDir, true); ConsolePrint("Asset cache cleared!", 3); MessageBox.Show("Asset cache cleared!"); } diff --git a/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.cs b/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.cs index dee848f..d54aa38 100644 --- a/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.cs +++ b/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.cs @@ -324,7 +324,7 @@ namespace NovetusLauncher void Button1Click(object sender, EventArgs e) { - if (LocalVars.LocalPlayMode) + if (GlobalVars.LocalPlayMode) { GeneratePlayerID(); GenerateTripcode(); @@ -447,29 +447,29 @@ namespace NovetusLauncher File.Create(GlobalPaths.ConfigDir + "\\ports.txt").Dispose(); } - if (!Directory.Exists(LocalPaths.AssetCacheDirFonts)) + if (!Directory.Exists(GlobalPaths.AssetCacheDirFonts)) { - Directory.CreateDirectory(LocalPaths.AssetCacheDirFonts); + Directory.CreateDirectory(GlobalPaths.AssetCacheDirFonts); } - if (!Directory.Exists(LocalPaths.AssetCacheDirSky)) + if (!Directory.Exists(GlobalPaths.AssetCacheDirSky)) { - Directory.CreateDirectory(LocalPaths.AssetCacheDirSky); + Directory.CreateDirectory(GlobalPaths.AssetCacheDirSky); } - if (!Directory.Exists(LocalPaths.AssetCacheDirSounds)) + if (!Directory.Exists(GlobalPaths.AssetCacheDirSounds)) { - Directory.CreateDirectory(LocalPaths.AssetCacheDirSounds); + Directory.CreateDirectory(GlobalPaths.AssetCacheDirSounds); } - if (!Directory.Exists(LocalPaths.AssetCacheDirTexturesGUI)) + if (!Directory.Exists(GlobalPaths.AssetCacheDirTexturesGUI)) { - Directory.CreateDirectory(LocalPaths.AssetCacheDirTexturesGUI); + Directory.CreateDirectory(GlobalPaths.AssetCacheDirTexturesGUI); } - if (!Directory.Exists(LocalPaths.AssetCacheDirScripts)) + if (!Directory.Exists(GlobalPaths.AssetCacheDirScripts)) { - Directory.CreateDirectory(LocalPaths.AssetCacheDirScripts); + Directory.CreateDirectory(GlobalPaths.AssetCacheDirScripts); } label8.Text = Application.ProductVersion; @@ -487,7 +487,7 @@ namespace NovetusLauncher void MainFormClose(object sender, CancelEventArgs e) { - if (LocalVars.LocalPlayMode != true) + if (GlobalVars.LocalPlayMode != true) { WriteConfigValues(); } @@ -620,7 +620,7 @@ namespace NovetusLauncher textBox5.Enabled = false; button4.Enabled = false; checkBox3.Enabled = false; - LocalVars.LocalPlayMode = false; + GlobalVars.LocalPlayMode = false; break; } @@ -656,7 +656,7 @@ namespace NovetusLauncher { GlobalVars.IP = textBox1.Text; checkBox3.Enabled = false; - LocalVars.LocalPlayMode = false; + GlobalVars.LocalPlayMode = false; label37.Text = GlobalVars.IP; } @@ -690,7 +690,7 @@ namespace NovetusLauncher void CheckBox3CheckedChanged(object sender, EventArgs e) { - LocalVars.LocalPlayMode = checkBox3.Checked; + GlobalVars.LocalPlayMode = checkBox3.Checked; } void TextBox5TextChanged(object sender, EventArgs e) @@ -730,7 +730,7 @@ namespace NovetusLauncher GlobalVars.IP = listBox3.SelectedItem.ToString(); textBox1.Text = GlobalVars.IP; checkBox3.Enabled = false; - LocalVars.LocalPlayMode = false; + GlobalVars.LocalPlayMode = false; label37.Text = GlobalVars.IP; } @@ -1335,9 +1335,9 @@ namespace NovetusLauncher void Button7Click(object sender, EventArgs e) { - numericUpDown1.Value = Convert.ToDecimal(LocalVars.DefaultRobloxPort); - numericUpDown2.Value = Convert.ToDecimal(LocalVars.DefaultRobloxPort); - GlobalVars.UserConfiguration.RobloxPort = LocalVars.DefaultRobloxPort; + numericUpDown1.Value = Convert.ToDecimal(GlobalVars.DefaultRobloxPort); + numericUpDown2.Value = Convert.ToDecimal(GlobalVars.DefaultRobloxPort); + GlobalVars.UserConfiguration.RobloxPort = GlobalVars.DefaultRobloxPort; } void Button23Click(object sender, EventArgs e) @@ -1347,9 +1347,9 @@ namespace NovetusLauncher void Button22Click(object sender, EventArgs e) { - numericUpDown1.Value = Convert.ToDecimal(LocalVars.DefaultRobloxPort); - numericUpDown2.Value = Convert.ToDecimal(LocalVars.DefaultRobloxPort); - GlobalVars.UserConfiguration.RobloxPort = LocalVars.DefaultRobloxPort; + numericUpDown1.Value = Convert.ToDecimal(GlobalVars.DefaultRobloxPort); + numericUpDown2.Value = Convert.ToDecimal(GlobalVars.DefaultRobloxPort); + GlobalVars.UserConfiguration.RobloxPort = GlobalVars.DefaultRobloxPort; } void TreeView1AfterSelect(object sender, TreeViewEventArgs e) @@ -1434,9 +1434,9 @@ namespace NovetusLauncher private void button26_Click(object sender, EventArgs e) { - if (Directory.Exists(LocalPaths.AssetCacheDir)) + if (Directory.Exists(GlobalPaths.AssetCacheDir)) { - Directory.Delete(LocalPaths.AssetCacheDir, true); + Directory.Delete(GlobalPaths.AssetCacheDir, true); ConsolePrint("Asset cache cleared!", 3); MessageBox.Show("Asset cache cleared!"); } diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj index 16b2d3a..37aa636 100644 --- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj +++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj @@ -134,18 +134,7 @@ CharacterCustomization.cs - - - - - - - - - - Component - - + Form diff --git a/Novetus/NovetusLauncher/SDK/AssetLocalizer.cs b/Novetus/NovetusLauncher/SDK/AssetLocalizer.cs index 7d29fa6..742bc57 100644 --- a/Novetus/NovetusLauncher/SDK/AssetLocalizer.cs +++ b/Novetus/NovetusLauncher/SDK/AssetLocalizer.cs @@ -70,9 +70,9 @@ namespace NovetusLauncher comboBox1.SelectedItem = "RBXL"; comboBox2.SelectedItem = "None"; - if (Directory.Exists(LocalPaths.hatdirFonts)) + if (Directory.Exists(GlobalPaths.hatdirFonts)) { - DirectoryInfo dinfo = new DirectoryInfo(LocalPaths.hatdirFonts); + DirectoryInfo dinfo = new DirectoryInfo(GlobalPaths.hatdirFonts); FileInfo[] Files = dinfo.GetFiles("*.mesh"); foreach (FileInfo file in Files) { @@ -85,29 +85,29 @@ namespace NovetusLauncher } } - if (!Directory.Exists(LocalPaths.AssetCacheDirFonts)) + if (!Directory.Exists(GlobalPaths.AssetCacheDirFonts)) { - Directory.CreateDirectory(LocalPaths.AssetCacheDirFonts); + Directory.CreateDirectory(GlobalPaths.AssetCacheDirFonts); } - if (!Directory.Exists(LocalPaths.AssetCacheDirSky)) + if (!Directory.Exists(GlobalPaths.AssetCacheDirSky)) { - Directory.CreateDirectory(LocalPaths.AssetCacheDirSky); + Directory.CreateDirectory(GlobalPaths.AssetCacheDirSky); } - if (!Directory.Exists(LocalPaths.AssetCacheDirSounds)) + if (!Directory.Exists(GlobalPaths.AssetCacheDirSounds)) { - Directory.CreateDirectory(LocalPaths.AssetCacheDirSounds); + Directory.CreateDirectory(GlobalPaths.AssetCacheDirSounds); } - if (!Directory.Exists(LocalPaths.AssetCacheDirTexturesGUI)) + if (!Directory.Exists(GlobalPaths.AssetCacheDirTexturesGUI)) { - Directory.CreateDirectory(LocalPaths.AssetCacheDirTexturesGUI); + Directory.CreateDirectory(GlobalPaths.AssetCacheDirTexturesGUI); } - if (!Directory.Exists(LocalPaths.AssetCacheDirScripts)) + if (!Directory.Exists(GlobalPaths.AssetCacheDirScripts)) { - Directory.CreateDirectory(LocalPaths.AssetCacheDirScripts); + Directory.CreateDirectory(GlobalPaths.AssetCacheDirScripts); } }