diff --git a/.gitignore b/.gitignore index ddf7381..0b29ae8 100644 --- a/.gitignore +++ b/.gitignore @@ -349,3 +349,6 @@ MigrationBackup/ # Ionide (cross platform F# VS Code tools) working folder .ionide/ + +.idea +.vscode \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..0eaa416 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "External/libremetaverse"] + path = External/libremetaverse + url = https://github.com/cinderblocks/libremetaverse +[submodule "External/LibZNI"] + path = External/LibZNI + url = ssh://git@git.zontreck.com:1212/zontreck/LibZNI diff --git a/External/LibZNI b/External/LibZNI new file mode 160000 index 0000000..0a02263 --- /dev/null +++ b/External/LibZNI @@ -0,0 +1 @@ +Subproject commit 0a022634c1a9e6a3ed63126cc4109c6030d054bd diff --git a/External/libremetaverse b/External/libremetaverse new file mode 160000 index 0000000..069ceac --- /dev/null +++ b/External/libremetaverse @@ -0,0 +1 @@ +Subproject commit 069ceac85869feffd34b6d64847468a710186838 diff --git a/ForgeCore.csproj b/ForgeCore.csproj index 2b6a640..d028b03 100644 --- a/ForgeCore.csproj +++ b/ForgeCore.csproj @@ -13,15 +13,22 @@ - - + + - - - - - + + + + + + + + + + + + diff --git a/ForgeCore.sln b/ForgeCore.sln index d7f3612..f727624 100644 --- a/ForgeCore.sln +++ b/ForgeCore.sln @@ -1,25 +1,64 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.5.002.0 +VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ForgeCore", "ForgeCore.csproj", "{FAD067A8-738A-40C1-BC6B-CF1CA270B177}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{EC162775-3331-430A-AA32-9700375DECCA}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libremetaverse", "libremetaverse", "{E5E8957B-7015-4DF0-AE67-0BEDBF9BA302}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse.StructuredData", "External\libremetaverse\LibreMetaverse.StructuredData\LibreMetaverse.StructuredData.csproj", "{A575D43A-A0D1-4027-869E-6F19BEBF6442}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse.Types", "External\libremetaverse\LibreMetaverse.Types\LibreMetaverse.Types.csproj", "{E61B1F80-B229-434D-9C23-6DC27FA5348E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse", "External\libremetaverse\LibreMetaverse\LibreMetaverse.csproj", "{FB276409-0C34-4F3D-AD58-EAEECF53B5EA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse.Utilities", "External\libremetaverse\LibreMetaverse.Utilities\LibreMetaverse.Utilities.csproj", "{39DEB2B1-BCA7-4853-BC17-1BE05B31989A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ForgeCore", "ForgeCore.csproj", "{5936E1A6-1891-4EA4-B595-442750FAEF80}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibZNI", "External\LibZNI\LibZNI.csproj", "{7758FB70-E6A3-4159-A20B-9F64105A0840}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FAD067A8-738A-40C1-BC6B-CF1CA270B177}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FAD067A8-738A-40C1-BC6B-CF1CA270B177}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FAD067A8-738A-40C1-BC6B-CF1CA270B177}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FAD067A8-738A-40C1-BC6B-CF1CA270B177}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {97B8BD93-EA3A-4930-AA37-EBB35D86510C} + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A575D43A-A0D1-4027-869E-6F19BEBF6442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A575D43A-A0D1-4027-869E-6F19BEBF6442}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A575D43A-A0D1-4027-869E-6F19BEBF6442}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A575D43A-A0D1-4027-869E-6F19BEBF6442}.Release|Any CPU.Build.0 = Release|Any CPU + {E61B1F80-B229-434D-9C23-6DC27FA5348E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E61B1F80-B229-434D-9C23-6DC27FA5348E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E61B1F80-B229-434D-9C23-6DC27FA5348E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E61B1F80-B229-434D-9C23-6DC27FA5348E}.Release|Any CPU.Build.0 = Release|Any CPU + {FB276409-0C34-4F3D-AD58-EAEECF53B5EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FB276409-0C34-4F3D-AD58-EAEECF53B5EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FB276409-0C34-4F3D-AD58-EAEECF53B5EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FB276409-0C34-4F3D-AD58-EAEECF53B5EA}.Release|Any CPU.Build.0 = Release|Any CPU + {39DEB2B1-BCA7-4853-BC17-1BE05B31989A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {39DEB2B1-BCA7-4853-BC17-1BE05B31989A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {39DEB2B1-BCA7-4853-BC17-1BE05B31989A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {39DEB2B1-BCA7-4853-BC17-1BE05B31989A}.Release|Any CPU.Build.0 = Release|Any CPU + {5936E1A6-1891-4EA4-B595-442750FAEF80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5936E1A6-1891-4EA4-B595-442750FAEF80}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5936E1A6-1891-4EA4-B595-442750FAEF80}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5936E1A6-1891-4EA4-B595-442750FAEF80}.Release|Any CPU.Build.0 = Release|Any CPU + {7758FB70-E6A3-4159-A20B-9F64105A0840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7758FB70-E6A3-4159-A20B-9F64105A0840}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7758FB70-E6A3-4159-A20B-9F64105A0840}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7758FB70-E6A3-4159-A20B-9F64105A0840}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {E5E8957B-7015-4DF0-AE67-0BEDBF9BA302} = {EC162775-3331-430A-AA32-9700375DECCA} + {A575D43A-A0D1-4027-869E-6F19BEBF6442} = {E5E8957B-7015-4DF0-AE67-0BEDBF9BA302} + {E61B1F80-B229-434D-9C23-6DC27FA5348E} = {E5E8957B-7015-4DF0-AE67-0BEDBF9BA302} + {FB276409-0C34-4F3D-AD58-EAEECF53B5EA} = {E5E8957B-7015-4DF0-AE67-0BEDBF9BA302} + {39DEB2B1-BCA7-4853-BC17-1BE05B31989A} = {E5E8957B-7015-4DF0-AE67-0BEDBF9BA302} + {7758FB70-E6A3-4159-A20B-9F64105A0840} = {EC162775-3331-430A-AA32-9700375DECCA} EndGlobalSection EndGlobal diff --git a/Assembly/ASMInfo.cs b/Sources/Assembly/ASMInfo.cs similarity index 70% rename from Assembly/ASMInfo.cs rename to Sources/Assembly/ASMInfo.cs index 5827a64..422b5d0 100644 --- a/Assembly/ASMInfo.cs +++ b/Sources/Assembly/ASMInfo.cs @@ -2,21 +2,19 @@ using System; using System.Collections.Generic; using System.Text; using System.Reflection; -using LibZNI; [assembly: AssemblyCompany("ZNI")] [assembly: AssemblyAlgorithmId(System.Configuration.Assemblies.AssemblyHashAlgorithm.MD5)] [assembly: AssemblyCopyright("(C) 2020 Tara Piccari")] [assembly: AssemblyFileVersion("5.0.7.9200")] -[assembly: AssemblyDescription("Second Life Bot - BotCore5")] -[assembly: AutoUpdater("/job/Bot", "!os!.tar")] +[assembly: AssemblyDescription("ForgeCore Bot Server")] namespace Bot.Assemble { public class ASMInfo { - public static string BotName = "ZBotCore"; - public static string BotVer = "5.0.7.9200"; + public static string BotName = "ForgeCore"; + public static string BotVer = "2.0.121524.1636"; public static string GitPassword { get diff --git a/BotSession.cs b/Sources/BotSession.cs similarity index 100% rename from BotSession.cs rename to Sources/BotSession.cs diff --git a/Charts/ChartCommands.cs b/Sources/Charts/ChartCommands.cs similarity index 100% rename from Charts/ChartCommands.cs rename to Sources/Charts/ChartCommands.cs diff --git a/Charts/ChartMemory.cs b/Sources/Charts/ChartMemory.cs similarity index 100% rename from Charts/ChartMemory.cs rename to Sources/Charts/ChartMemory.cs diff --git a/Charts/ChartRenderer.cs b/Sources/Charts/ChartRenderer.cs similarity index 100% rename from Charts/ChartRenderer.cs rename to Sources/Charts/ChartRenderer.cs diff --git a/ChatLogger.cs b/Sources/ChatLogger.cs similarity index 100% rename from ChatLogger.cs rename to Sources/ChatLogger.cs diff --git a/CommandSystem/BaseCommands.cs b/Sources/CommandSystem/BaseCommands.cs similarity index 100% rename from CommandSystem/BaseCommands.cs rename to Sources/CommandSystem/BaseCommands.cs diff --git a/CommandSystem/BaseHooks.cs b/Sources/CommandSystem/BaseHooks.cs similarity index 100% rename from CommandSystem/BaseHooks.cs rename to Sources/CommandSystem/BaseHooks.cs diff --git a/CommandSystem/CommandGroup.cs b/Sources/CommandSystem/CommandGroup.cs similarity index 100% rename from CommandSystem/CommandGroup.cs rename to Sources/CommandSystem/CommandGroup.cs diff --git a/CommandSystem/CommandHelp.cs b/Sources/CommandSystem/CommandHelp.cs similarity index 100% rename from CommandSystem/CommandHelp.cs rename to Sources/CommandSystem/CommandHelp.cs diff --git a/CommandSystem/CommandManager.cs b/Sources/CommandSystem/CommandManager.cs similarity index 100% rename from CommandSystem/CommandManager.cs rename to Sources/CommandSystem/CommandManager.cs diff --git a/CommandSystem/CommandRegistry.cs b/Sources/CommandSystem/CommandRegistry.cs similarity index 100% rename from CommandSystem/CommandRegistry.cs rename to Sources/CommandSystem/CommandRegistry.cs diff --git a/ConfigSystem/BaseConfig.cs b/Sources/ConfigSystem/BaseConfig.cs similarity index 100% rename from ConfigSystem/BaseConfig.cs rename to Sources/ConfigSystem/BaseConfig.cs diff --git a/ConfigSystem/IConfig.cs b/Sources/ConfigSystem/IConfig.cs similarity index 100% rename from ConfigSystem/IConfig.cs rename to Sources/ConfigSystem/IConfig.cs diff --git a/ConfigSystem/MainConfiguration.cs b/Sources/ConfigSystem/MainConfiguration.cs similarity index 100% rename from ConfigSystem/MainConfiguration.cs rename to Sources/ConfigSystem/MainConfiguration.cs diff --git a/GroupKeepAlive.cs b/Sources/GroupKeepAlive.cs similarity index 100% rename from GroupKeepAlive.cs rename to Sources/GroupKeepAlive.cs diff --git a/GroupLog.cs b/Sources/GroupLog.cs similarity index 100% rename from GroupLog.cs rename to Sources/GroupLog.cs diff --git a/IProgram.cs b/Sources/IProgram.cs similarity index 100% rename from IProgram.cs rename to Sources/IProgram.cs diff --git a/Level System/Auth.cs b/Sources/Level System/Auth.cs similarity index 100% rename from Level System/Auth.cs rename to Sources/Level System/Auth.cs diff --git a/Logger.cs b/Sources/Logger.cs similarity index 100% rename from Logger.cs rename to Sources/Logger.cs diff --git a/MessageHandler.cs b/Sources/MessageHandler.cs similarity index 100% rename from MessageHandler.cs rename to Sources/MessageHandler.cs diff --git a/NonCommands/IgnoreNonCommands.cs b/Sources/NonCommands/IgnoreNonCommands.cs similarity index 100% rename from NonCommands/IgnoreNonCommands.cs rename to Sources/NonCommands/IgnoreNonCommands.cs diff --git a/NonCommands/NotCommand.cs b/Sources/NonCommands/NotCommand.cs similarity index 100% rename from NonCommands/NotCommand.cs rename to Sources/NonCommands/NotCommand.cs diff --git a/NonCommands/nCMD.cs b/Sources/NonCommands/nCMD.cs similarity index 100% rename from NonCommands/nCMD.cs rename to Sources/NonCommands/nCMD.cs diff --git a/NonCommands/nRegistry.cs b/Sources/NonCommands/nRegistry.cs similarity index 100% rename from NonCommands/nRegistry.cs rename to Sources/NonCommands/nRegistry.cs diff --git a/PluginActivator.cs b/Sources/PluginActivator.cs similarity index 100% rename from PluginActivator.cs rename to Sources/PluginActivator.cs diff --git a/Program.cs b/Sources/Program.cs similarity index 99% rename from Program.cs rename to Sources/Program.cs index a3046b2..a139d1c 100644 --- a/Program.cs +++ b/Sources/Program.cs @@ -11,9 +11,9 @@ using System.Threading; using OpenMetaverse.Packets; using Bot.Assemble; using OpenMetaverse.Interfaces; -using LibZNI; using System.Security.Cryptography; using System.Reflection; +using CommandRegistry = Bot.CommandSystem.CommandRegistry; namespace Bot { @@ -56,9 +56,6 @@ namespace Bot Log = new Logger("BotCore5"); BotSession.Instance.Logger = Log; BotSession.Instance.LaunchTime = DateTime.Now; - ZHash.Instance.NewKey(); - ZHash.Instance.Key = "Test"; - Console.WriteLine("ZHash (Test): " + ZHash.Instance.Key); MainConfiguration.Instance.Load(); MainConfiguration conf = MainConfiguration.Instance; //MasterObjectCaches = ObjectCaches.Instance; diff --git a/RLV.cs b/Sources/RLV.cs similarity index 100% rename from RLV.cs rename to Sources/RLV.cs diff --git a/SerialManager.cs b/Sources/SerialManager.cs similarity index 100% rename from SerialManager.cs rename to Sources/SerialManager.cs diff --git a/Visitors/Greeter.cs b/Sources/Visitors/Greeter.cs similarity index 100% rename from Visitors/Greeter.cs rename to Sources/Visitors/Greeter.cs diff --git a/Visitors/VisitorLog.cs b/Sources/Visitors/VisitorLog.cs similarity index 100% rename from Visitors/VisitorLog.cs rename to Sources/Visitors/VisitorLog.cs diff --git a/WebHookServer/HookCmds.cs b/Sources/WebHookServer/HookCmds.cs similarity index 100% rename from WebHookServer/HookCmds.cs rename to Sources/WebHookServer/HookCmds.cs diff --git a/WebHookServer/NewVersionWatcher.cs b/Sources/WebHookServer/NewVersionWatcher.cs similarity index 100% rename from WebHookServer/NewVersionWatcher.cs rename to Sources/WebHookServer/NewVersionWatcher.cs diff --git a/WebHookServer/WebHookServer.cs b/Sources/WebHookServer/WebHookServer.cs similarity index 99% rename from WebHookServer/WebHookServer.cs rename to Sources/WebHookServer/WebHookServer.cs index cdfebc1..52716bd 100644 --- a/WebHookServer/WebHookServer.cs +++ b/Sources/WebHookServer/WebHookServer.cs @@ -20,7 +20,6 @@ using Newtonsoft.Json; using System.Security.Cryptography.X509Certificates; using System.Reflection; using System.Net.Sockets; -using LibZNI; namespace Bot.WebHookServer { diff --git a/WebHookServer/WebhookAttribs.cs b/Sources/WebHookServer/WebhookAttribs.cs similarity index 100% rename from WebHookServer/WebhookAttribs.cs rename to Sources/WebHookServer/WebhookAttribs.cs diff --git a/WebHookServer/WebhookRegistry.cs b/Sources/WebHookServer/WebhookRegistry.cs similarity index 100% rename from WebHookServer/WebhookRegistry.cs rename to Sources/WebHookServer/WebhookRegistry.cs diff --git a/zGroupCaches.cs b/Sources/zGroupCaches.cs similarity index 100% rename from zGroupCaches.cs rename to Sources/zGroupCaches.cs