Perform more refactoring
This commit is contained in:
parent
53396b9c39
commit
f735bce4e1
43 changed files with 78 additions and 27 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -349,3 +349,6 @@ MigrationBackup/
|
|||
|
||||
# Ionide (cross platform F# VS Code tools) working folder
|
||||
.ionide/
|
||||
|
||||
.idea
|
||||
.vscode
|
||||
6
.gitmodules
vendored
Normal file
6
.gitmodules
vendored
Normal file
|
|
@ -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
|
||||
1
External/LibZNI
vendored
Submodule
1
External/LibZNI
vendored
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 0a022634c1a9e6a3ed63126cc4109c6030d054bd
|
||||
1
External/libremetaverse
vendored
Submodule
1
External/libremetaverse
vendored
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 069ceac85869feffd34b6d64847468a710186838
|
||||
|
|
@ -13,15 +13,22 @@
|
|||
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||
<PackageReference Include="Terminal.Gui" Version="0.90.3" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="Terminal.Gui" Version="2.0.0-v2-develop.2329" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\LibZNI\LibZNI.csproj" />
|
||||
<ProjectReference Include="..\libremetaverse\LibreMetaverse.StructuredData\LibreMetaverse.StructuredData.csproj" />
|
||||
<ProjectReference Include="..\libremetaverse\LibreMetaverseTypes\LibreMetaverse.Types.csproj" />
|
||||
<ProjectReference Include="..\libremetaverse\LibreMetaverse\LibreMetaverse.csproj" />
|
||||
<None Remove="External/**/*" />
|
||||
<Compile Remove="External/**/*" />
|
||||
<Content Remove="External/**/*" />
|
||||
<EmbeddedResource Remove="External/**/*" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="External\LibZNI\LibZNI.csproj" />
|
||||
<ProjectReference Include="External\libremetaverse\LibreMetaverse.StructuredData\LibreMetaverse.StructuredData.csproj" />
|
||||
<ProjectReference Include="External\libremetaverse\LibreMetaverseTypes\LibreMetaverse.Types.csproj" />
|
||||
<ProjectReference Include="External\libremetaverse\LibreMetaverse\LibreMetaverse.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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;
|
||||
|
|
@ -20,7 +20,6 @@ using Newtonsoft.Json;
|
|||
using System.Security.Cryptography.X509Certificates;
|
||||
using System.Reflection;
|
||||
using System.Net.Sockets;
|
||||
using LibZNI;
|
||||
|
||||
namespace Bot.WebHookServer
|
||||
{
|
||||
Loading…
Add table
Add a link
Reference in a new issue