From 057ac49619dd4119bb4db973024b4aa29cd5356f Mon Sep 17 00:00:00 2001
From: Madpeterz <57852827+Madpeterz@users.noreply.github.com>
Date: Sun, 14 Feb 2021 01:21:35 +0000
Subject: [PATCH] oh god the pain
---
.dockerignore | 46 +-
.github/ISSUE_TEMPLATE/bug_report.md | 66 +-
.github/ISSUE_TEMPLATE/feature_request.md | 40 +-
.github/workflows/dotnetcore.yml | 50 +-
BSBshared/BSBshared.csproj | 24 -
BetterSecondBot.sln | 126 +-
BetterSecondBot.sln.DotSettings | 4 -
CLI/BetterSecondBot.csproj | 47 -
.../PublishProfiles/Linux-x64.pubxml | 18 -
.../PublishProfiles/Windows-64bit.pubxml | 18 -
Core/BSB.csproj | 31 -
Dockerfile | 146 +-
.../BetterRelayService/BetterRelay.cs | 0
.../BetterSecondbot/BetterSecondbot.cs | 0
.../BetterSecondbot/BetterSecondbot.csproj | 23 +
.../BetterSecondbot}/CliDocker.cs | 0
.../BetterSecondbot}/CliExitOnLogout.cs | 0
.../BetterSecondbot}/CliHardware.cs | 0
.../DiscordSupervisor/ChannelControl.cs | 0
.../DiscordSupervisor/Discord-super.cs | 0
.../DiscordSupervisor/DiscordBot.cs | 0
.../DiscordSupervisor/DiscordEvents.cs | 0
.../DiscordTTS/DiscordTTS.cs | 0
.../DiscordSupervisor/Functions.cs | 0
.../DiscordSupervisor/Inbound.cs | 6 +-
.../DiscordSupervisor/Status.cs | 0
.../DiscordSupervisor/Values.cs | 0
.../DiscordSupervisor/relay.cs | 0
Secondbot/BetterSecondbot/Dockerfile | 72 +
.../BetterSecondbot}/HttpService/Chat.cs | 0
.../BetterSecondbot}/HttpService/Core.cs | 0
.../BetterSecondbot}/HttpService/Group.cs | 0
.../HttpService/HttpAsService.cs | 0
.../BetterSecondbot}/HttpService/Im.cs | 0
.../BetterSecondbot}/HttpService/Inventory.cs | 0
.../HttpService/ParcelEstate.cs | 0
.../Properties/launchSettings.json | 18 +-
.../BetterSecondbot}/WikiMake/wiki_footer.txt | 20 +-
.../BetterSecondbot}/WikiMake/wiki_header.txt | 0
.../BetterSecondbot}/WikiMake/wikimake.cs | 4 +-
.../Core}/Commands/Animation/PlayGesture.cs | 0
.../Commands/Animation/addToAnimations.cs | 0
.../Commands/Animation/resetAnimations.cs | 0
.../Core}/Commands/Avatars/NearMe.cs | 0
.../Core}/Commands/Avatars/PayAvatar.cs | 0
.../Core}/Commands/Chat/LocalChatHistory.cs | 0
{Core => Secondbot/Core}/Commands/Chat/im.cs | 0
{Core => Secondbot/Core}/Commands/Chat/say.cs | 0
.../Core}/Commands/Dialogs/DialogRelay.cs | 0
.../Core}/Commands/Dialogs/DialogResponce.cs | 0
.../Core}/Commands/Dialogs/DialogTrack.cs | 0
.../Core}/Commands/DiscordAPI/AddRole.cs | 0
.../Core}/Commands/DiscordAPI/Ban_Member.cs | 0
.../Commands/DiscordAPI/BulkClear_Messages.cs | 0
.../Core}/Commands/DiscordAPI/Dm_Member.cs | 0
.../Core}/Commands/DiscordAPI/MembersList.cs | 0
.../Commands/DiscordAPI/MessageChannel.cs | 0
.../Core}/Commands/DiscordAPI/MuteMember.cs | 0
.../Core}/Commands/DiscordAPI/RoleCreate.cs | 0
.../Core}/Commands/DiscordAPI/RoleList.cs | 0
.../Core}/Commands/DiscordAPI/RoleRemove.cs | 0
.../Commands/DiscordAPI/Role_GetSettings.cs | 0
.../Commands/DiscordAPI/Role_UpdatePerms.cs | 0
.../Commands/DiscordAPI/TextChannels_List.cs | 0
.../Commands/Estate/EstateParcelReclaim.cs | 0
.../Core}/Commands/Estate/GetSimGlobalPos.cs | 0
.../Core}/Commands/Estate/GetSimTexture.cs | 0
.../Core}/Commands/Estate/SimMessage.cs | 0
.../Core}/Commands/Estate/SimRestart.cs | 0
.../Core}/Commands/Friends/FriendFullPerms.cs | 0
.../Core}/Commands/Friends/FriendRequest.cs | 0
.../Core}/Commands/Friends/Friendslist.cs | 0
.../Core}/Commands/Group/GroupActiveGroup.cs | 0
.../Core}/Commands/Group/GroupActiveTitle.cs | 0
.../Core}/Commands/Group/GroupAddRole.cs | 0
.../Core}/Commands/Group/GroupEject.cs | 0
.../Core}/Commands/Group/GroupInvite.cs | 0
.../Commands/Group/GroupInviteNoLimiter.cs | 0
.../Core}/Commands/Group/GroupNotice.cs | 0
.../Core}/Commands/Group/IsGroupMember.cs | 0
.../Core}/Commands/Group/getGroupList.cs | 0
.../Core}/Commands/Group/getGroupMembers.cs | 0
.../Core}/Commands/Group/getGroupRoles.cs | 0
.../Core}/Commands/Group/group.cs | 0
.../Core}/Commands/Group/groupchat.cs | 0
.../Commands/Group/groupchatAnyUnread.cs | 0
.../Core}/Commands/Group/groupchatClearAll.cs | 0
.../Commands/Group/groupchatGroupHasUnread.cs | 0
.../Core}/Commands/Group/groupchatHistory.cs | 0
.../Group/groupchatListAllUnreadGroups.cs | 0
.../Core}/Commands/Helpers/delay.cs | 0
.../Core}/Commands/Home/GoHome.cs | 0
.../Core}/Commands/Home/resetAtHome.cs | 0
.../Core}/Commands/Info/Balance.cs | 0
.../Core}/Commands/Info/GetPosition.cs | 0
.../Core}/Commands/Info/ParcelName.cs | 0
.../Core}/Commands/Info/SimName.cs | 0
.../Core}/Commands/Info/UnixTimeNow.cs | 0
.../Commands/Inventory/DeleteInventory.cs | 0
.../Inventory/InventoryPurgeNotecards.cs | 0
.../Commands/Inventory/RenameInventory.cs | 0
.../Core}/Commands/Inventory/attach.cs | 0
.../Core}/Commands/Inventory/getRealUUID.cs | 0
.../Commands/Inventory/inventoryContents.cs | 0
.../Commands/Inventory/inventoryFolders.cs | 0
.../Core}/Commands/Inventory/outfit.cs | 0
.../Core}/Commands/Inventory/sendFolder.cs | 0
.../Core}/Commands/Inventory/sendItem.cs | 0
.../Core}/Commands/Movement/AutoPilot.cs | 0
.../Core}/Commands/Movement/AutoPilotStop.cs | 0
.../Core}/Commands/Movement/Fly.cs | 0
.../Commands/Movement/RequestTeleport.cs | 0
.../Core}/Commands/Movement/RotateToFace.cs | 0
.../Commands/Movement/RotateToFaceVector.cs | 0
.../Commands/Movement/SendTeleportLure.cs | 0
.../Core}/Commands/Movement/rotateTo.cs | 0
.../Core}/Commands/Movement/teleport.cs | 0
.../Core}/Commands/Notecard/notecardAdd.cs | 0
.../Core}/Commands/Notecard/notecardClear.cs | 0
.../Core}/Commands/Notecard/notecardSend.cs | 0
.../Core}/Commands/Parcel/AbandonLand.cs | 0
.../Core}/Commands/Parcel/GetParcelBanlist.cs | 0
.../Core}/Commands/Parcel/GetParcelDesc.cs | 0
.../Core}/Commands/Parcel/GetParcelFlags.cs | 0
.../Core}/Commands/Parcel/ParcelBan.cs | 0
.../Core}/Commands/Parcel/ParcelBuy.cs | 0
.../Commands/Parcel/ParcelCleanAndSell.cs | 0
.../Commands/Parcel/ParcelCommandHelper.cs | 0
.../Commands/Parcel/ParcelDeedToGroup.cs | 0
.../Core}/Commands/Parcel/ParcelFreeze.cs | 0
.../Commands/Parcel/ParcelPrimCountAvatar.cs | 0
.../Commands/Parcel/ParcelPrimCountTotal.cs | 0
.../Commands/Parcel/ParcelReturnObjects.cs | 0
.../Commands/Parcel/ParcelReturnTargeted.cs | 0
.../Core}/Commands/Parcel/ParcelSetMedia.cs | 0
.../Core}/Commands/Parcel/SetParcelDesc.cs | 0
.../Core}/Commands/Parcel/SetParcelFlag.cs | 0
.../Core}/Commands/Parcel/SetParcelMusic.cs | 0
.../Core}/Commands/Parcel/SetParcelName.cs | 0
.../Core}/Commands/Parcel/SetParcelSale.cs | 0
.../Core}/Commands/Parcel/eject.cs | 0
.../Core}/Commands/Prims/RezObject.cs | 0
.../Prims/TransferInventoryToObject.cs | 0
.../Core}/Commands/Prims/UnRezObject.cs | 0
.../Core}/Commands/Script/scriptHttp.cs | 0
.../Core}/Commands/Script/scriptSend.cs | 0
.../Core}/Commands/Self/CickObject.cs | 0
.../Core}/Commands/Self/GetLastCommands.cs | 0
.../Core}/Commands/Self/Help.cs | 0
.../Core}/Commands/Self/PayObject.cs | 0
.../Core}/Commands/Self/SetPermFlag.cs | 0
.../Core}/Commands/Self/botVersion.cs | 0
.../Core}/Commands/Self/logout.cs | 0
.../Core}/Commands/Self/pointAt.cs | 0
{Core => Secondbot/Core}/Commands/Self/sit.cs | 0
.../Core}/Commands/Self/stand.cs | 0
.../Commands/StreamAdmin/FetchNextNotecard.cs | 0
.../Core}/Commands/commandlib.cs | 4 +-
Secondbot/Core/Core.csproj | 18 +
.../Core}/RLV/Blacklist/getblacklist.cs | 0
.../Core}/RLV/Blacklist/versionnumbl.cs | 0
.../Core}/RLV/Camera/camavdist.cs | 0
.../Core}/RLV/Camera/camdistmax.cs | 0
.../Core}/RLV/Camera/camdistmin.cs | 0
.../Core}/RLV/Camera/camdrawalphamax.cs | 0
.../Core}/RLV/Camera/camdrawalphamin.cs | 0
.../Core}/RLV/Camera/camdrawcolor.cs | 0
.../Core}/RLV/Camera/camdrawmax.cs | 0
.../Core}/RLV/Camera/camdrawmin.cs | 0
.../Core}/RLV/Camera/camtextures.cs | 0
.../Core}/RLV/Camera/camunlock.cs | 0
.../Core}/RLV/Camera/camzoommax.cs | 0
.../Core}/RLV/Camera/camzoommin.cs | 0
.../Core}/RLV/Camera/getcam_avdistmax.cs | 0
.../Core}/RLV/Camera/getcam_avdistmin.cs | 0
.../Core}/RLV/Camera/getcam_fov.cs | 0
.../Core}/RLV/Camera/getcam_fovmax.cs | 0
.../Core}/RLV/Camera/getcam_fovmin.cs | 0
.../Core}/RLV/Camera/getcam_zoommin.cs | 0
.../Core}/RLV/Camera/setcam_avdistmax.cs | 0
.../Core}/RLV/Camera/setcam_avdistmin.cs | 0
.../Core}/RLV/Camera/setcam_fov.cs | 0
.../Core}/RLV/Camera/setcam_fovmax.cs | 0
.../Core}/RLV/Camera/setcam_fovmin.cs | 0
.../Core}/RLV/Camera/setcam_textures.cs | 0
.../Core}/RLV/Camera/setcam_unlock.cs | 0
.../Core}/RLV/Chat/chatnormal.cs | 0
.../Core}/RLV/Chat/chatshout.cs | 0
.../Core}/RLV/Chat/chatwhisper.cs | 0
{Core => Secondbot/Core}/RLV/Chat/recvchat.cs | 0
.../Core}/RLV/Chat/recvchat_sec.cs | 0
.../Core}/RLV/Chat/recvchatfrom.cs | 0
.../Core}/RLV/Chat/redirchat.cs | 0
{Core => Secondbot/Core}/RLV/Chat/sendchat.cs | 0
.../Core}/RLV/Chat/sendgesture.cs | 0
{Core => Secondbot/Core}/RLV/Emotes/emote.cs | 0
.../Core}/RLV/Emotes/recvemote.cs | 0
.../Core}/RLV/Emotes/recvemote_sec.cs | 0
.../Core}/RLV/Emotes/rediremote.cs | 0
.../Core}/RLV/InstantMessages/sendim.cs | 0
.../Core}/RLV/InstantMessages/sendim_sec.cs | 0
.../Core}/RLV/Miscellaneous/clear.cs | 0
.../Core}/RLV/Miscellaneous/getstatus.cs | 0
.../Core}/RLV/Miscellaneous/getstatusall.cs | 0
.../Core}/RLV/Miscellaneous/notify.cs | 0
.../Core}/RLV/Miscellaneous/permissive.cs | 0
.../Core}/RLV/Movement/adjustheight.cs | 0
.../Core}/RLV/Movement/alwaysrun.cs | 0
{Core => Secondbot/Core}/RLV/Movement/fly.cs | 0
.../Core}/RLV/Movement/setrot.cs | 0
.../Core}/RLV/Movement/temprun.cs | 0
.../Core}/RLV/PrivateChannels/sendchannel.cs | 0
.../RLV/PrivateChannels/sendchannel_except.cs | 0
.../RLV/PrivateChannels/sendchannel_sec.cs | 0
.../Core}/RLV/RLV_commandlib.cs | 4 +-
.../Core}/RLV/Sitting/getsitid.cs | 0
{Core => Secondbot/Core}/RLV/Sitting/sit.cs | 0
{Core => Secondbot/Core}/RLV/Sitting/unsit.cs | 0
.../Core}/RLV/Version/version.cs | 0
.../Core}/RLV/Version/versionnew.cs | 0
.../Core}/RLV/Version/versionnum.cs | 0
{Core => Secondbot/Core}/Static/Inventory.cs | 0
{Core => Secondbot/Core}/Static/parcel.cs | 0
.../Core}/bottypes/AVstorageBot.cs | 0
.../Core}/bottypes/ActionsAutoAcceptBot.cs | 0
.../Core}/bottypes/AnimationsBot.cs | 0
.../Core}/bottypes/AwaitReplyEventBot.cs | 0
.../Core}/bottypes/CommandsBot.cs | 4 +-
.../Core}/bottypes/DialogsBot.cs | 0
.../Core}/bottypes/EventsBot.cs | 0
.../Core}/bottypes/Log2FileBot.cs | 0
.../Core}/bottypes/MessageSwitcherBot.cs | 0
{Core => Secondbot/Core}/bottypes/RLVbot.cs | 2 +-
.../Core}/bottypes/SecondBot.cs | 0
.../Core}/bottypes/VirtualsBot.cs | 0
{Core => Secondbot/Core}/bottypes/athome.cs | 0
.../Core}/bottypes/chatrelay.cs | 0
.../Core}/bottypes/loadorder.txt | 0
.../Shared}/API/API_interface.cs | 14 +-
.../Shared}/BotTypes/BasicBot.cs | 0
.../Shared}/IO/SimpleIO.cs | 0
.../Shared}/Json/JsonConfig.cs | 0
.../Shared}/Json/JsonConfigApi.cs | 0
Secondbot/Shared/Shared.csproj | 18 +
.../Shared}/Staic/Helpers.cs | 0
.../Shared}/Staic/LogFormater.cs | 0
.../LibreMetaverse.StructuredData.XML | 317 +
.../LibreMetaverse.StructuredData.csproj | 91 +
.../LibreMetaverse.StructuredData.nuspec | 15 +
.../LibreMetaverse/LibreMetaverse.XML | 36652 ++++++++++++++++
.../LibreMetaverse/LibreMetaverse.csproj | 98 +
.../LibreMetaverse/LibreMetaverse.nuspec | 15 +
.../CRC32.cs | 0
.../Color4.cs | 0
.../DoubleDictionary.cs | 0
.../Enums.cs | 0
.../EnumsPrimitive.cs | 0
.../ExpiringCache.cs | 0
.../LibreMetaverse.Types.csproj | 85 +
.../LibreMetaverseTypes.XML | 2583 ++
.../LibreMetaverseTypes.nuspec | 15 +
.../Matrix4.cs | 0
.../Quaternion.cs | 0
.../ThreadSafeDictionary.cs | 0
.../TokenBucket.cs | 0
.../UUID.cs | 0
.../Utils.cs | 0
.../UtilsConversions.cs | 0
.../Vector2.cs | 0
.../Vector3.cs | 0
.../Vector3d.cs | 0
.../Vector4.cs | 0
.../LibreMetaverse-core.StructuredData.csproj | 33 -
.../LibreMetaverse-core.Types.csproj | 31 -
.../Libremetaverse/Imaging/BakeLayer.cs | 3 +
.../Libremetaverse/Imaging/TGALoader.cs | 3 +-
.../Libremetaverse/InventoryAISClient.cs | 7 +-
.../Libremetaverse/InventoryManager.cs | 1 -
.../Libremetaverse/LibreMetaverse-core.csproj | 62 -
.../Libremetaverse/LibreMetaverse-core.nuspec | 15 -
libremetaverse-core/Libremetaverse/Logger.cs | 349 +-
.../Libremetaverse/ObjectManager.cs | 2 +-
.../Libremetaverse/Settings.cs | 25 +-
...ibopenjpeg-dotnet-2-1.5.0-dotnet-1-i686.so | Bin 140028 -> 0 bytes
...openjpeg-dotnet-2-1.5.0-dotnet-1-x86_64.so | Bin 149368 -> 0 bytes
.../libopenjpeg-dotnet-2-1.5.0-dotnet-1.dylib | Bin 130560 -> 0 bytes
.../Libremetaverse/openjpeg-dotnet-x86_64.dll | Bin 215040 -> 0 bytes
.../Libremetaverse/openjpeg-dotnet.dll | Bin 201216 -> 0 bytes
libremetaverse-core/libremetaverse-core.sln | 44 -
289 files changed, 40446 insertions(+), 823 deletions(-)
delete mode 100644 BSBshared/BSBshared.csproj
delete mode 100644 BetterSecondBot.sln.DotSettings
delete mode 100644 CLI/BetterSecondBot.csproj
delete mode 100644 CLI/Properties/PublishProfiles/Linux-x64.pubxml
delete mode 100644 CLI/Properties/PublishProfiles/Windows-64bit.pubxml
delete mode 100644 Core/BSB.csproj
rename {CLI => Secondbot/BetterSecondbot}/BetterRelayService/BetterRelay.cs (100%)
rename CLI/Cli.cs => Secondbot/BetterSecondbot/BetterSecondbot.cs (100%)
create mode 100644 Secondbot/BetterSecondbot/BetterSecondbot.csproj
rename {CLI => Secondbot/BetterSecondbot}/CliDocker.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/CliExitOnLogout.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/CliHardware.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/DiscordSupervisor/ChannelControl.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/DiscordSupervisor/Discord-super.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/DiscordSupervisor/DiscordBot.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/DiscordSupervisor/DiscordEvents.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/DiscordSupervisor/DiscordTTS/DiscordTTS.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/DiscordSupervisor/Functions.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/DiscordSupervisor/Inbound.cs (96%)
rename {CLI => Secondbot/BetterSecondbot}/DiscordSupervisor/Status.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/DiscordSupervisor/Values.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/DiscordSupervisor/relay.cs (100%)
create mode 100644 Secondbot/BetterSecondbot/Dockerfile
rename {CLI => Secondbot/BetterSecondbot}/HttpService/Chat.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/HttpService/Core.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/HttpService/Group.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/HttpService/HttpAsService.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/HttpService/Im.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/HttpService/Inventory.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/HttpService/ParcelEstate.cs (100%)
rename {CLI => Secondbot/BetterSecondbot}/Properties/launchSettings.json (76%)
rename {CLI => Secondbot/BetterSecondbot}/WikiMake/wiki_footer.txt (97%)
rename {CLI => Secondbot/BetterSecondbot}/WikiMake/wiki_header.txt (100%)
rename {CLI => Secondbot/BetterSecondbot}/WikiMake/wikimake.cs (98%)
rename {Core => Secondbot/Core}/Commands/Animation/PlayGesture.cs (100%)
rename {Core => Secondbot/Core}/Commands/Animation/addToAnimations.cs (100%)
rename {Core => Secondbot/Core}/Commands/Animation/resetAnimations.cs (100%)
rename {Core => Secondbot/Core}/Commands/Avatars/NearMe.cs (100%)
rename {Core => Secondbot/Core}/Commands/Avatars/PayAvatar.cs (100%)
rename {Core => Secondbot/Core}/Commands/Chat/LocalChatHistory.cs (100%)
rename {Core => Secondbot/Core}/Commands/Chat/im.cs (100%)
rename {Core => Secondbot/Core}/Commands/Chat/say.cs (100%)
rename {Core => Secondbot/Core}/Commands/Dialogs/DialogRelay.cs (100%)
rename {Core => Secondbot/Core}/Commands/Dialogs/DialogResponce.cs (100%)
rename {Core => Secondbot/Core}/Commands/Dialogs/DialogTrack.cs (100%)
rename {Core => Secondbot/Core}/Commands/DiscordAPI/AddRole.cs (100%)
rename {Core => Secondbot/Core}/Commands/DiscordAPI/Ban_Member.cs (100%)
rename {Core => Secondbot/Core}/Commands/DiscordAPI/BulkClear_Messages.cs (100%)
rename {Core => Secondbot/Core}/Commands/DiscordAPI/Dm_Member.cs (100%)
rename {Core => Secondbot/Core}/Commands/DiscordAPI/MembersList.cs (100%)
rename {Core => Secondbot/Core}/Commands/DiscordAPI/MessageChannel.cs (100%)
rename {Core => Secondbot/Core}/Commands/DiscordAPI/MuteMember.cs (100%)
rename {Core => Secondbot/Core}/Commands/DiscordAPI/RoleCreate.cs (100%)
rename {Core => Secondbot/Core}/Commands/DiscordAPI/RoleList.cs (100%)
rename {Core => Secondbot/Core}/Commands/DiscordAPI/RoleRemove.cs (100%)
rename {Core => Secondbot/Core}/Commands/DiscordAPI/Role_GetSettings.cs (100%)
rename {Core => Secondbot/Core}/Commands/DiscordAPI/Role_UpdatePerms.cs (100%)
rename {Core => Secondbot/Core}/Commands/DiscordAPI/TextChannels_List.cs (100%)
rename {Core => Secondbot/Core}/Commands/Estate/EstateParcelReclaim.cs (100%)
rename {Core => Secondbot/Core}/Commands/Estate/GetSimGlobalPos.cs (100%)
rename {Core => Secondbot/Core}/Commands/Estate/GetSimTexture.cs (100%)
rename {Core => Secondbot/Core}/Commands/Estate/SimMessage.cs (100%)
rename {Core => Secondbot/Core}/Commands/Estate/SimRestart.cs (100%)
rename {Core => Secondbot/Core}/Commands/Friends/FriendFullPerms.cs (100%)
rename {Core => Secondbot/Core}/Commands/Friends/FriendRequest.cs (100%)
rename {Core => Secondbot/Core}/Commands/Friends/Friendslist.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/GroupActiveGroup.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/GroupActiveTitle.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/GroupAddRole.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/GroupEject.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/GroupInvite.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/GroupInviteNoLimiter.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/GroupNotice.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/IsGroupMember.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/getGroupList.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/getGroupMembers.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/getGroupRoles.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/group.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/groupchat.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/groupchatAnyUnread.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/groupchatClearAll.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/groupchatGroupHasUnread.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/groupchatHistory.cs (100%)
rename {Core => Secondbot/Core}/Commands/Group/groupchatListAllUnreadGroups.cs (100%)
rename {Core => Secondbot/Core}/Commands/Helpers/delay.cs (100%)
rename {Core => Secondbot/Core}/Commands/Home/GoHome.cs (100%)
rename {Core => Secondbot/Core}/Commands/Home/resetAtHome.cs (100%)
rename {Core => Secondbot/Core}/Commands/Info/Balance.cs (100%)
rename {Core => Secondbot/Core}/Commands/Info/GetPosition.cs (100%)
rename {Core => Secondbot/Core}/Commands/Info/ParcelName.cs (100%)
rename {Core => Secondbot/Core}/Commands/Info/SimName.cs (100%)
rename {Core => Secondbot/Core}/Commands/Info/UnixTimeNow.cs (100%)
rename {Core => Secondbot/Core}/Commands/Inventory/DeleteInventory.cs (100%)
rename {Core => Secondbot/Core}/Commands/Inventory/InventoryPurgeNotecards.cs (100%)
rename {Core => Secondbot/Core}/Commands/Inventory/RenameInventory.cs (100%)
rename {Core => Secondbot/Core}/Commands/Inventory/attach.cs (100%)
rename {Core => Secondbot/Core}/Commands/Inventory/getRealUUID.cs (100%)
rename {Core => Secondbot/Core}/Commands/Inventory/inventoryContents.cs (100%)
rename {Core => Secondbot/Core}/Commands/Inventory/inventoryFolders.cs (100%)
rename {Core => Secondbot/Core}/Commands/Inventory/outfit.cs (100%)
rename {Core => Secondbot/Core}/Commands/Inventory/sendFolder.cs (100%)
rename {Core => Secondbot/Core}/Commands/Inventory/sendItem.cs (100%)
rename {Core => Secondbot/Core}/Commands/Movement/AutoPilot.cs (100%)
rename {Core => Secondbot/Core}/Commands/Movement/AutoPilotStop.cs (100%)
rename {Core => Secondbot/Core}/Commands/Movement/Fly.cs (100%)
rename {Core => Secondbot/Core}/Commands/Movement/RequestTeleport.cs (100%)
rename {Core => Secondbot/Core}/Commands/Movement/RotateToFace.cs (100%)
rename {Core => Secondbot/Core}/Commands/Movement/RotateToFaceVector.cs (100%)
rename {Core => Secondbot/Core}/Commands/Movement/SendTeleportLure.cs (100%)
rename {Core => Secondbot/Core}/Commands/Movement/rotateTo.cs (100%)
rename {Core => Secondbot/Core}/Commands/Movement/teleport.cs (100%)
rename {Core => Secondbot/Core}/Commands/Notecard/notecardAdd.cs (100%)
rename {Core => Secondbot/Core}/Commands/Notecard/notecardClear.cs (100%)
rename {Core => Secondbot/Core}/Commands/Notecard/notecardSend.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/AbandonLand.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/GetParcelBanlist.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/GetParcelDesc.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/GetParcelFlags.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/ParcelBan.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/ParcelBuy.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/ParcelCleanAndSell.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/ParcelCommandHelper.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/ParcelDeedToGroup.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/ParcelFreeze.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/ParcelPrimCountAvatar.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/ParcelPrimCountTotal.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/ParcelReturnObjects.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/ParcelReturnTargeted.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/ParcelSetMedia.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/SetParcelDesc.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/SetParcelFlag.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/SetParcelMusic.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/SetParcelName.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/SetParcelSale.cs (100%)
rename {Core => Secondbot/Core}/Commands/Parcel/eject.cs (100%)
rename {Core => Secondbot/Core}/Commands/Prims/RezObject.cs (100%)
rename {Core => Secondbot/Core}/Commands/Prims/TransferInventoryToObject.cs (100%)
rename {Core => Secondbot/Core}/Commands/Prims/UnRezObject.cs (100%)
rename {Core => Secondbot/Core}/Commands/Script/scriptHttp.cs (100%)
rename {Core => Secondbot/Core}/Commands/Script/scriptSend.cs (100%)
rename {Core => Secondbot/Core}/Commands/Self/CickObject.cs (100%)
rename {Core => Secondbot/Core}/Commands/Self/GetLastCommands.cs (100%)
rename {Core => Secondbot/Core}/Commands/Self/Help.cs (100%)
rename {Core => Secondbot/Core}/Commands/Self/PayObject.cs (100%)
rename {Core => Secondbot/Core}/Commands/Self/SetPermFlag.cs (100%)
rename {Core => Secondbot/Core}/Commands/Self/botVersion.cs (100%)
rename {Core => Secondbot/Core}/Commands/Self/logout.cs (100%)
rename {Core => Secondbot/Core}/Commands/Self/pointAt.cs (100%)
rename {Core => Secondbot/Core}/Commands/Self/sit.cs (100%)
rename {Core => Secondbot/Core}/Commands/Self/stand.cs (100%)
rename {Core => Secondbot/Core}/Commands/StreamAdmin/FetchNextNotecard.cs (100%)
rename {Core => Secondbot/Core}/Commands/commandlib.cs (99%)
create mode 100644 Secondbot/Core/Core.csproj
rename {Core => Secondbot/Core}/RLV/Blacklist/getblacklist.cs (100%)
rename {Core => Secondbot/Core}/RLV/Blacklist/versionnumbl.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/camavdist.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/camdistmax.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/camdistmin.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/camdrawalphamax.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/camdrawalphamin.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/camdrawcolor.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/camdrawmax.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/camdrawmin.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/camtextures.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/camunlock.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/camzoommax.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/camzoommin.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/getcam_avdistmax.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/getcam_avdistmin.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/getcam_fov.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/getcam_fovmax.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/getcam_fovmin.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/getcam_zoommin.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/setcam_avdistmax.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/setcam_avdistmin.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/setcam_fov.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/setcam_fovmax.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/setcam_fovmin.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/setcam_textures.cs (100%)
rename {Core => Secondbot/Core}/RLV/Camera/setcam_unlock.cs (100%)
rename {Core => Secondbot/Core}/RLV/Chat/chatnormal.cs (100%)
rename {Core => Secondbot/Core}/RLV/Chat/chatshout.cs (100%)
rename {Core => Secondbot/Core}/RLV/Chat/chatwhisper.cs (100%)
rename {Core => Secondbot/Core}/RLV/Chat/recvchat.cs (100%)
rename {Core => Secondbot/Core}/RLV/Chat/recvchat_sec.cs (100%)
rename {Core => Secondbot/Core}/RLV/Chat/recvchatfrom.cs (100%)
rename {Core => Secondbot/Core}/RLV/Chat/redirchat.cs (100%)
rename {Core => Secondbot/Core}/RLV/Chat/sendchat.cs (100%)
rename {Core => Secondbot/Core}/RLV/Chat/sendgesture.cs (100%)
rename {Core => Secondbot/Core}/RLV/Emotes/emote.cs (100%)
rename {Core => Secondbot/Core}/RLV/Emotes/recvemote.cs (100%)
rename {Core => Secondbot/Core}/RLV/Emotes/recvemote_sec.cs (100%)
rename {Core => Secondbot/Core}/RLV/Emotes/rediremote.cs (100%)
rename {Core => Secondbot/Core}/RLV/InstantMessages/sendim.cs (100%)
rename {Core => Secondbot/Core}/RLV/InstantMessages/sendim_sec.cs (100%)
rename {Core => Secondbot/Core}/RLV/Miscellaneous/clear.cs (100%)
rename {Core => Secondbot/Core}/RLV/Miscellaneous/getstatus.cs (100%)
rename {Core => Secondbot/Core}/RLV/Miscellaneous/getstatusall.cs (100%)
rename {Core => Secondbot/Core}/RLV/Miscellaneous/notify.cs (100%)
rename {Core => Secondbot/Core}/RLV/Miscellaneous/permissive.cs (100%)
rename {Core => Secondbot/Core}/RLV/Movement/adjustheight.cs (100%)
rename {Core => Secondbot/Core}/RLV/Movement/alwaysrun.cs (100%)
rename {Core => Secondbot/Core}/RLV/Movement/fly.cs (100%)
rename {Core => Secondbot/Core}/RLV/Movement/setrot.cs (100%)
rename {Core => Secondbot/Core}/RLV/Movement/temprun.cs (100%)
rename {Core => Secondbot/Core}/RLV/PrivateChannels/sendchannel.cs (100%)
rename {Core => Secondbot/Core}/RLV/PrivateChannels/sendchannel_except.cs (100%)
rename {Core => Secondbot/Core}/RLV/PrivateChannels/sendchannel_sec.cs (100%)
rename {Core => Secondbot/Core}/RLV/RLV_commandlib.cs (98%)
rename {Core => Secondbot/Core}/RLV/Sitting/getsitid.cs (100%)
rename {Core => Secondbot/Core}/RLV/Sitting/sit.cs (100%)
rename {Core => Secondbot/Core}/RLV/Sitting/unsit.cs (100%)
rename {Core => Secondbot/Core}/RLV/Version/version.cs (100%)
rename {Core => Secondbot/Core}/RLV/Version/versionnew.cs (100%)
rename {Core => Secondbot/Core}/RLV/Version/versionnum.cs (100%)
rename {Core => Secondbot/Core}/Static/Inventory.cs (100%)
rename {Core => Secondbot/Core}/Static/parcel.cs (100%)
rename {Core => Secondbot/Core}/bottypes/AVstorageBot.cs (100%)
rename {Core => Secondbot/Core}/bottypes/ActionsAutoAcceptBot.cs (100%)
rename {Core => Secondbot/Core}/bottypes/AnimationsBot.cs (100%)
rename {Core => Secondbot/Core}/bottypes/AwaitReplyEventBot.cs (100%)
rename {Core => Secondbot/Core}/bottypes/CommandsBot.cs (99%)
rename {Core => Secondbot/Core}/bottypes/DialogsBot.cs (100%)
rename {Core => Secondbot/Core}/bottypes/EventsBot.cs (100%)
rename {Core => Secondbot/Core}/bottypes/Log2FileBot.cs (100%)
rename {Core => Secondbot/Core}/bottypes/MessageSwitcherBot.cs (100%)
rename {Core => Secondbot/Core}/bottypes/RLVbot.cs (99%)
rename {Core => Secondbot/Core}/bottypes/SecondBot.cs (100%)
rename {Core => Secondbot/Core}/bottypes/VirtualsBot.cs (100%)
rename {Core => Secondbot/Core}/bottypes/athome.cs (100%)
rename {Core => Secondbot/Core}/bottypes/chatrelay.cs (100%)
rename {Core => Secondbot/Core}/bottypes/loadorder.txt (100%)
rename {BSBshared => Secondbot/Shared}/API/API_interface.cs (92%)
rename {BSBshared => Secondbot/Shared}/BotTypes/BasicBot.cs (100%)
rename {BSBshared => Secondbot/Shared}/IO/SimpleIO.cs (100%)
rename {BSBshared => Secondbot/Shared}/Json/JsonConfig.cs (100%)
rename {BSBshared => Secondbot/Shared}/Json/JsonConfigApi.cs (100%)
create mode 100644 Secondbot/Shared/Shared.csproj
rename {BSBshared => Secondbot/Shared}/Staic/Helpers.cs (100%)
rename {BSBshared => Secondbot/Shared}/Staic/LogFormater.cs (100%)
create mode 100644 libremetaverse-core/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.XML
create mode 100644 libremetaverse-core/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj
create mode 100644 libremetaverse-core/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.nuspec
create mode 100644 libremetaverse-core/LibreMetaverse/LibreMetaverse.XML
create mode 100644 libremetaverse-core/LibreMetaverse/LibreMetaverse.csproj
create mode 100644 libremetaverse-core/LibreMetaverse/LibreMetaverse.nuspec
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/CRC32.cs (100%)
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/Color4.cs (100%)
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/DoubleDictionary.cs (100%)
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/Enums.cs (100%)
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/EnumsPrimitive.cs (100%)
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/ExpiringCache.cs (100%)
create mode 100644 libremetaverse-core/LibreMetaverseTypes/LibreMetaverse.Types.csproj
create mode 100644 libremetaverse-core/LibreMetaverseTypes/LibreMetaverseTypes.XML
create mode 100644 libremetaverse-core/LibreMetaverseTypes/LibreMetaverseTypes.nuspec
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/Matrix4.cs (100%)
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/Quaternion.cs (100%)
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/ThreadSafeDictionary.cs (100%)
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/TokenBucket.cs (100%)
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/UUID.cs (100%)
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/Utils.cs (100%)
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/UtilsConversions.cs (100%)
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/Vector2.cs (100%)
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/Vector3.cs (100%)
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/Vector3d.cs (100%)
rename libremetaverse-core/{Libremetaverse.types => LibreMetaverseTypes}/Vector4.cs (100%)
delete mode 100644 libremetaverse-core/Libremetaverse.structureddata/LibreMetaverse-core.StructuredData.csproj
delete mode 100644 libremetaverse-core/Libremetaverse.types/LibreMetaverse-core.Types.csproj
delete mode 100644 libremetaverse-core/Libremetaverse/LibreMetaverse-core.csproj
delete mode 100644 libremetaverse-core/Libremetaverse/LibreMetaverse-core.nuspec
delete mode 100644 libremetaverse-core/Libremetaverse/libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686.so
delete mode 100644 libremetaverse-core/Libremetaverse/libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64.so
delete mode 100644 libremetaverse-core/Libremetaverse/libopenjpeg-dotnet-2-1.5.0-dotnet-1.dylib
delete mode 100644 libremetaverse-core/Libremetaverse/openjpeg-dotnet-x86_64.dll
delete mode 100644 libremetaverse-core/Libremetaverse/openjpeg-dotnet.dll
delete mode 100644 libremetaverse-core/libremetaverse-core.sln
diff --git a/.dockerignore b/.dockerignore
index ce59afa..f493380 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,24 +1,24 @@
-**/.classpath
-**/.dockerignore
-**/.env
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/*.jfm
-**/azds.yaml
-**/bin
-**/charts
-**/docker-compose*
-**/Dockerfile*
-**/node_modules
-**/npm-debug.log
-**/obj
-**/secrets.dev.yaml
-**/values.dev.yaml
-LICENSE
+**/.classpath
+**/.dockerignore
+**/.env
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
README.md
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index ecc0dc3..c2a0989 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,33 +1,33 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: Madpeterz
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Hardware (please complete the following information):**
- - OS: [e.g. iOS]
- - Version [e.g. 22]
- - Running in docker: [Yes/No]
- - Running as linux service: [Yes/No]
-
-**Additional context**
-Add any other context about the problem here.
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: Madpeterz
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Hardware (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Version [e.g. 22]
+ - Running in docker: [Yes/No]
+ - Running as linux service: [Yes/No]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 060d091..f94a7d9 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,20 +1,20 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: Madpeterz
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: Madpeterz
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index f734ea7..c2a722b 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -1,25 +1,25 @@
-name: .NET Core
-
-on:
- push:
- branches: [ master ]
- pull_request:
- branches: [ master ]
-
-jobs:
- build:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v2
- - name: Setup .NET Core
- uses: actions/setup-dotnet@v1
- with:
- dotnet-version: 3.1.101
- - name: Install dependencies
- run: dotnet restore
- - name: Build
- run: dotnet build --configuration Release --no-restore
- - name: Test
- run: dotnet test --no-restore --verbosity normal
+name: .NET Core
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ branches: [ master ]
+
+jobs:
+ build:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Setup .NET Core
+ uses: actions/setup-dotnet@v1
+ with:
+ dotnet-version: 3.1.101
+ - name: Install dependencies
+ run: dotnet restore
+ - name: Build
+ run: dotnet build --configuration Release --no-restore
+ - name: Test
+ run: dotnet test --no-restore --verbosity normal
diff --git a/BSBshared/BSBshared.csproj b/BSBshared/BSBshared.csproj
deleted file mode 100644
index 43abe98..0000000
--- a/BSBshared/BSBshared.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- netcoreapp3.1
- Debug;Release;DockerBuild
- x64
-
-
- none
- Linux
- false
- false
- false
- linux-x64
-
-
-
-
-
-
-
-
-
-
-
diff --git a/BetterSecondBot.sln b/BetterSecondBot.sln
index 6a09d93..db5079f 100644
--- a/BetterSecondBot.sln
+++ b/BetterSecondBot.sln
@@ -1,108 +1,74 @@
+
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
-VisualStudioVersion = 16.0.29123.88
+VisualStudioVersion = 16.0.30907.101
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BSB", "Core\BSB.csproj", "{077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Secondbot", "Secondbot", "{4388BA41-F3FC-4A0E-AA00-50E9ED45A027}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BetterSecondBot", "CLI\BetterSecondBot.csproj", "{E34873C1-3860-430A-8AE5-6289C4E68AC7}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Metaverse", "Metaverse", "{E9B97D05-D5FB-4CA9-99C3-839248621C21}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BSBshared", "BSBshared\BSBshared.csproj", "{42075C8C-8055-4178-8C12-AE97DAFE8484}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse", "libremetaverse-core\LibreMetaverse\LibreMetaverse.csproj", "{27C70F3A-0000-0000-0000-000000000000}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libmeta-core", "Libmeta-core", "{7538B15D-152B-4A0F-A24D-A89EDC382564}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.StructuredData", "libremetaverse-core\LibreMetaverse.StructuredData\LibreMetaverse.StructuredData.csproj", "{89D7A3E5-0000-0000-0000-000000000000}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B861AB1B-8F09-41A9-8817-CB8A2E961E4C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.Types", "libremetaverse-core\LibreMetaverseTypes\LibreMetaverse.Types.csproj", "{B37B02AD-0000-0000-0000-000000000000}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "Secondbot\Shared\Shared.csproj", "{55CFC932-BECF-4FDE-A48A-3C282E080F56}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Secondbot\Core\Core.csproj", "{D19B5D86-4680-4CC0-87BC-07B7BDF83FC0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BetterSecondbot", "Secondbot\BetterSecondbot\BetterSecondbot.csproj", "{513D7ED1-519E-47C0-BB28-29275BE041DC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Items", "Project Items", "{C343303B-F9BF-46B3-BBB5-5596823EC71C}"
ProjectSection(SolutionItems) = preProject
Dockerfile = Dockerfile
NuGet.Config = NuGet.Config
README.md = README.md
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse-core", "libremetaverse-core\Libremetaverse\LibreMetaverse-core.csproj", "{467F6546-8053-4B59-8C4E-65E621B1A0A6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse-core.StructuredData", "libremetaverse-core\Libremetaverse.structureddata\LibreMetaverse-core.StructuredData.csproj", "{67E9D8FC-29C6-470C-90C7-A38B60622133}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse-core.Types", "libremetaverse-core\Libremetaverse.types\LibreMetaverse-core.Types.csproj", "{69DE5884-FD5F-4040-9C8F-DBADE189902B}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
- Debug|x64 = Debug|x64
- DockerBuild|Any CPU = DockerBuild|Any CPU
- DockerBuild|x64 = DockerBuild|x64
Release|Any CPU = Release|Any CPU
- Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Debug|x64.ActiveCfg = Debug|x64
- {077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Debug|x64.Build.0 = Debug|x64
- {077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.DockerBuild|Any CPU.ActiveCfg = DockerBuild|x64
- {077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.DockerBuild|Any CPU.Build.0 = DockerBuild|x64
- {077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
- {077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.DockerBuild|x64.Build.0 = DockerBuild|x64
- {077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Release|Any CPU.Build.0 = Release|Any CPU
- {077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Release|x64.ActiveCfg = Release|x64
- {077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Release|x64.Build.0 = Release|x64
- {E34873C1-3860-430A-8AE5-6289C4E68AC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E34873C1-3860-430A-8AE5-6289C4E68AC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E34873C1-3860-430A-8AE5-6289C4E68AC7}.Debug|x64.ActiveCfg = Debug|x64
- {E34873C1-3860-430A-8AE5-6289C4E68AC7}.Debug|x64.Build.0 = Debug|x64
- {E34873C1-3860-430A-8AE5-6289C4E68AC7}.DockerBuild|Any CPU.ActiveCfg = DockerBuild|x64
- {E34873C1-3860-430A-8AE5-6289C4E68AC7}.DockerBuild|Any CPU.Build.0 = DockerBuild|x64
- {E34873C1-3860-430A-8AE5-6289C4E68AC7}.DockerBuild|x64.ActiveCfg = DockerBuild|Any CPU
- {E34873C1-3860-430A-8AE5-6289C4E68AC7}.DockerBuild|x64.Build.0 = DockerBuild|Any CPU
- {E34873C1-3860-430A-8AE5-6289C4E68AC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E34873C1-3860-430A-8AE5-6289C4E68AC7}.Release|Any CPU.Build.0 = Release|Any CPU
- {E34873C1-3860-430A-8AE5-6289C4E68AC7}.Release|x64.ActiveCfg = Release|x64
- {E34873C1-3860-430A-8AE5-6289C4E68AC7}.Release|x64.Build.0 = Release|x64
- {42075C8C-8055-4178-8C12-AE97DAFE8484}.Debug|Any CPU.ActiveCfg = Debug|x64
- {42075C8C-8055-4178-8C12-AE97DAFE8484}.Debug|x64.ActiveCfg = Debug|x64
- {42075C8C-8055-4178-8C12-AE97DAFE8484}.Debug|x64.Build.0 = Debug|x64
- {42075C8C-8055-4178-8C12-AE97DAFE8484}.DockerBuild|Any CPU.ActiveCfg = DockerBuild|x64
- {42075C8C-8055-4178-8C12-AE97DAFE8484}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
- {42075C8C-8055-4178-8C12-AE97DAFE8484}.DockerBuild|x64.Build.0 = DockerBuild|x64
- {42075C8C-8055-4178-8C12-AE97DAFE8484}.Release|Any CPU.ActiveCfg = Release|x64
- {42075C8C-8055-4178-8C12-AE97DAFE8484}.Release|x64.ActiveCfg = Release|x64
- {42075C8C-8055-4178-8C12-AE97DAFE8484}.Release|x64.Build.0 = Release|x64
- {467F6546-8053-4B59-8C4E-65E621B1A0A6}.Debug|Any CPU.ActiveCfg = Debug|x64
- {467F6546-8053-4B59-8C4E-65E621B1A0A6}.Debug|x64.ActiveCfg = Debug|x64
- {467F6546-8053-4B59-8C4E-65E621B1A0A6}.Debug|x64.Build.0 = Debug|x64
- {467F6546-8053-4B59-8C4E-65E621B1A0A6}.DockerBuild|Any CPU.ActiveCfg = DockerBuild|x64
- {467F6546-8053-4B59-8C4E-65E621B1A0A6}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
- {467F6546-8053-4B59-8C4E-65E621B1A0A6}.DockerBuild|x64.Build.0 = DockerBuild|x64
- {467F6546-8053-4B59-8C4E-65E621B1A0A6}.Release|Any CPU.ActiveCfg = Release|x64
- {467F6546-8053-4B59-8C4E-65E621B1A0A6}.Release|x64.ActiveCfg = Release|x64
- {467F6546-8053-4B59-8C4E-65E621B1A0A6}.Release|x64.Build.0 = Release|x64
- {67E9D8FC-29C6-470C-90C7-A38B60622133}.Debug|Any CPU.ActiveCfg = Debug|x64
- {67E9D8FC-29C6-470C-90C7-A38B60622133}.Debug|x64.ActiveCfg = Debug|x64
- {67E9D8FC-29C6-470C-90C7-A38B60622133}.Debug|x64.Build.0 = Debug|x64
- {67E9D8FC-29C6-470C-90C7-A38B60622133}.DockerBuild|Any CPU.ActiveCfg = DockerBuild|x64
- {67E9D8FC-29C6-470C-90C7-A38B60622133}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
- {67E9D8FC-29C6-470C-90C7-A38B60622133}.DockerBuild|x64.Build.0 = DockerBuild|x64
- {67E9D8FC-29C6-470C-90C7-A38B60622133}.Release|Any CPU.ActiveCfg = Release|x64
- {67E9D8FC-29C6-470C-90C7-A38B60622133}.Release|x64.ActiveCfg = Release|x64
- {67E9D8FC-29C6-470C-90C7-A38B60622133}.Release|x64.Build.0 = Release|x64
- {69DE5884-FD5F-4040-9C8F-DBADE189902B}.Debug|Any CPU.ActiveCfg = Debug|x64
- {69DE5884-FD5F-4040-9C8F-DBADE189902B}.Debug|x64.ActiveCfg = Debug|x64
- {69DE5884-FD5F-4040-9C8F-DBADE189902B}.Debug|x64.Build.0 = Debug|x64
- {69DE5884-FD5F-4040-9C8F-DBADE189902B}.DockerBuild|Any CPU.ActiveCfg = DockerBuild|x64
- {69DE5884-FD5F-4040-9C8F-DBADE189902B}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
- {69DE5884-FD5F-4040-9C8F-DBADE189902B}.DockerBuild|x64.Build.0 = DockerBuild|x64
- {69DE5884-FD5F-4040-9C8F-DBADE189902B}.Release|Any CPU.ActiveCfg = Release|x64
- {69DE5884-FD5F-4040-9C8F-DBADE189902B}.Release|x64.ActiveCfg = Release|x64
- {69DE5884-FD5F-4040-9C8F-DBADE189902B}.Release|x64.Build.0 = Release|x64
+ {27C70F3A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {27C70F3A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {27C70F3A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {27C70F3A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {89D7A3E5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {89D7A3E5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {89D7A3E5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {89D7A3E5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B37B02AD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B37B02AD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B37B02AD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B37B02AD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {55CFC932-BECF-4FDE-A48A-3C282E080F56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {55CFC932-BECF-4FDE-A48A-3C282E080F56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {55CFC932-BECF-4FDE-A48A-3C282E080F56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {55CFC932-BECF-4FDE-A48A-3C282E080F56}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D19B5D86-4680-4CC0-87BC-07B7BDF83FC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D19B5D86-4680-4CC0-87BC-07B7BDF83FC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D19B5D86-4680-4CC0-87BC-07B7BDF83FC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D19B5D86-4680-4CC0-87BC-07B7BDF83FC0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {513D7ED1-519E-47C0-BB28-29275BE041DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {513D7ED1-519E-47C0-BB28-29275BE041DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {513D7ED1-519E-47C0-BB28-29275BE041DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {513D7ED1-519E-47C0-BB28-29275BE041DC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {467F6546-8053-4B59-8C4E-65E621B1A0A6} = {7538B15D-152B-4A0F-A24D-A89EDC382564}
- {67E9D8FC-29C6-470C-90C7-A38B60622133} = {7538B15D-152B-4A0F-A24D-A89EDC382564}
- {69DE5884-FD5F-4040-9C8F-DBADE189902B} = {7538B15D-152B-4A0F-A24D-A89EDC382564}
+ {27C70F3A-0000-0000-0000-000000000000} = {E9B97D05-D5FB-4CA9-99C3-839248621C21}
+ {89D7A3E5-0000-0000-0000-000000000000} = {E9B97D05-D5FB-4CA9-99C3-839248621C21}
+ {B37B02AD-0000-0000-0000-000000000000} = {E9B97D05-D5FB-4CA9-99C3-839248621C21}
+ {55CFC932-BECF-4FDE-A48A-3C282E080F56} = {4388BA41-F3FC-4A0E-AA00-50E9ED45A027}
+ {D19B5D86-4680-4CC0-87BC-07B7BDF83FC0} = {4388BA41-F3FC-4A0E-AA00-50E9ED45A027}
+ {513D7ED1-519E-47C0-BB28-29275BE041DC} = {4388BA41-F3FC-4A0E-AA00-50E9ED45A027}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {39A7E333-AFC1-4BA8-9EBC-9298791FDC78}
+ SolutionGuid = {EC43F382-FAF2-49CC-8E23-5DDF87592DFA}
EndGlobalSection
EndGlobal
diff --git a/BetterSecondBot.sln.DotSettings b/BetterSecondBot.sln.DotSettings
deleted file mode 100644
index f70c8c4..0000000
--- a/BetterSecondBot.sln.DotSettings
+++ /dev/null
@@ -1,4 +0,0 @@
-
- True
- True
-
\ No newline at end of file
diff --git a/CLI/BetterSecondBot.csproj b/CLI/BetterSecondBot.csproj
deleted file mode 100644
index c3943f3..0000000
--- a/CLI/BetterSecondBot.csproj
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
- AnyCPU;x64
-
-
-
-
-
- git rev-parse --short HEAD
- False
- False
-
-
- Exe
- netcoreapp3.1
- BetterSecondBot.Program
- Debug;Release;DockerBuild;Windows
- Linux
-
-
- none
- Linux
- false
- false
- false
- linux-x64
-
-
-
-
-
-
-
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
-
-
-
-
-
-
diff --git a/CLI/Properties/PublishProfiles/Linux-x64.pubxml b/CLI/Properties/PublishProfiles/Linux-x64.pubxml
deleted file mode 100644
index 049c070..0000000
--- a/CLI/Properties/PublishProfiles/Linux-x64.pubxml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
- FileSystem
- Release
- x64
- netcoreapp3.1
- ..\Publish\linux-x64
- linux-x64
- true
- True
- False
- False
-
-
\ No newline at end of file
diff --git a/CLI/Properties/PublishProfiles/Windows-64bit.pubxml b/CLI/Properties/PublishProfiles/Windows-64bit.pubxml
deleted file mode 100644
index 2e54755..0000000
--- a/CLI/Properties/PublishProfiles/Windows-64bit.pubxml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
- FileSystem
- Release
- x64
- netcoreapp3.1
- ..\Publish\windows_x64
- win-x64
- true
- True
- False
- False
-
-
\ No newline at end of file
diff --git a/Core/BSB.csproj b/Core/BSB.csproj
deleted file mode 100644
index 559d3b5..0000000
--- a/Core/BSB.csproj
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- netcoreapp3.1
- Debug;Release;DockerBuild
- x64;AnyCPU
-
-
- none
- Linux
- false
- false
- false
- linux-x64
-
-
- none
- Linux
- false
- false
- false
- linux-x64
-
-
-
-
-
-
-
-
-
diff --git a/Dockerfile b/Dockerfile
index 8e92978..9bfa2ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,74 +1,72 @@
-#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim AS base
-WORKDIR /app
-
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
-WORKDIR /src
-COPY ["NuGet.Config", ""]
-COPY ["CLI/BetterSecondBot.csproj", "CLI/"]
-COPY ["Core/BSB.csproj", "Core/"]
-COPY ["BSBshared/BSBshared.csproj", "BSBshared/"]
-COPY ["libremetaverse-core/Libremetaverse/LibreMetaverse-core.csproj", "libremetaverse-core/Libremetaverse/"]
-COPY ["libremetaverse-core/Libremetaverse.structureddata/LibreMetaverse-core.StructuredData.csproj", "libremetaverse-core/Libremetaverse.structureddata/"]
-COPY ["libremetaverse-core/Libremetaverse.types/LibreMetaverse-core.Types.csproj", "libremetaverse-core/Libremetaverse.types/"]
-RUN dotnet restore "CLI/BetterSecondBot.csproj"
-COPY . .
-WORKDIR "/src/CLI"
-RUN dotnet build "BetterSecondBot.csproj" -c DockerBuild -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "BetterSecondBot.csproj" -c DockerBuild -o /app/publish
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-
-# --- Update your settings ---
-
-ENV Basic_BotUserName=''
-ENV Basic_BotPassword=''
-ENV Basic_HomeRegions='http://maps.secondlife.com/secondlife/Viserion/50/140/23'
-ENV Basic_LoginLocation='home'
-
-ENV Security_MasterUsername='Madpeter Zond'
-ENV Security_SubMasters='X X,Y Y,Z Z'
-ENV Security_SignedCommandkey=''
-ENV Security_WebUIKey=''
-
-ENV Setting_AllowRLV='false'
-ENV Setting_AllowFunds='false'
-ENV Setting_LogCommands='false'
-ENV Setting_RelayImToAvatarUUID=''
-ENV Setting_DefaultSit_UUID=''
-ENV Setting_loginURI='secondlife'
-
-ENV DiscordRelay_URL=''
-ENV DiscordRelay_GroupUUID=''
-ENV DiscordFull_Enable='false'
-ENV DiscordFull_Token=''
-ENV DiscordFull_ServerID=''
-ENV DiscordFull_Keep_GroupChat='false'
-
-ENV Http_Enable='false'
-ENV Http_Host='docker'
-
-ENV Name2Key_Enable='false'
-ENV Name2Key_Url='http://localhost:1234'
-ENV Name2Key_Key='magic'
-
-ENV DiscordTTS_Enable='false'
-ENV DiscordTTS_server_id=''
-ENV DiscordTTS_channel_name=''
-ENV DiscordTTS_avatar_uuid=''
-ENV DiscordTTS_Nickname=''
-
-ENV Log2File_Enable='false'
-ENV Log2File_Level=1
-
-EXPOSE 80
-ENV ASPNETCORE_URLS http://+:80
-
-# --- End of settings ---
-
-ENTRYPOINT ["/app/BetterSecondBot"]
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim AS base
+WORKDIR /app
+
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
+WORKDIR /src
+COPY ["Secondbot/BetterSecondbot/BetterSecondbot.csproj", "Secondbot/BetterSecondbot/"]
+COPY ["Secondbot/Core/Core.csproj", "Secondbot/Core/"]
+COPY ["Secondbot/Shared/Shared.csproj", "Secondbot/Shared/"]
+COPY ["libremetaverse-core/LibreMetaverse/LibreMetaverse.csproj", "libremetaverse-core/LibreMetaverse/"]
+COPY ["libremetaverse-core/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj", "libremetaverse-core/LibreMetaverse.StructuredData/"]
+COPY ["libremetaverse-core/LibreMetaverseTypes/LibreMetaverse.Types.csproj", "libremetaverse-core/LibreMetaverseTypes/"]
+RUN dotnet restore "Secondbot/BetterSecondbot/BetterSecondbot.csproj"
+COPY . .
+WORKDIR "/src/Secondbot/BetterSecondbot"
+RUN dotnet build "BetterSecondbot.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "BetterSecondbot.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+# --- Update your settings ---
+
+ENV Basic_BotUserName=''
+ENV Basic_BotPassword=''
+ENV Basic_HomeRegions='http://maps.secondlife.com/secondlife/Viserion/50/140/23'
+ENV Basic_LoginLocation='home'
+
+ENV Security_MasterUsername='Madpeter Zond'
+ENV Security_SubMasters='X X,Y Y,Z Z'
+ENV Security_SignedCommandkey=''
+ENV Security_WebUIKey=''
+
+ENV Setting_AllowRLV='false'
+ENV Setting_AllowFunds='false'
+ENV Setting_LogCommands='false'
+ENV Setting_RelayImToAvatarUUID=''
+ENV Setting_DefaultSit_UUID=''
+ENV Setting_loginURI='secondlife'
+
+ENV DiscordRelay_URL=''
+ENV DiscordRelay_GroupUUID=''
+ENV DiscordFull_Enable='false'
+ENV DiscordFull_Token=''
+ENV DiscordFull_ServerID=''
+ENV DiscordFull_Keep_GroupChat='false'
+
+ENV Http_Enable='false'
+ENV Http_Host='docker'
+
+ENV Name2Key_Enable='false'
+ENV Name2Key_Url='http://localhost:1234'
+ENV Name2Key_Key='magic'
+
+ENV DiscordTTS_Enable='false'
+ENV DiscordTTS_server_id=''
+ENV DiscordTTS_channel_name=''
+ENV DiscordTTS_avatar_uuid=''
+ENV DiscordTTS_Nickname=''
+
+ENV Log2File_Enable='false'
+ENV Log2File_Level=1
+
+EXPOSE 80
+ENV ASPNETCORE_URLS http://+:80
+
+# --- End of settings ---
+
+ENTRYPOINT ["/app/BetterSecondBot"]
\ No newline at end of file
diff --git a/CLI/BetterRelayService/BetterRelay.cs b/Secondbot/BetterSecondbot/BetterRelayService/BetterRelay.cs
similarity index 100%
rename from CLI/BetterRelayService/BetterRelay.cs
rename to Secondbot/BetterSecondbot/BetterRelayService/BetterRelay.cs
diff --git a/CLI/Cli.cs b/Secondbot/BetterSecondbot/BetterSecondbot.cs
similarity index 100%
rename from CLI/Cli.cs
rename to Secondbot/BetterSecondbot/BetterSecondbot.cs
diff --git a/Secondbot/BetterSecondbot/BetterSecondbot.csproj b/Secondbot/BetterSecondbot/BetterSecondbot.csproj
new file mode 100644
index 0000000..6cf4d69
--- /dev/null
+++ b/Secondbot/BetterSecondbot/BetterSecondbot.csproj
@@ -0,0 +1,23 @@
+
+
+
+ Exe
+ netcoreapp3.1
+ Linux
+ ..\..
+
+
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
+
+
+
+
+
diff --git a/CLI/CliDocker.cs b/Secondbot/BetterSecondbot/CliDocker.cs
similarity index 100%
rename from CLI/CliDocker.cs
rename to Secondbot/BetterSecondbot/CliDocker.cs
diff --git a/CLI/CliExitOnLogout.cs b/Secondbot/BetterSecondbot/CliExitOnLogout.cs
similarity index 100%
rename from CLI/CliExitOnLogout.cs
rename to Secondbot/BetterSecondbot/CliExitOnLogout.cs
diff --git a/CLI/CliHardware.cs b/Secondbot/BetterSecondbot/CliHardware.cs
similarity index 100%
rename from CLI/CliHardware.cs
rename to Secondbot/BetterSecondbot/CliHardware.cs
diff --git a/CLI/DiscordSupervisor/ChannelControl.cs b/Secondbot/BetterSecondbot/DiscordSupervisor/ChannelControl.cs
similarity index 100%
rename from CLI/DiscordSupervisor/ChannelControl.cs
rename to Secondbot/BetterSecondbot/DiscordSupervisor/ChannelControl.cs
diff --git a/CLI/DiscordSupervisor/Discord-super.cs b/Secondbot/BetterSecondbot/DiscordSupervisor/Discord-super.cs
similarity index 100%
rename from CLI/DiscordSupervisor/Discord-super.cs
rename to Secondbot/BetterSecondbot/DiscordSupervisor/Discord-super.cs
diff --git a/CLI/DiscordSupervisor/DiscordBot.cs b/Secondbot/BetterSecondbot/DiscordSupervisor/DiscordBot.cs
similarity index 100%
rename from CLI/DiscordSupervisor/DiscordBot.cs
rename to Secondbot/BetterSecondbot/DiscordSupervisor/DiscordBot.cs
diff --git a/CLI/DiscordSupervisor/DiscordEvents.cs b/Secondbot/BetterSecondbot/DiscordSupervisor/DiscordEvents.cs
similarity index 100%
rename from CLI/DiscordSupervisor/DiscordEvents.cs
rename to Secondbot/BetterSecondbot/DiscordSupervisor/DiscordEvents.cs
diff --git a/CLI/DiscordSupervisor/DiscordTTS/DiscordTTS.cs b/Secondbot/BetterSecondbot/DiscordSupervisor/DiscordTTS/DiscordTTS.cs
similarity index 100%
rename from CLI/DiscordSupervisor/DiscordTTS/DiscordTTS.cs
rename to Secondbot/BetterSecondbot/DiscordSupervisor/DiscordTTS/DiscordTTS.cs
diff --git a/CLI/DiscordSupervisor/Functions.cs b/Secondbot/BetterSecondbot/DiscordSupervisor/Functions.cs
similarity index 100%
rename from CLI/DiscordSupervisor/Functions.cs
rename to Secondbot/BetterSecondbot/DiscordSupervisor/Functions.cs
diff --git a/CLI/DiscordSupervisor/Inbound.cs b/Secondbot/BetterSecondbot/DiscordSupervisor/Inbound.cs
similarity index 96%
rename from CLI/DiscordSupervisor/Inbound.cs
rename to Secondbot/BetterSecondbot/DiscordSupervisor/Inbound.cs
index 0dc2435..6af6d3f 100644
--- a/CLI/DiscordSupervisor/Inbound.cs
+++ b/Secondbot/BetterSecondbot/DiscordSupervisor/Inbound.cs
@@ -307,7 +307,11 @@ namespace BetterSecondBot.DiscordSupervisor
{
ITextChannel Chan = (ITextChannel)message.Channel;
IGuildUser user = await Chan.Guild.GetUserAsync(message.Author.Id).ConfigureAwait(true);
- On_MessageEvent(new DiscordMessageEvent(Chan.GuildId, Chan.Id, user.Nickname, message.Content));
+ string username = user.Nickname;
+ if(username == null) {
+ username = message.Author.Username;
+ }
+ On_MessageEvent(new DiscordMessageEvent(Chan.GuildId, Chan.Id, username, message.Content));
if (message.Content.StartsWith("!clear") == true)
{
await CleanDiscordChannel(Chan, 0, true).ConfigureAwait(false);
diff --git a/CLI/DiscordSupervisor/Status.cs b/Secondbot/BetterSecondbot/DiscordSupervisor/Status.cs
similarity index 100%
rename from CLI/DiscordSupervisor/Status.cs
rename to Secondbot/BetterSecondbot/DiscordSupervisor/Status.cs
diff --git a/CLI/DiscordSupervisor/Values.cs b/Secondbot/BetterSecondbot/DiscordSupervisor/Values.cs
similarity index 100%
rename from CLI/DiscordSupervisor/Values.cs
rename to Secondbot/BetterSecondbot/DiscordSupervisor/Values.cs
diff --git a/CLI/DiscordSupervisor/relay.cs b/Secondbot/BetterSecondbot/DiscordSupervisor/relay.cs
similarity index 100%
rename from CLI/DiscordSupervisor/relay.cs
rename to Secondbot/BetterSecondbot/DiscordSupervisor/relay.cs
diff --git a/Secondbot/BetterSecondbot/Dockerfile b/Secondbot/BetterSecondbot/Dockerfile
new file mode 100644
index 0000000..9bfa2ff
--- /dev/null
+++ b/Secondbot/BetterSecondbot/Dockerfile
@@ -0,0 +1,72 @@
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim AS base
+WORKDIR /app
+
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
+WORKDIR /src
+COPY ["Secondbot/BetterSecondbot/BetterSecondbot.csproj", "Secondbot/BetterSecondbot/"]
+COPY ["Secondbot/Core/Core.csproj", "Secondbot/Core/"]
+COPY ["Secondbot/Shared/Shared.csproj", "Secondbot/Shared/"]
+COPY ["libremetaverse-core/LibreMetaverse/LibreMetaverse.csproj", "libremetaverse-core/LibreMetaverse/"]
+COPY ["libremetaverse-core/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj", "libremetaverse-core/LibreMetaverse.StructuredData/"]
+COPY ["libremetaverse-core/LibreMetaverseTypes/LibreMetaverse.Types.csproj", "libremetaverse-core/LibreMetaverseTypes/"]
+RUN dotnet restore "Secondbot/BetterSecondbot/BetterSecondbot.csproj"
+COPY . .
+WORKDIR "/src/Secondbot/BetterSecondbot"
+RUN dotnet build "BetterSecondbot.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "BetterSecondbot.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+# --- Update your settings ---
+
+ENV Basic_BotUserName=''
+ENV Basic_BotPassword=''
+ENV Basic_HomeRegions='http://maps.secondlife.com/secondlife/Viserion/50/140/23'
+ENV Basic_LoginLocation='home'
+
+ENV Security_MasterUsername='Madpeter Zond'
+ENV Security_SubMasters='X X,Y Y,Z Z'
+ENV Security_SignedCommandkey=''
+ENV Security_WebUIKey=''
+
+ENV Setting_AllowRLV='false'
+ENV Setting_AllowFunds='false'
+ENV Setting_LogCommands='false'
+ENV Setting_RelayImToAvatarUUID=''
+ENV Setting_DefaultSit_UUID=''
+ENV Setting_loginURI='secondlife'
+
+ENV DiscordRelay_URL=''
+ENV DiscordRelay_GroupUUID=''
+ENV DiscordFull_Enable='false'
+ENV DiscordFull_Token=''
+ENV DiscordFull_ServerID=''
+ENV DiscordFull_Keep_GroupChat='false'
+
+ENV Http_Enable='false'
+ENV Http_Host='docker'
+
+ENV Name2Key_Enable='false'
+ENV Name2Key_Url='http://localhost:1234'
+ENV Name2Key_Key='magic'
+
+ENV DiscordTTS_Enable='false'
+ENV DiscordTTS_server_id=''
+ENV DiscordTTS_channel_name=''
+ENV DiscordTTS_avatar_uuid=''
+ENV DiscordTTS_Nickname=''
+
+ENV Log2File_Enable='false'
+ENV Log2File_Level=1
+
+EXPOSE 80
+ENV ASPNETCORE_URLS http://+:80
+
+# --- End of settings ---
+
+ENTRYPOINT ["/app/BetterSecondBot"]
\ No newline at end of file
diff --git a/CLI/HttpService/Chat.cs b/Secondbot/BetterSecondbot/HttpService/Chat.cs
similarity index 100%
rename from CLI/HttpService/Chat.cs
rename to Secondbot/BetterSecondbot/HttpService/Chat.cs
diff --git a/CLI/HttpService/Core.cs b/Secondbot/BetterSecondbot/HttpService/Core.cs
similarity index 100%
rename from CLI/HttpService/Core.cs
rename to Secondbot/BetterSecondbot/HttpService/Core.cs
diff --git a/CLI/HttpService/Group.cs b/Secondbot/BetterSecondbot/HttpService/Group.cs
similarity index 100%
rename from CLI/HttpService/Group.cs
rename to Secondbot/BetterSecondbot/HttpService/Group.cs
diff --git a/CLI/HttpService/HttpAsService.cs b/Secondbot/BetterSecondbot/HttpService/HttpAsService.cs
similarity index 100%
rename from CLI/HttpService/HttpAsService.cs
rename to Secondbot/BetterSecondbot/HttpService/HttpAsService.cs
diff --git a/CLI/HttpService/Im.cs b/Secondbot/BetterSecondbot/HttpService/Im.cs
similarity index 100%
rename from CLI/HttpService/Im.cs
rename to Secondbot/BetterSecondbot/HttpService/Im.cs
diff --git a/CLI/HttpService/Inventory.cs b/Secondbot/BetterSecondbot/HttpService/Inventory.cs
similarity index 100%
rename from CLI/HttpService/Inventory.cs
rename to Secondbot/BetterSecondbot/HttpService/Inventory.cs
diff --git a/CLI/HttpService/ParcelEstate.cs b/Secondbot/BetterSecondbot/HttpService/ParcelEstate.cs
similarity index 100%
rename from CLI/HttpService/ParcelEstate.cs
rename to Secondbot/BetterSecondbot/HttpService/ParcelEstate.cs
diff --git a/CLI/Properties/launchSettings.json b/Secondbot/BetterSecondbot/Properties/launchSettings.json
similarity index 76%
rename from CLI/Properties/launchSettings.json
rename to Secondbot/BetterSecondbot/Properties/launchSettings.json
index 1aa4c7c..ec7d149 100644
--- a/CLI/Properties/launchSettings.json
+++ b/Secondbot/BetterSecondbot/Properties/launchSettings.json
@@ -1,10 +1,10 @@
-{
- "profiles": {
- "BetterSecondBot": {
- "commandName": "Project"
- },
- "Docker": {
- "commandName": "Docker"
- }
- }
+{
+ "profiles": {
+ "BetterSecondbot": {
+ "commandName": "Project"
+ },
+ "Docker": {
+ "commandName": "Docker"
+ }
+ }
}
\ No newline at end of file
diff --git a/CLI/WikiMake/wiki_footer.txt b/Secondbot/BetterSecondbot/WikiMake/wiki_footer.txt
similarity index 97%
rename from CLI/WikiMake/wiki_footer.txt
rename to Secondbot/BetterSecondbot/WikiMake/wiki_footer.txt
index dcd1b1f..5939521 100644
--- a/CLI/WikiMake/wiki_footer.txt
+++ b/Secondbot/BetterSecondbot/WikiMake/wiki_footer.txt
@@ -1,11 +1,11 @@
-
-
-
-
-
-
+
+