diff --git a/BetterSecondBot.sln b/BetterSecondBot.sln index ac48e55..320aea6 100644 --- a/BetterSecondBot.sln +++ b/BetterSecondBot.sln @@ -13,20 +13,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.StructuredDa EndProject 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 .gitignore = .gitignore - Dockerfile = Dockerfile NuGet.Config = NuGet.Config README.md = README.md EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "Shared\Shared.csproj", "{554DA151-71C4-4C1D-97D5-F89F13D31299}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core.csproj", "{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BetterSecondbot", "BetterSecondbot\BetterSecondbot.csproj", "{452CA177-FFD1-4248-93C0-09AFF1060E34}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,18 +44,18 @@ Global {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 + {554DA151-71C4-4C1D-97D5-F89F13D31299}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {554DA151-71C4-4C1D-97D5-F89F13D31299}.Debug|Any CPU.Build.0 = Debug|Any CPU + {554DA151-71C4-4C1D-97D5-F89F13D31299}.Release|Any CPU.ActiveCfg = Release|Any CPU + {554DA151-71C4-4C1D-97D5-F89F13D31299}.Release|Any CPU.Build.0 = Release|Any CPU + {BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Release|Any CPU.Build.0 = Release|Any CPU + {452CA177-FFD1-4248-93C0-09AFF1060E34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {452CA177-FFD1-4248-93C0-09AFF1060E34}.Debug|Any CPU.Build.0 = Debug|Any CPU + {452CA177-FFD1-4248-93C0-09AFF1060E34}.Release|Any CPU.ActiveCfg = Release|Any CPU + {452CA177-FFD1-4248-93C0-09AFF1060E34}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -65,9 +64,9 @@ Global {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} + {554DA151-71C4-4C1D-97D5-F89F13D31299} = {4388BA41-F3FC-4A0E-AA00-50E9ED45A027} + {BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859} = {4388BA41-F3FC-4A0E-AA00-50E9ED45A027} + {452CA177-FFD1-4248-93C0-09AFF1060E34} = {4388BA41-F3FC-4A0E-AA00-50E9ED45A027} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EC43F382-FAF2-49CC-8E23-5DDF87592DFA} diff --git a/Secondbot/BetterSecondbot/BetterRelayService/BetterRelay.cs b/BetterSecondbot/BetterRelayService/BetterRelay.cs similarity index 100% rename from Secondbot/BetterSecondbot/BetterRelayService/BetterRelay.cs rename to BetterSecondbot/BetterRelayService/BetterRelay.cs diff --git a/Secondbot/BetterSecondbot/BetterSecondbot.cs b/BetterSecondbot/BetterSecondbot.cs similarity index 100% rename from Secondbot/BetterSecondbot/BetterSecondbot.cs rename to BetterSecondbot/BetterSecondbot.cs diff --git a/Secondbot/BetterSecondbot/BetterSecondbot.csproj b/BetterSecondbot/BetterSecondbot.csproj similarity index 100% rename from Secondbot/BetterSecondbot/BetterSecondbot.csproj rename to BetterSecondbot/BetterSecondbot.csproj diff --git a/Secondbot/BetterSecondbot/CliDocker.cs b/BetterSecondbot/CliDocker.cs similarity index 100% rename from Secondbot/BetterSecondbot/CliDocker.cs rename to BetterSecondbot/CliDocker.cs diff --git a/Secondbot/BetterSecondbot/CliExitOnLogout.cs b/BetterSecondbot/CliExitOnLogout.cs similarity index 100% rename from Secondbot/BetterSecondbot/CliExitOnLogout.cs rename to BetterSecondbot/CliExitOnLogout.cs diff --git a/Secondbot/BetterSecondbot/CliHardware.cs b/BetterSecondbot/CliHardware.cs similarity index 100% rename from Secondbot/BetterSecondbot/CliHardware.cs rename to BetterSecondbot/CliHardware.cs diff --git a/Secondbot/BetterSecondbot/DiscordSupervisor/ChannelControl.cs b/BetterSecondbot/DiscordSupervisor/ChannelControl.cs similarity index 100% rename from Secondbot/BetterSecondbot/DiscordSupervisor/ChannelControl.cs rename to BetterSecondbot/DiscordSupervisor/ChannelControl.cs diff --git a/Secondbot/BetterSecondbot/DiscordSupervisor/Discord-super.cs b/BetterSecondbot/DiscordSupervisor/Discord-super.cs similarity index 100% rename from Secondbot/BetterSecondbot/DiscordSupervisor/Discord-super.cs rename to BetterSecondbot/DiscordSupervisor/Discord-super.cs diff --git a/Secondbot/BetterSecondbot/DiscordSupervisor/DiscordBot.cs b/BetterSecondbot/DiscordSupervisor/DiscordBot.cs similarity index 100% rename from Secondbot/BetterSecondbot/DiscordSupervisor/DiscordBot.cs rename to BetterSecondbot/DiscordSupervisor/DiscordBot.cs diff --git a/Secondbot/BetterSecondbot/DiscordSupervisor/DiscordEvents.cs b/BetterSecondbot/DiscordSupervisor/DiscordEvents.cs similarity index 100% rename from Secondbot/BetterSecondbot/DiscordSupervisor/DiscordEvents.cs rename to BetterSecondbot/DiscordSupervisor/DiscordEvents.cs diff --git a/Secondbot/BetterSecondbot/DiscordSupervisor/DiscordTTS/DiscordTTS.cs b/BetterSecondbot/DiscordSupervisor/DiscordTTS/DiscordTTS.cs similarity index 100% rename from Secondbot/BetterSecondbot/DiscordSupervisor/DiscordTTS/DiscordTTS.cs rename to BetterSecondbot/DiscordSupervisor/DiscordTTS/DiscordTTS.cs diff --git a/Secondbot/BetterSecondbot/DiscordSupervisor/Functions.cs b/BetterSecondbot/DiscordSupervisor/Functions.cs similarity index 100% rename from Secondbot/BetterSecondbot/DiscordSupervisor/Functions.cs rename to BetterSecondbot/DiscordSupervisor/Functions.cs diff --git a/Secondbot/BetterSecondbot/DiscordSupervisor/Inbound.cs b/BetterSecondbot/DiscordSupervisor/Inbound.cs similarity index 100% rename from Secondbot/BetterSecondbot/DiscordSupervisor/Inbound.cs rename to BetterSecondbot/DiscordSupervisor/Inbound.cs diff --git a/Secondbot/BetterSecondbot/DiscordSupervisor/Status.cs b/BetterSecondbot/DiscordSupervisor/Status.cs similarity index 100% rename from Secondbot/BetterSecondbot/DiscordSupervisor/Status.cs rename to BetterSecondbot/DiscordSupervisor/Status.cs diff --git a/Secondbot/BetterSecondbot/DiscordSupervisor/Values.cs b/BetterSecondbot/DiscordSupervisor/Values.cs similarity index 100% rename from Secondbot/BetterSecondbot/DiscordSupervisor/Values.cs rename to BetterSecondbot/DiscordSupervisor/Values.cs diff --git a/Secondbot/BetterSecondbot/DiscordSupervisor/relay.cs b/BetterSecondbot/DiscordSupervisor/relay.cs similarity index 100% rename from Secondbot/BetterSecondbot/DiscordSupervisor/relay.cs rename to BetterSecondbot/DiscordSupervisor/relay.cs diff --git a/Secondbot/BetterSecondbot/Dockerfile b/BetterSecondbot/Dockerfile similarity index 82% rename from Secondbot/BetterSecondbot/Dockerfile rename to BetterSecondbot/Dockerfile index 5397dcb..5e492d9 100644 --- a/Secondbot/BetterSecondbot/Dockerfile +++ b/BetterSecondbot/Dockerfile @@ -5,15 +5,15 @@ 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 ["BetterSecondbot/BetterSecondbot.csproj", "BetterSecondbot/"] +COPY ["Core/Core.csproj", "Core/"] +COPY ["Shared/Shared.csproj", "Shared/"] +COPY ["libremetaverse-core/LibreMetaverseTypes/LibreMetaverse.Types.csproj", "libremetaverse-core/LibreMetaverseTypes/"] 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" +RUN dotnet restore "BetterSecondbot/BetterSecondbot.csproj" COPY . . -WORKDIR "/src/Secondbot/BetterSecondbot" +WORKDIR "/src/BetterSecondbot" RUN dotnet build "BetterSecondbot.csproj" -c Release -o /app/build FROM build AS publish @@ -22,7 +22,6 @@ 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='' @@ -70,4 +69,4 @@ ENV ASPNETCORE_URLS http://+:80 # --- End of settings --- -ENTRYPOINT ["/app/BetterSecondBot"] +ENTRYPOINT ["/app/BetterSecondBot"] \ No newline at end of file diff --git a/Secondbot/BetterSecondbot/HttpService/Chat.cs b/BetterSecondbot/HttpService/Chat.cs similarity index 100% rename from Secondbot/BetterSecondbot/HttpService/Chat.cs rename to BetterSecondbot/HttpService/Chat.cs diff --git a/Secondbot/BetterSecondbot/HttpService/Core.cs b/BetterSecondbot/HttpService/Core.cs similarity index 100% rename from Secondbot/BetterSecondbot/HttpService/Core.cs rename to BetterSecondbot/HttpService/Core.cs diff --git a/Secondbot/BetterSecondbot/HttpService/Group.cs b/BetterSecondbot/HttpService/Group.cs similarity index 100% rename from Secondbot/BetterSecondbot/HttpService/Group.cs rename to BetterSecondbot/HttpService/Group.cs diff --git a/Secondbot/BetterSecondbot/HttpService/HttpAsService.cs b/BetterSecondbot/HttpService/HttpAsService.cs similarity index 100% rename from Secondbot/BetterSecondbot/HttpService/HttpAsService.cs rename to BetterSecondbot/HttpService/HttpAsService.cs diff --git a/Secondbot/BetterSecondbot/HttpService/Im.cs b/BetterSecondbot/HttpService/Im.cs similarity index 100% rename from Secondbot/BetterSecondbot/HttpService/Im.cs rename to BetterSecondbot/HttpService/Im.cs diff --git a/Secondbot/BetterSecondbot/HttpService/Inventory.cs b/BetterSecondbot/HttpService/Inventory.cs similarity index 100% rename from Secondbot/BetterSecondbot/HttpService/Inventory.cs rename to BetterSecondbot/HttpService/Inventory.cs diff --git a/Secondbot/BetterSecondbot/HttpService/ParcelEstate.cs b/BetterSecondbot/HttpService/ParcelEstate.cs similarity index 100% rename from Secondbot/BetterSecondbot/HttpService/ParcelEstate.cs rename to BetterSecondbot/HttpService/ParcelEstate.cs diff --git a/Secondbot/BetterSecondbot/Properties/launchSettings.json b/BetterSecondbot/Properties/launchSettings.json similarity index 100% rename from Secondbot/BetterSecondbot/Properties/launchSettings.json rename to BetterSecondbot/Properties/launchSettings.json diff --git a/Secondbot/BetterSecondbot/WikiMake/wiki_footer.txt b/BetterSecondbot/WikiMake/wiki_footer.txt similarity index 100% rename from Secondbot/BetterSecondbot/WikiMake/wiki_footer.txt rename to BetterSecondbot/WikiMake/wiki_footer.txt diff --git a/Secondbot/BetterSecondbot/WikiMake/wiki_header.txt b/BetterSecondbot/WikiMake/wiki_header.txt similarity index 100% rename from Secondbot/BetterSecondbot/WikiMake/wiki_header.txt rename to BetterSecondbot/WikiMake/wiki_header.txt diff --git a/Secondbot/BetterSecondbot/WikiMake/wikimake.cs b/BetterSecondbot/WikiMake/wikimake.cs similarity index 100% rename from Secondbot/BetterSecondbot/WikiMake/wikimake.cs rename to BetterSecondbot/WikiMake/wikimake.cs diff --git a/Secondbot/Core/Commands/Animation/PlayGesture.cs b/Core/Commands/Animation/PlayGesture.cs similarity index 100% rename from Secondbot/Core/Commands/Animation/PlayGesture.cs rename to Core/Commands/Animation/PlayGesture.cs diff --git a/Secondbot/Core/Commands/Animation/addToAnimations.cs b/Core/Commands/Animation/addToAnimations.cs similarity index 100% rename from Secondbot/Core/Commands/Animation/addToAnimations.cs rename to Core/Commands/Animation/addToAnimations.cs diff --git a/Secondbot/Core/Commands/Animation/resetAnimations.cs b/Core/Commands/Animation/resetAnimations.cs similarity index 100% rename from Secondbot/Core/Commands/Animation/resetAnimations.cs rename to Core/Commands/Animation/resetAnimations.cs diff --git a/Secondbot/Core/Commands/Avatars/NearMe.cs b/Core/Commands/Avatars/NearMe.cs similarity index 100% rename from Secondbot/Core/Commands/Avatars/NearMe.cs rename to Core/Commands/Avatars/NearMe.cs diff --git a/Secondbot/Core/Commands/Avatars/PayAvatar.cs b/Core/Commands/Avatars/PayAvatar.cs similarity index 100% rename from Secondbot/Core/Commands/Avatars/PayAvatar.cs rename to Core/Commands/Avatars/PayAvatar.cs diff --git a/Secondbot/Core/Commands/Chat/LocalChatHistory.cs b/Core/Commands/Chat/LocalChatHistory.cs similarity index 100% rename from Secondbot/Core/Commands/Chat/LocalChatHistory.cs rename to Core/Commands/Chat/LocalChatHistory.cs diff --git a/Secondbot/Core/Commands/Chat/im.cs b/Core/Commands/Chat/im.cs similarity index 100% rename from Secondbot/Core/Commands/Chat/im.cs rename to Core/Commands/Chat/im.cs diff --git a/Secondbot/Core/Commands/Chat/say.cs b/Core/Commands/Chat/say.cs similarity index 100% rename from Secondbot/Core/Commands/Chat/say.cs rename to Core/Commands/Chat/say.cs diff --git a/Secondbot/Core/Commands/Dialogs/DialogRelay.cs b/Core/Commands/Dialogs/DialogRelay.cs similarity index 100% rename from Secondbot/Core/Commands/Dialogs/DialogRelay.cs rename to Core/Commands/Dialogs/DialogRelay.cs diff --git a/Secondbot/Core/Commands/Dialogs/DialogResponce.cs b/Core/Commands/Dialogs/DialogResponce.cs similarity index 100% rename from Secondbot/Core/Commands/Dialogs/DialogResponce.cs rename to Core/Commands/Dialogs/DialogResponce.cs diff --git a/Secondbot/Core/Commands/Dialogs/DialogTrack.cs b/Core/Commands/Dialogs/DialogTrack.cs similarity index 100% rename from Secondbot/Core/Commands/Dialogs/DialogTrack.cs rename to Core/Commands/Dialogs/DialogTrack.cs diff --git a/Secondbot/Core/Commands/DiscordAPI/AddRole.cs b/Core/Commands/DiscordAPI/AddRole.cs similarity index 100% rename from Secondbot/Core/Commands/DiscordAPI/AddRole.cs rename to Core/Commands/DiscordAPI/AddRole.cs diff --git a/Secondbot/Core/Commands/DiscordAPI/Ban_Member.cs b/Core/Commands/DiscordAPI/Ban_Member.cs similarity index 100% rename from Secondbot/Core/Commands/DiscordAPI/Ban_Member.cs rename to Core/Commands/DiscordAPI/Ban_Member.cs diff --git a/Secondbot/Core/Commands/DiscordAPI/BulkClear_Messages.cs b/Core/Commands/DiscordAPI/BulkClear_Messages.cs similarity index 100% rename from Secondbot/Core/Commands/DiscordAPI/BulkClear_Messages.cs rename to Core/Commands/DiscordAPI/BulkClear_Messages.cs diff --git a/Secondbot/Core/Commands/DiscordAPI/Dm_Member.cs b/Core/Commands/DiscordAPI/Dm_Member.cs similarity index 100% rename from Secondbot/Core/Commands/DiscordAPI/Dm_Member.cs rename to Core/Commands/DiscordAPI/Dm_Member.cs diff --git a/Secondbot/Core/Commands/DiscordAPI/MembersList.cs b/Core/Commands/DiscordAPI/MembersList.cs similarity index 100% rename from Secondbot/Core/Commands/DiscordAPI/MembersList.cs rename to Core/Commands/DiscordAPI/MembersList.cs diff --git a/Secondbot/Core/Commands/DiscordAPI/MessageChannel.cs b/Core/Commands/DiscordAPI/MessageChannel.cs similarity index 100% rename from Secondbot/Core/Commands/DiscordAPI/MessageChannel.cs rename to Core/Commands/DiscordAPI/MessageChannel.cs diff --git a/Secondbot/Core/Commands/DiscordAPI/MuteMember.cs b/Core/Commands/DiscordAPI/MuteMember.cs similarity index 100% rename from Secondbot/Core/Commands/DiscordAPI/MuteMember.cs rename to Core/Commands/DiscordAPI/MuteMember.cs diff --git a/Secondbot/Core/Commands/DiscordAPI/RoleCreate.cs b/Core/Commands/DiscordAPI/RoleCreate.cs similarity index 100% rename from Secondbot/Core/Commands/DiscordAPI/RoleCreate.cs rename to Core/Commands/DiscordAPI/RoleCreate.cs diff --git a/Secondbot/Core/Commands/DiscordAPI/RoleList.cs b/Core/Commands/DiscordAPI/RoleList.cs similarity index 100% rename from Secondbot/Core/Commands/DiscordAPI/RoleList.cs rename to Core/Commands/DiscordAPI/RoleList.cs diff --git a/Secondbot/Core/Commands/DiscordAPI/RoleRemove.cs b/Core/Commands/DiscordAPI/RoleRemove.cs similarity index 100% rename from Secondbot/Core/Commands/DiscordAPI/RoleRemove.cs rename to Core/Commands/DiscordAPI/RoleRemove.cs diff --git a/Secondbot/Core/Commands/DiscordAPI/Role_GetSettings.cs b/Core/Commands/DiscordAPI/Role_GetSettings.cs similarity index 100% rename from Secondbot/Core/Commands/DiscordAPI/Role_GetSettings.cs rename to Core/Commands/DiscordAPI/Role_GetSettings.cs diff --git a/Secondbot/Core/Commands/DiscordAPI/Role_UpdatePerms.cs b/Core/Commands/DiscordAPI/Role_UpdatePerms.cs similarity index 100% rename from Secondbot/Core/Commands/DiscordAPI/Role_UpdatePerms.cs rename to Core/Commands/DiscordAPI/Role_UpdatePerms.cs diff --git a/Secondbot/Core/Commands/DiscordAPI/TextChannels_List.cs b/Core/Commands/DiscordAPI/TextChannels_List.cs similarity index 100% rename from Secondbot/Core/Commands/DiscordAPI/TextChannels_List.cs rename to Core/Commands/DiscordAPI/TextChannels_List.cs diff --git a/Secondbot/Core/Commands/Estate/EstateParcelReclaim.cs b/Core/Commands/Estate/EstateParcelReclaim.cs similarity index 100% rename from Secondbot/Core/Commands/Estate/EstateParcelReclaim.cs rename to Core/Commands/Estate/EstateParcelReclaim.cs diff --git a/Secondbot/Core/Commands/Estate/GetSimGlobalPos.cs b/Core/Commands/Estate/GetSimGlobalPos.cs similarity index 100% rename from Secondbot/Core/Commands/Estate/GetSimGlobalPos.cs rename to Core/Commands/Estate/GetSimGlobalPos.cs diff --git a/Secondbot/Core/Commands/Estate/GetSimTexture.cs b/Core/Commands/Estate/GetSimTexture.cs similarity index 100% rename from Secondbot/Core/Commands/Estate/GetSimTexture.cs rename to Core/Commands/Estate/GetSimTexture.cs diff --git a/Secondbot/Core/Commands/Estate/SimMessage.cs b/Core/Commands/Estate/SimMessage.cs similarity index 100% rename from Secondbot/Core/Commands/Estate/SimMessage.cs rename to Core/Commands/Estate/SimMessage.cs diff --git a/Secondbot/Core/Commands/Estate/SimRestart.cs b/Core/Commands/Estate/SimRestart.cs similarity index 100% rename from Secondbot/Core/Commands/Estate/SimRestart.cs rename to Core/Commands/Estate/SimRestart.cs diff --git a/Secondbot/Core/Commands/Friends/FriendFullPerms.cs b/Core/Commands/Friends/FriendFullPerms.cs similarity index 100% rename from Secondbot/Core/Commands/Friends/FriendFullPerms.cs rename to Core/Commands/Friends/FriendFullPerms.cs diff --git a/Secondbot/Core/Commands/Friends/FriendRequest.cs b/Core/Commands/Friends/FriendRequest.cs similarity index 100% rename from Secondbot/Core/Commands/Friends/FriendRequest.cs rename to Core/Commands/Friends/FriendRequest.cs diff --git a/Secondbot/Core/Commands/Friends/Friendslist.cs b/Core/Commands/Friends/Friendslist.cs similarity index 100% rename from Secondbot/Core/Commands/Friends/Friendslist.cs rename to Core/Commands/Friends/Friendslist.cs diff --git a/Secondbot/Core/Commands/Group/GroupActiveGroup.cs b/Core/Commands/Group/GroupActiveGroup.cs similarity index 100% rename from Secondbot/Core/Commands/Group/GroupActiveGroup.cs rename to Core/Commands/Group/GroupActiveGroup.cs diff --git a/Secondbot/Core/Commands/Group/GroupActiveTitle.cs b/Core/Commands/Group/GroupActiveTitle.cs similarity index 100% rename from Secondbot/Core/Commands/Group/GroupActiveTitle.cs rename to Core/Commands/Group/GroupActiveTitle.cs diff --git a/Secondbot/Core/Commands/Group/GroupAddRole.cs b/Core/Commands/Group/GroupAddRole.cs similarity index 100% rename from Secondbot/Core/Commands/Group/GroupAddRole.cs rename to Core/Commands/Group/GroupAddRole.cs diff --git a/Secondbot/Core/Commands/Group/GroupEject.cs b/Core/Commands/Group/GroupEject.cs similarity index 100% rename from Secondbot/Core/Commands/Group/GroupEject.cs rename to Core/Commands/Group/GroupEject.cs diff --git a/Secondbot/Core/Commands/Group/GroupInvite.cs b/Core/Commands/Group/GroupInvite.cs similarity index 100% rename from Secondbot/Core/Commands/Group/GroupInvite.cs rename to Core/Commands/Group/GroupInvite.cs diff --git a/Secondbot/Core/Commands/Group/GroupInviteNoLimiter.cs b/Core/Commands/Group/GroupInviteNoLimiter.cs similarity index 100% rename from Secondbot/Core/Commands/Group/GroupInviteNoLimiter.cs rename to Core/Commands/Group/GroupInviteNoLimiter.cs diff --git a/Secondbot/Core/Commands/Group/GroupNotice.cs b/Core/Commands/Group/GroupNotice.cs similarity index 100% rename from Secondbot/Core/Commands/Group/GroupNotice.cs rename to Core/Commands/Group/GroupNotice.cs diff --git a/Secondbot/Core/Commands/Group/IsGroupMember.cs b/Core/Commands/Group/IsGroupMember.cs similarity index 100% rename from Secondbot/Core/Commands/Group/IsGroupMember.cs rename to Core/Commands/Group/IsGroupMember.cs diff --git a/Secondbot/Core/Commands/Group/getGroupList.cs b/Core/Commands/Group/getGroupList.cs similarity index 100% rename from Secondbot/Core/Commands/Group/getGroupList.cs rename to Core/Commands/Group/getGroupList.cs diff --git a/Secondbot/Core/Commands/Group/getGroupMembers.cs b/Core/Commands/Group/getGroupMembers.cs similarity index 100% rename from Secondbot/Core/Commands/Group/getGroupMembers.cs rename to Core/Commands/Group/getGroupMembers.cs diff --git a/Secondbot/Core/Commands/Group/getGroupRoles.cs b/Core/Commands/Group/getGroupRoles.cs similarity index 100% rename from Secondbot/Core/Commands/Group/getGroupRoles.cs rename to Core/Commands/Group/getGroupRoles.cs diff --git a/Secondbot/Core/Commands/Group/group.cs b/Core/Commands/Group/group.cs similarity index 100% rename from Secondbot/Core/Commands/Group/group.cs rename to Core/Commands/Group/group.cs diff --git a/Secondbot/Core/Commands/Group/groupchat.cs b/Core/Commands/Group/groupchat.cs similarity index 100% rename from Secondbot/Core/Commands/Group/groupchat.cs rename to Core/Commands/Group/groupchat.cs diff --git a/Secondbot/Core/Commands/Group/groupchatAnyUnread.cs b/Core/Commands/Group/groupchatAnyUnread.cs similarity index 100% rename from Secondbot/Core/Commands/Group/groupchatAnyUnread.cs rename to Core/Commands/Group/groupchatAnyUnread.cs diff --git a/Secondbot/Core/Commands/Group/groupchatClearAll.cs b/Core/Commands/Group/groupchatClearAll.cs similarity index 100% rename from Secondbot/Core/Commands/Group/groupchatClearAll.cs rename to Core/Commands/Group/groupchatClearAll.cs diff --git a/Secondbot/Core/Commands/Group/groupchatGroupHasUnread.cs b/Core/Commands/Group/groupchatGroupHasUnread.cs similarity index 100% rename from Secondbot/Core/Commands/Group/groupchatGroupHasUnread.cs rename to Core/Commands/Group/groupchatGroupHasUnread.cs diff --git a/Secondbot/Core/Commands/Group/groupchatHistory.cs b/Core/Commands/Group/groupchatHistory.cs similarity index 100% rename from Secondbot/Core/Commands/Group/groupchatHistory.cs rename to Core/Commands/Group/groupchatHistory.cs diff --git a/Secondbot/Core/Commands/Group/groupchatListAllUnreadGroups.cs b/Core/Commands/Group/groupchatListAllUnreadGroups.cs similarity index 100% rename from Secondbot/Core/Commands/Group/groupchatListAllUnreadGroups.cs rename to Core/Commands/Group/groupchatListAllUnreadGroups.cs diff --git a/Secondbot/Core/Commands/Helpers/delay.cs b/Core/Commands/Helpers/delay.cs similarity index 100% rename from Secondbot/Core/Commands/Helpers/delay.cs rename to Core/Commands/Helpers/delay.cs diff --git a/Secondbot/Core/Commands/Home/GoHome.cs b/Core/Commands/Home/GoHome.cs similarity index 100% rename from Secondbot/Core/Commands/Home/GoHome.cs rename to Core/Commands/Home/GoHome.cs diff --git a/Secondbot/Core/Commands/Home/resetAtHome.cs b/Core/Commands/Home/resetAtHome.cs similarity index 100% rename from Secondbot/Core/Commands/Home/resetAtHome.cs rename to Core/Commands/Home/resetAtHome.cs diff --git a/Secondbot/Core/Commands/Info/Balance.cs b/Core/Commands/Info/Balance.cs similarity index 100% rename from Secondbot/Core/Commands/Info/Balance.cs rename to Core/Commands/Info/Balance.cs diff --git a/Secondbot/Core/Commands/Info/GetPosition.cs b/Core/Commands/Info/GetPosition.cs similarity index 100% rename from Secondbot/Core/Commands/Info/GetPosition.cs rename to Core/Commands/Info/GetPosition.cs diff --git a/Secondbot/Core/Commands/Info/ParcelName.cs b/Core/Commands/Info/ParcelName.cs similarity index 100% rename from Secondbot/Core/Commands/Info/ParcelName.cs rename to Core/Commands/Info/ParcelName.cs diff --git a/Secondbot/Core/Commands/Info/SimName.cs b/Core/Commands/Info/SimName.cs similarity index 100% rename from Secondbot/Core/Commands/Info/SimName.cs rename to Core/Commands/Info/SimName.cs diff --git a/Secondbot/Core/Commands/Info/UnixTimeNow.cs b/Core/Commands/Info/UnixTimeNow.cs similarity index 100% rename from Secondbot/Core/Commands/Info/UnixTimeNow.cs rename to Core/Commands/Info/UnixTimeNow.cs diff --git a/Secondbot/Core/Commands/Inventory/DeleteInventory.cs b/Core/Commands/Inventory/DeleteInventory.cs similarity index 100% rename from Secondbot/Core/Commands/Inventory/DeleteInventory.cs rename to Core/Commands/Inventory/DeleteInventory.cs diff --git a/Secondbot/Core/Commands/Inventory/InventoryPurgeNotecards.cs b/Core/Commands/Inventory/InventoryPurgeNotecards.cs similarity index 100% rename from Secondbot/Core/Commands/Inventory/InventoryPurgeNotecards.cs rename to Core/Commands/Inventory/InventoryPurgeNotecards.cs diff --git a/Secondbot/Core/Commands/Inventory/RenameInventory.cs b/Core/Commands/Inventory/RenameInventory.cs similarity index 100% rename from Secondbot/Core/Commands/Inventory/RenameInventory.cs rename to Core/Commands/Inventory/RenameInventory.cs diff --git a/Secondbot/Core/Commands/Inventory/attach.cs b/Core/Commands/Inventory/attach.cs similarity index 100% rename from Secondbot/Core/Commands/Inventory/attach.cs rename to Core/Commands/Inventory/attach.cs diff --git a/Secondbot/Core/Commands/Inventory/getRealUUID.cs b/Core/Commands/Inventory/getRealUUID.cs similarity index 100% rename from Secondbot/Core/Commands/Inventory/getRealUUID.cs rename to Core/Commands/Inventory/getRealUUID.cs diff --git a/Secondbot/Core/Commands/Inventory/inventoryContents.cs b/Core/Commands/Inventory/inventoryContents.cs similarity index 100% rename from Secondbot/Core/Commands/Inventory/inventoryContents.cs rename to Core/Commands/Inventory/inventoryContents.cs diff --git a/Secondbot/Core/Commands/Inventory/inventoryFolders.cs b/Core/Commands/Inventory/inventoryFolders.cs similarity index 100% rename from Secondbot/Core/Commands/Inventory/inventoryFolders.cs rename to Core/Commands/Inventory/inventoryFolders.cs diff --git a/Secondbot/Core/Commands/Inventory/outfit.cs b/Core/Commands/Inventory/outfit.cs similarity index 100% rename from Secondbot/Core/Commands/Inventory/outfit.cs rename to Core/Commands/Inventory/outfit.cs diff --git a/Secondbot/Core/Commands/Inventory/sendFolder.cs b/Core/Commands/Inventory/sendFolder.cs similarity index 100% rename from Secondbot/Core/Commands/Inventory/sendFolder.cs rename to Core/Commands/Inventory/sendFolder.cs diff --git a/Secondbot/Core/Commands/Inventory/sendItem.cs b/Core/Commands/Inventory/sendItem.cs similarity index 100% rename from Secondbot/Core/Commands/Inventory/sendItem.cs rename to Core/Commands/Inventory/sendItem.cs diff --git a/Secondbot/Core/Commands/Movement/AutoPilot.cs b/Core/Commands/Movement/AutoPilot.cs similarity index 100% rename from Secondbot/Core/Commands/Movement/AutoPilot.cs rename to Core/Commands/Movement/AutoPilot.cs diff --git a/Secondbot/Core/Commands/Movement/AutoPilotStop.cs b/Core/Commands/Movement/AutoPilotStop.cs similarity index 100% rename from Secondbot/Core/Commands/Movement/AutoPilotStop.cs rename to Core/Commands/Movement/AutoPilotStop.cs diff --git a/Secondbot/Core/Commands/Movement/Fly.cs b/Core/Commands/Movement/Fly.cs similarity index 100% rename from Secondbot/Core/Commands/Movement/Fly.cs rename to Core/Commands/Movement/Fly.cs diff --git a/Secondbot/Core/Commands/Movement/RequestTeleport.cs b/Core/Commands/Movement/RequestTeleport.cs similarity index 100% rename from Secondbot/Core/Commands/Movement/RequestTeleport.cs rename to Core/Commands/Movement/RequestTeleport.cs diff --git a/Secondbot/Core/Commands/Movement/RotateToFace.cs b/Core/Commands/Movement/RotateToFace.cs similarity index 100% rename from Secondbot/Core/Commands/Movement/RotateToFace.cs rename to Core/Commands/Movement/RotateToFace.cs diff --git a/Secondbot/Core/Commands/Movement/RotateToFaceVector.cs b/Core/Commands/Movement/RotateToFaceVector.cs similarity index 100% rename from Secondbot/Core/Commands/Movement/RotateToFaceVector.cs rename to Core/Commands/Movement/RotateToFaceVector.cs diff --git a/Secondbot/Core/Commands/Movement/SendTeleportLure.cs b/Core/Commands/Movement/SendTeleportLure.cs similarity index 100% rename from Secondbot/Core/Commands/Movement/SendTeleportLure.cs rename to Core/Commands/Movement/SendTeleportLure.cs diff --git a/Secondbot/Core/Commands/Movement/rotateTo.cs b/Core/Commands/Movement/rotateTo.cs similarity index 100% rename from Secondbot/Core/Commands/Movement/rotateTo.cs rename to Core/Commands/Movement/rotateTo.cs diff --git a/Secondbot/Core/Commands/Movement/teleport.cs b/Core/Commands/Movement/teleport.cs similarity index 100% rename from Secondbot/Core/Commands/Movement/teleport.cs rename to Core/Commands/Movement/teleport.cs diff --git a/Secondbot/Core/Commands/Notecard/notecardAdd.cs b/Core/Commands/Notecard/notecardAdd.cs similarity index 100% rename from Secondbot/Core/Commands/Notecard/notecardAdd.cs rename to Core/Commands/Notecard/notecardAdd.cs diff --git a/Secondbot/Core/Commands/Notecard/notecardClear.cs b/Core/Commands/Notecard/notecardClear.cs similarity index 100% rename from Secondbot/Core/Commands/Notecard/notecardClear.cs rename to Core/Commands/Notecard/notecardClear.cs diff --git a/Secondbot/Core/Commands/Notecard/notecardSend.cs b/Core/Commands/Notecard/notecardSend.cs similarity index 100% rename from Secondbot/Core/Commands/Notecard/notecardSend.cs rename to Core/Commands/Notecard/notecardSend.cs diff --git a/Secondbot/Core/Commands/Parcel/AbandonLand.cs b/Core/Commands/Parcel/AbandonLand.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/AbandonLand.cs rename to Core/Commands/Parcel/AbandonLand.cs diff --git a/Secondbot/Core/Commands/Parcel/GetParcelBanlist.cs b/Core/Commands/Parcel/GetParcelBanlist.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/GetParcelBanlist.cs rename to Core/Commands/Parcel/GetParcelBanlist.cs diff --git a/Secondbot/Core/Commands/Parcel/GetParcelDesc.cs b/Core/Commands/Parcel/GetParcelDesc.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/GetParcelDesc.cs rename to Core/Commands/Parcel/GetParcelDesc.cs diff --git a/Secondbot/Core/Commands/Parcel/GetParcelFlags.cs b/Core/Commands/Parcel/GetParcelFlags.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/GetParcelFlags.cs rename to Core/Commands/Parcel/GetParcelFlags.cs diff --git a/Secondbot/Core/Commands/Parcel/ParcelBan.cs b/Core/Commands/Parcel/ParcelBan.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/ParcelBan.cs rename to Core/Commands/Parcel/ParcelBan.cs diff --git a/Secondbot/Core/Commands/Parcel/ParcelBuy.cs b/Core/Commands/Parcel/ParcelBuy.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/ParcelBuy.cs rename to Core/Commands/Parcel/ParcelBuy.cs diff --git a/Secondbot/Core/Commands/Parcel/ParcelCleanAndSell.cs b/Core/Commands/Parcel/ParcelCleanAndSell.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/ParcelCleanAndSell.cs rename to Core/Commands/Parcel/ParcelCleanAndSell.cs diff --git a/Secondbot/Core/Commands/Parcel/ParcelCommandHelper.cs b/Core/Commands/Parcel/ParcelCommandHelper.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/ParcelCommandHelper.cs rename to Core/Commands/Parcel/ParcelCommandHelper.cs diff --git a/Secondbot/Core/Commands/Parcel/ParcelDeedToGroup.cs b/Core/Commands/Parcel/ParcelDeedToGroup.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/ParcelDeedToGroup.cs rename to Core/Commands/Parcel/ParcelDeedToGroup.cs diff --git a/Secondbot/Core/Commands/Parcel/ParcelFreeze.cs b/Core/Commands/Parcel/ParcelFreeze.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/ParcelFreeze.cs rename to Core/Commands/Parcel/ParcelFreeze.cs diff --git a/Secondbot/Core/Commands/Parcel/ParcelPrimCountAvatar.cs b/Core/Commands/Parcel/ParcelPrimCountAvatar.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/ParcelPrimCountAvatar.cs rename to Core/Commands/Parcel/ParcelPrimCountAvatar.cs diff --git a/Secondbot/Core/Commands/Parcel/ParcelPrimCountTotal.cs b/Core/Commands/Parcel/ParcelPrimCountTotal.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/ParcelPrimCountTotal.cs rename to Core/Commands/Parcel/ParcelPrimCountTotal.cs diff --git a/Secondbot/Core/Commands/Parcel/ParcelReturnObjects.cs b/Core/Commands/Parcel/ParcelReturnObjects.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/ParcelReturnObjects.cs rename to Core/Commands/Parcel/ParcelReturnObjects.cs diff --git a/Secondbot/Core/Commands/Parcel/ParcelReturnTargeted.cs b/Core/Commands/Parcel/ParcelReturnTargeted.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/ParcelReturnTargeted.cs rename to Core/Commands/Parcel/ParcelReturnTargeted.cs diff --git a/Secondbot/Core/Commands/Parcel/ParcelSetMedia.cs b/Core/Commands/Parcel/ParcelSetMedia.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/ParcelSetMedia.cs rename to Core/Commands/Parcel/ParcelSetMedia.cs diff --git a/Secondbot/Core/Commands/Parcel/SetParcelDesc.cs b/Core/Commands/Parcel/SetParcelDesc.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/SetParcelDesc.cs rename to Core/Commands/Parcel/SetParcelDesc.cs diff --git a/Secondbot/Core/Commands/Parcel/SetParcelFlag.cs b/Core/Commands/Parcel/SetParcelFlag.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/SetParcelFlag.cs rename to Core/Commands/Parcel/SetParcelFlag.cs diff --git a/Secondbot/Core/Commands/Parcel/SetParcelMusic.cs b/Core/Commands/Parcel/SetParcelMusic.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/SetParcelMusic.cs rename to Core/Commands/Parcel/SetParcelMusic.cs diff --git a/Secondbot/Core/Commands/Parcel/SetParcelName.cs b/Core/Commands/Parcel/SetParcelName.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/SetParcelName.cs rename to Core/Commands/Parcel/SetParcelName.cs diff --git a/Secondbot/Core/Commands/Parcel/SetParcelSale.cs b/Core/Commands/Parcel/SetParcelSale.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/SetParcelSale.cs rename to Core/Commands/Parcel/SetParcelSale.cs diff --git a/Secondbot/Core/Commands/Parcel/eject.cs b/Core/Commands/Parcel/eject.cs similarity index 100% rename from Secondbot/Core/Commands/Parcel/eject.cs rename to Core/Commands/Parcel/eject.cs diff --git a/Secondbot/Core/Commands/Prims/RezObject.cs b/Core/Commands/Prims/RezObject.cs similarity index 100% rename from Secondbot/Core/Commands/Prims/RezObject.cs rename to Core/Commands/Prims/RezObject.cs diff --git a/Secondbot/Core/Commands/Prims/TransferInventoryToObject.cs b/Core/Commands/Prims/TransferInventoryToObject.cs similarity index 100% rename from Secondbot/Core/Commands/Prims/TransferInventoryToObject.cs rename to Core/Commands/Prims/TransferInventoryToObject.cs diff --git a/Secondbot/Core/Commands/Prims/UnRezObject.cs b/Core/Commands/Prims/UnRezObject.cs similarity index 100% rename from Secondbot/Core/Commands/Prims/UnRezObject.cs rename to Core/Commands/Prims/UnRezObject.cs diff --git a/Secondbot/Core/Commands/Script/scriptHttp.cs b/Core/Commands/Script/scriptHttp.cs similarity index 100% rename from Secondbot/Core/Commands/Script/scriptHttp.cs rename to Core/Commands/Script/scriptHttp.cs diff --git a/Secondbot/Core/Commands/Script/scriptSend.cs b/Core/Commands/Script/scriptSend.cs similarity index 100% rename from Secondbot/Core/Commands/Script/scriptSend.cs rename to Core/Commands/Script/scriptSend.cs diff --git a/Secondbot/Core/Commands/Self/CickObject.cs b/Core/Commands/Self/CickObject.cs similarity index 100% rename from Secondbot/Core/Commands/Self/CickObject.cs rename to Core/Commands/Self/CickObject.cs diff --git a/Secondbot/Core/Commands/Self/GetLastCommands.cs b/Core/Commands/Self/GetLastCommands.cs similarity index 100% rename from Secondbot/Core/Commands/Self/GetLastCommands.cs rename to Core/Commands/Self/GetLastCommands.cs diff --git a/Secondbot/Core/Commands/Self/Help.cs b/Core/Commands/Self/Help.cs similarity index 100% rename from Secondbot/Core/Commands/Self/Help.cs rename to Core/Commands/Self/Help.cs diff --git a/Secondbot/Core/Commands/Self/PayObject.cs b/Core/Commands/Self/PayObject.cs similarity index 100% rename from Secondbot/Core/Commands/Self/PayObject.cs rename to Core/Commands/Self/PayObject.cs diff --git a/Secondbot/Core/Commands/Self/SetPermFlag.cs b/Core/Commands/Self/SetPermFlag.cs similarity index 100% rename from Secondbot/Core/Commands/Self/SetPermFlag.cs rename to Core/Commands/Self/SetPermFlag.cs diff --git a/Secondbot/Core/Commands/Self/botVersion.cs b/Core/Commands/Self/botVersion.cs similarity index 100% rename from Secondbot/Core/Commands/Self/botVersion.cs rename to Core/Commands/Self/botVersion.cs diff --git a/Secondbot/Core/Commands/Self/logout.cs b/Core/Commands/Self/logout.cs similarity index 100% rename from Secondbot/Core/Commands/Self/logout.cs rename to Core/Commands/Self/logout.cs diff --git a/Secondbot/Core/Commands/Self/pointAt.cs b/Core/Commands/Self/pointAt.cs similarity index 100% rename from Secondbot/Core/Commands/Self/pointAt.cs rename to Core/Commands/Self/pointAt.cs diff --git a/Secondbot/Core/Commands/Self/sit.cs b/Core/Commands/Self/sit.cs similarity index 100% rename from Secondbot/Core/Commands/Self/sit.cs rename to Core/Commands/Self/sit.cs diff --git a/Secondbot/Core/Commands/Self/stand.cs b/Core/Commands/Self/stand.cs similarity index 100% rename from Secondbot/Core/Commands/Self/stand.cs rename to Core/Commands/Self/stand.cs diff --git a/Secondbot/Core/Commands/StreamAdmin/FetchNextNotecard.cs b/Core/Commands/StreamAdmin/FetchNextNotecard.cs similarity index 100% rename from Secondbot/Core/Commands/StreamAdmin/FetchNextNotecard.cs rename to Core/Commands/StreamAdmin/FetchNextNotecard.cs diff --git a/Secondbot/Core/Commands/commandlib.cs b/Core/Commands/commandlib.cs similarity index 100% rename from Secondbot/Core/Commands/commandlib.cs rename to Core/Commands/commandlib.cs diff --git a/Secondbot/Core/Core.csproj b/Core/Core.csproj similarity index 100% rename from Secondbot/Core/Core.csproj rename to Core/Core.csproj diff --git a/Secondbot/Core/RLV/Blacklist/getblacklist.cs b/Core/RLV/Blacklist/getblacklist.cs similarity index 100% rename from Secondbot/Core/RLV/Blacklist/getblacklist.cs rename to Core/RLV/Blacklist/getblacklist.cs diff --git a/Secondbot/Core/RLV/Blacklist/versionnumbl.cs b/Core/RLV/Blacklist/versionnumbl.cs similarity index 100% rename from Secondbot/Core/RLV/Blacklist/versionnumbl.cs rename to Core/RLV/Blacklist/versionnumbl.cs diff --git a/Secondbot/Core/RLV/Camera/camavdist.cs b/Core/RLV/Camera/camavdist.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/camavdist.cs rename to Core/RLV/Camera/camavdist.cs diff --git a/Secondbot/Core/RLV/Camera/camdistmax.cs b/Core/RLV/Camera/camdistmax.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/camdistmax.cs rename to Core/RLV/Camera/camdistmax.cs diff --git a/Secondbot/Core/RLV/Camera/camdistmin.cs b/Core/RLV/Camera/camdistmin.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/camdistmin.cs rename to Core/RLV/Camera/camdistmin.cs diff --git a/Secondbot/Core/RLV/Camera/camdrawalphamax.cs b/Core/RLV/Camera/camdrawalphamax.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/camdrawalphamax.cs rename to Core/RLV/Camera/camdrawalphamax.cs diff --git a/Secondbot/Core/RLV/Camera/camdrawalphamin.cs b/Core/RLV/Camera/camdrawalphamin.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/camdrawalphamin.cs rename to Core/RLV/Camera/camdrawalphamin.cs diff --git a/Secondbot/Core/RLV/Camera/camdrawcolor.cs b/Core/RLV/Camera/camdrawcolor.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/camdrawcolor.cs rename to Core/RLV/Camera/camdrawcolor.cs diff --git a/Secondbot/Core/RLV/Camera/camdrawmax.cs b/Core/RLV/Camera/camdrawmax.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/camdrawmax.cs rename to Core/RLV/Camera/camdrawmax.cs diff --git a/Secondbot/Core/RLV/Camera/camdrawmin.cs b/Core/RLV/Camera/camdrawmin.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/camdrawmin.cs rename to Core/RLV/Camera/camdrawmin.cs diff --git a/Secondbot/Core/RLV/Camera/camtextures.cs b/Core/RLV/Camera/camtextures.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/camtextures.cs rename to Core/RLV/Camera/camtextures.cs diff --git a/Secondbot/Core/RLV/Camera/camunlock.cs b/Core/RLV/Camera/camunlock.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/camunlock.cs rename to Core/RLV/Camera/camunlock.cs diff --git a/Secondbot/Core/RLV/Camera/camzoommax.cs b/Core/RLV/Camera/camzoommax.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/camzoommax.cs rename to Core/RLV/Camera/camzoommax.cs diff --git a/Secondbot/Core/RLV/Camera/camzoommin.cs b/Core/RLV/Camera/camzoommin.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/camzoommin.cs rename to Core/RLV/Camera/camzoommin.cs diff --git a/Secondbot/Core/RLV/Camera/getcam_avdistmax.cs b/Core/RLV/Camera/getcam_avdistmax.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/getcam_avdistmax.cs rename to Core/RLV/Camera/getcam_avdistmax.cs diff --git a/Secondbot/Core/RLV/Camera/getcam_avdistmin.cs b/Core/RLV/Camera/getcam_avdistmin.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/getcam_avdistmin.cs rename to Core/RLV/Camera/getcam_avdistmin.cs diff --git a/Secondbot/Core/RLV/Camera/getcam_fov.cs b/Core/RLV/Camera/getcam_fov.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/getcam_fov.cs rename to Core/RLV/Camera/getcam_fov.cs diff --git a/Secondbot/Core/RLV/Camera/getcam_fovmax.cs b/Core/RLV/Camera/getcam_fovmax.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/getcam_fovmax.cs rename to Core/RLV/Camera/getcam_fovmax.cs diff --git a/Secondbot/Core/RLV/Camera/getcam_fovmin.cs b/Core/RLV/Camera/getcam_fovmin.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/getcam_fovmin.cs rename to Core/RLV/Camera/getcam_fovmin.cs diff --git a/Secondbot/Core/RLV/Camera/getcam_zoommin.cs b/Core/RLV/Camera/getcam_zoommin.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/getcam_zoommin.cs rename to Core/RLV/Camera/getcam_zoommin.cs diff --git a/Secondbot/Core/RLV/Camera/setcam_avdistmax.cs b/Core/RLV/Camera/setcam_avdistmax.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/setcam_avdistmax.cs rename to Core/RLV/Camera/setcam_avdistmax.cs diff --git a/Secondbot/Core/RLV/Camera/setcam_avdistmin.cs b/Core/RLV/Camera/setcam_avdistmin.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/setcam_avdistmin.cs rename to Core/RLV/Camera/setcam_avdistmin.cs diff --git a/Secondbot/Core/RLV/Camera/setcam_fov.cs b/Core/RLV/Camera/setcam_fov.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/setcam_fov.cs rename to Core/RLV/Camera/setcam_fov.cs diff --git a/Secondbot/Core/RLV/Camera/setcam_fovmax.cs b/Core/RLV/Camera/setcam_fovmax.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/setcam_fovmax.cs rename to Core/RLV/Camera/setcam_fovmax.cs diff --git a/Secondbot/Core/RLV/Camera/setcam_fovmin.cs b/Core/RLV/Camera/setcam_fovmin.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/setcam_fovmin.cs rename to Core/RLV/Camera/setcam_fovmin.cs diff --git a/Secondbot/Core/RLV/Camera/setcam_textures.cs b/Core/RLV/Camera/setcam_textures.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/setcam_textures.cs rename to Core/RLV/Camera/setcam_textures.cs diff --git a/Secondbot/Core/RLV/Camera/setcam_unlock.cs b/Core/RLV/Camera/setcam_unlock.cs similarity index 100% rename from Secondbot/Core/RLV/Camera/setcam_unlock.cs rename to Core/RLV/Camera/setcam_unlock.cs diff --git a/Secondbot/Core/RLV/Chat/chatnormal.cs b/Core/RLV/Chat/chatnormal.cs similarity index 100% rename from Secondbot/Core/RLV/Chat/chatnormal.cs rename to Core/RLV/Chat/chatnormal.cs diff --git a/Secondbot/Core/RLV/Chat/chatshout.cs b/Core/RLV/Chat/chatshout.cs similarity index 100% rename from Secondbot/Core/RLV/Chat/chatshout.cs rename to Core/RLV/Chat/chatshout.cs diff --git a/Secondbot/Core/RLV/Chat/chatwhisper.cs b/Core/RLV/Chat/chatwhisper.cs similarity index 100% rename from Secondbot/Core/RLV/Chat/chatwhisper.cs rename to Core/RLV/Chat/chatwhisper.cs diff --git a/Secondbot/Core/RLV/Chat/recvchat.cs b/Core/RLV/Chat/recvchat.cs similarity index 100% rename from Secondbot/Core/RLV/Chat/recvchat.cs rename to Core/RLV/Chat/recvchat.cs diff --git a/Secondbot/Core/RLV/Chat/recvchat_sec.cs b/Core/RLV/Chat/recvchat_sec.cs similarity index 100% rename from Secondbot/Core/RLV/Chat/recvchat_sec.cs rename to Core/RLV/Chat/recvchat_sec.cs diff --git a/Secondbot/Core/RLV/Chat/recvchatfrom.cs b/Core/RLV/Chat/recvchatfrom.cs similarity index 100% rename from Secondbot/Core/RLV/Chat/recvchatfrom.cs rename to Core/RLV/Chat/recvchatfrom.cs diff --git a/Secondbot/Core/RLV/Chat/redirchat.cs b/Core/RLV/Chat/redirchat.cs similarity index 100% rename from Secondbot/Core/RLV/Chat/redirchat.cs rename to Core/RLV/Chat/redirchat.cs diff --git a/Secondbot/Core/RLV/Chat/sendchat.cs b/Core/RLV/Chat/sendchat.cs similarity index 100% rename from Secondbot/Core/RLV/Chat/sendchat.cs rename to Core/RLV/Chat/sendchat.cs diff --git a/Secondbot/Core/RLV/Chat/sendgesture.cs b/Core/RLV/Chat/sendgesture.cs similarity index 100% rename from Secondbot/Core/RLV/Chat/sendgesture.cs rename to Core/RLV/Chat/sendgesture.cs diff --git a/Secondbot/Core/RLV/Emotes/emote.cs b/Core/RLV/Emotes/emote.cs similarity index 100% rename from Secondbot/Core/RLV/Emotes/emote.cs rename to Core/RLV/Emotes/emote.cs diff --git a/Secondbot/Core/RLV/Emotes/recvemote.cs b/Core/RLV/Emotes/recvemote.cs similarity index 100% rename from Secondbot/Core/RLV/Emotes/recvemote.cs rename to Core/RLV/Emotes/recvemote.cs diff --git a/Secondbot/Core/RLV/Emotes/recvemote_sec.cs b/Core/RLV/Emotes/recvemote_sec.cs similarity index 100% rename from Secondbot/Core/RLV/Emotes/recvemote_sec.cs rename to Core/RLV/Emotes/recvemote_sec.cs diff --git a/Secondbot/Core/RLV/Emotes/rediremote.cs b/Core/RLV/Emotes/rediremote.cs similarity index 100% rename from Secondbot/Core/RLV/Emotes/rediremote.cs rename to Core/RLV/Emotes/rediremote.cs diff --git a/Secondbot/Core/RLV/InstantMessages/sendim.cs b/Core/RLV/InstantMessages/sendim.cs similarity index 100% rename from Secondbot/Core/RLV/InstantMessages/sendim.cs rename to Core/RLV/InstantMessages/sendim.cs diff --git a/Secondbot/Core/RLV/InstantMessages/sendim_sec.cs b/Core/RLV/InstantMessages/sendim_sec.cs similarity index 100% rename from Secondbot/Core/RLV/InstantMessages/sendim_sec.cs rename to Core/RLV/InstantMessages/sendim_sec.cs diff --git a/Secondbot/Core/RLV/Miscellaneous/clear.cs b/Core/RLV/Miscellaneous/clear.cs similarity index 100% rename from Secondbot/Core/RLV/Miscellaneous/clear.cs rename to Core/RLV/Miscellaneous/clear.cs diff --git a/Secondbot/Core/RLV/Miscellaneous/getstatus.cs b/Core/RLV/Miscellaneous/getstatus.cs similarity index 100% rename from Secondbot/Core/RLV/Miscellaneous/getstatus.cs rename to Core/RLV/Miscellaneous/getstatus.cs diff --git a/Secondbot/Core/RLV/Miscellaneous/getstatusall.cs b/Core/RLV/Miscellaneous/getstatusall.cs similarity index 100% rename from Secondbot/Core/RLV/Miscellaneous/getstatusall.cs rename to Core/RLV/Miscellaneous/getstatusall.cs diff --git a/Secondbot/Core/RLV/Miscellaneous/notify.cs b/Core/RLV/Miscellaneous/notify.cs similarity index 100% rename from Secondbot/Core/RLV/Miscellaneous/notify.cs rename to Core/RLV/Miscellaneous/notify.cs diff --git a/Secondbot/Core/RLV/Miscellaneous/permissive.cs b/Core/RLV/Miscellaneous/permissive.cs similarity index 100% rename from Secondbot/Core/RLV/Miscellaneous/permissive.cs rename to Core/RLV/Miscellaneous/permissive.cs diff --git a/Secondbot/Core/RLV/Movement/adjustheight.cs b/Core/RLV/Movement/adjustheight.cs similarity index 100% rename from Secondbot/Core/RLV/Movement/adjustheight.cs rename to Core/RLV/Movement/adjustheight.cs diff --git a/Secondbot/Core/RLV/Movement/alwaysrun.cs b/Core/RLV/Movement/alwaysrun.cs similarity index 100% rename from Secondbot/Core/RLV/Movement/alwaysrun.cs rename to Core/RLV/Movement/alwaysrun.cs diff --git a/Secondbot/Core/RLV/Movement/fly.cs b/Core/RLV/Movement/fly.cs similarity index 100% rename from Secondbot/Core/RLV/Movement/fly.cs rename to Core/RLV/Movement/fly.cs diff --git a/Secondbot/Core/RLV/Movement/setrot.cs b/Core/RLV/Movement/setrot.cs similarity index 100% rename from Secondbot/Core/RLV/Movement/setrot.cs rename to Core/RLV/Movement/setrot.cs diff --git a/Secondbot/Core/RLV/Movement/temprun.cs b/Core/RLV/Movement/temprun.cs similarity index 100% rename from Secondbot/Core/RLV/Movement/temprun.cs rename to Core/RLV/Movement/temprun.cs diff --git a/Secondbot/Core/RLV/PrivateChannels/sendchannel.cs b/Core/RLV/PrivateChannels/sendchannel.cs similarity index 100% rename from Secondbot/Core/RLV/PrivateChannels/sendchannel.cs rename to Core/RLV/PrivateChannels/sendchannel.cs diff --git a/Secondbot/Core/RLV/PrivateChannels/sendchannel_except.cs b/Core/RLV/PrivateChannels/sendchannel_except.cs similarity index 100% rename from Secondbot/Core/RLV/PrivateChannels/sendchannel_except.cs rename to Core/RLV/PrivateChannels/sendchannel_except.cs diff --git a/Secondbot/Core/RLV/PrivateChannels/sendchannel_sec.cs b/Core/RLV/PrivateChannels/sendchannel_sec.cs similarity index 100% rename from Secondbot/Core/RLV/PrivateChannels/sendchannel_sec.cs rename to Core/RLV/PrivateChannels/sendchannel_sec.cs diff --git a/Secondbot/Core/RLV/RLV_commandlib.cs b/Core/RLV/RLV_commandlib.cs similarity index 100% rename from Secondbot/Core/RLV/RLV_commandlib.cs rename to Core/RLV/RLV_commandlib.cs diff --git a/Secondbot/Core/RLV/Sitting/getsitid.cs b/Core/RLV/Sitting/getsitid.cs similarity index 100% rename from Secondbot/Core/RLV/Sitting/getsitid.cs rename to Core/RLV/Sitting/getsitid.cs diff --git a/Secondbot/Core/RLV/Sitting/sit.cs b/Core/RLV/Sitting/sit.cs similarity index 100% rename from Secondbot/Core/RLV/Sitting/sit.cs rename to Core/RLV/Sitting/sit.cs diff --git a/Secondbot/Core/RLV/Sitting/unsit.cs b/Core/RLV/Sitting/unsit.cs similarity index 100% rename from Secondbot/Core/RLV/Sitting/unsit.cs rename to Core/RLV/Sitting/unsit.cs diff --git a/Secondbot/Core/RLV/Version/version.cs b/Core/RLV/Version/version.cs similarity index 100% rename from Secondbot/Core/RLV/Version/version.cs rename to Core/RLV/Version/version.cs diff --git a/Secondbot/Core/RLV/Version/versionnew.cs b/Core/RLV/Version/versionnew.cs similarity index 100% rename from Secondbot/Core/RLV/Version/versionnew.cs rename to Core/RLV/Version/versionnew.cs diff --git a/Secondbot/Core/RLV/Version/versionnum.cs b/Core/RLV/Version/versionnum.cs similarity index 100% rename from Secondbot/Core/RLV/Version/versionnum.cs rename to Core/RLV/Version/versionnum.cs diff --git a/Secondbot/Core/Static/Inventory.cs b/Core/Static/Inventory.cs similarity index 100% rename from Secondbot/Core/Static/Inventory.cs rename to Core/Static/Inventory.cs diff --git a/Secondbot/Core/Static/parcel.cs b/Core/Static/parcel.cs similarity index 100% rename from Secondbot/Core/Static/parcel.cs rename to Core/Static/parcel.cs diff --git a/Secondbot/Core/bottypes/AVstorageBot.cs b/Core/bottypes/AVstorageBot.cs similarity index 100% rename from Secondbot/Core/bottypes/AVstorageBot.cs rename to Core/bottypes/AVstorageBot.cs diff --git a/Secondbot/Core/bottypes/ActionsAutoAcceptBot.cs b/Core/bottypes/ActionsAutoAcceptBot.cs similarity index 100% rename from Secondbot/Core/bottypes/ActionsAutoAcceptBot.cs rename to Core/bottypes/ActionsAutoAcceptBot.cs diff --git a/Secondbot/Core/bottypes/AnimationsBot.cs b/Core/bottypes/AnimationsBot.cs similarity index 100% rename from Secondbot/Core/bottypes/AnimationsBot.cs rename to Core/bottypes/AnimationsBot.cs diff --git a/Secondbot/Core/bottypes/AwaitReplyEventBot.cs b/Core/bottypes/AwaitReplyEventBot.cs similarity index 100% rename from Secondbot/Core/bottypes/AwaitReplyEventBot.cs rename to Core/bottypes/AwaitReplyEventBot.cs diff --git a/Secondbot/Core/bottypes/CommandsBot.cs b/Core/bottypes/CommandsBot.cs similarity index 100% rename from Secondbot/Core/bottypes/CommandsBot.cs rename to Core/bottypes/CommandsBot.cs diff --git a/Secondbot/Core/bottypes/DialogsBot.cs b/Core/bottypes/DialogsBot.cs similarity index 100% rename from Secondbot/Core/bottypes/DialogsBot.cs rename to Core/bottypes/DialogsBot.cs diff --git a/Secondbot/Core/bottypes/EventsBot.cs b/Core/bottypes/EventsBot.cs similarity index 100% rename from Secondbot/Core/bottypes/EventsBot.cs rename to Core/bottypes/EventsBot.cs diff --git a/Secondbot/Core/bottypes/Log2FileBot.cs b/Core/bottypes/Log2FileBot.cs similarity index 100% rename from Secondbot/Core/bottypes/Log2FileBot.cs rename to Core/bottypes/Log2FileBot.cs diff --git a/Secondbot/Core/bottypes/MessageSwitcherBot.cs b/Core/bottypes/MessageSwitcherBot.cs similarity index 100% rename from Secondbot/Core/bottypes/MessageSwitcherBot.cs rename to Core/bottypes/MessageSwitcherBot.cs diff --git a/Secondbot/Core/bottypes/RLVbot.cs b/Core/bottypes/RLVbot.cs similarity index 100% rename from Secondbot/Core/bottypes/RLVbot.cs rename to Core/bottypes/RLVbot.cs diff --git a/Secondbot/Core/bottypes/SecondBot.cs b/Core/bottypes/SecondBot.cs similarity index 100% rename from Secondbot/Core/bottypes/SecondBot.cs rename to Core/bottypes/SecondBot.cs diff --git a/Secondbot/Core/bottypes/VirtualsBot.cs b/Core/bottypes/VirtualsBot.cs similarity index 100% rename from Secondbot/Core/bottypes/VirtualsBot.cs rename to Core/bottypes/VirtualsBot.cs diff --git a/Secondbot/Core/bottypes/athome.cs b/Core/bottypes/athome.cs similarity index 100% rename from Secondbot/Core/bottypes/athome.cs rename to Core/bottypes/athome.cs diff --git a/Secondbot/Core/bottypes/chatrelay.cs b/Core/bottypes/chatrelay.cs similarity index 100% rename from Secondbot/Core/bottypes/chatrelay.cs rename to Core/bottypes/chatrelay.cs diff --git a/Secondbot/Core/bottypes/loadorder.txt b/Core/bottypes/loadorder.txt similarity index 100% rename from Secondbot/Core/bottypes/loadorder.txt rename to Core/bottypes/loadorder.txt diff --git a/Dockerfile b/Dockerfile index 5397dcb..5e492d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,15 +5,15 @@ 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 ["BetterSecondbot/BetterSecondbot.csproj", "BetterSecondbot/"] +COPY ["Core/Core.csproj", "Core/"] +COPY ["Shared/Shared.csproj", "Shared/"] +COPY ["libremetaverse-core/LibreMetaverseTypes/LibreMetaverse.Types.csproj", "libremetaverse-core/LibreMetaverseTypes/"] 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" +RUN dotnet restore "BetterSecondbot/BetterSecondbot.csproj" COPY . . -WORKDIR "/src/Secondbot/BetterSecondbot" +WORKDIR "/src/BetterSecondbot" RUN dotnet build "BetterSecondbot.csproj" -c Release -o /app/build FROM build AS publish @@ -22,7 +22,6 @@ 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='' @@ -70,4 +69,4 @@ ENV ASPNETCORE_URLS http://+:80 # --- End of settings --- -ENTRYPOINT ["/app/BetterSecondBot"] +ENTRYPOINT ["/app/BetterSecondBot"] \ No newline at end of file diff --git a/Secondbot/Shared/Shared.csproj b/Secondbot/Shared/Shared.csproj deleted file mode 100644 index 05f498d..0000000 --- a/Secondbot/Shared/Shared.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - Library - netcoreapp3.1 - - - - - - - - - - - - - diff --git a/Secondbot/Shared/API/API_interface.cs b/Shared/API/API_interface.cs similarity index 100% rename from Secondbot/Shared/API/API_interface.cs rename to Shared/API/API_interface.cs diff --git a/Secondbot/Shared/BotTypes/BasicBot.cs b/Shared/BotTypes/BasicBot.cs similarity index 100% rename from Secondbot/Shared/BotTypes/BasicBot.cs rename to Shared/BotTypes/BasicBot.cs diff --git a/Secondbot/Shared/IO/SimpleIO.cs b/Shared/IO/SimpleIO.cs similarity index 100% rename from Secondbot/Shared/IO/SimpleIO.cs rename to Shared/IO/SimpleIO.cs diff --git a/Secondbot/Shared/Json/JsonConfig.cs b/Shared/Json/JsonConfig.cs similarity index 100% rename from Secondbot/Shared/Json/JsonConfig.cs rename to Shared/Json/JsonConfig.cs diff --git a/Secondbot/Shared/Json/JsonConfigApi.cs b/Shared/Json/JsonConfigApi.cs similarity index 100% rename from Secondbot/Shared/Json/JsonConfigApi.cs rename to Shared/Json/JsonConfigApi.cs diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj new file mode 100644 index 0000000..4bddf02 --- /dev/null +++ b/Shared/Shared.csproj @@ -0,0 +1,18 @@ + + + + Library + netcoreapp3.1 + + + + + + + + + + + + + diff --git a/Secondbot/Shared/Staic/Helpers.cs b/Shared/Staic/Helpers.cs similarity index 100% rename from Secondbot/Shared/Staic/Helpers.cs rename to Shared/Staic/Helpers.cs diff --git a/Secondbot/Shared/Staic/LogFormater.cs b/Shared/Staic/LogFormater.cs similarity index 100% rename from Secondbot/Shared/Staic/LogFormater.cs rename to Shared/Staic/LogFormater.cs