diff --git a/BetterSecondbot/BetterAtHome/BetterAtHome.cs b/BetterSecondbot/BetterAtHome/BetterAtHome.cs index 0480e3d..1bac3eb 100644 --- a/BetterSecondbot/BetterAtHome/BetterAtHome.cs +++ b/BetterSecondbot/BetterAtHome/BetterAtHome.cs @@ -1,7 +1,7 @@ using BetterSecondBot; using BetterSecondBotShared.Json; using BetterSecondBotShared.Static; -using BSB.bottypes; +using BetterSecondBot.bottypes; using OpenMetaverse; using System.Collections.Generic; diff --git a/BetterSecondbot/BetterRelayService/BetterRelay.cs b/BetterSecondbot/BetterRelayService/BetterRelay.cs index a23d116..aac3313 100644 --- a/BetterSecondbot/BetterRelayService/BetterRelay.cs +++ b/BetterSecondbot/BetterRelayService/BetterRelay.cs @@ -3,7 +3,7 @@ using BetterSecondBotShared.IO; using BetterSecondBotShared.Json; using BetterSecondBotShared.logs; using BetterSecondBotShared.Static; -using BSB.bottypes; +using BetterSecondBot.bottypes; using Newtonsoft.Json; using OpenMetaverse; using System; diff --git a/BetterSecondbot/CliExitOnLogout.cs b/BetterSecondbot/CliExitOnLogout.cs index 1d7e9df..6720633 100644 --- a/BetterSecondbot/CliExitOnLogout.cs +++ b/BetterSecondbot/CliExitOnLogout.cs @@ -2,7 +2,7 @@ using BetterSecondBotShared.Json; using BetterSecondBotShared.logs; using BetterSecondBotShared.Static; -using BSB.bottypes; +using BetterSecondBot.bottypes; using System.Threading; using static BetterSecondBot.Program; @@ -14,22 +14,22 @@ namespace BetterSecondBot protected bool exitBot = false; public SecondBot Bot; - protected void keep_alive() - { - while (Bot.KillMe == false) - { - string NewStatusMessage = Bot.GetStatus(); - if (NewStatusMessage != Bot.LastStatusMessage) - { - NewStatusMessage = NewStatusMessage.Trim(); - if (NewStatusMessage.Replace(" ", "") != "") - { - Bot.LastStatusMessage = NewStatusMessage; - Bot.Log2File(LogFormater.Status(Bot.LastStatusMessage, false), ConsoleLogLogLevel.Status); - } - } - Thread.Sleep(1000); - } + protected void keep_alive() + { + while (Bot.KillMe == false) + { + string NewStatusMessage = Bot.GetStatus(); + if (NewStatusMessage != Bot.LastStatusMessage) + { + NewStatusMessage = NewStatusMessage.Trim(); + if (NewStatusMessage.Replace(" ", "") != "") + { + Bot.LastStatusMessage = NewStatusMessage; + Bot.Log2File(LogFormater.Status(Bot.LastStatusMessage, false), ConsoleLogLogLevel.Status); + } + } + Thread.Sleep(1000); + } } public CliExitOnLogout(JsonConfig Config, bool as_docker, bool use_self_keep_alive) { @@ -50,23 +50,23 @@ namespace BetterSecondBot SecondBotHttpServer my_http_server = new SecondBotHttpServer(); my_http_server.StartHttpServer(Bot, Config); */ - new Thread(() => - { - new HttpAsService(Bot, Config, as_docker); + new Thread(() => + { + new HttpAsService(Bot, Config, as_docker); }).Start(); } - if(use_self_keep_alive == true) - { - keep_alive(); + if(use_self_keep_alive == true) + { + keep_alive(); } } else { LogFormater.Warn("Required settings missing"); - } - if (use_self_keep_alive == true) - { - exitBot = true; + } + if (use_self_keep_alive == true) + { + exitBot = true; } } } diff --git a/BetterSecondbot/DiscordSupervisor/Discord-super.cs b/BetterSecondbot/DiscordSupervisor/Discord-super.cs index 9c09bef..e264b9c 100644 --- a/BetterSecondbot/DiscordSupervisor/Discord-super.cs +++ b/BetterSecondbot/DiscordSupervisor/Discord-super.cs @@ -20,7 +20,7 @@ namespace BetterSecondBot.DiscordSupervisor { if (HasBasicBot() == false) { - StatusMessageHandler(null, new BSB.bottypes.StatusMessageEvent(false, "None")); + StatusMessageHandler(null, new BetterSecondBot.bottypes.StatusMessageEvent(false, "None")); } string NewStatusMessage = GetStatus(); if (NewStatusMessage != LastStatusMessage) diff --git a/BetterSecondbot/DiscordSupervisor/DiscordEvents.cs b/BetterSecondbot/DiscordSupervisor/DiscordEvents.cs index 6c6e5cb..b1ea515 100644 --- a/BetterSecondbot/DiscordSupervisor/DiscordEvents.cs +++ b/BetterSecondbot/DiscordSupervisor/DiscordEvents.cs @@ -1,4 +1,4 @@ -using BSB.bottypes; +using BetterSecondBot.bottypes; using System; using System.Collections.Generic; using System.Text; diff --git a/BetterSecondbot/HttpService/Chat.cs b/BetterSecondbot/HttpService/Chat.cs index 48d4592..7fe9435 100644 --- a/BetterSecondbot/HttpService/Chat.cs +++ b/BetterSecondbot/HttpService/Chat.cs @@ -1,5 +1,5 @@ -using BSB.bottypes; -using BSB.Static; +using BetterSecondBot.bottypes; +using BetterSecondBot.Static; using EmbedIO; using EmbedIO.Routing; using EmbedIO.WebApi; diff --git a/BetterSecondbot/HttpService/Core.cs b/BetterSecondbot/HttpService/Core.cs index d8fdc4c..07aa2a2 100644 --- a/BetterSecondbot/HttpService/Core.cs +++ b/BetterSecondbot/HttpService/Core.cs @@ -1,6 +1,6 @@ using BetterSecondBotShared.Json; using BetterSecondBotShared.Static; -using BSB.bottypes; +using BetterSecondBot.bottypes; using OpenMetaverse; using System.Threading.Tasks; using EmbedIO; diff --git a/BetterSecondbot/HttpService/Group.cs b/BetterSecondbot/HttpService/Group.cs index 0ae39a3..358c78a 100644 --- a/BetterSecondbot/HttpService/Group.cs +++ b/BetterSecondbot/HttpService/Group.cs @@ -1,5 +1,5 @@ -using BSB.bottypes; -using BSB.Static; +using BetterSecondBot.bottypes; +using BetterSecondBot.Static; using EmbedIO; using EmbedIO.Routing; using EmbedIO.WebApi; diff --git a/BetterSecondbot/HttpService/HttpAsService.cs b/BetterSecondbot/HttpService/HttpAsService.cs index ff7dce4..c1d62e1 100644 --- a/BetterSecondbot/HttpService/HttpAsService.cs +++ b/BetterSecondbot/HttpService/HttpAsService.cs @@ -1,5 +1,5 @@ using BetterSecondBotShared.Json; -using BSB.bottypes; +using BetterSecondBot.bottypes; using System; using EmbedIO; using EmbedIO.Actions; diff --git a/BetterSecondbot/HttpService/Im.cs b/BetterSecondbot/HttpService/Im.cs index f0e803d..feaee26 100644 --- a/BetterSecondbot/HttpService/Im.cs +++ b/BetterSecondbot/HttpService/Im.cs @@ -1,5 +1,5 @@ -using BSB.bottypes; -using BSB.Static; +using BetterSecondBot.bottypes; +using BetterSecondBot.Static; using EmbedIO; using EmbedIO.Routing; using EmbedIO.WebApi; diff --git a/BetterSecondbot/HttpService/Inventory.cs b/BetterSecondbot/HttpService/Inventory.cs index 431aff2..b87c908 100644 --- a/BetterSecondbot/HttpService/Inventory.cs +++ b/BetterSecondbot/HttpService/Inventory.cs @@ -1,5 +1,5 @@ -using BSB.bottypes; -using BSB.Static; +using BetterSecondBot.bottypes; +using BetterSecondBot.Static; using EmbedIO; using EmbedIO.Routing; using EmbedIO.WebApi; diff --git a/BetterSecondbot/HttpService/ParcelEstate.cs b/BetterSecondbot/HttpService/ParcelEstate.cs index c9ebe69..3e47767 100644 --- a/BetterSecondbot/HttpService/ParcelEstate.cs +++ b/BetterSecondbot/HttpService/ParcelEstate.cs @@ -1,5 +1,5 @@ -using BSB.bottypes; -using BSB.Static; +using BetterSecondBot.bottypes; +using BetterSecondBot.Static; using EmbedIO; using EmbedIO.Routing; using EmbedIO.WebApi; diff --git a/BetterSecondbot/WikiMake/wikimake.cs b/BetterSecondbot/WikiMake/wikimake.cs index 3d381b6..69b3200 100644 --- a/BetterSecondbot/WikiMake/wikimake.cs +++ b/BetterSecondbot/WikiMake/wikimake.cs @@ -1,327 +1,327 @@ using BetterSecondBot.HttpService; -using BetterSecondBotShared.API; -using BetterSecondBotShared.IO; -using BetterSecondBotShared.Json; -using BetterSecondBotShared.logs; -using BetterSecondBotShared.Static; +using BetterSecondBotShared.API; +using BetterSecondBotShared.IO; +using BetterSecondBotShared.Json; +using BetterSecondBotShared.logs; +using BetterSecondBotShared.Static; using EmbedIO; -using System; -using System.Collections.Generic; -using System.Reflection; -using System.Text; - -namespace BetterSecondBot.WikiMake -{ - class DebugModeCreateWiki - { - protected Dictionary> api_reports = new Dictionary>(); - protected string html_header = ""; - protected string html_footer = ""; - protected string buildVersion = ""; - protected SimpleIO io; - protected Dictionary seen_command_names = new Dictionary(); - - - public string CreateRoot() - { - StringBuilder sb = new StringBuilder(); - sb.Append(html_header); - sb.Append("

Build: "); - sb.Append(buildVersion); - sb.Append("


"); - sb.Append(""); - foreach (KeyValuePair> entry in api_reports) - { - sb.Append(""); - sb.Append(""); - sb.Append(""); - } - sb.Append("
InterfaceCommandsStatus
"); - sb.Append(entry.Key); - sb.Append(""); - sb.Append(entry.Value.Key.ToString()); - sb.Append(""); - sb.Append(entry.Value.Value); - sb.Append("
"); - sb.Replace("[[AREA]]", "Home"); - sb.Replace("[[SUBFOLDER]]", "files/"); - sb.Replace("[[RETURNROOT]]", ""); - sb = DebugModeCreateWiki.MenuActive(sb, "Home"); - sb.Append(html_footer); - return sb.ToString(); - } - - protected static StringBuilder MenuActive(StringBuilder index, string area) - { - Dictionary active_swaps = new Dictionary - { - { "CoreActive", "" }, - { "CLIActive", "" }, - { "JSONActive", "" }, - { "RLVapiActive", "" }, - { "HTTPActive", "" } - }; - active_swaps["" + area + "Active"] = "Active"; - foreach (KeyValuePair pair in active_swaps) - { - index = index.Replace("[[" + pair.Key + "]]", pair.Value); - } - return index; - } - - protected void InterfaceCommands(string area, API_supported_interface shared_interface, bool track_commands = false) - { - string[] cmds = shared_interface.GetCommandsList(); - string interface_name = shared_interface.GetType().Name; - foreach (string c in cmds) - { - if (track_commands == true) - { - if (seen_command_names.ContainsKey(c) == false) - { - seen_command_names.Add(c, interface_name); - } - else - { - LogFormater.Debug("command " + c + " from " + interface_name + " overlaps an ready loaded command from " + seen_command_names[c] + ""); - } - } - string workspace = shared_interface.GetCommandWorkspace(c); - StringBuilder sb = new StringBuilder(); - sb.Append(html_header); - sb.Append("

Build: "); - sb.Append(buildVersion); - sb.Append("


"); - sb.Append("

Interface: [[AREA]]"); - if (workspace != "") - { - sb.Append(" / [[WORKSPACE]]"); - } - sb.Append("

[[COMMAND]]

"); - int loop = 0; - int minargs = shared_interface.GetCommandArgs(c); - string[] arg_types = shared_interface.GetCommandArgTypes(c); - string[] arg_hints = shared_interface.GetCommandArgHints(c); - if (area == "Core") - { - StringBuilder ExampleCall = new StringBuilder(); - ExampleCall.Append("Example: [[COMMAND]]"); - ExampleCall.Append("|||"); - string addon = ""; - while (loop < minargs) - { - ExampleCall.Append(addon); - addon = "~#~"; - string hint_value = ""; - if (arg_hints.Length > loop) - { - if (arg_hints[loop] != null) - { - string[] bits = arg_hints[loop].Split("
", StringSplitOptions.RemoveEmptyEntries); - if (bits.Length >= 1) - { - hint_value = bits[0]; - } - } - } - if (hint_value != "") - { - ExampleCall.Append(hint_value); - } - else - { - ExampleCall.Append("?"); - LogFormater.Debug("[WikiMake] " + area + " Command " + c + " missing some required hint values"); - } - loop++; - } - sb.Append(ExampleCall.ToString()); - sb.Append("
"); - } - sb.Append("[[HELP]]"); - if (arg_types.Length > 0) - { - sb.Append("

Args helper

"); - loop = 0; - - sb.Append(""); - while (loop < arg_types.Length) - { - string hint = ""; - if (arg_hints.Length > loop) - { - hint = arg_hints[loop]; - } - string Required = "X"; - if ((loop + 1) > minargs) - { - Required = ""; - } - sb.Append(""); - loop++; - } - sb.Append("
NumTypeRequiredHint
" + (loop + 1).ToString() + "" + arg_types[loop] + "" + Required + "" + hint + "
"); - } - sb.Append(html_footer); - - sb.Replace("[[COMMAND]]", c); - sb.Replace("[[HELP]]", shared_interface.GetCommandHelp(c)); - sb.Replace("[[MINARGS]]", minargs.ToString()); - sb.Replace("[[WORKSPACE]]", workspace); - sb.Replace("[[AREA]]", area); - sb.Replace("[[SUBFOLDER]]", ""); - sb.Replace("[[RETURNROOT]]", "../"); - sb = DebugModeCreateWiki.MenuActive(sb, area); - string target_file = "" + area + "" + workspace + "" + c.ToLowerInvariant() + ".html"; - io.writefile(target_file, sb.ToString()); - } - } - protected void InterfaceWorkspaces(string area, API_supported_interface shared_interface) - { - string[] cmds = shared_interface.GetCommandsList(); - foreach (string workspace in shared_interface.GetAllWorkspaces()) - { - StringBuilder sb = new StringBuilder(); - sb.Append(html_header); - sb.Append("

Interface: [[AREA]]"); - if (workspace != "") - { - sb.Append(" / [[WORKSPACE]]"); - } - sb.Append("


"); - sb.Append("

Build: "); - sb.Append(buildVersion); - sb.Append("


"); - sb.Append(""); - foreach (string c in cmds) - { - if (shared_interface.GetCommandWorkspace(c) == workspace) - { - int args = shared_interface.GetCommandArgs(c); - sb.Append(""); - } - } - sb.Append("
CommandMin args
"); - sb.Append(c); - sb.Append(""); - sb.Append(args.ToString()); - sb.Append("
"); - sb.Replace("[[SUBFOLDER]]", ""); - sb.Replace("[[RETURNROOT]]", "../"); - sb.Replace("[[WORKSPACE]]", workspace); - sb.Replace("[[AREA]]", area); - sb.Append(html_footer); - sb = DebugModeCreateWiki.MenuActive(sb, area); - string target_file = "" + area + "" + workspace + ".html"; - io.writefile(target_file, sb.ToString()); - } - } - - protected void InterfaceIndex(string area, API_supported_interface shared_interface) - { - StringBuilder sb = new StringBuilder(); - sb.Append(html_header); - sb.Append("

Interface:"); - sb.Append(area); - sb.Append("


"); - sb.Append("

Build: "); - sb.Append(buildVersion); - sb.Append("


"); - string[] cmds = shared_interface.GetCommandsList(); - sb.Append(""); - foreach (string workspace in shared_interface.GetAllWorkspaces()) - { - int commands_count = 0; - foreach (string c in cmds) - { - if (shared_interface.GetCommandWorkspace(c) == workspace) - { - commands_count++; - } - } - - string workspace_link = "" + workspace + ""; - sb.Append(""); - } - sb.Append("
WorkspaceCommands
"); - sb.Append(workspace_link); - sb.Append(""); - sb.Append(commands_count.ToString()); - sb.Append("
"); - sb.Replace("[[SUBFOLDER]]", ""); - sb.Replace("[[RETURNROOT]]", "../"); - sb.Replace("[[AREA]]", area); - sb.Append(html_footer); - sb = DebugModeCreateWiki.MenuActive(sb, area); - io.writefile("" + area + ".html", sb.ToString()); - } - protected void InterfaceWiki(string area, API_supported_interface shared_interface, bool track_commands = false) - { - LogFormater.Info("[WIKI] Starting area " + area + ""); - // create index - InterfaceIndex(area, shared_interface); - - // create workspaces - InterfaceWorkspaces(area, shared_interface); - - // create commands - InterfaceCommands(area, shared_interface, track_commands); - LogFormater.Info("[WIKI] Done with area"); - } - - public DebugModeCreateWiki(string Version, SimpleIO shareio) - { - io = shareio; - buildVersion = Version; - html_header = helpers.ReadResourceFile(Assembly.GetExecutingAssembly(), "wiki_header.txt"); - html_footer = helpers.ReadResourceFile(Assembly.GetExecutingAssembly(), "wiki_footer.txt"); - io.ChangeRoot("wiki"); - io.ChangeRoot("wiki/files"); - - // JSONcfg - MakeJsonConfig defaultJson = new MakeJsonConfig(); - api_reports.Add("JSON", new KeyValuePair(defaultJson.ApiCommandsCount, "Ready")); - InterfaceWiki("JSON", defaultJson); - - // CMD - BSB.Commands.CoreCommandsInterface cmd = new BSB.Commands.CoreCommandsInterface(null); - api_reports.Add("Core", new KeyValuePair(cmd.ApiCommandsCount, "Good")); - InterfaceWiki("Core", cmd, true); - - // RLVapi - BSB.RLV.RLVcontrol RLVapi = new BSB.RLV.RLVcontrol(null); - api_reports.Add("RLVapi", new KeyValuePair(RLVapi.ApiCommandsCount, "Limited")); - InterfaceWiki("RLVapi", RLVapi, true); - - // HTTP +using System; +using System.Collections.Generic; +using System.Reflection; +using System.Text; + +namespace BetterSecondBot.WikiMake +{ + class DebugModeCreateWiki + { + protected Dictionary> api_reports = new Dictionary>(); + protected string html_header = ""; + protected string html_footer = ""; + protected string buildVersion = ""; + protected SimpleIO io; + protected Dictionary seen_command_names = new Dictionary(); + + + public string CreateRoot() + { + StringBuilder sb = new StringBuilder(); + sb.Append(html_header); + sb.Append("

Build: "); + sb.Append(buildVersion); + sb.Append("


"); + sb.Append(""); + foreach (KeyValuePair> entry in api_reports) + { + sb.Append(""); + sb.Append(""); + sb.Append(""); + } + sb.Append("
InterfaceCommandsStatus
"); + sb.Append(entry.Key); + sb.Append(""); + sb.Append(entry.Value.Key.ToString()); + sb.Append(""); + sb.Append(entry.Value.Value); + sb.Append("
"); + sb.Replace("[[AREA]]", "Home"); + sb.Replace("[[SUBFOLDER]]", "files/"); + sb.Replace("[[RETURNROOT]]", ""); + sb = DebugModeCreateWiki.MenuActive(sb, "Home"); + sb.Append(html_footer); + return sb.ToString(); + } + + protected static StringBuilder MenuActive(StringBuilder index, string area) + { + Dictionary active_swaps = new Dictionary + { + { "CoreActive", "" }, + { "CLIActive", "" }, + { "JSONActive", "" }, + { "RLVapiActive", "" }, + { "HTTPActive", "" } + }; + active_swaps["" + area + "Active"] = "Active"; + foreach (KeyValuePair pair in active_swaps) + { + index = index.Replace("[[" + pair.Key + "]]", pair.Value); + } + return index; + } + + protected void InterfaceCommands(string area, API_supported_interface shared_interface, bool track_commands = false) + { + string[] cmds = shared_interface.GetCommandsList(); + string interface_name = shared_interface.GetType().Name; + foreach (string c in cmds) + { + if (track_commands == true) + { + if (seen_command_names.ContainsKey(c) == false) + { + seen_command_names.Add(c, interface_name); + } + else + { + LogFormater.Debug("command " + c + " from " + interface_name + " overlaps an ready loaded command from " + seen_command_names[c] + ""); + } + } + string workspace = shared_interface.GetCommandWorkspace(c); + StringBuilder sb = new StringBuilder(); + sb.Append(html_header); + sb.Append("

Build: "); + sb.Append(buildVersion); + sb.Append("


"); + sb.Append("

Interface: [[AREA]]"); + if (workspace != "") + { + sb.Append(" / [[WORKSPACE]]"); + } + sb.Append("

[[COMMAND]]

"); + int loop = 0; + int minargs = shared_interface.GetCommandArgs(c); + string[] arg_types = shared_interface.GetCommandArgTypes(c); + string[] arg_hints = shared_interface.GetCommandArgHints(c); + if (area == "Core") + { + StringBuilder ExampleCall = new StringBuilder(); + ExampleCall.Append("Example: [[COMMAND]]"); + ExampleCall.Append("|||"); + string addon = ""; + while (loop < minargs) + { + ExampleCall.Append(addon); + addon = "~#~"; + string hint_value = ""; + if (arg_hints.Length > loop) + { + if (arg_hints[loop] != null) + { + string[] bits = arg_hints[loop].Split("
", StringSplitOptions.RemoveEmptyEntries); + if (bits.Length >= 1) + { + hint_value = bits[0]; + } + } + } + if (hint_value != "") + { + ExampleCall.Append(hint_value); + } + else + { + ExampleCall.Append("?"); + LogFormater.Debug("[WikiMake] " + area + " Command " + c + " missing some required hint values"); + } + loop++; + } + sb.Append(ExampleCall.ToString()); + sb.Append("
"); + } + sb.Append("[[HELP]]"); + if (arg_types.Length > 0) + { + sb.Append("

Args helper

"); + loop = 0; + + sb.Append(""); + while (loop < arg_types.Length) + { + string hint = ""; + if (arg_hints.Length > loop) + { + hint = arg_hints[loop]; + } + string Required = "X"; + if ((loop + 1) > minargs) + { + Required = ""; + } + sb.Append(""); + loop++; + } + sb.Append("
NumTypeRequiredHint
" + (loop + 1).ToString() + "" + arg_types[loop] + "" + Required + "" + hint + "
"); + } + sb.Append(html_footer); + + sb.Replace("[[COMMAND]]", c); + sb.Replace("[[HELP]]", shared_interface.GetCommandHelp(c)); + sb.Replace("[[MINARGS]]", minargs.ToString()); + sb.Replace("[[WORKSPACE]]", workspace); + sb.Replace("[[AREA]]", area); + sb.Replace("[[SUBFOLDER]]", ""); + sb.Replace("[[RETURNROOT]]", "../"); + sb = DebugModeCreateWiki.MenuActive(sb, area); + string target_file = "" + area + "" + workspace + "" + c.ToLowerInvariant() + ".html"; + io.writefile(target_file, sb.ToString()); + } + } + protected void InterfaceWorkspaces(string area, API_supported_interface shared_interface) + { + string[] cmds = shared_interface.GetCommandsList(); + foreach (string workspace in shared_interface.GetAllWorkspaces()) + { + StringBuilder sb = new StringBuilder(); + sb.Append(html_header); + sb.Append("

Interface: [[AREA]]"); + if (workspace != "") + { + sb.Append(" / [[WORKSPACE]]"); + } + sb.Append("


"); + sb.Append("

Build: "); + sb.Append(buildVersion); + sb.Append("


"); + sb.Append(""); + foreach (string c in cmds) + { + if (shared_interface.GetCommandWorkspace(c) == workspace) + { + int args = shared_interface.GetCommandArgs(c); + sb.Append(""); + } + } + sb.Append("
CommandMin args
"); + sb.Append(c); + sb.Append(""); + sb.Append(args.ToString()); + sb.Append("
"); + sb.Replace("[[SUBFOLDER]]", ""); + sb.Replace("[[RETURNROOT]]", "../"); + sb.Replace("[[WORKSPACE]]", workspace); + sb.Replace("[[AREA]]", area); + sb.Append(html_footer); + sb = DebugModeCreateWiki.MenuActive(sb, area); + string target_file = "" + area + "" + workspace + ".html"; + io.writefile(target_file, sb.ToString()); + } + } + + protected void InterfaceIndex(string area, API_supported_interface shared_interface) + { + StringBuilder sb = new StringBuilder(); + sb.Append(html_header); + sb.Append("

Interface:"); + sb.Append(area); + sb.Append("


"); + sb.Append("

Build: "); + sb.Append(buildVersion); + sb.Append("


"); + string[] cmds = shared_interface.GetCommandsList(); + sb.Append(""); + foreach (string workspace in shared_interface.GetAllWorkspaces()) + { + int commands_count = 0; + foreach (string c in cmds) + { + if (shared_interface.GetCommandWorkspace(c) == workspace) + { + commands_count++; + } + } + + string workspace_link = "" + workspace + ""; + sb.Append(""); + } + sb.Append("
WorkspaceCommands
"); + sb.Append(workspace_link); + sb.Append(""); + sb.Append(commands_count.ToString()); + sb.Append("
"); + sb.Replace("[[SUBFOLDER]]", ""); + sb.Replace("[[RETURNROOT]]", "../"); + sb.Replace("[[AREA]]", area); + sb.Append(html_footer); + sb = DebugModeCreateWiki.MenuActive(sb, area); + io.writefile("" + area + ".html", sb.ToString()); + } + protected void InterfaceWiki(string area, API_supported_interface shared_interface, bool track_commands = false) + { + LogFormater.Info("[WIKI] Starting area " + area + ""); + // create index + InterfaceIndex(area, shared_interface); + + // create workspaces + InterfaceWorkspaces(area, shared_interface); + + // create commands + InterfaceCommands(area, shared_interface, track_commands); + LogFormater.Info("[WIKI] Done with area"); + } + + public DebugModeCreateWiki(string Version, SimpleIO shareio) + { + io = shareio; + buildVersion = Version; + html_header = helpers.ReadResourceFile(Assembly.GetExecutingAssembly(), "wiki_header.txt"); + html_footer = helpers.ReadResourceFile(Assembly.GetExecutingAssembly(), "wiki_footer.txt"); + io.ChangeRoot("wiki"); + io.ChangeRoot("wiki/files"); + + // JSONcfg + MakeJsonConfig defaultJson = new MakeJsonConfig(); + api_reports.Add("JSON", new KeyValuePair(defaultJson.ApiCommandsCount, "Ready")); + InterfaceWiki("JSON", defaultJson); + + // CMD + BetterSecondBot.Commands.CoreCommandsInterface cmd = new BetterSecondBot.Commands.CoreCommandsInterface(null); + api_reports.Add("Core", new KeyValuePair(cmd.ApiCommandsCount, "Good")); + InterfaceWiki("Core", cmd, true); + + // RLVapi + BetterSecondBot.RLV.RLVcontrol RLVapi = new BetterSecondBot.RLV.RLVcontrol(null); + api_reports.Add("RLVapi", new KeyValuePair(RLVapi.ApiCommandsCount, "Limited")); + InterfaceWiki("RLVapi", RLVapi, true); + + // HTTP HTTPWiki(); - io.ChangeRoot("wiki"); - io.writefile("index.html", CreateRoot()); - } - + io.ChangeRoot("wiki"); + io.writefile("index.html", CreateRoot()); + } + protected void HTTPWiki() { - LogFormater.Info("[WIKI] Starting area HTTP endpoint"); + LogFormater.Info("[WIKI] Starting area HTTP endpoint"); HTTPendpoint HTTP = new HTTPendpoint(); - HTTPmenu("HTTP", HTTP); - - // create workspaces - HTTPWorkspaces("HTTP", HTTP); - - // create commands - HTTPCommands("HTTP", HTTP); - - HTTP = null; + HTTPmenu("HTTP", HTTP); + + // create workspaces + HTTPWorkspaces("HTTP", HTTP); + + // create commands + HTTPCommands("HTTP", HTTP); + + HTTP = null; LogFormater.Info("[WIKI] Done with area"); - } - + } + protected string getURLargs(Dictionary> values) { List urlargs = new List(); @@ -333,13 +333,13 @@ namespace BetterSecondBot.WikiMake } } return String.Join('/', urlargs); - } - - protected void HTTPCommands(string area, HTTPendpoint HTTP) + } + + protected void HTTPCommands(string area, HTTPendpoint HTTP) { - foreach (string workspace in HTTP.getEndPoints()) - { - + foreach (string workspace in HTTP.getEndPoints()) + { + foreach (string c in HTTP.getEndpointCommands(workspace)) { StringBuilder sb = new StringBuilder(); @@ -742,4 +742,4 @@ namespace BetterSecondBot.WikiMake } } } -} +} diff --git a/Core/Commands/Animation/PlayGesture.cs b/Core/Commands/Animation/PlayGesture.cs index 1e75700..56fd4e4 100644 --- a/Core/Commands/Animation/PlayGesture.cs +++ b/Core/Commands/Animation/PlayGesture.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.Animation +namespace BetterSecondBot.Commands.Animation { public class PlayGesture : CoreCommand_1arg { diff --git a/Core/Commands/Animation/addToAnimations.cs b/Core/Commands/Animation/addToAnimations.cs index 3ee18c4..1bf9078 100644 --- a/Core/Commands/Animation/addToAnimations.cs +++ b/Core/Commands/Animation/addToAnimations.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.Animation +namespace BetterSecondBot.Commands.Animation { public class AddToAllowAnimations : CoreCommand_1arg { diff --git a/Core/Commands/Animation/resetAnimations.cs b/Core/Commands/Animation/resetAnimations.cs index ee17a70..8b673b3 100644 --- a/Core/Commands/Animation/resetAnimations.cs +++ b/Core/Commands/Animation/resetAnimations.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Animation +namespace BetterSecondBot.Commands.Animation { public class ResetAnimations : CoreCommand { diff --git a/Core/Commands/Avatars/NearMe.cs b/Core/Commands/Avatars/NearMe.cs index f99447b..4b301cc 100644 --- a/Core/Commands/Avatars/NearMe.cs +++ b/Core/Commands/Avatars/NearMe.cs @@ -5,7 +5,7 @@ using System.Linq; using OpenMetaverse; using Newtonsoft.Json; -namespace BSB.Commands.Avatars +namespace BetterSecondBot.Commands.Avatars { class RoleCreate : CoreCommand_SmartReply_1arg { @@ -15,17 +15,17 @@ namespace BSB.Commands.Avatars if (base.CallFunction(args) == true) { Dictionary collection = new Dictionary(); - foreach(Avatar av in bot.GetClient.Network.CurrentSim.ObjectsAvatars.Copy().Values) - { - Vector3 pos = new Vector3(1, 1, 1); - if(bot.GetClient.Network.CurrentSim.AvatarPositions.ContainsKey(av.ID) == true) - { - pos = bot.GetClient.Network.CurrentSim.AvatarPositions[av.ID]; - } - Dictionary entrys = new Dictionary(); - entrys.Add("Username",av.Name); - entrys.Add("Pos", pos.X.ToString() + "," + pos.Y.ToString() + "," + pos.Z.ToString()); - collection.Add(av.ID.ToString(), JsonConvert.SerializeObject(entrys)); + foreach(Avatar av in bot.GetClient.Network.CurrentSim.ObjectsAvatars.Copy().Values) + { + Vector3 pos = new Vector3(1, 1, 1); + if(bot.GetClient.Network.CurrentSim.AvatarPositions.ContainsKey(av.ID) == true) + { + pos = bot.GetClient.Network.CurrentSim.AvatarPositions[av.ID]; + } + Dictionary entrys = new Dictionary(); + entrys.Add("Username",av.Name); + entrys.Add("Pos", pos.X.ToString() + "," + pos.Y.ToString() + "," + pos.Z.ToString()); + collection.Add(av.ID.ToString(), JsonConvert.SerializeObject(entrys)); } return bot.GetCommandsInterface.SmartCommandReply(true, args[0], "ok", CommandName, collection); } diff --git a/Core/Commands/Avatars/PayAvatar.cs b/Core/Commands/Avatars/PayAvatar.cs index e87706a..268124d 100644 --- a/Core/Commands/Avatars/PayAvatar.cs +++ b/Core/Commands/Avatars/PayAvatar.cs @@ -5,7 +5,7 @@ using System.Linq; using OpenMetaverse; -namespace BSB.Commands.Avatars +namespace BetterSecondBot.Commands.Avatars { public class PayAvatar : CoreCommand_2arg { diff --git a/Core/Commands/Chat/LocalChatHistory.cs b/Core/Commands/Chat/LocalChatHistory.cs index ba1da25..d0fc35d 100644 --- a/Core/Commands/Chat/LocalChatHistory.cs +++ b/Core/Commands/Chat/LocalChatHistory.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using OpenMetaverse; -namespace BSB.Commands.Chat +namespace BetterSecondBot.Commands.Chat { class LocalChatHistory : CoreCommand_SmartReply_1arg { diff --git a/Core/Commands/Chat/im.cs b/Core/Commands/Chat/im.cs index 2242cbb..3396199 100644 --- a/Core/Commands/Chat/im.cs +++ b/Core/Commands/Chat/im.cs @@ -1,7 +1,7 @@ using OpenMetaverse; using BetterSecondBotShared.Static; -namespace BSB.Commands.Chat +namespace BetterSecondBot.Commands.Chat { class IM : CoreCommand_2arg { diff --git a/Core/Commands/Chat/say.cs b/Core/Commands/Chat/say.cs index a27f585..e07ff91 100644 --- a/Core/Commands/Chat/say.cs +++ b/Core/Commands/Chat/say.cs @@ -1,7 +1,7 @@ using System.Linq; using OpenMetaverse; -namespace BSB.Commands.Chat +namespace BetterSecondBot.Commands.Chat { class Say : CoreCommand_1arg { diff --git a/Core/Commands/Dialogs/DialogRelay.cs b/Core/Commands/Dialogs/DialogRelay.cs index 1e5b780..c4e2714 100644 --- a/Core/Commands/Dialogs/DialogRelay.cs +++ b/Core/Commands/Dialogs/DialogRelay.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.Dialogs +namespace BetterSecondBot.Commands.Dialogs { class DialogRelay : CoreCommand_1arg { diff --git a/Core/Commands/Dialogs/DialogResponce.cs b/Core/Commands/Dialogs/DialogResponce.cs index 4ad3a1f..eadf43f 100644 --- a/Core/Commands/Dialogs/DialogResponce.cs +++ b/Core/Commands/Dialogs/DialogResponce.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Dialogs +namespace BetterSecondBot.Commands.Dialogs { class DialogResponce : CoreCommand_2arg { diff --git a/Core/Commands/Dialogs/DialogTrack.cs b/Core/Commands/Dialogs/DialogTrack.cs index d8db22d..36f65db 100644 --- a/Core/Commands/Dialogs/DialogTrack.cs +++ b/Core/Commands/Dialogs/DialogTrack.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Dialogs +namespace BetterSecondBot.Commands.Dialogs { class DialogTrack : CoreCommand_1arg { diff --git a/Core/Commands/DiscordAPI/AddRole.cs b/Core/Commands/DiscordAPI/AddRole.cs index e4043c0..8887c88 100644 --- a/Core/Commands/DiscordAPI/AddRole.cs +++ b/Core/Commands/DiscordAPI/AddRole.cs @@ -9,7 +9,7 @@ using Discord; using Discord.Rest; using System.Threading.Tasks; -namespace BSB.Commands.DiscordAPI +namespace BetterSecondBot.Commands.DiscordAPI { class Discord_AddRole : CoreCommand_4arg { diff --git a/Core/Commands/DiscordAPI/Ban_Member.cs b/Core/Commands/DiscordAPI/Ban_Member.cs index 677fe65..1485016 100644 --- a/Core/Commands/DiscordAPI/Ban_Member.cs +++ b/Core/Commands/DiscordAPI/Ban_Member.cs @@ -9,7 +9,7 @@ using Discord; using Discord.Rest; using System.Threading.Tasks; -namespace BSB.Commands.DiscordAPI +namespace BetterSecondBot.Commands.DiscordAPI { class Discord_BanMember : CoreCommand_3arg { diff --git a/Core/Commands/DiscordAPI/BulkClear_Messages.cs b/Core/Commands/DiscordAPI/BulkClear_Messages.cs index f899f11..49bea46 100644 --- a/Core/Commands/DiscordAPI/BulkClear_Messages.cs +++ b/Core/Commands/DiscordAPI/BulkClear_Messages.cs @@ -9,7 +9,7 @@ using Discord; using Discord.Rest; using System.Threading.Tasks; -namespace BSB.Commands.DiscordAPI +namespace BetterSecondBot.Commands.DiscordAPI { class Discord_BulkClear_Messages : CoreCommand_3arg { diff --git a/Core/Commands/DiscordAPI/Dm_Member.cs b/Core/Commands/DiscordAPI/Dm_Member.cs index 01a476b..7a2e311 100644 --- a/Core/Commands/DiscordAPI/Dm_Member.cs +++ b/Core/Commands/DiscordAPI/Dm_Member.cs @@ -9,7 +9,7 @@ using Discord; using Discord.Rest; using System.Threading.Tasks; -namespace BSB.Commands.DiscordAPI +namespace BetterSecondBot.Commands.DiscordAPI { class Discord_Dm_Member : CoreCommand_4arg { diff --git a/Core/Commands/DiscordAPI/MembersList.cs b/Core/Commands/DiscordAPI/MembersList.cs index e5e5ae4..a771545 100644 --- a/Core/Commands/DiscordAPI/MembersList.cs +++ b/Core/Commands/DiscordAPI/MembersList.cs @@ -9,7 +9,7 @@ using Discord; using Discord.Rest; using System.Threading.Tasks; -namespace BSB.Commands.DiscordAPI +namespace BetterSecondBot.Commands.DiscordAPI { class Discord_MembersList : CoreCommand_SmartReply_2arg { diff --git a/Core/Commands/DiscordAPI/MessageChannel.cs b/Core/Commands/DiscordAPI/MessageChannel.cs index 70fa86f..dd8c1ae 100644 --- a/Core/Commands/DiscordAPI/MessageChannel.cs +++ b/Core/Commands/DiscordAPI/MessageChannel.cs @@ -9,7 +9,7 @@ using Discord; using Discord.Rest; using System.Threading.Tasks; -namespace BSB.Commands.DiscordAPI +namespace BetterSecondBot.Commands.DiscordAPI { class Discord_MessageChannel : CoreCommand_4arg { diff --git a/Core/Commands/DiscordAPI/MuteMember.cs b/Core/Commands/DiscordAPI/MuteMember.cs index ecfa817..623e576 100644 --- a/Core/Commands/DiscordAPI/MuteMember.cs +++ b/Core/Commands/DiscordAPI/MuteMember.cs @@ -9,7 +9,7 @@ using Discord; using Discord.Rest; using System.Threading.Tasks; -namespace BSB.Commands.DiscordAPI +namespace BetterSecondBot.Commands.DiscordAPI { class Discord_MuteMember : CoreCommand_3arg { diff --git a/Core/Commands/DiscordAPI/RoleCreate.cs b/Core/Commands/DiscordAPI/RoleCreate.cs index 6beae56..7f265cb 100644 --- a/Core/Commands/DiscordAPI/RoleCreate.cs +++ b/Core/Commands/DiscordAPI/RoleCreate.cs @@ -4,12 +4,12 @@ using System.Text; using System.Linq; using OpenMetaverse; using Newtonsoft.Json; -using Discord.WebSocket; -using Discord; -using Discord.Rest; -using System.Threading.Tasks; - -namespace BSB.Commands.DiscordAPI +using Discord.WebSocket; +using Discord; +using Discord.Rest; +using System.Threading.Tasks; + +namespace BetterSecondBot.Commands.DiscordAPI { class Discord_RoleCreate : CoreCommand_SmartReply_3arg { @@ -20,28 +20,28 @@ namespace BSB.Commands.DiscordAPI { if (base.CallFunction(args) == true) { - if(bot.discordReady() == false) - { - return bot.GetCommandsInterface.SmartCommandReply(false, args[0], bot.getDiscordWhyFailed(), CommandName); + if(bot.discordReady() == false) + { + return bot.GetCommandsInterface.SmartCommandReply(false, args[0], bot.getDiscordWhyFailed(), CommandName); } KeyValuePair reply = CreateRole(args).Result; - Dictionary collection = new Dictionary(); - collection.Add("roleid", reply.Value.ToString()); + Dictionary collection = new Dictionary(); + collection.Add("roleid", reply.Value.ToString()); return bot.GetCommandsInterface.SmartCommandReply(true, args[0], "ok", CommandName, collection); } return bot.GetCommandsInterface.SmartCommandReply(false, args[0], "incorrect args", CommandName); } - protected async Task> CreateRole(string[] args) - { - DiscordSocketClient Discord = bot.getDiscordClient(); - if (ulong.TryParse(args[1], out ulong serverid) == true) - { - SocketGuild server = Discord.GetGuild(serverid); - RestRole role = await server.CreateRoleAsync(args[2], new GuildPermissions(), Color.DarkRed, false, null).ConfigureAwait(true); - return new KeyValuePair("ok", role.Id); - } - return new KeyValuePair("Unable to process server id", 0); + protected async Task> CreateRole(string[] args) + { + DiscordSocketClient Discord = bot.getDiscordClient(); + if (ulong.TryParse(args[1], out ulong serverid) == true) + { + SocketGuild server = Discord.GetGuild(serverid); + RestRole role = await server.CreateRoleAsync(args[2], new GuildPermissions(), Color.DarkRed, false, null).ConfigureAwait(true); + return new KeyValuePair("ok", role.Id); + } + return new KeyValuePair("Unable to process server id", 0); } } } diff --git a/Core/Commands/DiscordAPI/RoleList.cs b/Core/Commands/DiscordAPI/RoleList.cs index 42aa85d..3490ce2 100644 --- a/Core/Commands/DiscordAPI/RoleList.cs +++ b/Core/Commands/DiscordAPI/RoleList.cs @@ -9,7 +9,7 @@ using Discord; using Discord.Rest; using System.Threading.Tasks; -namespace BSB.Commands.DiscordAPI +namespace BetterSecondBot.Commands.DiscordAPI { class Discord_RoleList: CoreCommand_SmartReply_2arg { diff --git a/Core/Commands/DiscordAPI/RoleRemove.cs b/Core/Commands/DiscordAPI/RoleRemove.cs index fa75271..ad4a3c1 100644 --- a/Core/Commands/DiscordAPI/RoleRemove.cs +++ b/Core/Commands/DiscordAPI/RoleRemove.cs @@ -9,7 +9,7 @@ using Discord; using Discord.Rest; using System.Threading.Tasks; -namespace BSB.Commands.DiscordAPI +namespace BetterSecondBot.Commands.DiscordAPI { class Discord_RoleRemove: CoreCommand_SmartReply_3arg { diff --git a/Core/Commands/DiscordAPI/Role_GetSettings.cs b/Core/Commands/DiscordAPI/Role_GetSettings.cs index 01066ab..4f21e65 100644 --- a/Core/Commands/DiscordAPI/Role_GetSettings.cs +++ b/Core/Commands/DiscordAPI/Role_GetSettings.cs @@ -9,7 +9,7 @@ using Discord; using Discord.Rest; using System.Threading.Tasks; -namespace BSB.Commands.DiscordAPI +namespace BetterSecondBot.Commands.DiscordAPI { class Discord_Role_GetSettings : CoreCommand_SmartReply_3arg { diff --git a/Core/Commands/DiscordAPI/Role_UpdatePerms.cs b/Core/Commands/DiscordAPI/Role_UpdatePerms.cs index 8847af0..5e53575 100644 --- a/Core/Commands/DiscordAPI/Role_UpdatePerms.cs +++ b/Core/Commands/DiscordAPI/Role_UpdatePerms.cs @@ -9,7 +9,7 @@ using Discord; using Discord.Rest; using System.Threading.Tasks; -namespace BSB.Commands.DiscordAPI +namespace BetterSecondBot.Commands.DiscordAPI { class Discord_Role_UpdatePerms : CoreCommand_4arg { diff --git a/Core/Commands/DiscordAPI/TextChannels_List.cs b/Core/Commands/DiscordAPI/TextChannels_List.cs index 004e628..a18d72c 100644 --- a/Core/Commands/DiscordAPI/TextChannels_List.cs +++ b/Core/Commands/DiscordAPI/TextChannels_List.cs @@ -9,7 +9,7 @@ using Discord; using Discord.Rest; using System.Threading.Tasks; -namespace BSB.Commands.DiscordAPI +namespace BetterSecondBot.Commands.DiscordAPI { class Discord_TextChannels_List : CoreCommand_SmartReply_2arg { diff --git a/Core/Commands/Estate/EstateParcelReclaim.cs b/Core/Commands/Estate/EstateParcelReclaim.cs index 94f557b..47a8e4e 100644 --- a/Core/Commands/Estate/EstateParcelReclaim.cs +++ b/Core/Commands/Estate/EstateParcelReclaim.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Estate +namespace BetterSecondBot.Commands.Estate { public class EstateParcelReclaim : CoreCommand { diff --git a/Core/Commands/Estate/GetSimGlobalPos.cs b/Core/Commands/Estate/GetSimGlobalPos.cs index 8a6dc16..60f007d 100644 --- a/Core/Commands/Estate/GetSimGlobalPos.cs +++ b/Core/Commands/Estate/GetSimGlobalPos.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.Estate +namespace BetterSecondBot.Commands.Estate { public class GetSimGlobalPos : CoreCommand_SmartReply_2arg { diff --git a/Core/Commands/Estate/GetSimTexture.cs b/Core/Commands/Estate/GetSimTexture.cs index f9fbac3..de732b1 100644 --- a/Core/Commands/Estate/GetSimTexture.cs +++ b/Core/Commands/Estate/GetSimTexture.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.Estate +namespace BetterSecondBot.Commands.Estate { public class GetSimTexture : CoreCommand_SmartReply_2arg { diff --git a/Core/Commands/Estate/SimMessage.cs b/Core/Commands/Estate/SimMessage.cs index aa7d8e9..2083466 100644 --- a/Core/Commands/Estate/SimMessage.cs +++ b/Core/Commands/Estate/SimMessage.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Estate +namespace BetterSecondBot.Commands.Estate { public class SimMessage : CoreCommand_1arg { diff --git a/Core/Commands/Estate/SimRestart.cs b/Core/Commands/Estate/SimRestart.cs index ff60209..86471ad 100644 --- a/Core/Commands/Estate/SimRestart.cs +++ b/Core/Commands/Estate/SimRestart.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Estate +namespace BetterSecondBot.Commands.Estate { public class SimRestart : CoreCommand_1arg { diff --git a/Core/Commands/Friends/FriendFullPerms.cs b/Core/Commands/Friends/FriendFullPerms.cs index 144e8f6..9c4c5a6 100644 --- a/Core/Commands/Friends/FriendFullPerms.cs +++ b/Core/Commands/Friends/FriendFullPerms.cs @@ -1,6 +1,6 @@ using System; using OpenMetaverse; -namespace BSB.Commands.Friends +namespace BetterSecondBot.Commands.Friends { public class FriendFullPerms : CoreCommand_2arg { diff --git a/Core/Commands/Friends/FriendRequest.cs b/Core/Commands/Friends/FriendRequest.cs index 6738104..f26d34f 100644 --- a/Core/Commands/Friends/FriendRequest.cs +++ b/Core/Commands/Friends/FriendRequest.cs @@ -1,6 +1,6 @@ using System; using OpenMetaverse; -namespace BSB.Commands.Friends +namespace BetterSecondBot.Commands.Friends { public class FriendRequest : CoreCommand_1arg { diff --git a/Core/Commands/Friends/Friendslist.cs b/Core/Commands/Friends/Friendslist.cs index f14c55f..cc05419 100644 --- a/Core/Commands/Friends/Friendslist.cs +++ b/Core/Commands/Friends/Friendslist.cs @@ -1,6 +1,6 @@ using System; using OpenMetaverse; -namespace BSB.Commands.Friends +namespace BetterSecondBot.Commands.Friends { public class Friendslist : CoreCommand_SmartReply_1arg { diff --git a/Core/Commands/Group/GroupActiveGroup.cs b/Core/Commands/Group/GroupActiveGroup.cs index 692c422..5e9dd2d 100644 --- a/Core/Commands/Group/GroupActiveGroup.cs +++ b/Core/Commands/Group/GroupActiveGroup.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { class GroupActiveGroup : CoreCommand_1arg { diff --git a/Core/Commands/Group/GroupActiveTitle.cs b/Core/Commands/Group/GroupActiveTitle.cs index 4b6bf1c..0b5fd6f 100644 --- a/Core/Commands/Group/GroupActiveTitle.cs +++ b/Core/Commands/Group/GroupActiveTitle.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { class GroupActiveTitle : CoreCommand_2arg { diff --git a/Core/Commands/Group/GroupAddRole.cs b/Core/Commands/Group/GroupAddRole.cs index 1589060..092320c 100644 --- a/Core/Commands/Group/GroupAddRole.cs +++ b/Core/Commands/Group/GroupAddRole.cs @@ -2,7 +2,7 @@ using OpenMetaverse; using BetterSecondBotShared.logs; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { class GroupAddRole : CoreCommand_3arg { diff --git a/Core/Commands/Group/GroupEject.cs b/Core/Commands/Group/GroupEject.cs index ae06a28..cf521ab 100644 --- a/Core/Commands/Group/GroupEject.cs +++ b/Core/Commands/Group/GroupEject.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using OpenMetaverse; using BetterSecondBotShared.logs; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { public class GroupEject : CoreCommand_2arg { diff --git a/Core/Commands/Group/GroupInvite.cs b/Core/Commands/Group/GroupInvite.cs index 9d119a8..020480a 100644 --- a/Core/Commands/Group/GroupInvite.cs +++ b/Core/Commands/Group/GroupInvite.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using OpenMetaverse; using BetterSecondBotShared.logs; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { public class GroupInvite : CoreCommand_2arg { diff --git a/Core/Commands/Group/GroupInviteNoLimiter.cs b/Core/Commands/Group/GroupInviteNoLimiter.cs index 4374dab..ec4eb55 100644 --- a/Core/Commands/Group/GroupInviteNoLimiter.cs +++ b/Core/Commands/Group/GroupInviteNoLimiter.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { class GroupInviteNoLimiter: CoreCommand_2arg { diff --git a/Core/Commands/Group/GroupNotice.cs b/Core/Commands/Group/GroupNotice.cs index 2661858..1341c7d 100644 --- a/Core/Commands/Group/GroupNotice.cs +++ b/Core/Commands/Group/GroupNotice.cs @@ -1,7 +1,7 @@ using BetterSecondBotShared.Static; using OpenMetaverse; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { class Groupnotice : CoreCommand_2arg { diff --git a/Core/Commands/Group/IsGroupMember.cs b/Core/Commands/Group/IsGroupMember.cs index 26f80b3..b98fd93 100644 --- a/Core/Commands/Group/IsGroupMember.cs +++ b/Core/Commands/Group/IsGroupMember.cs @@ -4,7 +4,7 @@ using System.Text; using Newtonsoft.Json; using OpenMetaverse; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { public class IsGroupMember : CoreCommand_3arg { diff --git a/Core/Commands/Group/getGroupList.cs b/Core/Commands/Group/getGroupList.cs index 3c8653c..c285e2a 100644 --- a/Core/Commands/Group/getGroupList.cs +++ b/Core/Commands/Group/getGroupList.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using OpenMetaverse; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { public class GetGroupList : CoreGroupCommand_SmartReply_auto { diff --git a/Core/Commands/Group/getGroupMembers.cs b/Core/Commands/Group/getGroupMembers.cs index f31aae2..dce0041 100644 --- a/Core/Commands/Group/getGroupMembers.cs +++ b/Core/Commands/Group/getGroupMembers.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using OpenMetaverse; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { public class GetGroupMembers : CoreCommand_2arg { diff --git a/Core/Commands/Group/getGroupRoles.cs b/Core/Commands/Group/getGroupRoles.cs index 5f1f27a..379dab0 100644 --- a/Core/Commands/Group/getGroupRoles.cs +++ b/Core/Commands/Group/getGroupRoles.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using OpenMetaverse; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { public class GetGroupRoles : CoreGroupCommand_SmartReply_Group { diff --git a/Core/Commands/Group/group.cs b/Core/Commands/Group/group.cs index 5ea61cd..3ab64e6 100644 --- a/Core/Commands/Group/group.cs +++ b/Core/Commands/Group/group.cs @@ -1,7 +1,7 @@ using OpenMetaverse; using System.Collections.Generic; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { public abstract class CoreGroupCommand_SmartReply_auto : CoreCommand_SmartReply_1arg { diff --git a/Core/Commands/Group/groupchat.cs b/Core/Commands/Group/groupchat.cs index bf5b38f..ce3c7bb 100644 --- a/Core/Commands/Group/groupchat.cs +++ b/Core/Commands/Group/groupchat.cs @@ -1,7 +1,7 @@ using OpenMetaverse; using System; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { class Groupchat : CoreCommand_2arg { diff --git a/Core/Commands/Group/groupchatAnyUnread.cs b/Core/Commands/Group/groupchatAnyUnread.cs index a4fb6b6..2e8451a 100644 --- a/Core/Commands/Group/groupchatAnyUnread.cs +++ b/Core/Commands/Group/groupchatAnyUnread.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { class GroupchatAnyUnread : CoreGroupCommand_SmartReply_auto { diff --git a/Core/Commands/Group/groupchatClearAll.cs b/Core/Commands/Group/groupchatClearAll.cs index 6efd7ab..d9c669d 100644 --- a/Core/Commands/Group/groupchatClearAll.cs +++ b/Core/Commands/Group/groupchatClearAll.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { class GroupchatClearAll : CoreCommand { diff --git a/Core/Commands/Group/groupchatGroupHasUnread.cs b/Core/Commands/Group/groupchatGroupHasUnread.cs index db7551a..b83c31b 100644 --- a/Core/Commands/Group/groupchatGroupHasUnread.cs +++ b/Core/Commands/Group/groupchatGroupHasUnread.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { class GroupchatGroupHasUnread : CoreGroupCommand_SmartReply_Group_auto { diff --git a/Core/Commands/Group/groupchatHistory.cs b/Core/Commands/Group/groupchatHistory.cs index 557a7c8..22475f4 100644 --- a/Core/Commands/Group/groupchatHistory.cs +++ b/Core/Commands/Group/groupchatHistory.cs @@ -3,7 +3,7 @@ using System.Linq; using Microsoft.VisualBasic.CompilerServices; using OpenMetaverse; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { class GroupchatHistory : CoreGroupCommand_SmartReply_Group_auto { diff --git a/Core/Commands/Group/groupchatListAllUnreadGroups.cs b/Core/Commands/Group/groupchatListAllUnreadGroups.cs index e62dbed..15a8989 100644 --- a/Core/Commands/Group/groupchatListAllUnreadGroups.cs +++ b/Core/Commands/Group/groupchatListAllUnreadGroups.cs @@ -1,7 +1,7 @@ using OpenMetaverse; using System.Text; -namespace BSB.Commands.Group +namespace BetterSecondBot.Commands.Group { public class GroupchatListAllUnreadGroups : CoreGroupCommand_SmartReply_auto { diff --git a/Core/Commands/Helpers/delay.cs b/Core/Commands/Helpers/delay.cs index 9895267..3dc8c4b 100644 --- a/Core/Commands/Helpers/delay.cs +++ b/Core/Commands/Helpers/delay.cs @@ -2,7 +2,7 @@ using System.Threading; using OpenMetaverse; -namespace BSB.Commands.Helpers +namespace BetterSecondBot.Commands.Helpers { public class Delay : CoreCommand_1arg { diff --git a/Core/Commands/Home/GoHome.cs b/Core/Commands/Home/GoHome.cs index 308cda0..30fa54a 100644 --- a/Core/Commands/Home/GoHome.cs +++ b/Core/Commands/Home/GoHome.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Home +namespace BetterSecondBot.Commands.Home { public class GoHome : CoreCommand { diff --git a/Core/Commands/Home/resetAtHome.cs b/Core/Commands/Home/resetAtHome.cs index b1cff25..947db62 100644 --- a/Core/Commands/Home/resetAtHome.cs +++ b/Core/Commands/Home/resetAtHome.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Home +namespace BetterSecondBot.Commands.Home { public class ResetAtHome : CoreCommand { diff --git a/Core/Commands/Info/Balance.cs b/Core/Commands/Info/Balance.cs index aaf8716..1b08433 100644 --- a/Core/Commands/Info/Balance.cs +++ b/Core/Commands/Info/Balance.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Info +namespace BetterSecondBot.Commands.Info { public class Balance : CoreCommand_SmartReply_1arg { diff --git a/Core/Commands/Info/GetPosition.cs b/Core/Commands/Info/GetPosition.cs index bc45f7c..e617a63 100644 --- a/Core/Commands/Info/GetPosition.cs +++ b/Core/Commands/Info/GetPosition.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Info +namespace BetterSecondBot.Commands.Info { public class GetPosition : CoreCommand_SmartReply_1arg { diff --git a/Core/Commands/Info/ParcelName.cs b/Core/Commands/Info/ParcelName.cs index 74af8c5..a4eb654 100644 --- a/Core/Commands/Info/ParcelName.cs +++ b/Core/Commands/Info/ParcelName.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Info +namespace BetterSecondBot.Commands.Info { public class ParcelName : ParcelCommand_CheckParcel_1arg_smart { diff --git a/Core/Commands/Info/SimName.cs b/Core/Commands/Info/SimName.cs index f7b461a..3823bc0 100644 --- a/Core/Commands/Info/SimName.cs +++ b/Core/Commands/Info/SimName.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Info +namespace BetterSecondBot.Commands.Info { public class SimName : CoreCommand_SmartReply_1arg { diff --git a/Core/Commands/Info/UnixTimeNow.cs b/Core/Commands/Info/UnixTimeNow.cs index 56e0645..934eb6b 100644 --- a/Core/Commands/Info/UnixTimeNow.cs +++ b/Core/Commands/Info/UnixTimeNow.cs @@ -1,6 +1,6 @@ using BetterSecondBotShared.Static; -namespace BSB.Commands.Info +namespace BetterSecondBot.Commands.Info { public class UnixTimeNow : CoreCommand_SmartReply_1arg { diff --git a/Core/Commands/Inventory/DeleteInventory.cs b/Core/Commands/Inventory/DeleteInventory.cs index 8fb6611..88e58b3 100644 --- a/Core/Commands/Inventory/DeleteInventory.cs +++ b/Core/Commands/Inventory/DeleteInventory.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using OpenMetaverse; -namespace BSB.Commands.Inventory +namespace BetterSecondBot.Commands.Inventory { public class DeleteInventoryItem : CoreCommand_1arg { diff --git a/Core/Commands/Inventory/InventoryPurgeNotecards.cs b/Core/Commands/Inventory/InventoryPurgeNotecards.cs index c91fc64..6aa7b04 100644 --- a/Core/Commands/Inventory/InventoryPurgeNotecards.cs +++ b/Core/Commands/Inventory/InventoryPurgeNotecards.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using OpenMetaverse; -namespace BSB.Commands.Inventory +namespace BetterSecondBot.Commands.Inventory { public class InventoryPurgeNotecards : CoreCommand { diff --git a/Core/Commands/Inventory/RenameInventory.cs b/Core/Commands/Inventory/RenameInventory.cs index 3cf20b2..a10f430 100644 --- a/Core/Commands/Inventory/RenameInventory.cs +++ b/Core/Commands/Inventory/RenameInventory.cs @@ -1,7 +1,7 @@ -using BSB.Static; +using BetterSecondBot.Static; using OpenMetaverse; -namespace BSB.Commands.Inventory +namespace BetterSecondBot.Commands.Inventory { public class RenameInventory : CoreCommand_3arg { diff --git a/Core/Commands/Inventory/attach.cs b/Core/Commands/Inventory/attach.cs index 7f21469..d2e46f1 100644 --- a/Core/Commands/Inventory/attach.cs +++ b/Core/Commands/Inventory/attach.cs @@ -2,7 +2,7 @@ using System.Linq; using OpenMetaverse; -namespace BSB.Commands.Inventory +namespace BetterSecondBot.Commands.Inventory { public class Attach : CoreCommand_2arg { diff --git a/Core/Commands/Inventory/getRealUUID.cs b/Core/Commands/Inventory/getRealUUID.cs index 5504de8..3d0af0b 100644 --- a/Core/Commands/Inventory/getRealUUID.cs +++ b/Core/Commands/Inventory/getRealUUID.cs @@ -1,7 +1,7 @@ -using BSB.Static; +using BetterSecondBot.Static; using OpenMetaverse; -namespace BSB.Commands.Inventory +namespace BetterSecondBot.Commands.Inventory { public class getRealUUID : CoreCommand_2arg { diff --git a/Core/Commands/Inventory/inventoryContents.cs b/Core/Commands/Inventory/inventoryContents.cs index eb977bb..603a84e 100644 --- a/Core/Commands/Inventory/inventoryContents.cs +++ b/Core/Commands/Inventory/inventoryContents.cs @@ -1,10 +1,10 @@ using System; using OpenMetaverse; -using BSB.Static; +using BetterSecondBot.Static; using BetterSecondBotShared.Static; using System.Collections.Generic; -namespace BSB.Commands.Inventory +namespace BetterSecondBot.Commands.Inventory { public class InventoryContents : CoreCommand_2arg diff --git a/Core/Commands/Inventory/inventoryFolders.cs b/Core/Commands/Inventory/inventoryFolders.cs index 3ee4c7f..078893a 100644 --- a/Core/Commands/Inventory/inventoryFolders.cs +++ b/Core/Commands/Inventory/inventoryFolders.cs @@ -1,7 +1,7 @@ using OpenMetaverse; -using BSB.Static; +using BetterSecondBot.Static; -namespace BSB.Commands.Inventory +namespace BetterSecondBot.Commands.Inventory { public class InventoryFolders : CoreCommand_1arg { diff --git a/Core/Commands/Inventory/outfit.cs b/Core/Commands/Inventory/outfit.cs index 8096fa7..5bd30a6 100644 --- a/Core/Commands/Inventory/outfit.cs +++ b/Core/Commands/Inventory/outfit.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using OpenMetaverse; -namespace BSB.Commands.Inventory +namespace BetterSecondBot.Commands.Inventory { public class Outfit : CoreCommand_1arg { diff --git a/Core/Commands/Inventory/sendFolder.cs b/Core/Commands/Inventory/sendFolder.cs index c14a75c..d0a8bb6 100644 --- a/Core/Commands/Inventory/sendFolder.cs +++ b/Core/Commands/Inventory/sendFolder.cs @@ -1,7 +1,7 @@ -using BSB.Static; +using BetterSecondBot.Static; using OpenMetaverse; -namespace BSB.Commands.Inventory +namespace BetterSecondBot.Commands.Inventory { public class SendFolder : CoreCommand_2arg { diff --git a/Core/Commands/Inventory/sendItem.cs b/Core/Commands/Inventory/sendItem.cs index af0eeb9..e79e4de 100644 --- a/Core/Commands/Inventory/sendItem.cs +++ b/Core/Commands/Inventory/sendItem.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.Inventory +namespace BetterSecondBot.Commands.Inventory { public class SendItem : CoreCommand_2arg { diff --git a/Core/Commands/Movement/AutoPilot.cs b/Core/Commands/Movement/AutoPilot.cs index 1043c22..ca2a761 100644 --- a/Core/Commands/Movement/AutoPilot.cs +++ b/Core/Commands/Movement/AutoPilot.cs @@ -1,10 +1,8 @@ -using System; +using BetterSecondBotShared.Static; using OpenMetaverse; -using BetterSecondBotShared.Static; -using System.Runtime.CompilerServices; using System.Threading; -namespace BSB.Commands.Movement +namespace BetterSecondBot.Commands.Movement { public class AutoPilot : CoreCommand_1arg { diff --git a/Core/Commands/Movement/AutoPilotStop.cs b/Core/Commands/Movement/AutoPilotStop.cs index 93de70a..eb1ea3a 100644 --- a/Core/Commands/Movement/AutoPilotStop.cs +++ b/Core/Commands/Movement/AutoPilotStop.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Movement +namespace BetterSecondBot.Commands.Movement { public class AutoPilotStop : CoreCommand { diff --git a/Core/Commands/Movement/Fly.cs b/Core/Commands/Movement/Fly.cs index e80412a..50d1fdc 100644 --- a/Core/Commands/Movement/Fly.cs +++ b/Core/Commands/Movement/Fly.cs @@ -1,6 +1,6 @@ using System.Threading; -namespace BSB.Commands.Movement +namespace BetterSecondBot.Commands.Movement { public class BotFly : CoreCommand_1arg { diff --git a/Core/Commands/Movement/RequestTeleport.cs b/Core/Commands/Movement/RequestTeleport.cs index 1c8db1e..0fa44d6 100644 --- a/Core/Commands/Movement/RequestTeleport.cs +++ b/Core/Commands/Movement/RequestTeleport.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.Movement +namespace BetterSecondBot.Commands.Movement { public class RequestTeleport : CoreCommand_1arg { diff --git a/Core/Commands/Movement/RotateToFace.cs b/Core/Commands/Movement/RotateToFace.cs index 7e73ab3..42fd711 100644 --- a/Core/Commands/Movement/RotateToFace.cs +++ b/Core/Commands/Movement/RotateToFace.cs @@ -1,6 +1,6 @@ using System; using OpenMetaverse; -namespace BSB.Commands.Movement +namespace BetterSecondBot.Commands.Movement { public class RotateToFace : CoreCommand_1arg { diff --git a/Core/Commands/Movement/RotateToFaceVector.cs b/Core/Commands/Movement/RotateToFaceVector.cs index 2a6171d..b944dbb 100644 --- a/Core/Commands/Movement/RotateToFaceVector.cs +++ b/Core/Commands/Movement/RotateToFaceVector.cs @@ -1,7 +1,7 @@ using System; using BetterSecondBotShared.Static; using OpenMetaverse; -namespace BSB.Commands.Movement +namespace BetterSecondBot.Commands.Movement { public class RotateToFaceVector : CoreCommand_1arg { diff --git a/Core/Commands/Movement/SendTeleportLure.cs b/Core/Commands/Movement/SendTeleportLure.cs index 98edb25..fc9cf38 100644 --- a/Core/Commands/Movement/SendTeleportLure.cs +++ b/Core/Commands/Movement/SendTeleportLure.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.Movement +namespace BetterSecondBot.Commands.Movement { public class SendTeleportLure : CoreCommand_1arg { diff --git a/Core/Commands/Movement/rotateTo.cs b/Core/Commands/Movement/rotateTo.cs index 03a2ecb..8338de0 100644 --- a/Core/Commands/Movement/rotateTo.cs +++ b/Core/Commands/Movement/rotateTo.cs @@ -1,6 +1,6 @@ using System; using OpenMetaverse; -namespace BSB.Commands.Movement +namespace BetterSecondBot.Commands.Movement { public class RotateTo : CoreCommand_1arg { diff --git a/Core/Commands/Movement/teleport.cs b/Core/Commands/Movement/teleport.cs index 49c28c0..7875e22 100644 --- a/Core/Commands/Movement/teleport.cs +++ b/Core/Commands/Movement/teleport.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.Movement +namespace BetterSecondBot.Commands.Movement { public class Teleport : CoreCommand_1arg { diff --git a/Core/Commands/Notecard/notecardAdd.cs b/Core/Commands/Notecard/notecardAdd.cs index 0eec5a7..4d35fe8 100644 --- a/Core/Commands/Notecard/notecardAdd.cs +++ b/Core/Commands/Notecard/notecardAdd.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Notecard +namespace BetterSecondBot.Commands.Notecard { class NotecardAdd : CoreCommand_2arg { diff --git a/Core/Commands/Notecard/notecardClear.cs b/Core/Commands/Notecard/notecardClear.cs index 3999065..8df95d6 100644 --- a/Core/Commands/Notecard/notecardClear.cs +++ b/Core/Commands/Notecard/notecardClear.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Notecard +namespace BetterSecondBot.Commands.Notecard { class NotecardClear : CoreCommand_1arg { diff --git a/Core/Commands/Notecard/notecardSend.cs b/Core/Commands/Notecard/notecardSend.cs index baf3c65..0c34eaa 100644 --- a/Core/Commands/Notecard/notecardSend.cs +++ b/Core/Commands/Notecard/notecardSend.cs @@ -1,7 +1,7 @@ using BetterSecondBotShared.Static; using OpenMetaverse; -namespace BSB.Commands.Notecard +namespace BetterSecondBot.Commands.Notecard { class NotecardSend : CoreCommand_2arg { diff --git a/Core/Commands/Parcel/AbandonLand.cs b/Core/Commands/Parcel/AbandonLand.cs index 121b083..6934361 100644 --- a/Core/Commands/Parcel/AbandonLand.cs +++ b/Core/Commands/Parcel/AbandonLand.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { public class AbandonLand : ParcelCommand_RequirePerms { diff --git a/Core/Commands/Parcel/GetParcelBanlist.cs b/Core/Commands/Parcel/GetParcelBanlist.cs index 55764de..660a83e 100644 --- a/Core/Commands/Parcel/GetParcelBanlist.cs +++ b/Core/Commands/Parcel/GetParcelBanlist.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using static OpenMetaverse.ParcelManager; -namespace BSB.Commands.Parcel +namespace BetterSecondBot.Commands.Parcel { class GetParcelBanlist : ParcelCommand_CheckParcel_1arg_smart { diff --git a/Core/Commands/Parcel/GetParcelDesc.cs b/Core/Commands/Parcel/GetParcelDesc.cs index d957cbc..ece327b 100644 --- a/Core/Commands/Parcel/GetParcelDesc.cs +++ b/Core/Commands/Parcel/GetParcelDesc.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { public class GetParcelDesc : ParcelCommand_CheckParcel_1arg_smart { diff --git a/Core/Commands/Parcel/GetParcelFlags.cs b/Core/Commands/Parcel/GetParcelFlags.cs index 9a16843..9405808 100644 --- a/Core/Commands/Parcel/GetParcelFlags.cs +++ b/Core/Commands/Parcel/GetParcelFlags.cs @@ -4,7 +4,7 @@ using BetterSecondBotShared.logs; using BetterSecondBotShared.Static; using OpenMetaverse; -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { public class GetParcelFlags : CoreCommand_1arg { diff --git a/Core/Commands/Parcel/ParcelBan.cs b/Core/Commands/Parcel/ParcelBan.cs index 0702dde..40e036f 100644 --- a/Core/Commands/Parcel/ParcelBan.cs +++ b/Core/Commands/Parcel/ParcelBan.cs @@ -1,7 +1,7 @@ using OpenMetaverse; using static OpenMetaverse.ParcelManager; -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { public class ParcelBan : CoreCommand_1arg { diff --git a/Core/Commands/Parcel/ParcelBuy.cs b/Core/Commands/Parcel/ParcelBuy.cs index c8da391..666df1d 100644 --- a/Core/Commands/Parcel/ParcelBuy.cs +++ b/Core/Commands/Parcel/ParcelBuy.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { class ParcelBuy : ParcelCommand_CheckParcel { diff --git a/Core/Commands/Parcel/ParcelCleanAndSell.cs b/Core/Commands/Parcel/ParcelCleanAndSell.cs index 7c8e781..a116ec4 100644 --- a/Core/Commands/Parcel/ParcelCleanAndSell.cs +++ b/Core/Commands/Parcel/ParcelCleanAndSell.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Threading; using OpenMetaverse; -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { public class ParcelCleanAndSell : ParcelCommand_RequirePerms_1arg { diff --git a/Core/Commands/Parcel/ParcelCommandHelper.cs b/Core/Commands/Parcel/ParcelCommandHelper.cs index 2b488f6..5d68f47 100644 --- a/Core/Commands/Parcel/ParcelCommandHelper.cs +++ b/Core/Commands/Parcel/ParcelCommandHelper.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands +namespace BetterSecondBot.Commands { public abstract class ParcelCommand_RequirePerms_1arg_Group : ParcelCommand_RequirePerms_1arg { diff --git a/Core/Commands/Parcel/ParcelDeedToGroup.cs b/Core/Commands/Parcel/ParcelDeedToGroup.cs index c52efcb..b9894bc 100644 --- a/Core/Commands/Parcel/ParcelDeedToGroup.cs +++ b/Core/Commands/Parcel/ParcelDeedToGroup.cs @@ -1,6 +1,6 @@ using System.Threading; -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { public class ParcelDeedToGroup : ParcelCommand_RequirePerms_1arg_Group { diff --git a/Core/Commands/Parcel/ParcelFreeze.cs b/Core/Commands/Parcel/ParcelFreeze.cs index d8d2544..13ad8e1 100644 --- a/Core/Commands/Parcel/ParcelFreeze.cs +++ b/Core/Commands/Parcel/ParcelFreeze.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { public class ParcelFreeze : CoreCommand_1arg { diff --git a/Core/Commands/Parcel/ParcelPrimCountAvatar.cs b/Core/Commands/Parcel/ParcelPrimCountAvatar.cs index e9d6717..7ee79ce 100644 --- a/Core/Commands/Parcel/ParcelPrimCountAvatar.cs +++ b/Core/Commands/Parcel/ParcelPrimCountAvatar.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { class ParcelPrimCountAvatar : CoreCommand_SmartReply_2arg { diff --git a/Core/Commands/Parcel/ParcelPrimCountTotal.cs b/Core/Commands/Parcel/ParcelPrimCountTotal.cs index d89db74..d41c5f8 100644 --- a/Core/Commands/Parcel/ParcelPrimCountTotal.cs +++ b/Core/Commands/Parcel/ParcelPrimCountTotal.cs @@ -2,7 +2,7 @@ using System; using System.Text; -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { class ParcelPrimCountTotal : CoreCommand_SmartReply_1arg { diff --git a/Core/Commands/Parcel/ParcelReturnObjects.cs b/Core/Commands/Parcel/ParcelReturnObjects.cs index 41adc94..9eff62b 100644 --- a/Core/Commands/Parcel/ParcelReturnObjects.cs +++ b/Core/Commands/Parcel/ParcelReturnObjects.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { class ParcelReturnObjects : CoreCommand { diff --git a/Core/Commands/Parcel/ParcelReturnTargeted.cs b/Core/Commands/Parcel/ParcelReturnTargeted.cs index 068a971..0dcbe2d 100644 --- a/Core/Commands/Parcel/ParcelReturnTargeted.cs +++ b/Core/Commands/Parcel/ParcelReturnTargeted.cs @@ -1,7 +1,7 @@ using OpenMetaverse; using System.Collections.Generic; -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { class ParcelReturnTargeted : ParcelCommand_RequirePerms_1arg { diff --git a/Core/Commands/Parcel/ParcelSetMedia.cs b/Core/Commands/Parcel/ParcelSetMedia.cs index af42534..46e9d55 100644 --- a/Core/Commands/Parcel/ParcelSetMedia.cs +++ b/Core/Commands/Parcel/ParcelSetMedia.cs @@ -1,7 +1,7 @@ using BetterSecondBotShared.Static; using OpenMetaverse; -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { class ParcelSetMedia : ParcelCommand_RequirePerms_1arg { diff --git a/Core/Commands/Parcel/SetParcelDesc.cs b/Core/Commands/Parcel/SetParcelDesc.cs index f68763f..3788caa 100644 --- a/Core/Commands/Parcel/SetParcelDesc.cs +++ b/Core/Commands/Parcel/SetParcelDesc.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { public class SetParcelDesc : ParcelCommand_RequirePerms_1arg { diff --git a/Core/Commands/Parcel/SetParcelFlag.cs b/Core/Commands/Parcel/SetParcelFlag.cs index a69488b..f772987 100644 --- a/Core/Commands/Parcel/SetParcelFlag.cs +++ b/Core/Commands/Parcel/SetParcelFlag.cs @@ -4,7 +4,7 @@ using BetterSecondBotShared.logs; using BetterSecondBotShared.Static; using OpenMetaverse; -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { public class SetParcelFlag : ParcelCommand_RequirePerms_1arg { diff --git a/Core/Commands/Parcel/SetParcelMusic.cs b/Core/Commands/Parcel/SetParcelMusic.cs index be6f3e1..849d55a 100644 --- a/Core/Commands/Parcel/SetParcelMusic.cs +++ b/Core/Commands/Parcel/SetParcelMusic.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { class SetParcelMusic : ParcelCommand_RequirePerms { diff --git a/Core/Commands/Parcel/SetParcelName.cs b/Core/Commands/Parcel/SetParcelName.cs index 34a46e1..614c045 100644 --- a/Core/Commands/Parcel/SetParcelName.cs +++ b/Core/Commands/Parcel/SetParcelName.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { public class SetParcelName : ParcelCommand_RequirePerms_1arg { diff --git a/Core/Commands/Parcel/SetParcelSale.cs b/Core/Commands/Parcel/SetParcelSale.cs index 757ec90..dfd0402 100644 --- a/Core/Commands/Parcel/SetParcelSale.cs +++ b/Core/Commands/Parcel/SetParcelSale.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { public class SetParcelSale : ParcelCommand_RequirePerms_1arg { diff --git a/Core/Commands/Parcel/eject.cs b/Core/Commands/Parcel/eject.cs index 18fcf04..86ca5b9 100644 --- a/Core/Commands/Parcel/eject.cs +++ b/Core/Commands/Parcel/eject.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.CMD_Parcel +namespace BetterSecondBot.Commands.CMD_Parcel { public class ParcelEject : CoreCommand_1arg { diff --git a/Core/Commands/Prims/RezObject.cs b/Core/Commands/Prims/RezObject.cs index bd88e56..b42fec7 100644 --- a/Core/Commands/Prims/RezObject.cs +++ b/Core/Commands/Prims/RezObject.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace BSB.Commands.Prims +namespace BetterSecondBot.Commands.Prims { class RezObject : CoreCommand_1arg { diff --git a/Core/Commands/Prims/TransferInventoryToObject.cs b/Core/Commands/Prims/TransferInventoryToObject.cs index 80561ab..74c3594 100644 --- a/Core/Commands/Prims/TransferInventoryToObject.cs +++ b/Core/Commands/Prims/TransferInventoryToObject.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace BSB.Commands.Prims +namespace BetterSecondBot.Commands.Prims { class TransferInventoryToObject : CoreCommand_2arg { diff --git a/Core/Commands/Prims/UnRezObject.cs b/Core/Commands/Prims/UnRezObject.cs index 0260ea3..f6b0edd 100644 --- a/Core/Commands/Prims/UnRezObject.cs +++ b/Core/Commands/Prims/UnRezObject.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace BSB.Commands.Prims +namespace BetterSecondBot.Commands.Prims { class UnRezObject : CoreCommand_1arg { diff --git a/Core/Commands/Script/scriptHttp.cs b/Core/Commands/Script/scriptHttp.cs index 5836fdd..98ce28d 100644 --- a/Core/Commands/Script/scriptHttp.cs +++ b/Core/Commands/Script/scriptHttp.cs @@ -3,7 +3,7 @@ using System.Linq; using OpenMetaverse; using RestSharp; -namespace BSB.Commands.Script +namespace BetterSecondBot.Commands.Script { public class ScriptHttp : CoreCommand_2arg { diff --git a/Core/Commands/Script/scriptSend.cs b/Core/Commands/Script/scriptSend.cs index 2676afa..39bc488 100644 --- a/Core/Commands/Script/scriptSend.cs +++ b/Core/Commands/Script/scriptSend.cs @@ -1,7 +1,7 @@ using BetterSecondBotShared.Static; using OpenMetaverse; -namespace BSB.Commands.Script +namespace BetterSecondBot.Commands.Script { class ScriptSend : CoreCommand_2arg { diff --git a/Core/Commands/Self/CickObject.cs b/Core/Commands/Self/CickObject.cs index 606a933..286f6a4 100644 --- a/Core/Commands/Self/CickObject.cs +++ b/Core/Commands/Self/CickObject.cs @@ -5,7 +5,7 @@ using System.Linq; using OpenMetaverse; -namespace BSB.Commands.Self +namespace BetterSecondBot.Commands.Self { public class ClickObject : CoreCommand_1arg { diff --git a/Core/Commands/Self/GetLastCommands.cs b/Core/Commands/Self/GetLastCommands.cs index 040b88a..f19b51c 100644 --- a/Core/Commands/Self/GetLastCommands.cs +++ b/Core/Commands/Self/GetLastCommands.cs @@ -1,6 +1,6 @@ using System; -namespace BSB.Commands.Self +namespace BetterSecondBot.Commands.Self { public class GetLastCommands : CoreCommand_SmartReply_1arg { diff --git a/Core/Commands/Self/Help.cs b/Core/Commands/Self/Help.cs index 5b98b4a..476bbb1 100644 --- a/Core/Commands/Self/Help.cs +++ b/Core/Commands/Self/Help.cs @@ -1,7 +1,7 @@ using System.Text; using OpenMetaverse; -namespace BSB.Commands.Self +namespace BetterSecondBot.Commands.Self { public class Help : CoreCommand { diff --git a/Core/Commands/Self/PayObject.cs b/Core/Commands/Self/PayObject.cs index b86c0a2..8b49e4b 100644 --- a/Core/Commands/Self/PayObject.cs +++ b/Core/Commands/Self/PayObject.cs @@ -5,7 +5,7 @@ using System.Linq; using OpenMetaverse; -namespace BSB.Commands.Self +namespace BetterSecondBot.Commands.Self { public class PayObject : CoreCommand_3arg { diff --git a/Core/Commands/Self/SetPermFlag.cs b/Core/Commands/Self/SetPermFlag.cs index 27aeaf2..c0e4649 100644 --- a/Core/Commands/Self/SetPermFlag.cs +++ b/Core/Commands/Self/SetPermFlag.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace BSB.Commands.Self +namespace BetterSecondBot.Commands.Self { public class SetPermFlag : CoreCommand_3arg { diff --git a/Core/Commands/Self/botVersion.cs b/Core/Commands/Self/botVersion.cs index d468fa8..d7993b0 100644 --- a/Core/Commands/Self/botVersion.cs +++ b/Core/Commands/Self/botVersion.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Self +namespace BetterSecondBot.Commands.Self { class BotVersion : CoreCommand_SmartReply_1arg { diff --git a/Core/Commands/Self/logout.cs b/Core/Commands/Self/logout.cs index 0cfc10b..79973af 100644 --- a/Core/Commands/Self/logout.cs +++ b/Core/Commands/Self/logout.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.Self +namespace BetterSecondBot.Commands.Self { public class Bye : Logout { diff --git a/Core/Commands/Self/pointAt.cs b/Core/Commands/Self/pointAt.cs index c1512dc..13b3444 100644 --- a/Core/Commands/Self/pointAt.cs +++ b/Core/Commands/Self/pointAt.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.Self +namespace BetterSecondBot.Commands.Self { public class PointAt : CoreCommand_1arg { diff --git a/Core/Commands/Self/sit.cs b/Core/Commands/Self/sit.cs index c8c1bb2..6239294 100644 --- a/Core/Commands/Self/sit.cs +++ b/Core/Commands/Self/sit.cs @@ -1,6 +1,6 @@ using OpenMetaverse; -namespace BSB.Commands.Self +namespace BetterSecondBot.Commands.Self { public class BotSit : CoreCommand_1arg { diff --git a/Core/Commands/Self/stand.cs b/Core/Commands/Self/stand.cs index 12b7009..8fe8a0d 100644 --- a/Core/Commands/Self/stand.cs +++ b/Core/Commands/Self/stand.cs @@ -1,4 +1,4 @@ -namespace BSB.Commands.Self +namespace BetterSecondBot.Commands.Self { public class Stand : CoreCommand { diff --git a/Core/Commands/StreamAdmin/FetchNextNotecard.cs b/Core/Commands/StreamAdmin/FetchNextNotecard.cs index d6f327f..c480af4 100644 --- a/Core/Commands/StreamAdmin/FetchNextNotecard.cs +++ b/Core/Commands/StreamAdmin/FetchNextNotecard.cs @@ -4,7 +4,7 @@ using BetterSecondBotShared.Static; using RestSharp; using Newtonsoft.Json; -namespace BSB.Commands.StreamAdmin +namespace BetterSecondBot.Commands.StreamAdmin { public class FetchNextNotecard : CoreCommand_2arg { diff --git a/Core/Commands/commandlib.cs b/Core/Commands/commandlib.cs index ab0f835..97f7c1c 100644 --- a/Core/Commands/commandlib.cs +++ b/Core/Commands/commandlib.cs @@ -4,13 +4,13 @@ using System.Text; using System.Linq; using OpenMetaverse; using System.Net.Http; -using BSB.bottypes; +using BetterSecondBot.bottypes; using BetterSecondBotShared.API; using BetterSecondBotShared.Static; using BetterSecondBotShared.logs; using Newtonsoft.Json; -namespace BSB.Commands +namespace BetterSecondBot.Commands { public class pending_avatar_lookup { diff --git a/Core/RLV/Blacklist/getblacklist.cs b/Core/RLV/Blacklist/getblacklist.cs index 5dfb64a..1e7b9ad 100644 --- a/Core/RLV/Blacklist/getblacklist.cs +++ b/Core/RLV/Blacklist/getblacklist.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Blacklist +namespace BetterSecondBot.RLV.Blacklist { public class GetBlacklist : RLV_command_1arg { diff --git a/Core/RLV/Blacklist/versionnumbl.cs b/Core/RLV/Blacklist/versionnumbl.cs index 14a7631..efa4439 100644 --- a/Core/RLV/Blacklist/versionnumbl.cs +++ b/Core/RLV/Blacklist/versionnumbl.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Blacklist +namespace BetterSecondBot.RLV.Blacklist { public class VersionNumBL : RLV_command_1arg { diff --git a/Core/RLV/Camera/camavdist.cs b/Core/RLV/Camera/camavdist.cs index 24a7933..a96c182 100644 --- a/Core/RLV/Camera/camavdist.cs +++ b/Core/RLV/Camera/camavdist.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class CamAvDist : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Camera/camdistmax.cs b/Core/RLV/Camera/camdistmax.cs index 8d94885..52a3cc2 100644 --- a/Core/RLV/Camera/camdistmax.cs +++ b/Core/RLV/Camera/camdistmax.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class CamDistMax : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Camera/camdistmin.cs b/Core/RLV/Camera/camdistmin.cs index 68a6ce1..b57aaec 100644 --- a/Core/RLV/Camera/camdistmin.cs +++ b/Core/RLV/Camera/camdistmin.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class CamDistMin : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Camera/camdrawalphamax.cs b/Core/RLV/Camera/camdrawalphamax.cs index 90a56c1..686157f 100644 --- a/Core/RLV/Camera/camdrawalphamax.cs +++ b/Core/RLV/Camera/camdrawalphamax.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class CamDrawAlphaMax : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Camera/camdrawalphamin.cs b/Core/RLV/Camera/camdrawalphamin.cs index ed111c6..5b45105 100644 --- a/Core/RLV/Camera/camdrawalphamin.cs +++ b/Core/RLV/Camera/camdrawalphamin.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class CamDrawAlphaMin : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Camera/camdrawcolor.cs b/Core/RLV/Camera/camdrawcolor.cs index 0c84ba2..8dec3b2 100644 --- a/Core/RLV/Camera/camdrawcolor.cs +++ b/Core/RLV/Camera/camdrawcolor.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class CamDrawColor : RLV_UUID_flag_4arg_yn { diff --git a/Core/RLV/Camera/camdrawmax.cs b/Core/RLV/Camera/camdrawmax.cs index f883355..18b5d98 100644 --- a/Core/RLV/Camera/camdrawmax.cs +++ b/Core/RLV/Camera/camdrawmax.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class CamDrawMax : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Camera/camdrawmin.cs b/Core/RLV/Camera/camdrawmin.cs index 3312f9d..38632a1 100644 --- a/Core/RLV/Camera/camdrawmin.cs +++ b/Core/RLV/Camera/camdrawmin.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class CamDrawMin : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Camera/camtextures.cs b/Core/RLV/Camera/camtextures.cs index 54c5472..5e158d7 100644 --- a/Core/RLV/Camera/camtextures.cs +++ b/Core/RLV/Camera/camtextures.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class CamTextures : RLV_UUID_flag_optional_arg_yn { diff --git a/Core/RLV/Camera/camunlock.cs b/Core/RLV/Camera/camunlock.cs index 8a72116..17d6f43 100644 --- a/Core/RLV/Camera/camunlock.cs +++ b/Core/RLV/Camera/camunlock.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class CamUnlock : RLV_UUID_flag_yn { diff --git a/Core/RLV/Camera/camzoommax.cs b/Core/RLV/Camera/camzoommax.cs index 79af3c5..a25a2e0 100644 --- a/Core/RLV/Camera/camzoommax.cs +++ b/Core/RLV/Camera/camzoommax.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class CamZoomMax : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Camera/camzoommin.cs b/Core/RLV/Camera/camzoommin.cs index e9cece5..ea0ed2e 100644 --- a/Core/RLV/Camera/camzoommin.cs +++ b/Core/RLV/Camera/camzoommin.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class CamZoomMin : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Camera/getcam_avdistmax.cs b/Core/RLV/Camera/getcam_avdistmax.cs index 35007cb..d65c1e1 100644 --- a/Core/RLV/Camera/getcam_avdistmax.cs +++ b/Core/RLV/Camera/getcam_avdistmax.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class GetCam_AvDistMax : RLV_UUID_flag_get { diff --git a/Core/RLV/Camera/getcam_avdistmin.cs b/Core/RLV/Camera/getcam_avdistmin.cs index c4c1aa3..307de2c 100644 --- a/Core/RLV/Camera/getcam_avdistmin.cs +++ b/Core/RLV/Camera/getcam_avdistmin.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class GetCam_AvDistMin : RLV_UUID_flag_get { diff --git a/Core/RLV/Camera/getcam_fov.cs b/Core/RLV/Camera/getcam_fov.cs index ca3117b..e156c99 100644 --- a/Core/RLV/Camera/getcam_fov.cs +++ b/Core/RLV/Camera/getcam_fov.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class GetCam_Fov : RLV_UUID_flag_get { diff --git a/Core/RLV/Camera/getcam_fovmax.cs b/Core/RLV/Camera/getcam_fovmax.cs index 8e29a9a..5ec4670 100644 --- a/Core/RLV/Camera/getcam_fovmax.cs +++ b/Core/RLV/Camera/getcam_fovmax.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class GetCam_FovMax : RLV_UUID_flag_get { diff --git a/Core/RLV/Camera/getcam_fovmin.cs b/Core/RLV/Camera/getcam_fovmin.cs index 63b13e3..0f275e8 100644 --- a/Core/RLV/Camera/getcam_fovmin.cs +++ b/Core/RLV/Camera/getcam_fovmin.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class GetCam_FovMin : RLV_UUID_flag_get { diff --git a/Core/RLV/Camera/getcam_zoommin.cs b/Core/RLV/Camera/getcam_zoommin.cs index 3b871c2..b516e4c 100644 --- a/Core/RLV/Camera/getcam_zoommin.cs +++ b/Core/RLV/Camera/getcam_zoommin.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class GetCam_ZoomMin : RLV_UUID_flag_get { diff --git a/Core/RLV/Camera/setcam_avdistmax.cs b/Core/RLV/Camera/setcam_avdistmax.cs index eca16f9..5a1cd04 100644 --- a/Core/RLV/Camera/setcam_avdistmax.cs +++ b/Core/RLV/Camera/setcam_avdistmax.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class SetCam_AvDistMax : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Camera/setcam_avdistmin.cs b/Core/RLV/Camera/setcam_avdistmin.cs index d4c4138..b43a550 100644 --- a/Core/RLV/Camera/setcam_avdistmin.cs +++ b/Core/RLV/Camera/setcam_avdistmin.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class SetCam_AvDistMin : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Camera/setcam_fov.cs b/Core/RLV/Camera/setcam_fov.cs index 1907cf1..8ab0cad 100644 --- a/Core/RLV/Camera/setcam_fov.cs +++ b/Core/RLV/Camera/setcam_fov.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class SetCam_Fov : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Camera/setcam_fovmax.cs b/Core/RLV/Camera/setcam_fovmax.cs index 9cd3e10..add8c0b 100644 --- a/Core/RLV/Camera/setcam_fovmax.cs +++ b/Core/RLV/Camera/setcam_fovmax.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class SetCam_FovMax : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Camera/setcam_fovmin.cs b/Core/RLV/Camera/setcam_fovmin.cs index 15b5abb..a5241b8 100644 --- a/Core/RLV/Camera/setcam_fovmin.cs +++ b/Core/RLV/Camera/setcam_fovmin.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class SetCam_FovMin : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Camera/setcam_textures.cs b/Core/RLV/Camera/setcam_textures.cs index ed90e0c..7c77360 100644 --- a/Core/RLV/Camera/setcam_textures.cs +++ b/Core/RLV/Camera/setcam_textures.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class SetCam_Textures : RLV_UUID_flag_optional_arg_yn { diff --git a/Core/RLV/Camera/setcam_unlock.cs b/Core/RLV/Camera/setcam_unlock.cs index ff5cbcd..f4b6ff8 100644 --- a/Core/RLV/Camera/setcam_unlock.cs +++ b/Core/RLV/Camera/setcam_unlock.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Camera +namespace BetterSecondBot.RLV.Camera { public class SetCam_Unlock : RLV_UUID_flag_yn { diff --git a/Core/RLV/Chat/chatnormal.cs b/Core/RLV/Chat/chatnormal.cs index 8dea634..2100f9c 100644 --- a/Core/RLV/Chat/chatnormal.cs +++ b/Core/RLV/Chat/chatnormal.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Chat +namespace BetterSecondBot.RLV.Chat { public class ChatNormal : RLV_UUID_flag_yn { diff --git a/Core/RLV/Chat/chatshout.cs b/Core/RLV/Chat/chatshout.cs index bcdcd05..d4dc08e 100644 --- a/Core/RLV/Chat/chatshout.cs +++ b/Core/RLV/Chat/chatshout.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Chat +namespace BetterSecondBot.RLV.Chat { public class ChatShout : RLV_UUID_flag_yn { diff --git a/Core/RLV/Chat/chatwhisper.cs b/Core/RLV/Chat/chatwhisper.cs index 1b314f3..cc67044 100644 --- a/Core/RLV/Chat/chatwhisper.cs +++ b/Core/RLV/Chat/chatwhisper.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Chat +namespace BetterSecondBot.RLV.Chat { public class ChatWhisper : RLV_UUID_flag_yn { diff --git a/Core/RLV/Chat/recvchat.cs b/Core/RLV/Chat/recvchat.cs index 9199205..459a54f 100644 --- a/Core/RLV/Chat/recvchat.cs +++ b/Core/RLV/Chat/recvchat.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using OpenMetaverse; -namespace BSB.RLV.Chat +namespace BetterSecondBot.RLV.Chat { public class RecvChat : RLV_command_1arg { diff --git a/Core/RLV/Chat/recvchat_sec.cs b/Core/RLV/Chat/recvchat_sec.cs index 7c1d978..95a9f09 100644 --- a/Core/RLV/Chat/recvchat_sec.cs +++ b/Core/RLV/Chat/recvchat_sec.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Chat +namespace BetterSecondBot.RLV.Chat { public class RecvChat_Sec : RLV_UUID_flag_yn { diff --git a/Core/RLV/Chat/recvchatfrom.cs b/Core/RLV/Chat/recvchatfrom.cs index 698f738..da1908f 100644 --- a/Core/RLV/Chat/recvchatfrom.cs +++ b/Core/RLV/Chat/recvchatfrom.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Chat +namespace BetterSecondBot.RLV.Chat { public class RecvChatFrom : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Chat/redirchat.cs b/Core/RLV/Chat/redirchat.cs index c12224b..59e79d0 100644 --- a/Core/RLV/Chat/redirchat.cs +++ b/Core/RLV/Chat/redirchat.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Chat +namespace BetterSecondBot.RLV.Chat { public class RedirChat : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/Chat/sendchat.cs b/Core/RLV/Chat/sendchat.cs index 247c39c..1dfed9a 100644 --- a/Core/RLV/Chat/sendchat.cs +++ b/Core/RLV/Chat/sendchat.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Chat +namespace BetterSecondBot.RLV.Chat { public class SendChat : RLV_UUID_flag_yn { diff --git a/Core/RLV/Chat/sendgesture.cs b/Core/RLV/Chat/sendgesture.cs index 80b0d2a..b913717 100644 --- a/Core/RLV/Chat/sendgesture.cs +++ b/Core/RLV/Chat/sendgesture.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Chat +namespace BetterSecondBot.RLV.Chat { public class SendGesture : RLV_UUID_flag_yn { diff --git a/Core/RLV/Emotes/emote.cs b/Core/RLV/Emotes/emote.cs index b3de93f..5cea1a0 100644 --- a/Core/RLV/Emotes/emote.cs +++ b/Core/RLV/Emotes/emote.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Emotes +namespace BetterSecondBot.RLV.Emotes { public class Emote : RLV_UUID_flag_yn { diff --git a/Core/RLV/Emotes/recvemote.cs b/Core/RLV/Emotes/recvemote.cs index 843e87b..9cf4f61 100644 --- a/Core/RLV/Emotes/recvemote.cs +++ b/Core/RLV/Emotes/recvemote.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using OpenMetaverse; -namespace BSB.RLV.Emotes +namespace BetterSecondBot.RLV.Emotes { public class RecvEmote : RLV_UUID_flag_optional_arg_yn { diff --git a/Core/RLV/Emotes/recvemote_sec.cs b/Core/RLV/Emotes/recvemote_sec.cs index 6afa6e7..d3adec6 100644 --- a/Core/RLV/Emotes/recvemote_sec.cs +++ b/Core/RLV/Emotes/recvemote_sec.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Emotes +namespace BetterSecondBot.RLV.Emotes { public class RecvEmote_Sec : RLV_UUID_flag_yn { diff --git a/Core/RLV/Emotes/rediremote.cs b/Core/RLV/Emotes/rediremote.cs index 37570ab..7050c13 100644 --- a/Core/RLV/Emotes/rediremote.cs +++ b/Core/RLV/Emotes/rediremote.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Emotes +namespace BetterSecondBot.RLV.Emotes { public class RedirEmote : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/InstantMessages/sendim.cs b/Core/RLV/InstantMessages/sendim.cs index dc16a86..12306b9 100644 --- a/Core/RLV/InstantMessages/sendim.cs +++ b/Core/RLV/InstantMessages/sendim.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace BSB.RLV.InstantMessages +namespace BetterSecondBot.RLV.InstantMessages { public class SendIm : RLV_command_1arg { diff --git a/Core/RLV/InstantMessages/sendim_sec.cs b/Core/RLV/InstantMessages/sendim_sec.cs index b381d58..0285f89 100644 --- a/Core/RLV/InstantMessages/sendim_sec.cs +++ b/Core/RLV/InstantMessages/sendim_sec.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace BSB.RLV.InstantMessages +namespace BetterSecondBot.RLV.InstantMessages { public class SendIm_Sec : RLV_command_1arg { diff --git a/Core/RLV/Miscellaneous/clear.cs b/Core/RLV/Miscellaneous/clear.cs index 4a38f35..0d6a02d 100644 --- a/Core/RLV/Miscellaneous/clear.cs +++ b/Core/RLV/Miscellaneous/clear.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using OpenMetaverse; -namespace BSB.RLV.Miscellaneous +namespace BetterSecondBot.RLV.Miscellaneous { public class Clear : RLV_command { diff --git a/Core/RLV/Miscellaneous/getstatus.cs b/Core/RLV/Miscellaneous/getstatus.cs index 2c44d6d..fa11842 100644 --- a/Core/RLV/Miscellaneous/getstatus.cs +++ b/Core/RLV/Miscellaneous/getstatus.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using OpenMetaverse; -namespace BSB.RLV.Miscellaneous +namespace BetterSecondBot.RLV.Miscellaneous { public class GetStatus : RLV_command_1arg { diff --git a/Core/RLV/Miscellaneous/getstatusall.cs b/Core/RLV/Miscellaneous/getstatusall.cs index 2894aa5..2a8c5f7 100644 --- a/Core/RLV/Miscellaneous/getstatusall.cs +++ b/Core/RLV/Miscellaneous/getstatusall.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using OpenMetaverse; -namespace BSB.RLV.Miscellaneous +namespace BetterSecondBot.RLV.Miscellaneous { public class GetStatusAll : RLV_command_1arg { diff --git a/Core/RLV/Miscellaneous/notify.cs b/Core/RLV/Miscellaneous/notify.cs index 3869b00..e576035 100644 --- a/Core/RLV/Miscellaneous/notify.cs +++ b/Core/RLV/Miscellaneous/notify.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Miscellaneous +namespace BetterSecondBot.RLV.Miscellaneous { public class Notify : RLV_command_2arg { diff --git a/Core/RLV/Miscellaneous/permissive.cs b/Core/RLV/Miscellaneous/permissive.cs index de87f3b..f139ecc 100644 --- a/Core/RLV/Miscellaneous/permissive.cs +++ b/Core/RLV/Miscellaneous/permissive.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using OpenMetaverse; -namespace BSB.RLV.Miscellaneous +namespace BetterSecondBot.RLV.Miscellaneous { public class Permissive : RLV_command_1arg { diff --git a/Core/RLV/Movement/adjustheight.cs b/Core/RLV/Movement/adjustheight.cs index ee296f2..d85a251 100644 --- a/Core/RLV/Movement/adjustheight.cs +++ b/Core/RLV/Movement/adjustheight.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Movement +namespace BetterSecondBot.RLV.Movement { public class AdjustHeight : RLV_command_3arg { diff --git a/Core/RLV/Movement/alwaysrun.cs b/Core/RLV/Movement/alwaysrun.cs index a92fc25..46394dd 100644 --- a/Core/RLV/Movement/alwaysrun.cs +++ b/Core/RLV/Movement/alwaysrun.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Movement +namespace BetterSecondBot.RLV.Movement { public class AlwaysRun : RLV_UUID_flag_yn { diff --git a/Core/RLV/Movement/fly.cs b/Core/RLV/Movement/fly.cs index ac3711f..92cfbe4 100644 --- a/Core/RLV/Movement/fly.cs +++ b/Core/RLV/Movement/fly.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Movement +namespace BetterSecondBot.RLV.Movement { public class Fly : RLV_UUID_flag_yn { diff --git a/Core/RLV/Movement/setrot.cs b/Core/RLV/Movement/setrot.cs index 8d4ae8a..c1eacda 100644 --- a/Core/RLV/Movement/setrot.cs +++ b/Core/RLV/Movement/setrot.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using OpenMetaverse; -namespace BSB.RLV.Movement +namespace BetterSecondBot.RLV.Movement { public class SetRot : RLV_command_2arg { diff --git a/Core/RLV/Movement/temprun.cs b/Core/RLV/Movement/temprun.cs index f46f278..57b895b 100644 --- a/Core/RLV/Movement/temprun.cs +++ b/Core/RLV/Movement/temprun.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Movement +namespace BetterSecondBot.RLV.Movement { public class TempRun : RLV_UUID_flag_yn { diff --git a/Core/RLV/PrivateChannels/sendchannel.cs b/Core/RLV/PrivateChannels/sendchannel.cs index c87ba72..c9209f5 100644 --- a/Core/RLV/PrivateChannels/sendchannel.cs +++ b/Core/RLV/PrivateChannels/sendchannel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.PrivateChannels +namespace BetterSecondBot.RLV.PrivateChannels { public class SendChannel : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/PrivateChannels/sendchannel_except.cs b/Core/RLV/PrivateChannels/sendchannel_except.cs index 9403127..005906c 100644 --- a/Core/RLV/PrivateChannels/sendchannel_except.cs +++ b/Core/RLV/PrivateChannels/sendchannel_except.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.PrivateChannels +namespace BetterSecondBot.RLV.PrivateChannels { public class SendChannel_Except : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/PrivateChannels/sendchannel_sec.cs b/Core/RLV/PrivateChannels/sendchannel_sec.cs index b43223f..fe07add 100644 --- a/Core/RLV/PrivateChannels/sendchannel_sec.cs +++ b/Core/RLV/PrivateChannels/sendchannel_sec.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.PrivateChannels +namespace BetterSecondBot.RLV.PrivateChannels { public class SendChannel_Sec : RLV_UUID_flag_arg_yn { diff --git a/Core/RLV/RLV_commandlib.cs b/Core/RLV/RLV_commandlib.cs index 58fe378..5500654 100644 --- a/Core/RLV/RLV_commandlib.cs +++ b/Core/RLV/RLV_commandlib.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using System.Linq; using OpenMetaverse; -using BSB.bottypes; +using BetterSecondBot.bottypes; using BetterSecondBotShared.API; using BetterSecondBotShared.logs; -namespace BSB.RLV +namespace BetterSecondBot.RLV { public class RLVcontrol : API_supported_interface { diff --git a/Core/RLV/Sitting/getsitid.cs b/Core/RLV/Sitting/getsitid.cs index 6c0907b..0a21e11 100644 --- a/Core/RLV/Sitting/getsitid.cs +++ b/Core/RLV/Sitting/getsitid.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Sitting +namespace BetterSecondBot.RLV.Sitting { class GetSitId : RLV_command_1arg { diff --git a/Core/RLV/Sitting/sit.cs b/Core/RLV/Sitting/sit.cs index 49ff578..40e910c 100644 --- a/Core/RLV/Sitting/sit.cs +++ b/Core/RLV/Sitting/sit.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Sitting +namespace BetterSecondBot.RLV.Sitting { public class Sit : RLV_command_1arg { diff --git a/Core/RLV/Sitting/unsit.cs b/Core/RLV/Sitting/unsit.cs index 4456bbe..00f2b53 100644 --- a/Core/RLV/Sitting/unsit.cs +++ b/Core/RLV/Sitting/unsit.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Sitting +namespace BetterSecondBot.RLV.Sitting { public class UnSit : RLV_command_1arg { diff --git a/Core/RLV/Version/version.cs b/Core/RLV/Version/version.cs index 9174d1e..4056068 100644 --- a/Core/RLV/Version/version.cs +++ b/Core/RLV/Version/version.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Version +namespace BetterSecondBot.RLV.Version { public class Version : RLV_command { diff --git a/Core/RLV/Version/versionnew.cs b/Core/RLV/Version/versionnew.cs index 07366ae..db3e55c 100644 --- a/Core/RLV/Version/versionnew.cs +++ b/Core/RLV/Version/versionnew.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Version +namespace BetterSecondBot.RLV.Version { public class VersionNew : RLV_command { diff --git a/Core/RLV/Version/versionnum.cs b/Core/RLV/Version/versionnum.cs index ceb64e0..0e36223 100644 --- a/Core/RLV/Version/versionnum.cs +++ b/Core/RLV/Version/versionnum.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BSB.RLV.Version +namespace BetterSecondBot.RLV.Version { public class VersionNum : RLV_command { diff --git a/Core/Static/Inventory.cs b/Core/Static/Inventory.cs index cd50ae0..0f068b7 100644 --- a/Core/Static/Inventory.cs +++ b/Core/Static/Inventory.cs @@ -1,11 +1,11 @@ -using BSB.bottypes; +using BetterSecondBot.bottypes; using Newtonsoft.Json; using OpenMetaverse; using System; using System.Collections.Generic; using System.Text; -namespace BSB.Static +namespace BetterSecondBot.Static { public class InventoryMapFolder { @@ -22,18 +22,18 @@ namespace BSB.Static public static class HelperInventory { - public static InventoryItem getItemByInventoryUUID(CommandsBot bot, UUID target) - { - return bot.GetClient.Inventory.FetchItem(target, bot.GetClient.Self.AgentID, 3000); + public static InventoryItem getItemByInventoryUUID(CommandsBot bot, UUID target) + { + return bot.GetClient.Inventory.FetchItem(target, bot.GetClient.Self.AgentID, 3000); } - public static UUID GetAssetUUID(CommandsBot bot, UUID target) - { - InventoryItem A = getItemByInventoryUUID(bot, target); - if (A != null) - { - return A.AssetUUID; - } - return UUID.Zero; + public static UUID GetAssetUUID(CommandsBot bot, UUID target) + { + InventoryItem A = getItemByInventoryUUID(bot, target); + if (A != null) + { + return A.AssetUUID; + } + return UUID.Zero; } public static InventoryBase FindFolder(CommandsBot bot, InventoryFolder current,UUID target) { @@ -115,12 +115,12 @@ namespace BSB.Static public static string MapFolderJson(CommandsBot bot) { - if (bot.GetClient.Inventory.Store != null) - { - if (bot.GetClient.Inventory.Store.RootFolder != null) - { - return JsonConvert.SerializeObject(DoMapFolderJson(bot, bot.GetClient.Inventory.Store.RootFolder)); - } + if (bot.GetClient.Inventory.Store != null) + { + if (bot.GetClient.Inventory.Store.RootFolder != null) + { + return JsonConvert.SerializeObject(DoMapFolderJson(bot, bot.GetClient.Inventory.Store.RootFolder)); + } } return null; } diff --git a/Core/Static/parcel.cs b/Core/Static/parcel.cs index ab423e4..7a1c50a 100644 --- a/Core/Static/parcel.cs +++ b/Core/Static/parcel.cs @@ -1,10 +1,10 @@ -using BSB.bottypes; +using BetterSecondBot.bottypes; using OpenMetaverse; using System; using System.Collections.Generic; using System.Text; -namespace BSB +namespace BetterSecondBot { public static class parcel_static { diff --git a/Core/bottypes/AVstorageBot.cs b/Core/bottypes/AVstorageBot.cs index a19bb32..b3ac2b2 100644 --- a/Core/bottypes/AVstorageBot.cs +++ b/Core/bottypes/AVstorageBot.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace BSB.bottypes +namespace BetterSecondBot.bottypes { public abstract class AVstorageBot : AtHome { @@ -27,28 +27,28 @@ namespace BSB.bottypes protected Dictionary FriendNames = new Dictionary(); - protected override void AvatarFriendNames(object o, FriendNamesEventArgs E) - { - FriendNames = E.Names; + protected override void AvatarFriendNames(object o, FriendNamesEventArgs E) + { + FriendNames = E.Names; } - public string getJsonFriendlist() - { - Dictionary Friends = new Dictionary(); - Dictionary friendscopy = GetClient.Friends.FriendList.Copy(); - foreach (KeyValuePair av in friendscopy) - { - string name = FindAvatarKey2Name(av.Key); - if (name != "loopup") - { - friendreplyobject entry = new friendreplyobject(); - entry.name = name; - entry.id = av.Key.ToString(); - entry.online = av.Value.IsOnline; - Friends.Add(av.Key, entry); - } - } - return JsonConvert.SerializeObject(Friends); + public string getJsonFriendlist() + { + Dictionary Friends = new Dictionary(); + Dictionary friendscopy = GetClient.Friends.FriendList.Copy(); + foreach (KeyValuePair av in friendscopy) + { + string name = FindAvatarKey2Name(av.Key); + if (name != "loopup") + { + friendreplyobject entry = new friendreplyobject(); + entry.name = name; + entry.id = av.Key.ToString(); + entry.online = av.Value.IsOnline; + Friends.Add(av.Key, entry); + } + } + return JsonConvert.SerializeObject(Friends); } public override string GetStatus() @@ -90,16 +90,16 @@ namespace BSB.bottypes return base.GetStatus(); } - protected void UpdateStorageWithAroundMe() - { - if(Client.Network.CurrentSim != null) - { - Dictionary avcopy = Client.Network.CurrentSim.ObjectsAvatars.Copy(); - foreach (Avatar av in avcopy.Values) - { - AddAvatarToDB(av.ID, av.Name); - } - } + protected void UpdateStorageWithAroundMe() + { + if(Client.Network.CurrentSim != null) + { + Dictionary avcopy = Client.Network.CurrentSim.ObjectsAvatars.Copy(); + foreach (Avatar av in avcopy.Values) + { + AddAvatarToDB(av.ID, av.Name); + } + } } protected void ReTriggerUUIDtoName() @@ -110,16 +110,16 @@ namespace BSB.bottypes foreach (KeyValuePair> pair in PendingAvatarFinds_viauuid) { long dif = now - pair.Value.Key; - if (dif > 30) - { - if (pair.Value.Value < max_retry_attempts) - { - retrigger_key2name.Add(pair.Key); - } - else - { - giveup_key2name.Add(pair.Key); - } + if (dif > 30) + { + if (pair.Value.Value < max_retry_attempts) + { + retrigger_key2name.Add(pair.Key); + } + else + { + giveup_key2name.Add(pair.Key); + } } } if(retrigger_key2name.Count > 0) @@ -144,22 +144,22 @@ namespace BSB.bottypes foreach (KeyValuePair> pair in PendingAvatarFinds_vianame) { long dif = now - pair.Value.Key; - if (dif > 30) - { - if (pair.Value.Value < max_retry_attempts) - { - retrigger_name2key.Add(pair.Key); - } - else - { - giveup_name2key.Add(pair.Key); - } + if (dif > 30) + { + if (pair.Value.Value < max_retry_attempts) + { + retrigger_name2key.Add(pair.Key); + } + else + { + giveup_name2key.Add(pair.Key); + } } } foreach (string avname in retrigger_name2key) - { - int retry_counter = PendingAvatarFinds_vianame[avname].Value + 1; + { + int retry_counter = PendingAvatarFinds_vianame[avname].Value + 1; PendingAvatarFinds_vianame[avname] = new KeyValuePair(now, retry_counter); Client.Directory.StartPeopleSearch(avname, 0); @@ -191,25 +191,25 @@ namespace BSB.bottypes } } } - lock (AvatarName2Key) - { - lock (AvatarStorageLastUsed) - { - foreach (string purge in PurgeAvatars) - { - if (purge != myconfig.Security_MasterUsername) - { - if (AvatarStorageLastUsed.ContainsKey(purge) == true) - { - if (AvatarName2Key.ContainsKey(purge) == true) - { - AvatarStorageLastUsed.Remove(purge); - UUID avuuid = AvatarName2Key[purge]; - AvatarName2Key.Remove(purge); - AvatarKey2Name.Remove(avuuid); - } - } - } + lock (AvatarName2Key) + { + lock (AvatarStorageLastUsed) + { + foreach (string purge in PurgeAvatars) + { + if (purge != myconfig.Security_MasterUsername) + { + if (AvatarStorageLastUsed.ContainsKey(purge) == true) + { + if (AvatarName2Key.ContainsKey(purge) == true) + { + AvatarStorageLastUsed.Remove(purge); + UUID avuuid = AvatarName2Key[purge]; + AvatarName2Key.Remove(purge); + AvatarKey2Name.Remove(avuuid); + } + } + } } } } @@ -249,28 +249,28 @@ namespace BSB.bottypes if ((av_name != "null") && (av_name != null) && (av_name.ToLowerInvariant() != "secondlife") && (av_uuid != UUID.Zero)) { if (AvatarStorageLastUsed.ContainsKey(av_name) == false) - { - if (av_uuid != UUID.Zero) - { - if ((AvatarKey2Name.ContainsKey(av_uuid) == false) && (AvatarName2Key.ContainsKey(av_name) == false)) - { - AvatarName2Key.Add(av_name, av_uuid); - AvatarKey2Name.Add(av_uuid, av_name); - } - AvatarStorageLastUsed.Add(av_name, helpers.UnixTimeNow()); - if (PendingAvatarFinds_vianame.ContainsKey(av_name) == true) - { - PendingAvatarFinds_vianame.Remove(av_name); - } - if (PendingAvatarFinds_viauuid.ContainsKey(av_uuid) == true) - { - PendingAvatarFinds_viauuid.Remove(av_uuid); - } + { + if (av_uuid != UUID.Zero) + { + if ((AvatarKey2Name.ContainsKey(av_uuid) == false) && (AvatarName2Key.ContainsKey(av_name) == false)) + { + AvatarName2Key.Add(av_name, av_uuid); + AvatarKey2Name.Add(av_uuid, av_name); + } + AvatarStorageLastUsed.Add(av_name, helpers.UnixTimeNow()); + if (PendingAvatarFinds_vianame.ContainsKey(av_name) == true) + { + PendingAvatarFinds_vianame.Remove(av_name); + } + if (PendingAvatarFinds_viauuid.ContainsKey(av_uuid) == true) + { + PendingAvatarFinds_viauuid.Remove(av_uuid); + } } } else - { - AvatarStorageLastUsed[av_name] = helpers.UnixTimeNow(); + { + AvatarStorageLastUsed[av_name] = helpers.UnixTimeNow(); } if (helpers.notempty(myconfig.Security_MasterUsername) == true) { @@ -287,59 +287,59 @@ namespace BSB.bottypes } } - protected string httpLookupKey(string avatar_name) - { + protected string httpLookupKey(string avatar_name) + { if (myconfig.Name2Key_Enable == true) - { - var client = new RestClient(myconfig.Name2Key_Url); - var request = new RestRequest("name2key/" + avatar_name + "/" + myconfig.Name2Key_Key + "", Method.GET); - client.Timeout = 3000; // ? does this even do anything - request.Timeout = 3000; - IRestResponse endpoint_checks = client.Get(request); - if (endpoint_checks.StatusCode == System.Net.HttpStatusCode.OK) - { - try - { - namekeyservicereply server_reply = JsonConvert.DeserializeObject(endpoint_checks.Content); - if (server_reply.status == true) - { - if (server_reply.found == true) - { - AddAvatarToDB((UUID)server_reply.uuid, server_reply.name); - return server_reply.uuid; - } - } - } - catch - { - - } - } - } - return ""; + { + var client = new RestClient(myconfig.Name2Key_Url); + var request = new RestRequest("name2key/" + avatar_name + "/" + myconfig.Name2Key_Key + "", Method.GET); + client.Timeout = 3000; // ? does this even do anything + request.Timeout = 3000; + IRestResponse endpoint_checks = client.Get(request); + if (endpoint_checks.StatusCode == System.Net.HttpStatusCode.OK) + { + try + { + namekeyservicereply server_reply = JsonConvert.DeserializeObject(endpoint_checks.Content); + if (server_reply.status == true) + { + if (server_reply.found == true) + { + AddAvatarToDB((UUID)server_reply.uuid, server_reply.name); + return server_reply.uuid; + } + } + } + catch + { + + } + } + } + return ""; } - protected string FindAvatarUUIDInStorage(string avatar_name) - { + protected string FindAvatarUUIDInStorage(string avatar_name) + { if (AvatarStorageLastUsed.ContainsKey(avatar_name) == true) { AvatarStorageLastUsed[avatar_name] = helpers.UnixTimeNow(); return AvatarName2Key[avatar_name].ToString(); - } - else if (FriendNames.ContainsValue(avatar_name) == true) - { - string returnvalue = ""; - foreach(UUID entry in FriendNames.Keys) - { - if(FriendNames[entry] == avatar_name) - { - returnvalue = entry.ToString(); - break; - } - } - return returnvalue; - } - return ""; + } + else if (FriendNames.ContainsValue(avatar_name) == true) + { + string returnvalue = ""; + foreach(UUID entry in FriendNames.Keys) + { + if(FriendNames[entry] == avatar_name) + { + returnvalue = entry.ToString(); + break; + } + } + return returnvalue; + } + return ""; } public string FindAvatarName2Key(string avatar_name) @@ -349,16 +349,16 @@ namespace BSB.bottypes { bits.Add("Resident"); } - avatar_name = bits[0].FirstCharToUpper() + " " + bits[1].FirstCharToUpper(); + avatar_name = bits[0].FirstCharToUpper() + " " + bits[1].FirstCharToUpper(); string uuid = FindAvatarUUIDInStorage(avatar_name); - if (uuid != "") + if (uuid != "") { - return uuid; + return uuid; } uuid = httpLookupKey(avatar_name); - if (uuid != "") + if (uuid != "") { - return uuid; + return uuid; } if (PendingAvatarFinds_vianame.ContainsKey(avatar_name) == false) { @@ -369,70 +369,70 @@ namespace BSB.bottypes } - protected string FindAvatarNameInStorage(UUID avatar_uuid) - { + protected string FindAvatarNameInStorage(UUID avatar_uuid) + { if (AvatarKey2Name.ContainsKey(avatar_uuid) == true) { AvatarStorageLastUsed[AvatarKey2Name[avatar_uuid]] = helpers.UnixTimeNow(); return AvatarKey2Name[avatar_uuid]; - } - else if(FriendNames.ContainsKey(avatar_uuid) == true) - { - return FriendNames[avatar_uuid]; - } - return ""; + } + else if(FriendNames.ContainsKey(avatar_uuid) == true) + { + return FriendNames[avatar_uuid]; + } + return ""; } - protected string httpLookupName(UUID avatar_uuid) - { + protected string httpLookupName(UUID avatar_uuid) + { if (myconfig.Name2Key_Enable == true) - { - var client = new RestClient(myconfig.Name2Key_Url); - var request = new RestRequest("key2name/" + avatar_uuid.ToString() + "/" + myconfig.Name2Key_Key + "", Method.GET); - client.Timeout = 3000; // ? does this even do anything - request.Timeout = 3000; - IRestResponse endpoint_checks = client.Get(request); - if (endpoint_checks.StatusCode == System.Net.HttpStatusCode.OK) - { - try - { - namekeyservicereply server_reply = JsonConvert.DeserializeObject(endpoint_checks.Content); - if (server_reply.status == true) - { - if (server_reply.found == true) - { - AddAvatarToDB((UUID)server_reply.uuid, server_reply.name); - return server_reply.name; - } - } - } - catch - { - - } - } - } - return ""; + { + var client = new RestClient(myconfig.Name2Key_Url); + var request = new RestRequest("key2name/" + avatar_uuid.ToString() + "/" + myconfig.Name2Key_Key + "", Method.GET); + client.Timeout = 3000; // ? does this even do anything + request.Timeout = 3000; + IRestResponse endpoint_checks = client.Get(request); + if (endpoint_checks.StatusCode == System.Net.HttpStatusCode.OK) + { + try + { + namekeyservicereply server_reply = JsonConvert.DeserializeObject(endpoint_checks.Content); + if (server_reply.status == true) + { + if (server_reply.found == true) + { + AddAvatarToDB((UUID)server_reply.uuid, server_reply.name); + return server_reply.name; + } + } + } + catch + { + + } + } + } + return ""; } public string FindAvatarKey2Name(UUID avatar_uuid) { string avatar_name = FindAvatarNameInStorage(avatar_uuid); - if (avatar_name != "") - { - return avatar_name; + if (avatar_name != "") + { + return avatar_name; } avatar_name = httpLookupName(avatar_uuid); - if (avatar_name != "") - { - return avatar_name; + if (avatar_name != "") + { + return avatar_name; } if (PendingAvatarFinds_viauuid.ContainsKey(avatar_uuid) == false) { PendingAvatarFinds_viauuid.Add(avatar_uuid, new KeyValuePair(helpers.UnixTimeNow(), 0)); Client.Avatars.RequestAvatarName(avatar_uuid); - } + } return "lookup"; } @@ -450,12 +450,12 @@ namespace BSB.bottypes public bool found { get; set; } public bool status { get; set; } public string message { get; set; } - } - - public class friendreplyobject - { - public string name; - public string id; - public bool online; + } + + public class friendreplyobject + { + public string name; + public string id; + public bool online; } } diff --git a/Core/bottypes/ActionsAutoAcceptBot.cs b/Core/bottypes/ActionsAutoAcceptBot.cs index a909afa..7c16036 100644 --- a/Core/bottypes/ActionsAutoAcceptBot.cs +++ b/Core/bottypes/ActionsAutoAcceptBot.cs @@ -3,7 +3,7 @@ using BetterSecondBotShared.Static; using OpenMetaverse; using System.Collections.Generic; -namespace BSB.bottypes +namespace BetterSecondBot.bottypes { public abstract class ActionsAutoAcceptBot : BasicBot { diff --git a/Core/bottypes/AnimationsBot.cs b/Core/bottypes/AnimationsBot.cs index 53736ef..4311fab 100644 --- a/Core/bottypes/AnimationsBot.cs +++ b/Core/bottypes/AnimationsBot.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using OpenMetaverse; -namespace BSB.bottypes +namespace BetterSecondBot.bottypes { public abstract class AnimationsBot : VirtualsBot { @@ -19,15 +19,15 @@ namespace BSB.bottypes } public override void ResetAnimations() - { - List copyAnyimations = active_animations; - foreach (UUID ani in copyAnyimations) - { - Client.Self.AnimationStop(ani, true); - } - lock (active_animations) - { - active_animations.Clear(); + { + List copyAnyimations = active_animations; + foreach (UUID ani in copyAnyimations) + { + Client.Self.AnimationStop(ani, true); + } + lock (active_animations) + { + active_animations.Clear(); } } diff --git a/Core/bottypes/AwaitReplyEventBot.cs b/Core/bottypes/AwaitReplyEventBot.cs index 34281c2..5e2160a 100644 --- a/Core/bottypes/AwaitReplyEventBot.cs +++ b/Core/bottypes/AwaitReplyEventBot.cs @@ -1,11 +1,11 @@ -using BSB.Commands; +using BetterSecondBot.Commands; using System; using System.Collections.Generic; using System.Text; using OpenMetaverse; -using BetterSecondBotShared.Static; - -namespace BSB.bottypes +using BetterSecondBotShared.Static; + +namespace BetterSecondBot.bottypes { public abstract class AwaitReplyEventBot : CommandsBot { @@ -109,22 +109,22 @@ namespace BSB.bottypes } } protected void GroupRolesData(object sender,GroupRolesDataReplyEventArgs e) - { - // update group role storage - List entrys = new List(); - foreach (GroupRole gr in e.Roles.Values) - { - entrys.Add(gr); - } - - KeyValuePair> storage = new KeyValuePair>(helpers.UnixTimeNow(), entrys); - if (mygrouprolesstorage.ContainsKey(e.GroupID) == false) - { - mygrouprolesstorage.Add(e.GroupID, storage); - } - else - { - mygrouprolesstorage[e.GroupID] = storage; + { + // update group role storage + List entrys = new List(); + foreach (GroupRole gr in e.Roles.Values) + { + entrys.Add(gr); + } + + KeyValuePair> storage = new KeyValuePair>(helpers.UnixTimeNow(), entrys); + if (mygrouprolesstorage.ContainsKey(e.GroupID) == false) + { + mygrouprolesstorage.Add(e.GroupID, storage); + } + else + { + mygrouprolesstorage[e.GroupID] = storage; } // trigger events if (await_events.ContainsKey("grouproles") == true) diff --git a/Core/bottypes/CommandsBot.cs b/Core/bottypes/CommandsBot.cs index 0051fda..56ba8af 100644 --- a/Core/bottypes/CommandsBot.cs +++ b/Core/bottypes/CommandsBot.cs @@ -8,7 +8,7 @@ using BetterSecondBotShared.Static; using BetterSecondBotShared.logs; using System.Threading; -namespace BSB.bottypes +namespace BetterSecondBot.bottypes { public abstract class CommandsBot : AVstorageBot { @@ -105,19 +105,19 @@ namespace BSB.bottypes } public bool GetAllowGroupInvite(UUID avatar, UUID group) { - if (group_invite_lockout_timer.ContainsKey(group) == true) - { - return !group_invite_lockout_timer[group].ContainsKey(avatar); + if (group_invite_lockout_timer.ContainsKey(group) == true) + { + return !group_invite_lockout_timer[group].ContainsKey(avatar); } return true; } public void GroupInviteLockoutArm(UUID avatar, UUID group) - { - if (group_invite_lockout_timer.ContainsKey(group) == false) - { - group_invite_lockout_timer.Add(group, new Dictionary()); - } + { + if (group_invite_lockout_timer.ContainsKey(group) == false) + { + group_invite_lockout_timer.Add(group, new Dictionary()); + } if (group_invite_lockout_timer[group].ContainsKey(avatar) == false) { group_invite_lockout_timer[group].Add(avatar,0); @@ -127,20 +127,20 @@ namespace BSB.bottypes protected void PurgeOldGroupinviteLockouts() { long now = helpers.UnixTimeNow(); - foreach (UUID group in group_invite_lockout_timer.Keys) - { - List clear_locks = new List(); - foreach (KeyValuePair Glock in group_invite_lockout_timer[group]) - { - long dif = now - Glock.Value; - if (dif >= 120) - { - clear_locks.Add(Glock.Key); - } - } - foreach (UUID glock in clear_locks) - { - group_invite_lockout_timer[group].Remove(glock); + foreach (UUID group in group_invite_lockout_timer.Keys) + { + List clear_locks = new List(); + foreach (KeyValuePair Glock in group_invite_lockout_timer[group]) + { + long dif = now - Glock.Value; + if (dif >= 120) + { + clear_locks.Add(Glock.Key); + } + } + foreach (UUID glock in clear_locks) + { + group_invite_lockout_timer[group].Remove(glock); } } } diff --git a/Core/bottypes/DialogsBot.cs b/Core/bottypes/DialogsBot.cs index 5162ded..3da85ed 100644 --- a/Core/bottypes/DialogsBot.cs +++ b/Core/bottypes/DialogsBot.cs @@ -10,7 +10,7 @@ using Discord.WebSocket; using System.Threading.Tasks; using System.Threading; -namespace BSB.bottypes +namespace BetterSecondBot.bottypes { public abstract class DialogsBot : ChatRelay { diff --git a/Core/bottypes/EventsBot.cs b/Core/bottypes/EventsBot.cs index b9a582a..d0b7ff3 100644 --- a/Core/bottypes/EventsBot.cs +++ b/Core/bottypes/EventsBot.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Text; using BetterSecondBotShared.Static; -using BSB.Commands; +using BetterSecondBot.Commands; using OpenMetaverse; -using OpenMetaverse.Imaging; +using OpenMetaverse.Imaging; using OpenMetaverse.Packets; -namespace BSB.bottypes +namespace BetterSecondBot.bottypes { public abstract class VoidEventBot : AnimationsBot { @@ -59,134 +59,134 @@ namespace BSB.bottypes } - } - public class StatusMessageEvent : EventArgs - { - public bool connected { get; } - public string sim { get; } - - public StatusMessageEvent(bool connected,string sim) - { - this.connected = connected; - this.sim = sim; - } - } - public class GroupEventArgs : EventArgs - { - public bool ready { get; } - - public GroupEventArgs(bool ready) - { - this.ready = ready; - } - } - - public class ImSendArgs : EventArgs - { - public UUID avataruuid { get; } - public string message { get; } - - public ImSendArgs(UUID avataruuid, string message) - { - this.avataruuid = avataruuid; - this.message = message; - } - } - - public class MessageEventArgs : EventArgs - { - public string message { get; } - public string sender_name { get; } - public UUID sender_uuid { get; } - public bool avatar { get; } - public bool group { get; } - public UUID group_uuid { get; } - public bool localchat { get; } - public bool fromme { get; } - - public MessageEventArgs(string message, string sender_name, UUID sender_uuid, bool avatar, bool group, UUID group_uuid, bool localchat, bool fromme) - { - this.message = message; - this.sender_name = sender_name; - this.sender_uuid = sender_uuid; - this.avatar = avatar; - this.group = group; - this.group_uuid = group_uuid; - this.localchat = localchat; - this.fromme = fromme; - } + } + public class StatusMessageEvent : EventArgs + { + public bool connected { get; } + public string sim { get; } + + public StatusMessageEvent(bool connected,string sim) + { + this.connected = connected; + this.sim = sim; + } + } + public class GroupEventArgs : EventArgs + { + public bool ready { get; } + + public GroupEventArgs(bool ready) + { + this.ready = ready; + } + } + + public class ImSendArgs : EventArgs + { + public UUID avataruuid { get; } + public string message { get; } + + public ImSendArgs(UUID avataruuid, string message) + { + this.avataruuid = avataruuid; + this.message = message; + } + } + + public class MessageEventArgs : EventArgs + { + public string message { get; } + public string sender_name { get; } + public UUID sender_uuid { get; } + public bool avatar { get; } + public bool group { get; } + public UUID group_uuid { get; } + public bool localchat { get; } + public bool fromme { get; } + + public MessageEventArgs(string message, string sender_name, UUID sender_uuid, bool avatar, bool group, UUID group_uuid, bool localchat, bool fromme) + { + this.message = message; + this.sender_name = sender_name; + this.sender_uuid = sender_uuid; + this.avatar = avatar; + this.group = group; + this.group_uuid = group_uuid; + this.localchat = localchat; + this.fromme = fromme; + } } public class EventsBot : VoidEventBot - { - private EventHandler _MessageEvent; - private EventHandler _StatusMessageEvent; - private EventHandler _GroupsEvent; - private EventHandler _SendImEvent; - - private readonly object _MessageEventLock = new object(); - private readonly object _StatusMessageEventlock = new object(); - private readonly object _GroupsEventLock = new object(); - private readonly object _SendImEventLock = new object(); - - - public event EventHandler MessageEvent - { - add { lock (_MessageEventLock) { _MessageEvent += value; } } - remove { lock (_MessageEventLock) { _MessageEvent -= value; } } - } - public event EventHandler StatusMessageEvent - { - add { lock (_StatusMessageEventlock) { _StatusMessageEvent += value; } } - remove { lock (_StatusMessageEventlock) { _StatusMessageEvent -= value; } } - } - public event EventHandler GroupsReadyEvent - { - add { lock (_GroupsEventLock) { _GroupsEvent += value; } } - remove { lock (_GroupsEventLock) { _GroupsEvent -= value; } } - } - public event EventHandler SendImEvent - { - add { lock (_SendImEventLock) { _SendImEvent += value; } } - remove { lock (_SendImEventLock) { _SendImEvent -= value; } } - } - - protected void On_SendImEvent(ImSendArgs e) - { - EventHandler handler = _SendImEvent; - handler?.Invoke(this, e); - } - protected void On_MessageEvent(MessageEventArgs e) - { - EventHandler handler = _MessageEvent; - handler?.Invoke(this, e); - } - - protected void On_StatusMessageEvent(StatusMessageEvent e) - { - EventHandler handler = _StatusMessageEvent; - handler?.Invoke(this, e); - } - - protected void On_GroupsReadyEvent(GroupEventArgs e) - { - EventHandler handler = _GroupsEvent; - handler?.Invoke(this, e); - } - + { + private EventHandler _MessageEvent; + private EventHandler _StatusMessageEvent; + private EventHandler _GroupsEvent; + private EventHandler _SendImEvent; + + private readonly object _MessageEventLock = new object(); + private readonly object _StatusMessageEventlock = new object(); + private readonly object _GroupsEventLock = new object(); + private readonly object _SendImEventLock = new object(); + + + public event EventHandler MessageEvent + { + add { lock (_MessageEventLock) { _MessageEvent += value; } } + remove { lock (_MessageEventLock) { _MessageEvent -= value; } } + } + public event EventHandler StatusMessageEvent + { + add { lock (_StatusMessageEventlock) { _StatusMessageEvent += value; } } + remove { lock (_StatusMessageEventlock) { _StatusMessageEvent -= value; } } + } + public event EventHandler GroupsReadyEvent + { + add { lock (_GroupsEventLock) { _GroupsEvent += value; } } + remove { lock (_GroupsEventLock) { _GroupsEvent -= value; } } + } + public event EventHandler SendImEvent + { + add { lock (_SendImEventLock) { _SendImEvent += value; } } + remove { lock (_SendImEventLock) { _SendImEvent -= value; } } + } + + protected void On_SendImEvent(ImSendArgs e) + { + EventHandler handler = _SendImEvent; + handler?.Invoke(this, e); + } + protected void On_MessageEvent(MessageEventArgs e) + { + EventHandler handler = _MessageEvent; + handler?.Invoke(this, e); + } + + protected void On_StatusMessageEvent(StatusMessageEvent e) + { + EventHandler handler = _StatusMessageEvent; + handler?.Invoke(this, e); + } + + protected void On_GroupsReadyEvent(GroupEventArgs e) + { + EventHandler handler = _GroupsEvent; + handler?.Invoke(this, e); + } + public virtual void SendIM(UUID avatar, string message) { On_SendImEvent(new ImSendArgs(avatar, message)); - } - - protected virtual void BotChatControler(string message, string sender_name, UUID sender_uuid, bool avatar, bool group, UUID group_uuid, bool localchat, bool fromme) - { - if (_MessageEvent != null) - { - On_MessageEvent(new MessageEventArgs(message, sender_name, sender_uuid, avatar, group, group_uuid, localchat, fromme)); - } - } - + } + + protected virtual void BotChatControler(string message, string sender_name, UUID sender_uuid, bool avatar, bool group, UUID group_uuid, bool localchat, bool fromme) + { + if (_MessageEvent != null) + { + On_MessageEvent(new MessageEventArgs(message, sender_name, sender_uuid, avatar, group, group_uuid, localchat, fromme)); + } + } + protected bool login_auto_logout; protected long delay_group_fetch; protected Dictionary>> group_members_storage = new Dictionary>>(); @@ -276,18 +276,18 @@ namespace BSB.bottypes } } } - if (Client.Network.CurrentSim != null) - { - On_StatusMessageEvent(new StatusMessageEvent(true, Client.Network.CurrentSim.Name)); + if (Client.Network.CurrentSim != null) + { + On_StatusMessageEvent(new StatusMessageEvent(true, Client.Network.CurrentSim.Name)); } else - { - On_StatusMessageEvent(new StatusMessageEvent(true, "None")); + { + On_StatusMessageEvent(new StatusMessageEvent(true, "None")); } return base.GetStatus(); } public override void KillMePlease() - { + { On_StatusMessageEvent(new StatusMessageEvent(false, "None")); base.KillMePlease(); } @@ -319,9 +319,9 @@ namespace BSB.bottypes } - protected virtual void AvatarFriendNames(object o, FriendNamesEventArgs E) - { - + protected virtual void AvatarFriendNames(object o, FriendNamesEventArgs E) + { + } protected virtual void FriendshipResponse(object o, FriendshipResponseEventArgs E) diff --git a/Core/bottypes/Log2FileBot.cs b/Core/bottypes/Log2FileBot.cs index c6e4e66..1244e9c 100644 --- a/Core/bottypes/Log2FileBot.cs +++ b/Core/bottypes/Log2FileBot.cs @@ -9,7 +9,7 @@ using Microsoft.VisualBasic.CompilerServices; using System.IO; using System.IO.Compression; -namespace BSB.bottypes +namespace BetterSecondBot.bottypes { public abstract class Log2FileBot : ActionsAutoAcceptBot { diff --git a/Core/bottypes/MessageSwitcherBot.cs b/Core/bottypes/MessageSwitcherBot.cs index 34cec31..d7174b2 100644 --- a/Core/bottypes/MessageSwitcherBot.cs +++ b/Core/bottypes/MessageSwitcherBot.cs @@ -4,27 +4,27 @@ using System.Text; using System.Linq; using OpenMetaverse; -namespace BSB.bottypes +namespace BetterSecondBot.bottypes { public abstract class MessageSwitcherBot : EventsBot { protected bool connected_to_groups = false; - public override string GetStatus() - { - if(connected_to_groups == false) - { - if (mygroups.Keys.Count() > 0) - { - foreach (UUID group in mygroups.Keys) - { - Client.Self.RequestJoinGroupChat(group); - } - connected_to_groups = true; - } - } - return base.GetStatus(); - } - + public override string GetStatus() + { + if(connected_to_groups == false) + { + if (mygroups.Keys.Count() > 0) + { + foreach (UUID group in mygroups.Keys) + { + Client.Self.RequestJoinGroupChat(group); + } + connected_to_groups = true; + } + } + return base.GetStatus(); + } + public override void AfterBotLoginHandler() { connected_to_groups = false; diff --git a/Core/bottypes/RLVbot.cs b/Core/bottypes/RLVbot.cs index 05484fe..9b200a7 100644 --- a/Core/bottypes/RLVbot.cs +++ b/Core/bottypes/RLVbot.cs @@ -5,7 +5,7 @@ using BetterSecondBotShared.Json; using OpenMetaverse; using BetterSecondBotShared.logs; -namespace BSB.bottypes +namespace BetterSecondBot.bottypes { public abstract class RLVbot : RLVbotHelper { diff --git a/Core/bottypes/SecondBot.cs b/Core/bottypes/SecondBot.cs index ca497f6..2368b9b 100644 --- a/Core/bottypes/SecondBot.cs +++ b/Core/bottypes/SecondBot.cs @@ -7,7 +7,7 @@ using Discord.Webhook; using BetterSecondBotShared.Json; using BetterSecondBotShared.Static; -namespace BSB.bottypes +namespace BetterSecondBot.bottypes { public class SecondBot : DialogsBot { @@ -26,7 +26,7 @@ namespace BSB.bottypes { if ((masteruuid_ready == true) && (friendslist_ready == true) && (started_friendship_hug == false)) { - started_friendship_hug = true; + started_friendship_hug = true; if (Client.Friends.FriendList.ContainsKey(master_uuid) == false) { CommandsInterface.Call("IM", String.Join("~#~", new string[] { myconfig.Security_MasterUsername, "Hello master, I am sending you a friend request now!" })); diff --git a/Core/bottypes/VirtualsBot.cs b/Core/bottypes/VirtualsBot.cs index e054d79..5020dfa 100644 --- a/Core/bottypes/VirtualsBot.cs +++ b/Core/bottypes/VirtualsBot.cs @@ -1,73 +1,73 @@ using BetterSecondBotShared.logs; -using Discord.WebSocket; +using Discord.WebSocket; using OpenMetaverse; using System; using System.Collections.Generic; using System.Text; using Discord; -using System.Threading.Tasks; - -namespace BSB.bottypes +using System.Threading.Tasks; + +namespace BetterSecondBot.bottypes { public abstract class VirtualsBot : Log2FileBot { #region DiscordOutputTarget protected DiscordSocketClient DiscordLink = null; - protected string DiscordReadyWhyFailed = ""; - public async Task SendMessageToDiscord(string target_serverid, string target_channelid, string message, bool useTTS) - { - if (discordReady() == true) - { - DiscordSocketClient Discord = getDiscordClient(); - if (ulong.TryParse(target_serverid, out ulong serverid) == true) - { - if (ulong.TryParse(target_channelid, out ulong channelid) == true) - { - SocketGuild server = Discord.GetGuild(serverid); - SocketTextChannel Channel = null; - foreach (SocketTextChannel channel in server.TextChannels) - { - if (channel.Id == channelid) - { - Channel = channel; - break; - } - } - if (Channel != null) - { - await Channel.SendMessageAsync(message, useTTS); - return true; - } - } - } - } - return false; + protected string DiscordReadyWhyFailed = ""; + public async Task SendMessageToDiscord(string target_serverid, string target_channelid, string message, bool useTTS) + { + if (discordReady() == true) + { + DiscordSocketClient Discord = getDiscordClient(); + if (ulong.TryParse(target_serverid, out ulong serverid) == true) + { + if (ulong.TryParse(target_channelid, out ulong channelid) == true) + { + SocketGuild server = Discord.GetGuild(serverid); + SocketTextChannel Channel = null; + foreach (SocketTextChannel channel in server.TextChannels) + { + if (channel.Id == channelid) + { + Channel = channel; + break; + } + } + if (Channel != null) + { + await Channel.SendMessageAsync(message, useTTS); + return true; + } + } + } + } + return false; } - public void setDiscordClient(DiscordSocketClient GivenDiscordLink) - { - DiscordLink = GivenDiscordLink; + public void setDiscordClient(DiscordSocketClient GivenDiscordLink) + { + DiscordLink = GivenDiscordLink; } - public DiscordSocketClient getDiscordClient() - { - return DiscordLink; + public DiscordSocketClient getDiscordClient() + { + return DiscordLink; } - public string getDiscordWhyFailed() - { - return DiscordReadyWhyFailed; + public string getDiscordWhyFailed() + { + return DiscordReadyWhyFailed; } - public bool discordReady() - { - if (DiscordLink == null) - { - DiscordReadyWhyFailed = "No client"; - return false; - } - if (DiscordLink.ConnectionState != ConnectionState.Connected) - { - DiscordReadyWhyFailed = "Not connected"; - return false; - } - return true; + public bool discordReady() + { + if (DiscordLink == null) + { + DiscordReadyWhyFailed = "No client"; + return false; + } + if (DiscordLink.ConnectionState != ConnectionState.Connected) + { + DiscordReadyWhyFailed = "Not connected"; + return false; + } + return true; } #endregion public virtual Dictionary GetIMChatWindowKeyNames() diff --git a/Core/bottypes/athome.cs b/Core/bottypes/athome.cs index 7ce2e35..df86bbc 100644 --- a/Core/bottypes/athome.cs +++ b/Core/bottypes/athome.cs @@ -1,19 +1,19 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using OpenMetaverse; -using BetterSecondBotShared.Static; -using BetterSecondBotShared.logs; - -namespace BSB.bottypes -{ +using System; +using System.Collections.Generic; +using System.Linq; +using OpenMetaverse; +using BetterSecondBotShared.Static; +using BetterSecondBotShared.logs; + +namespace BetterSecondBot.bottypes +{ public class NextHomeRegionArgs: EventArgs { - } - - public abstract class AtHome : MessageSwitcherBot - { - protected string BetterAtHomeAction = ""; + } + + public abstract class AtHome : MessageSwitcherBot + { + protected string BetterAtHomeAction = ""; private EventHandler _ChangeSim; private EventHandler _AlertMessage; private EventHandler _LoginProgess; @@ -29,12 +29,12 @@ namespace BSB.bottypes { add { lock (_ChangeSimLock) { _ChangeSim += value; } } remove { lock (_ChangeSimLock) { _ChangeSim -= value; } } - } + } public event EventHandler AlertMessage { add { lock (_AlertMessageLock) { _AlertMessage += value; } } remove { lock (_AlertMessageLock) { _AlertMessage -= value; } } - } + } public event EventHandler LoginProgess { add { lock (_LoginProgressLock) { _LoginProgess += value; } } @@ -46,45 +46,45 @@ namespace BSB.bottypes remove { lock (_NextHomeRegionLock) { _NextHomeRegion -= value; } } } - protected override void LoginHandler(object o, LoginProgressEventArgs e) - { - base.LoginHandler(o, e); + protected override void LoginHandler(object o, LoginProgressEventArgs e) + { + base.LoginHandler(o, e); EventHandler handler = _LoginProgess; - handler?.Invoke(this, e); + handler?.Invoke(this, e); } - protected void ChangeSim(object sender,SimChangedEventArgs e) + protected void ChangeSim(object sender,SimChangedEventArgs e) { EventHandler handler = _ChangeSim; - handler?.Invoke(this, e); - } - - protected void AlertEvent(object sender,AlertMessageEventArgs e) + handler?.Invoke(this, e); + } + + protected void AlertEvent(object sender,AlertMessageEventArgs e) { EventHandler handler = _AlertMessage; - handler?.Invoke(this, e); - } - + handler?.Invoke(this, e); + } + public void GotoNextHomeRegion() { NextHomeRegionArgs e = new NextHomeRegionArgs(); EventHandler handler = _NextHomeRegion; handler?.Invoke(this, e); - } - - public void ResetAtHome() - { - - } - + } + + public void ResetAtHome() + { + + } + public void SetBetterAtHomeAction(string BetterAtHomeAction) { this.BetterAtHomeAction = BetterAtHomeAction; - } - - public override string GetStatus() - { - return base.GetStatus() + " <@BetterAtHome: " + BetterAtHomeAction + ">"; + } + + public override string GetStatus() + { + return base.GetStatus() + " <@BetterAtHome: " + BetterAtHomeAction + ">"; } public string TeleportWithSLurl(string sl_url) @@ -104,6 +104,6 @@ namespace BSB.bottypes return "Invaild bits length for SLurl"; } return "No bits decoded"; - } - } -} + } + } +} diff --git a/Core/bottypes/chatrelay.cs b/Core/bottypes/chatrelay.cs index 0ff2d7b..af7fd4a 100644 --- a/Core/bottypes/chatrelay.cs +++ b/Core/bottypes/chatrelay.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace BSB.bottypes +namespace BetterSecondBot.bottypes { public abstract class ChatRelay : RLVbot { @@ -51,15 +51,15 @@ namespace BSB.bottypes public override void AddToIMchat(UUID avatar, string name, string message) { string sendername = name; - if(sendername == GetClient.Self.Name) - { - name = FindAvatarKey2Name(avatar); + if(sendername == GetClient.Self.Name) + { + name = FindAvatarKey2Name(avatar); } if (im_chat_history.ContainsKey(avatar) == false) { - if(im_chat_history_to_name.ContainsKey(avatar) == false) - { - im_chat_history_to_name.Add(avatar, name); + if(im_chat_history_to_name.ContainsKey(avatar) == false) + { + im_chat_history_to_name.Add(avatar, name); } im_chat_history.Add(avatar, new List()); im_chat_unread.Add(avatar, false); @@ -119,8 +119,8 @@ namespace BSB.bottypes } } } - } - + } + public override bool HasUnreadGroupchats() { return group_chat_unread.ContainsValue(true); diff --git a/Shared/API/API_interface.cs b/Shared/API/API_interface.cs index e23b239..7b208a2 100644 --- a/Shared/API/API_interface.cs +++ b/Shared/API/API_interface.cs @@ -3,6 +3,7 @@ using OpenMetaverse; using System; using System.Collections.Generic; using System.Linq; +using System.Reflection; using System.Text; namespace BetterSecondBotShared.API @@ -49,12 +50,12 @@ namespace BetterSecondBotShared.API if (subtype_map.ContainsKey(name) == false) { string worknamespace = com.Namespace; - worknamespace = worknamespace.Replace("BSB.Commands.", ""); - worknamespace = worknamespace.Replace("BSB.RLV.", ""); - worknamespace = worknamespace.Replace("BetterSecondBot.HttpServer.View.", ""); - worknamespace = worknamespace.Replace("BetterSecondBot.HttpServer.view.", ""); - worknamespace = worknamespace.Replace("BetterSecondBot.HttpServer.Control.", ""); - worknamespace = worknamespace.Replace("BetterSecondBot.HttpServer.control.", ""); + worknamespace = worknamespace.Replace("BetterSecondBot.Commands.", ""); + worknamespace = worknamespace.Replace("BetterSecondBot.RLV.", ""); + worknamespace = worknamespace.Replace("BetterSecondbot.HttpServer.View.", ""); + worknamespace = worknamespace.Replace("BetterSecondbot.HttpServer.view.", ""); + worknamespace = worknamespace.Replace("BetterSecondbot.HttpServer.Control.", ""); + worknamespace = worknamespace.Replace("BetterSecondbot.HttpServer.control.", ""); worknamespace = worknamespace.Replace("CMD_", ""); subtype_map.Add(name, D.GetType()); subtype_workspace_map.Add(name, worknamespace); @@ -71,13 +72,39 @@ namespace BetterSecondBotShared.API protected IEnumerable GetAPICommandClasses() { if (API_type != null) - { - return AppDomain.CurrentDomain.GetAssemblies().Where(Ass => { - bool reply = false; - if (Ass.FullName.StartsWith("BSB") == true) { reply = true; } - else if (Ass.FullName.StartsWith("BetterSecondBot") == true){ reply = true; } - return reply; - }).SelectMany(assembly => assembly.GetTypes()).Where(type => type.IsSubclassOf(API_type)); + { + + Assembly[] asses = AppDomain.CurrentDomain.GetAssemblies(); + + List GoodLooking = new List(); + foreach (Assembly Ass in asses) + { + if (Ass.FullName.StartsWith("BetterSecondbot") == true) + { + GoodLooking.Add(Ass); + } + else if (Ass.FullName.StartsWith("Core") == true) + { + GoodLooking.Add(Ass); + } + else if (Ass.FullName.StartsWith("Shared") == true) + { + GoodLooking.Add(Ass); + } + } + + List reply = new List(); + foreach (Assembly Ass in GoodLooking) + { + foreach(Type ClassType in Ass.GetTypes()) + { + if(ClassType.IsSubclassOf(API_type) == true) + { + reply.Add(ClassType); + } + } + } + return reply; } else { @@ -87,6 +114,10 @@ namespace BetterSecondBotShared.API } public virtual string[] GetCommandsList() { + if (subtype_map.Count() == 0) + { + LoadCommandsList(); + } return subtype_map.Keys.ToArray(); } public virtual string GetCommandWorkspace(string cmd)