From da91200c7453cc21b69e3d300a8d7c70351e0ffb Mon Sep 17 00:00:00 2001 From: Zontreck Date: Fri, 20 Dec 2019 17:38:55 -0700 Subject: [PATCH] Restructure --- .gitignore | 1 + Bot.csproj | 29 +++++++++++++++++++ Source/BotSession.cs => BotSession.cs | 8 +---- .../CommandGroup.cs | 9 +----- .../CommandHelp.cs | 9 +----- .../CommandRegistry.cs | 9 +----- .../BaseConfig.cs | 7 +---- .../ConfigSystem => ConfigSystem}/IConfig.cs | 8 +---- .../MainConfiguration.cs | 7 +---- Source/IProgram.cs => IProgram.cs | 7 +---- Source/MessageHandler.cs => MessageHandler.cs | 8 +---- .../PluginActivator.cs => PluginActivator.cs | 8 +---- Source/Program.cs => Program.cs | 8 +---- Source/SerialManager.cs => SerialManager.cs | 8 +---- Source/Assembly/ASMInfo.cs | 19 ------------ Source/SysOut.cs => SysOut.cs | 8 +---- 16 files changed, 43 insertions(+), 110 deletions(-) create mode 100644 Bot.csproj rename Source/BotSession.cs => BotSession.cs (89%) rename {Source/CommandSystem => CommandSystem}/CommandGroup.cs (91%) rename {Source/CommandSystem => CommandSystem}/CommandHelp.cs (95%) rename {Source/CommandSystem => CommandSystem}/CommandRegistry.cs (98%) rename {Source/ConfigSystem => ConfigSystem}/BaseConfig.cs (74%) rename {Source/ConfigSystem => ConfigSystem}/IConfig.cs (72%) rename {Source/ConfigSystem => ConfigSystem}/MainConfiguration.cs (92%) rename Source/IProgram.cs => IProgram.cs (87%) rename Source/MessageHandler.cs => MessageHandler.cs (98%) rename Source/PluginActivator.cs => PluginActivator.cs (89%) rename Source/Program.cs => Program.cs (99%) rename Source/SerialManager.cs => SerialManager.cs (96%) delete mode 100644 Source/Assembly/ASMInfo.cs rename Source/SysOut.cs => SysOut.cs (97%) diff --git a/.gitignore b/.gitignore index dfcfd56..89ed6be 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore # User-specific files +Assembly/ASMInfo.cs *.rsuser *.suo *.user diff --git a/Bot.csproj b/Bot.csproj new file mode 100644 index 0000000..365813e --- /dev/null +++ b/Bot.csproj @@ -0,0 +1,29 @@ + + + + Exe + netcoreapp3.0 + true + + + + + + + + + + ..\..\libremetaverse\bin\netcoreapp3.0\LibreMetaverse.dll + + + ..\..\libremetaverse\bin\netcoreapp3.0\LibreMetaverse.StructuredData.dll + + + ..\..\libremetaverse\bin\netcoreapp3.0\LibreMetaverse.Types.dll + + + ..\..\libremetaverse\bin\netcoreapp3.0\LibreMetaverse.Utilities.dll + + + + diff --git a/Source/BotSession.cs b/BotSession.cs similarity index 89% rename from Source/BotSession.cs rename to BotSession.cs index ee86955..f5b086b 100644 --- a/Source/BotSession.cs +++ b/BotSession.cs @@ -1,10 +1,4 @@ -/* -Copyright © 2019 Tara Piccari (Aria; Tashia Redrose) -Licensed under the AGPL-3.0 -*/ - - -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Source/CommandSystem/CommandGroup.cs b/CommandSystem/CommandGroup.cs similarity index 91% rename from Source/CommandSystem/CommandGroup.cs rename to CommandSystem/CommandGroup.cs index 580f64f..f686add 100644 --- a/Source/CommandSystem/CommandGroup.cs +++ b/CommandSystem/CommandGroup.cs @@ -1,11 +1,4 @@ -/* -Copyright © 2019 Tara Piccari (Aria; Tashia Redrose) -Licensed under the AGPL-3.0 -*/ - - - -using System; +using System; using System.Reflection; diff --git a/Source/CommandSystem/CommandHelp.cs b/CommandSystem/CommandHelp.cs similarity index 95% rename from Source/CommandSystem/CommandHelp.cs rename to CommandSystem/CommandHelp.cs index 6a0d619..d98e595 100644 --- a/Source/CommandSystem/CommandHelp.cs +++ b/CommandSystem/CommandHelp.cs @@ -1,11 +1,4 @@ -/* -Copyright © 2019 Tara Piccari (Aria; Tashia Redrose) -Licensed under the AGPL-3.0 -*/ - - - -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Source/CommandSystem/CommandRegistry.cs b/CommandSystem/CommandRegistry.cs similarity index 98% rename from Source/CommandSystem/CommandRegistry.cs rename to CommandSystem/CommandRegistry.cs index 67764e9..27bcaa6 100644 --- a/Source/CommandSystem/CommandRegistry.cs +++ b/CommandSystem/CommandRegistry.cs @@ -1,11 +1,4 @@ -/* -Copyright © 2019 Tara Piccari (Aria; Tashia Redrose) -Licensed under the AGPL-3.0 -*/ - - - -using System; +using System; using System.Collections.Generic; using System.Linq; using OpenMetaverse; diff --git a/Source/ConfigSystem/BaseConfig.cs b/ConfigSystem/BaseConfig.cs similarity index 74% rename from Source/ConfigSystem/BaseConfig.cs rename to ConfigSystem/BaseConfig.cs index 957a205..f38cd28 100644 --- a/Source/ConfigSystem/BaseConfig.cs +++ b/ConfigSystem/BaseConfig.cs @@ -1,9 +1,4 @@ -/* -Copyright © 2019 Tara Piccari (Aria; Tashia Redrose) -Licensed under the AGPL-3.0 -*/ - -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Source/ConfigSystem/IConfig.cs b/ConfigSystem/IConfig.cs similarity index 72% rename from Source/ConfigSystem/IConfig.cs rename to ConfigSystem/IConfig.cs index 5c8a1da..3234455 100644 --- a/Source/ConfigSystem/IConfig.cs +++ b/ConfigSystem/IConfig.cs @@ -1,10 +1,4 @@ -/* -Copyright © 2019 Tara Piccari (Aria; Tashia Redrose) -Licensed under the AGPL-3.0 -*/ - - -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Source/ConfigSystem/MainConfiguration.cs b/ConfigSystem/MainConfiguration.cs similarity index 92% rename from Source/ConfigSystem/MainConfiguration.cs rename to ConfigSystem/MainConfiguration.cs index 1773ea1..5efdee0 100644 --- a/Source/ConfigSystem/MainConfiguration.cs +++ b/ConfigSystem/MainConfiguration.cs @@ -1,9 +1,4 @@ -/* -Copyright © 2019 Tara Piccari (Aria; Tashia Redrose) -Licensed under the AGPL-3.0 -*/ - -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Source/IProgram.cs b/IProgram.cs similarity index 87% rename from Source/IProgram.cs rename to IProgram.cs index 9e84e90..537a851 100644 --- a/Source/IProgram.cs +++ b/IProgram.cs @@ -1,9 +1,4 @@ -/* -Copyright © 2019 Tara Piccari (Aria; Tashia Redrose) -Licensed under the AGPL-3.0 -*/ - -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Source/MessageHandler.cs b/MessageHandler.cs similarity index 98% rename from Source/MessageHandler.cs rename to MessageHandler.cs index b81c587..78318a9 100644 --- a/Source/MessageHandler.cs +++ b/MessageHandler.cs @@ -1,10 +1,4 @@ - -/* -Copyright © 2019 Tara Piccari (Aria; Tashia Redrose) -Licensed under the AGPL-3.0 -*/ - -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Source/PluginActivator.cs b/PluginActivator.cs similarity index 89% rename from Source/PluginActivator.cs rename to PluginActivator.cs index bbb6377..bea258f 100644 --- a/Source/PluginActivator.cs +++ b/PluginActivator.cs @@ -1,10 +1,4 @@ -/* -Copyright © 2019 Tara Piccari (Aria; Tashia Redrose) -Licensed under the AGPL-3.0 -*/ - - -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; diff --git a/Source/Program.cs b/Program.cs similarity index 99% rename from Source/Program.cs rename to Program.cs index be904b0..6ee4bec 100644 --- a/Source/Program.cs +++ b/Program.cs @@ -1,10 +1,4 @@ -/* -Copyright © 2019 Tara Piccari (Aria; Tashia Redrose) -Licensed under the AGPL-3.0 -*/ - - -using Bot.CommandSystem; +using Bot.CommandSystem; using Newtonsoft.Json; using OpenMetaverse; using System; diff --git a/Source/SerialManager.cs b/SerialManager.cs similarity index 96% rename from Source/SerialManager.cs rename to SerialManager.cs index 7ea50d8..a5f76fc 100644 --- a/Source/SerialManager.cs +++ b/SerialManager.cs @@ -1,10 +1,4 @@ -/* -Copyright © 2019 Tara Piccari (Aria; Tashia Redrose) -Licensed under the AGPL-3.0 -*/ - - -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Source/Assembly/ASMInfo.cs b/Source/Assembly/ASMInfo.cs deleted file mode 100644 index a0e70df..0000000 --- a/Source/Assembly/ASMInfo.cs +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright © 2019 Tara Piccari (Aria; Tashia Redrose) -Licensed under the AGPL-3.0 -*/ - - -using System; -using System.Collections.Generic; -using System.Text; - -namespace Bot.Assemble -{ - public class ASMInfo - { - public static string BotName = "ZBotCore"; - public static double BotVer = 5.0; - public static string GitPassword = "**REMOVED**"; - } -} diff --git a/Source/SysOut.cs b/SysOut.cs similarity index 97% rename from Source/SysOut.cs rename to SysOut.cs index 4341198..1dea9a1 100644 --- a/Source/SysOut.cs +++ b/SysOut.cs @@ -1,10 +1,4 @@ -/* -Copyright © 2019 Tara Piccari (Aria; Tashia Redrose) -Licensed under the AGPL-3.0 -*/ - - -using System; +using System; using System.Collections.Generic; using System.Text;