diff --git a/.gitmodules b/.gitmodules index efad6d04a..4b7e54367 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "lib/ImGuiScene"] path = lib/ImGuiScene url = https://github.com/goatcorp/ImGuiScene -[submodule "lib/Discord.Net"] - path = lib/Discord.Net - url = https://github.com/goaaats/Discord.Net.git diff --git a/Dalamud.Injector/Program.cs b/Dalamud.Injector/Program.cs index b517803a3..6ae51f0e4 100644 --- a/Dalamud.Injector/Program.cs +++ b/Dalamud.Injector/Program.cs @@ -9,8 +9,6 @@ using System.Runtime.InteropServices; using System.Text; using System.Threading; using System.Windows.Forms; -using Dalamud.DiscordBot; -using Dalamud.Game.Chat; using EasyHook; using Newtonsoft.Json; diff --git a/Dalamud.sln b/Dalamud.sln index 6ec37ea91..5106fd18d 100644 --- a/Dalamud.sln +++ b/Dalamud.sln @@ -15,14 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImGui.NET-472", "lib\ImGuiS EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Interface", "Interface", "{E15BDA6D-E881-4482-94BA-BE5527E917FF}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DiscordNet", "DiscordNet", "{E1F3D3F5-7820-4A62-A16A-53260375A781}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Rest", "lib\Discord.Net\src\Discord.Net.Rest\Discord.Net.Rest.csproj", "{10E4E5CB-F51E-42EC-B98C-FBCE839D4624}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Core", "lib\Discord.Net\src\Discord.Net.Core\Discord.Net.Core.csproj", "{B46F33B5-9702-434E-A92C-8DE5CF7164E3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.WebSocket", "lib\Discord.Net\src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj", "{AACDC15A-56F8-458F-9C73-DE89F60466AE}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DalamudDebugStub", "DalamudDebugStub\DalamudDebugStub.vcxproj", "{9FDA9A5C-50C6-4333-8DCE-DFEB89363F2A}" EndProject Global @@ -95,42 +87,6 @@ Global {0483026E-C6CE-4B1A-AA68-46544C08140B}.Release|x64.Build.0 = Release|Any CPU {0483026E-C6CE-4B1A-AA68-46544C08140B}.Release|x86.ActiveCfg = Release|Any CPU {0483026E-C6CE-4B1A-AA68-46544C08140B}.Release|x86.Build.0 = Release|Any CPU - {10E4E5CB-F51E-42EC-B98C-FBCE839D4624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10E4E5CB-F51E-42EC-B98C-FBCE839D4624}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10E4E5CB-F51E-42EC-B98C-FBCE839D4624}.Debug|x64.ActiveCfg = Debug|Any CPU - {10E4E5CB-F51E-42EC-B98C-FBCE839D4624}.Debug|x64.Build.0 = Debug|Any CPU - {10E4E5CB-F51E-42EC-B98C-FBCE839D4624}.Debug|x86.ActiveCfg = Debug|Any CPU - {10E4E5CB-F51E-42EC-B98C-FBCE839D4624}.Debug|x86.Build.0 = Debug|Any CPU - {10E4E5CB-F51E-42EC-B98C-FBCE839D4624}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10E4E5CB-F51E-42EC-B98C-FBCE839D4624}.Release|Any CPU.Build.0 = Release|Any CPU - {10E4E5CB-F51E-42EC-B98C-FBCE839D4624}.Release|x64.ActiveCfg = Release|Any CPU - {10E4E5CB-F51E-42EC-B98C-FBCE839D4624}.Release|x64.Build.0 = Release|Any CPU - {10E4E5CB-F51E-42EC-B98C-FBCE839D4624}.Release|x86.ActiveCfg = Release|Any CPU - {10E4E5CB-F51E-42EC-B98C-FBCE839D4624}.Release|x86.Build.0 = Release|Any CPU - {B46F33B5-9702-434E-A92C-8DE5CF7164E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B46F33B5-9702-434E-A92C-8DE5CF7164E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B46F33B5-9702-434E-A92C-8DE5CF7164E3}.Debug|x64.ActiveCfg = Debug|Any CPU - {B46F33B5-9702-434E-A92C-8DE5CF7164E3}.Debug|x64.Build.0 = Debug|Any CPU - {B46F33B5-9702-434E-A92C-8DE5CF7164E3}.Debug|x86.ActiveCfg = Debug|Any CPU - {B46F33B5-9702-434E-A92C-8DE5CF7164E3}.Debug|x86.Build.0 = Debug|Any CPU - {B46F33B5-9702-434E-A92C-8DE5CF7164E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B46F33B5-9702-434E-A92C-8DE5CF7164E3}.Release|Any CPU.Build.0 = Release|Any CPU - {B46F33B5-9702-434E-A92C-8DE5CF7164E3}.Release|x64.ActiveCfg = Release|Any CPU - {B46F33B5-9702-434E-A92C-8DE5CF7164E3}.Release|x64.Build.0 = Release|Any CPU - {B46F33B5-9702-434E-A92C-8DE5CF7164E3}.Release|x86.ActiveCfg = Release|Any CPU - {B46F33B5-9702-434E-A92C-8DE5CF7164E3}.Release|x86.Build.0 = Release|Any CPU - {AACDC15A-56F8-458F-9C73-DE89F60466AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AACDC15A-56F8-458F-9C73-DE89F60466AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AACDC15A-56F8-458F-9C73-DE89F60466AE}.Debug|x64.ActiveCfg = Debug|Any CPU - {AACDC15A-56F8-458F-9C73-DE89F60466AE}.Debug|x64.Build.0 = Debug|Any CPU - {AACDC15A-56F8-458F-9C73-DE89F60466AE}.Debug|x86.ActiveCfg = Debug|Any CPU - {AACDC15A-56F8-458F-9C73-DE89F60466AE}.Debug|x86.Build.0 = Debug|Any CPU - {AACDC15A-56F8-458F-9C73-DE89F60466AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AACDC15A-56F8-458F-9C73-DE89F60466AE}.Release|Any CPU.Build.0 = Release|Any CPU - {AACDC15A-56F8-458F-9C73-DE89F60466AE}.Release|x64.ActiveCfg = Release|Any CPU - {AACDC15A-56F8-458F-9C73-DE89F60466AE}.Release|x64.Build.0 = Release|Any CPU - {AACDC15A-56F8-458F-9C73-DE89F60466AE}.Release|x86.ActiveCfg = Release|Any CPU - {AACDC15A-56F8-458F-9C73-DE89F60466AE}.Release|x86.Build.0 = Release|Any CPU {9FDA9A5C-50C6-4333-8DCE-DFEB89363F2A}.Debug|Any CPU.ActiveCfg = Debug|x64 {9FDA9A5C-50C6-4333-8DCE-DFEB89363F2A}.Debug|Any CPU.Build.0 = Debug|x64 {9FDA9A5C-50C6-4333-8DCE-DFEB89363F2A}.Debug|x64.ActiveCfg = Debug|x64 @@ -151,9 +107,6 @@ Global {C0E7E797-4FBF-4F46-BC57-463F3719BA7A} = {E15BDA6D-E881-4482-94BA-BE5527E917FF} {85480198-8711-4355-830E-72FD794AD3F6} = {E15BDA6D-E881-4482-94BA-BE5527E917FF} {0483026E-C6CE-4B1A-AA68-46544C08140B} = {E15BDA6D-E881-4482-94BA-BE5527E917FF} - {10E4E5CB-F51E-42EC-B98C-FBCE839D4624} = {E1F3D3F5-7820-4A62-A16A-53260375A781} - {B46F33B5-9702-434E-A92C-8DE5CF7164E3} = {E1F3D3F5-7820-4A62-A16A-53260375A781} - {AACDC15A-56F8-458F-9C73-DE89F60466AE} = {E1F3D3F5-7820-4A62-A16A-53260375A781} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {79B65AC9-C940-410E-AB61-7EA7E12C7599} diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj index 2a57b4f8f..15fa097ba 100644 --- a/Dalamud/Dalamud.csproj +++ b/Dalamud/Dalamud.csproj @@ -63,8 +63,6 @@ - - diff --git a/lib/Discord.Net b/lib/Discord.Net deleted file mode 160000 index 819a325ce..000000000 --- a/lib/Discord.Net +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 819a325cec923e4a817ab2f08be5c7bbe0d775d0