diff --git a/.gitignore b/.gitignore index 5dab4e4..7dc54f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ +.idea/ +cmake-build-debug/ +cmake-build-release/ +build/vs17/ + ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. diff --git a/.gitmodules b/.gitmodules index d0c9225..3b3308b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "Jupiter"] - path = Jupiter + path = src/Jupiter url = https://github.com/JAJames/Jupiter.git diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config deleted file mode 100644 index c2abfb4..0000000 --- a/.vs/config/applicationhost.config +++ /dev/null @@ -1,1030 +0,0 @@ - - - - - - - - -
-
-
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
- -
-
- -
-
-
- - -
-
-
-
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Bot/Bot.vcxproj b/Bot/Bot.vcxproj deleted file mode 100644 index 9e350d5..0000000 --- a/Bot/Bot.vcxproj +++ /dev/null @@ -1,35 +0,0 @@ - - - - {C188871B-5F32-4946-B301-24CA2EBB275D} - Bot - - - - - - Application - - - - _CRT_NONSTDC_NO_DEPRECATE;JUPITER_BOT_EXPORTS;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Bot/Bot.vcxproj.filters b/Bot/Bot.vcxproj.filters deleted file mode 100644 index 0ec680a..0000000 --- a/Bot/Bot.vcxproj.filters +++ /dev/null @@ -1,51 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..afd36f2 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,9 @@ +cmake_minimum_required(VERSION 3.0) +project(jupiter_bot) + +set(CMAKE_CXX_STANDARD 11) + +include(build/CMakeLists.txt) + +# Setup source files +add_subdirectory(src) diff --git a/ChannelRelay/ChannelRelay.vcxproj b/ChannelRelay/ChannelRelay.vcxproj deleted file mode 100644 index ce39f8e..0000000 --- a/ChannelRelay/ChannelRelay.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {ADAD973E-EAA8-446D-BCD3-83B53DBC3A3F} - ChannelRelay - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ChannelRelay/ChannelRelay.vcxproj.filters b/ChannelRelay/ChannelRelay.vcxproj.filters deleted file mode 100644 index 23166c8..0000000 --- a/ChannelRelay/ChannelRelay.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/CoreCommands/CoreCommands.vcxproj b/CoreCommands/CoreCommands.vcxproj deleted file mode 100644 index a3fcf60..0000000 --- a/CoreCommands/CoreCommands.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {55F71101-B302-4345-9F9F-3055E805422A} - CoreCommands - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CoreCommands/CoreCommands.vcxproj.filters b/CoreCommands/CoreCommands.vcxproj.filters deleted file mode 100644 index f703931..0000000 --- a/CoreCommands/CoreCommands.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/ExtraCommands/ExtraCommands.vcxproj b/ExtraCommands/ExtraCommands.vcxproj deleted file mode 100644 index 3d06d8c..0000000 --- a/ExtraCommands/ExtraCommands.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {85874531-681D-4F44-8A84-C8E939DA3FCB} - ExtraCommands - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ExtraCommands/ExtraCommands.vcxproj.filters b/ExtraCommands/ExtraCommands.vcxproj.filters deleted file mode 100644 index 1528858..0000000 --- a/ExtraCommands/ExtraCommands.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/FunCommands/FunCommands.vcxproj b/FunCommands/FunCommands.vcxproj deleted file mode 100644 index e0f446b..0000000 --- a/FunCommands/FunCommands.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {80E38D71-CEC5-457F-88EC-24D3097C3470} - FunCommands - - - - - - - - - - - - - - \ No newline at end of file diff --git a/FunCommands/FunCommands.vcxproj.filters b/FunCommands/FunCommands.vcxproj.filters deleted file mode 100644 index ce69fff..0000000 --- a/FunCommands/FunCommands.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/HTTPServer/HTTPServer.vcxproj b/HTTPServer/HTTPServer.vcxproj deleted file mode 100644 index c4e41dd..0000000 --- a/HTTPServer/HTTPServer.vcxproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - {BB048D6F-F001-4E9B-95F4-886081E0807A} - HTTPServer - - - - - - - _CRT_SECURE_NO_WARNINGS;HTTPSERVER_EXPORTS;%(PreprocessorDefinitions) - - - - - - - - - - - - \ No newline at end of file diff --git a/HTTPServer/HTTPServer.vcxproj.filters b/HTTPServer/HTTPServer.vcxproj.filters deleted file mode 100644 index 7378452..0000000 --- a/HTTPServer/HTTPServer.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/IRC.Core/IRC.Core.vcxproj b/IRC.Core/IRC.Core.vcxproj deleted file mode 100644 index 1e34fbe..0000000 --- a/IRC.Core/IRC.Core.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {89368D08-5E06-4530-B82A-AD2BC07B09E7} - IRC.Core - - - - - - - - - - - - - - \ No newline at end of file diff --git a/IRC.Core/IRC.Core.vcxproj.filters b/IRC.Core/IRC.Core.vcxproj.filters deleted file mode 100644 index 84f6b45..0000000 --- a/IRC.Core/IRC.Core.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/Jupiter b/Jupiter deleted file mode 160000 index 2dc2618..0000000 --- a/Jupiter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2dc261835430c7d9257f71c6492367e3e1852866 diff --git a/Jupiter Bot.props b/Jupiter Bot.props deleted file mode 100644 index 68b12c5..0000000 --- a/Jupiter Bot.props +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - 10.0.14393.0 - - - - - - - - - - v141 - Unicode - - - true - - - false - true - - - - - - - - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\ - $(IncludePath) - $(SolutionDir)bin\$(Platform)\$(Configuration)\;$(SolutionDir)bin\$(Platform)\$(Configuration)\Plugins\;$(LibraryPath) - - - - - Level3 - ../Jupiter;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Speed - - - Jupiter.lib;%(AdditionalDependencies) - - - - - Full - - - true - - - - - Disabled - - - true - - - - diff --git a/Jupiter Bot.sln b/Jupiter Bot.sln deleted file mode 100644 index 324a7f7..0000000 --- a/Jupiter Bot.sln +++ /dev/null @@ -1,612 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26228.9 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bot", "Bot\Bot.vcxproj", "{C188871B-5F32-4946-B301-24CA2EBB275D}" - ProjectSection(ProjectDependencies) = postProject - {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8} = {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin.Example", "Plugin.Example\Plugin.Example.vcxproj", "{EA2C0100-5CC5-4416-8216-059833CAACE2}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin.Template", "Plugin.Template\Plugin.Template.vcxproj", "{1DD04156-F096-4C41-9E1C-5BFD3234E9FD}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginManager", "PluginManager\PluginManager.vcxproj", "{9D82C7EE-4167-4F5A-9764-B2C6B0EB9712}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SetJoin", "SetJoin\SetJoin.vcxproj", "{FDBEC4F9-AC8D-4197-BA6C-D042DF218A93}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FunCommands", "FunCommands\FunCommands.vcxproj", "{80E38D71-CEC5-457F-88EC-24D3097C3470}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExtraCommands", "ExtraCommands\ExtraCommands.vcxproj", "{85874531-681D-4F44-8A84-C8E939DA3FCB}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CoreCommands", "CoreCommands\CoreCommands.vcxproj", "{55F71101-B302-4345-9F9F-3055E805422A}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Core", "RenX.Core\RenX.Core.vcxproj", "{9103DF3D-8B4A-48E5-A6B3-CBE2554630E2}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Commands", "RenX.Commands\RenX.Commands.vcxproj", "{72B6B5A6-4267-4FED-9F96-917C7974CE25}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Plugin.Template", "RenX.Plugin.Template\RenX.Plugin.Template.vcxproj", "{6F575493-CF43-43CB-8062-9F3D0722A624}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Logging", "RenX.Logging\RenX.Logging.vcxproj", "{069D6053-F39A-4418-BAA3-FA8D260C83D1}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.ExcessiveHeadshots", "RenX.ExcessiveHeadshots\RenX.ExcessiveHeadshots.vcxproj", "{0F71052A-A773-4AB5-AE2A-50DBDFB9CF9E}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.ExtraLogging", "RenX.ExtraLogging\RenX.ExtraLogging.vcxproj", "{CEFD949E-BCF2-4EDB-8168-0920924FE2D8}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Announcements", "RenX.Announcements\RenX.Announcements.vcxproj", "{EF55A6DC-1861-4037-868A-9557ECAEBC27}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{844CF9EF-70F3-449D-ACF3-A70D3501A775}" - ProjectSection(SolutionItems) = preProject - RenX.Greetings\RenX.Greetings.vcxproj = RenX.Greetings\RenX.Greetings.vcxproj - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Medals", "RenX.Medals\RenX.Medals.vcxproj", "{C295FFC2-8CE5-4387-B237-E4E1B1AB9987}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.SetJoin", "RenX.SetJoin\RenX.SetJoin.vcxproj", "{0489F164-DC8F-433C-8CFA-F7EB2A3356F1}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Greetings", "RenX.Greetings\RenX.Greetings.vcxproj", "{8709993F-B08A-4156-BD93-581F297FE0A4}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.IRCJoin", "RenX.IRCJoin\RenX.IRCJoin.vcxproj", "{672B3FC9-0B31-45B4-AAB6-669073F2D291}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.ModSystem", "RenX.ModSystem\RenX.ModSystem.vcxproj", "{160CD71B-1E13-4816-9977-8BBD73871F31}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Warn", "RenX.Warn\RenX.Warn.vcxproj", "{41C67B8B-D84D-42C2-B174-200B2ACB19C0}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.NicknameUUID", "RenX.NicknameUUID\RenX.NicknameUUID.vcxproj", "{553C70DE-37B7-4C31-985B-591BEC238C9D}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.HybridUUID", "RenX.HybridUUID\RenX.HybridUUID.vcxproj", "{FF61361F-CB09-4C72-80E2-9CA2DA63910E}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Listen", "RenX.Listen\RenX.Listen.vcxproj", "{DA05D8B5-5E24-410E-A201-CC5905E327D3}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ChannelRelay", "ChannelRelay\ChannelRelay.vcxproj", "{ADAD973E-EAA8-446D-BCD3-83B53DBC3A3F}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Ladder", "RenX.Ladder\RenX.Ladder.vcxproj", "{B2846BD6-2332-4DA6-A13B-113318F76D5E}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.MinPlayers", "RenX.MinPlayers\RenX.MinPlayers.vcxproj", "{99D34DCB-A484-437C-9FC5-D4051FEDC18C}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.AlwaysRecord", "RenX.AlwaysRecord\RenX.AlwaysRecord.vcxproj", "{C5CDEDF5-BAFB-4D5B-A4DB-4331E13DBD58}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPServer", "HTTPServer\HTTPServer.vcxproj", "{BB048D6F-F001-4E9B-95F4-886081E0807A}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Ladder.Web", "RenX.Ladder.Web\RenX.Ladder.Web.vcxproj", "{57661A2A-EE94-4E9C-B792-AB756533DEFA}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - {BB048D6F-F001-4E9B-95F4-886081E0807A} = {BB048D6F-F001-4E9B-95F4-886081E0807A} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Ladder.All-Time", "RenX.Ladder.All-Time\RenX.Ladder.All-Time.vcxproj", "{24B039D0-5A71-4F76-8908-BAD772FDBE1A}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Ladder.Monthly", "RenX.Ladder.Monthly\RenX.Ladder.Monthly.vcxproj", "{34FDE301-A29D-44ED-8ECC-15693F137DE2}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Ladder.Yearly", "RenX.Ladder.Yearly\RenX.Ladder.Yearly.vcxproj", "{075AF69B-71D6-43B9-B102-4649CB2CA40C}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Ladder.Weekly", "RenX.Ladder.Weekly\RenX.Ladder.Weekly.vcxproj", "{6F0141F3-CF64-47D9-8EC2-80A38FAFDAC7}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.Ladder.Daily", "RenX.Ladder.Daily\RenX.Ladder.Daily.vcxproj", "{73F0EEF6-CE5E-46EB-80B4-2B319AE2B258}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenX.ServerList", "RenX.ServerList\RenX.ServerList.vcxproj", "{6B0D59BA-B153-4DE8-8DD4-FBE5D810B033}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - {BB048D6F-F001-4E9B-95F4-886081E0807A} = {BB048D6F-F001-4E9B-95F4-886081E0807A} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IRC.Core", "IRC.Core\IRC.Core.vcxproj", "{89368D08-5E06-4530-B82A-AD2BC07B09E7}" - ProjectSection(ProjectDependencies) = postProject - {C188871B-5F32-4946-B301-24CA2EBB275D} = {C188871B-5F32-4946-B301-24CA2EBB275D} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jupiter", "Jupiter\Jupiter\Jupiter.vcxproj", "{367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tester", "Jupiter\Tester\Tester.vcxproj", "{0F041791-1047-4C6A-A4C1-814E6957D5EB}" - ProjectSection(ProjectDependencies) = postProject - {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8} = {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Jupiter", "Jupiter", "{531C0AB6-298D-4439-939A-38EE4F4E99CF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RenX", "RenX", "{A028FD55-A97C-42FE-9199-FD9E95F57700}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IRC", "IRC", "{C7A6B4EC-6A37-4027-B9B1-84294440DE7A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HTTP", "HTTP", "{C2EC0FC0-30E4-46AD-8D80-3AC8C05B7644}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Commands", "Commands", "{963CB590-B810-4DEE-8AA2-01077634616C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bot", "Bot", "{434670E6-C23F-4C53-B77F-64ABAB831AF3}" - ProjectSection(SolutionItems) = preProject - Jupiter Bot.props = Jupiter Bot.props - Plugin.props = Plugin.props - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C188871B-5F32-4946-B301-24CA2EBB275D}.Debug|Win32.ActiveCfg = Debug|Win32 - {C188871B-5F32-4946-B301-24CA2EBB275D}.Debug|Win32.Build.0 = Debug|Win32 - {C188871B-5F32-4946-B301-24CA2EBB275D}.Debug|x64.ActiveCfg = Release|x64 - {C188871B-5F32-4946-B301-24CA2EBB275D}.Debug|x64.Build.0 = Release|x64 - {C188871B-5F32-4946-B301-24CA2EBB275D}.Release|Win32.ActiveCfg = Release|Win32 - {C188871B-5F32-4946-B301-24CA2EBB275D}.Release|Win32.Build.0 = Release|Win32 - {C188871B-5F32-4946-B301-24CA2EBB275D}.Release|x64.ActiveCfg = Release|x64 - {C188871B-5F32-4946-B301-24CA2EBB275D}.Release|x64.Build.0 = Release|x64 - {EA2C0100-5CC5-4416-8216-059833CAACE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {EA2C0100-5CC5-4416-8216-059833CAACE2}.Debug|Win32.Build.0 = Debug|Win32 - {EA2C0100-5CC5-4416-8216-059833CAACE2}.Debug|x64.ActiveCfg = Release|x64 - {EA2C0100-5CC5-4416-8216-059833CAACE2}.Debug|x64.Build.0 = Release|x64 - {EA2C0100-5CC5-4416-8216-059833CAACE2}.Release|Win32.ActiveCfg = Release|Win32 - {EA2C0100-5CC5-4416-8216-059833CAACE2}.Release|Win32.Build.0 = Release|Win32 - {EA2C0100-5CC5-4416-8216-059833CAACE2}.Release|x64.ActiveCfg = Release|x64 - {EA2C0100-5CC5-4416-8216-059833CAACE2}.Release|x64.Build.0 = Release|x64 - {1DD04156-F096-4C41-9E1C-5BFD3234E9FD}.Debug|Win32.ActiveCfg = Debug|Win32 - {1DD04156-F096-4C41-9E1C-5BFD3234E9FD}.Debug|Win32.Build.0 = Debug|Win32 - {1DD04156-F096-4C41-9E1C-5BFD3234E9FD}.Debug|x64.ActiveCfg = Release|x64 - {1DD04156-F096-4C41-9E1C-5BFD3234E9FD}.Debug|x64.Build.0 = Release|x64 - {1DD04156-F096-4C41-9E1C-5BFD3234E9FD}.Release|Win32.ActiveCfg = Release|Win32 - {1DD04156-F096-4C41-9E1C-5BFD3234E9FD}.Release|Win32.Build.0 = Release|Win32 - {1DD04156-F096-4C41-9E1C-5BFD3234E9FD}.Release|x64.ActiveCfg = Release|x64 - {1DD04156-F096-4C41-9E1C-5BFD3234E9FD}.Release|x64.Build.0 = Release|x64 - {9D82C7EE-4167-4F5A-9764-B2C6B0EB9712}.Debug|Win32.ActiveCfg = Debug|Win32 - {9D82C7EE-4167-4F5A-9764-B2C6B0EB9712}.Debug|Win32.Build.0 = Debug|Win32 - {9D82C7EE-4167-4F5A-9764-B2C6B0EB9712}.Debug|x64.ActiveCfg = Release|x64 - {9D82C7EE-4167-4F5A-9764-B2C6B0EB9712}.Debug|x64.Build.0 = Release|x64 - {9D82C7EE-4167-4F5A-9764-B2C6B0EB9712}.Release|Win32.ActiveCfg = Release|Win32 - {9D82C7EE-4167-4F5A-9764-B2C6B0EB9712}.Release|Win32.Build.0 = Release|Win32 - {9D82C7EE-4167-4F5A-9764-B2C6B0EB9712}.Release|x64.ActiveCfg = Release|x64 - {9D82C7EE-4167-4F5A-9764-B2C6B0EB9712}.Release|x64.Build.0 = Release|x64 - {FDBEC4F9-AC8D-4197-BA6C-D042DF218A93}.Debug|Win32.ActiveCfg = Debug|Win32 - {FDBEC4F9-AC8D-4197-BA6C-D042DF218A93}.Debug|Win32.Build.0 = Debug|Win32 - {FDBEC4F9-AC8D-4197-BA6C-D042DF218A93}.Debug|x64.ActiveCfg = Release|x64 - {FDBEC4F9-AC8D-4197-BA6C-D042DF218A93}.Debug|x64.Build.0 = Release|x64 - {FDBEC4F9-AC8D-4197-BA6C-D042DF218A93}.Release|Win32.ActiveCfg = Release|Win32 - {FDBEC4F9-AC8D-4197-BA6C-D042DF218A93}.Release|Win32.Build.0 = Release|Win32 - {FDBEC4F9-AC8D-4197-BA6C-D042DF218A93}.Release|x64.ActiveCfg = Release|x64 - {FDBEC4F9-AC8D-4197-BA6C-D042DF218A93}.Release|x64.Build.0 = Release|x64 - {80E38D71-CEC5-457F-88EC-24D3097C3470}.Debug|Win32.ActiveCfg = Debug|Win32 - {80E38D71-CEC5-457F-88EC-24D3097C3470}.Debug|Win32.Build.0 = Debug|Win32 - {80E38D71-CEC5-457F-88EC-24D3097C3470}.Debug|x64.ActiveCfg = Release|x64 - {80E38D71-CEC5-457F-88EC-24D3097C3470}.Debug|x64.Build.0 = Release|x64 - {80E38D71-CEC5-457F-88EC-24D3097C3470}.Release|Win32.ActiveCfg = Release|Win32 - {80E38D71-CEC5-457F-88EC-24D3097C3470}.Release|Win32.Build.0 = Release|Win32 - {80E38D71-CEC5-457F-88EC-24D3097C3470}.Release|x64.ActiveCfg = Release|x64 - {80E38D71-CEC5-457F-88EC-24D3097C3470}.Release|x64.Build.0 = Release|x64 - {85874531-681D-4F44-8A84-C8E939DA3FCB}.Debug|Win32.ActiveCfg = Debug|Win32 - {85874531-681D-4F44-8A84-C8E939DA3FCB}.Debug|Win32.Build.0 = Debug|Win32 - {85874531-681D-4F44-8A84-C8E939DA3FCB}.Debug|x64.ActiveCfg = Release|x64 - {85874531-681D-4F44-8A84-C8E939DA3FCB}.Debug|x64.Build.0 = Release|x64 - {85874531-681D-4F44-8A84-C8E939DA3FCB}.Release|Win32.ActiveCfg = Release|Win32 - {85874531-681D-4F44-8A84-C8E939DA3FCB}.Release|Win32.Build.0 = Release|Win32 - {85874531-681D-4F44-8A84-C8E939DA3FCB}.Release|x64.ActiveCfg = Release|x64 - {85874531-681D-4F44-8A84-C8E939DA3FCB}.Release|x64.Build.0 = Release|x64 - {55F71101-B302-4345-9F9F-3055E805422A}.Debug|Win32.ActiveCfg = Debug|Win32 - {55F71101-B302-4345-9F9F-3055E805422A}.Debug|Win32.Build.0 = Debug|Win32 - {55F71101-B302-4345-9F9F-3055E805422A}.Debug|x64.ActiveCfg = Release|x64 - {55F71101-B302-4345-9F9F-3055E805422A}.Debug|x64.Build.0 = Release|x64 - {55F71101-B302-4345-9F9F-3055E805422A}.Release|Win32.ActiveCfg = Release|Win32 - {55F71101-B302-4345-9F9F-3055E805422A}.Release|Win32.Build.0 = Release|Win32 - {55F71101-B302-4345-9F9F-3055E805422A}.Release|x64.ActiveCfg = Release|x64 - {55F71101-B302-4345-9F9F-3055E805422A}.Release|x64.Build.0 = Release|x64 - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2}.Debug|Win32.ActiveCfg = Debug|Win32 - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2}.Debug|Win32.Build.0 = Debug|Win32 - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2}.Debug|x64.ActiveCfg = Release|x64 - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2}.Debug|x64.Build.0 = Release|x64 - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2}.Release|Win32.ActiveCfg = Release|Win32 - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2}.Release|Win32.Build.0 = Release|Win32 - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2}.Release|x64.ActiveCfg = Release|x64 - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2}.Release|x64.Build.0 = Release|x64 - {72B6B5A6-4267-4FED-9F96-917C7974CE25}.Debug|Win32.ActiveCfg = Debug|Win32 - {72B6B5A6-4267-4FED-9F96-917C7974CE25}.Debug|Win32.Build.0 = Debug|Win32 - {72B6B5A6-4267-4FED-9F96-917C7974CE25}.Debug|x64.ActiveCfg = Release|x64 - {72B6B5A6-4267-4FED-9F96-917C7974CE25}.Debug|x64.Build.0 = Release|x64 - {72B6B5A6-4267-4FED-9F96-917C7974CE25}.Release|Win32.ActiveCfg = Release|Win32 - {72B6B5A6-4267-4FED-9F96-917C7974CE25}.Release|Win32.Build.0 = Release|Win32 - {72B6B5A6-4267-4FED-9F96-917C7974CE25}.Release|x64.ActiveCfg = Release|x64 - {72B6B5A6-4267-4FED-9F96-917C7974CE25}.Release|x64.Build.0 = Release|x64 - {6F575493-CF43-43CB-8062-9F3D0722A624}.Debug|Win32.ActiveCfg = Debug|Win32 - {6F575493-CF43-43CB-8062-9F3D0722A624}.Debug|Win32.Build.0 = Debug|Win32 - {6F575493-CF43-43CB-8062-9F3D0722A624}.Debug|x64.ActiveCfg = Release|x64 - {6F575493-CF43-43CB-8062-9F3D0722A624}.Debug|x64.Build.0 = Release|x64 - {6F575493-CF43-43CB-8062-9F3D0722A624}.Release|Win32.ActiveCfg = Release|Win32 - {6F575493-CF43-43CB-8062-9F3D0722A624}.Release|Win32.Build.0 = Release|Win32 - {6F575493-CF43-43CB-8062-9F3D0722A624}.Release|x64.ActiveCfg = Release|x64 - {6F575493-CF43-43CB-8062-9F3D0722A624}.Release|x64.Build.0 = Release|x64 - {069D6053-F39A-4418-BAA3-FA8D260C83D1}.Debug|Win32.ActiveCfg = Debug|Win32 - {069D6053-F39A-4418-BAA3-FA8D260C83D1}.Debug|Win32.Build.0 = Debug|Win32 - {069D6053-F39A-4418-BAA3-FA8D260C83D1}.Debug|x64.ActiveCfg = Release|x64 - {069D6053-F39A-4418-BAA3-FA8D260C83D1}.Debug|x64.Build.0 = Release|x64 - {069D6053-F39A-4418-BAA3-FA8D260C83D1}.Release|Win32.ActiveCfg = Release|Win32 - {069D6053-F39A-4418-BAA3-FA8D260C83D1}.Release|Win32.Build.0 = Release|Win32 - {069D6053-F39A-4418-BAA3-FA8D260C83D1}.Release|x64.ActiveCfg = Release|x64 - {069D6053-F39A-4418-BAA3-FA8D260C83D1}.Release|x64.Build.0 = Release|x64 - {0F71052A-A773-4AB5-AE2A-50DBDFB9CF9E}.Debug|Win32.ActiveCfg = Debug|Win32 - {0F71052A-A773-4AB5-AE2A-50DBDFB9CF9E}.Debug|Win32.Build.0 = Debug|Win32 - {0F71052A-A773-4AB5-AE2A-50DBDFB9CF9E}.Debug|x64.ActiveCfg = Release|x64 - {0F71052A-A773-4AB5-AE2A-50DBDFB9CF9E}.Debug|x64.Build.0 = Release|x64 - {0F71052A-A773-4AB5-AE2A-50DBDFB9CF9E}.Release|Win32.ActiveCfg = Release|Win32 - {0F71052A-A773-4AB5-AE2A-50DBDFB9CF9E}.Release|Win32.Build.0 = Release|Win32 - {0F71052A-A773-4AB5-AE2A-50DBDFB9CF9E}.Release|x64.ActiveCfg = Release|x64 - {0F71052A-A773-4AB5-AE2A-50DBDFB9CF9E}.Release|x64.Build.0 = Release|x64 - {CEFD949E-BCF2-4EDB-8168-0920924FE2D8}.Debug|Win32.ActiveCfg = Debug|Win32 - {CEFD949E-BCF2-4EDB-8168-0920924FE2D8}.Debug|Win32.Build.0 = Debug|Win32 - {CEFD949E-BCF2-4EDB-8168-0920924FE2D8}.Debug|x64.ActiveCfg = Release|x64 - {CEFD949E-BCF2-4EDB-8168-0920924FE2D8}.Debug|x64.Build.0 = Release|x64 - {CEFD949E-BCF2-4EDB-8168-0920924FE2D8}.Release|Win32.ActiveCfg = Release|Win32 - {CEFD949E-BCF2-4EDB-8168-0920924FE2D8}.Release|Win32.Build.0 = Release|Win32 - {CEFD949E-BCF2-4EDB-8168-0920924FE2D8}.Release|x64.ActiveCfg = Release|x64 - {CEFD949E-BCF2-4EDB-8168-0920924FE2D8}.Release|x64.Build.0 = Release|x64 - {EF55A6DC-1861-4037-868A-9557ECAEBC27}.Debug|Win32.ActiveCfg = Debug|Win32 - {EF55A6DC-1861-4037-868A-9557ECAEBC27}.Debug|Win32.Build.0 = Debug|Win32 - {EF55A6DC-1861-4037-868A-9557ECAEBC27}.Debug|x64.ActiveCfg = Release|x64 - {EF55A6DC-1861-4037-868A-9557ECAEBC27}.Debug|x64.Build.0 = Release|x64 - {EF55A6DC-1861-4037-868A-9557ECAEBC27}.Release|Win32.ActiveCfg = Release|Win32 - {EF55A6DC-1861-4037-868A-9557ECAEBC27}.Release|Win32.Build.0 = Release|Win32 - {EF55A6DC-1861-4037-868A-9557ECAEBC27}.Release|x64.ActiveCfg = Release|x64 - {EF55A6DC-1861-4037-868A-9557ECAEBC27}.Release|x64.Build.0 = Release|x64 - {C295FFC2-8CE5-4387-B237-E4E1B1AB9987}.Debug|Win32.ActiveCfg = Debug|Win32 - {C295FFC2-8CE5-4387-B237-E4E1B1AB9987}.Debug|Win32.Build.0 = Debug|Win32 - {C295FFC2-8CE5-4387-B237-E4E1B1AB9987}.Debug|x64.ActiveCfg = Release|x64 - {C295FFC2-8CE5-4387-B237-E4E1B1AB9987}.Debug|x64.Build.0 = Release|x64 - {C295FFC2-8CE5-4387-B237-E4E1B1AB9987}.Release|Win32.ActiveCfg = Release|Win32 - {C295FFC2-8CE5-4387-B237-E4E1B1AB9987}.Release|Win32.Build.0 = Release|Win32 - {C295FFC2-8CE5-4387-B237-E4E1B1AB9987}.Release|x64.ActiveCfg = Release|x64 - {C295FFC2-8CE5-4387-B237-E4E1B1AB9987}.Release|x64.Build.0 = Release|x64 - {0489F164-DC8F-433C-8CFA-F7EB2A3356F1}.Debug|Win32.ActiveCfg = Debug|Win32 - {0489F164-DC8F-433C-8CFA-F7EB2A3356F1}.Debug|Win32.Build.0 = Debug|Win32 - {0489F164-DC8F-433C-8CFA-F7EB2A3356F1}.Debug|x64.ActiveCfg = Release|x64 - {0489F164-DC8F-433C-8CFA-F7EB2A3356F1}.Debug|x64.Build.0 = Release|x64 - {0489F164-DC8F-433C-8CFA-F7EB2A3356F1}.Release|Win32.ActiveCfg = Release|Win32 - {0489F164-DC8F-433C-8CFA-F7EB2A3356F1}.Release|Win32.Build.0 = Release|Win32 - {0489F164-DC8F-433C-8CFA-F7EB2A3356F1}.Release|x64.ActiveCfg = Release|x64 - {0489F164-DC8F-433C-8CFA-F7EB2A3356F1}.Release|x64.Build.0 = Release|x64 - {8709993F-B08A-4156-BD93-581F297FE0A4}.Debug|Win32.ActiveCfg = Debug|Win32 - {8709993F-B08A-4156-BD93-581F297FE0A4}.Debug|Win32.Build.0 = Debug|Win32 - {8709993F-B08A-4156-BD93-581F297FE0A4}.Debug|x64.ActiveCfg = Release|x64 - {8709993F-B08A-4156-BD93-581F297FE0A4}.Debug|x64.Build.0 = Release|x64 - {8709993F-B08A-4156-BD93-581F297FE0A4}.Release|Win32.ActiveCfg = Release|Win32 - {8709993F-B08A-4156-BD93-581F297FE0A4}.Release|Win32.Build.0 = Release|Win32 - {8709993F-B08A-4156-BD93-581F297FE0A4}.Release|x64.ActiveCfg = Release|x64 - {8709993F-B08A-4156-BD93-581F297FE0A4}.Release|x64.Build.0 = Release|x64 - {672B3FC9-0B31-45B4-AAB6-669073F2D291}.Debug|Win32.ActiveCfg = Debug|Win32 - {672B3FC9-0B31-45B4-AAB6-669073F2D291}.Debug|Win32.Build.0 = Debug|Win32 - {672B3FC9-0B31-45B4-AAB6-669073F2D291}.Debug|x64.ActiveCfg = Release|x64 - {672B3FC9-0B31-45B4-AAB6-669073F2D291}.Debug|x64.Build.0 = Release|x64 - {672B3FC9-0B31-45B4-AAB6-669073F2D291}.Release|Win32.ActiveCfg = Release|Win32 - {672B3FC9-0B31-45B4-AAB6-669073F2D291}.Release|Win32.Build.0 = Release|Win32 - {672B3FC9-0B31-45B4-AAB6-669073F2D291}.Release|x64.ActiveCfg = Release|x64 - {672B3FC9-0B31-45B4-AAB6-669073F2D291}.Release|x64.Build.0 = Release|x64 - {160CD71B-1E13-4816-9977-8BBD73871F31}.Debug|Win32.ActiveCfg = Debug|Win32 - {160CD71B-1E13-4816-9977-8BBD73871F31}.Debug|Win32.Build.0 = Debug|Win32 - {160CD71B-1E13-4816-9977-8BBD73871F31}.Debug|x64.ActiveCfg = Release|x64 - {160CD71B-1E13-4816-9977-8BBD73871F31}.Debug|x64.Build.0 = Release|x64 - {160CD71B-1E13-4816-9977-8BBD73871F31}.Release|Win32.ActiveCfg = Release|Win32 - {160CD71B-1E13-4816-9977-8BBD73871F31}.Release|Win32.Build.0 = Release|Win32 - {160CD71B-1E13-4816-9977-8BBD73871F31}.Release|x64.ActiveCfg = Release|x64 - {160CD71B-1E13-4816-9977-8BBD73871F31}.Release|x64.Build.0 = Release|x64 - {41C67B8B-D84D-42C2-B174-200B2ACB19C0}.Debug|Win32.ActiveCfg = Debug|Win32 - {41C67B8B-D84D-42C2-B174-200B2ACB19C0}.Debug|Win32.Build.0 = Debug|Win32 - {41C67B8B-D84D-42C2-B174-200B2ACB19C0}.Debug|x64.ActiveCfg = Release|x64 - {41C67B8B-D84D-42C2-B174-200B2ACB19C0}.Debug|x64.Build.0 = Release|x64 - {41C67B8B-D84D-42C2-B174-200B2ACB19C0}.Release|Win32.ActiveCfg = Release|Win32 - {41C67B8B-D84D-42C2-B174-200B2ACB19C0}.Release|Win32.Build.0 = Release|Win32 - {41C67B8B-D84D-42C2-B174-200B2ACB19C0}.Release|x64.ActiveCfg = Release|x64 - {41C67B8B-D84D-42C2-B174-200B2ACB19C0}.Release|x64.Build.0 = Release|x64 - {553C70DE-37B7-4C31-985B-591BEC238C9D}.Debug|Win32.ActiveCfg = Debug|Win32 - {553C70DE-37B7-4C31-985B-591BEC238C9D}.Debug|Win32.Build.0 = Debug|Win32 - {553C70DE-37B7-4C31-985B-591BEC238C9D}.Debug|x64.ActiveCfg = Release|x64 - {553C70DE-37B7-4C31-985B-591BEC238C9D}.Debug|x64.Build.0 = Release|x64 - {553C70DE-37B7-4C31-985B-591BEC238C9D}.Release|Win32.ActiveCfg = Release|Win32 - {553C70DE-37B7-4C31-985B-591BEC238C9D}.Release|Win32.Build.0 = Release|Win32 - {553C70DE-37B7-4C31-985B-591BEC238C9D}.Release|x64.ActiveCfg = Release|x64 - {553C70DE-37B7-4C31-985B-591BEC238C9D}.Release|x64.Build.0 = Release|x64 - {FF61361F-CB09-4C72-80E2-9CA2DA63910E}.Debug|Win32.ActiveCfg = Debug|Win32 - {FF61361F-CB09-4C72-80E2-9CA2DA63910E}.Debug|Win32.Build.0 = Debug|Win32 - {FF61361F-CB09-4C72-80E2-9CA2DA63910E}.Debug|x64.ActiveCfg = Release|x64 - {FF61361F-CB09-4C72-80E2-9CA2DA63910E}.Debug|x64.Build.0 = Release|x64 - {FF61361F-CB09-4C72-80E2-9CA2DA63910E}.Release|Win32.ActiveCfg = Release|Win32 - {FF61361F-CB09-4C72-80E2-9CA2DA63910E}.Release|Win32.Build.0 = Release|Win32 - {FF61361F-CB09-4C72-80E2-9CA2DA63910E}.Release|x64.ActiveCfg = Release|x64 - {FF61361F-CB09-4C72-80E2-9CA2DA63910E}.Release|x64.Build.0 = Release|x64 - {DA05D8B5-5E24-410E-A201-CC5905E327D3}.Debug|Win32.ActiveCfg = Debug|Win32 - {DA05D8B5-5E24-410E-A201-CC5905E327D3}.Debug|Win32.Build.0 = Debug|Win32 - {DA05D8B5-5E24-410E-A201-CC5905E327D3}.Debug|x64.ActiveCfg = Release|x64 - {DA05D8B5-5E24-410E-A201-CC5905E327D3}.Debug|x64.Build.0 = Release|x64 - {DA05D8B5-5E24-410E-A201-CC5905E327D3}.Release|Win32.ActiveCfg = Release|Win32 - {DA05D8B5-5E24-410E-A201-CC5905E327D3}.Release|Win32.Build.0 = Release|Win32 - {DA05D8B5-5E24-410E-A201-CC5905E327D3}.Release|x64.ActiveCfg = Release|x64 - {DA05D8B5-5E24-410E-A201-CC5905E327D3}.Release|x64.Build.0 = Release|x64 - {ADAD973E-EAA8-446D-BCD3-83B53DBC3A3F}.Debug|Win32.ActiveCfg = Debug|Win32 - {ADAD973E-EAA8-446D-BCD3-83B53DBC3A3F}.Debug|Win32.Build.0 = Debug|Win32 - {ADAD973E-EAA8-446D-BCD3-83B53DBC3A3F}.Debug|x64.ActiveCfg = Release|x64 - {ADAD973E-EAA8-446D-BCD3-83B53DBC3A3F}.Debug|x64.Build.0 = Release|x64 - {ADAD973E-EAA8-446D-BCD3-83B53DBC3A3F}.Release|Win32.ActiveCfg = Release|Win32 - {ADAD973E-EAA8-446D-BCD3-83B53DBC3A3F}.Release|Win32.Build.0 = Release|Win32 - {ADAD973E-EAA8-446D-BCD3-83B53DBC3A3F}.Release|x64.ActiveCfg = Release|x64 - {ADAD973E-EAA8-446D-BCD3-83B53DBC3A3F}.Release|x64.Build.0 = Release|x64 - {B2846BD6-2332-4DA6-A13B-113318F76D5E}.Debug|Win32.ActiveCfg = Debug|Win32 - {B2846BD6-2332-4DA6-A13B-113318F76D5E}.Debug|Win32.Build.0 = Debug|Win32 - {B2846BD6-2332-4DA6-A13B-113318F76D5E}.Debug|x64.ActiveCfg = Release|x64 - {B2846BD6-2332-4DA6-A13B-113318F76D5E}.Debug|x64.Build.0 = Release|x64 - {B2846BD6-2332-4DA6-A13B-113318F76D5E}.Release|Win32.ActiveCfg = Release|Win32 - {B2846BD6-2332-4DA6-A13B-113318F76D5E}.Release|Win32.Build.0 = Release|Win32 - {B2846BD6-2332-4DA6-A13B-113318F76D5E}.Release|x64.ActiveCfg = Release|x64 - {B2846BD6-2332-4DA6-A13B-113318F76D5E}.Release|x64.Build.0 = Release|x64 - {99D34DCB-A484-437C-9FC5-D4051FEDC18C}.Debug|Win32.ActiveCfg = Debug|Win32 - {99D34DCB-A484-437C-9FC5-D4051FEDC18C}.Debug|Win32.Build.0 = Debug|Win32 - {99D34DCB-A484-437C-9FC5-D4051FEDC18C}.Debug|x64.ActiveCfg = Release|x64 - {99D34DCB-A484-437C-9FC5-D4051FEDC18C}.Debug|x64.Build.0 = Release|x64 - {99D34DCB-A484-437C-9FC5-D4051FEDC18C}.Release|Win32.ActiveCfg = Release|Win32 - {99D34DCB-A484-437C-9FC5-D4051FEDC18C}.Release|Win32.Build.0 = Release|Win32 - {99D34DCB-A484-437C-9FC5-D4051FEDC18C}.Release|x64.ActiveCfg = Release|x64 - {99D34DCB-A484-437C-9FC5-D4051FEDC18C}.Release|x64.Build.0 = Release|x64 - {C5CDEDF5-BAFB-4D5B-A4DB-4331E13DBD58}.Debug|Win32.ActiveCfg = Debug|Win32 - {C5CDEDF5-BAFB-4D5B-A4DB-4331E13DBD58}.Debug|Win32.Build.0 = Debug|Win32 - {C5CDEDF5-BAFB-4D5B-A4DB-4331E13DBD58}.Debug|x64.ActiveCfg = Release|x64 - {C5CDEDF5-BAFB-4D5B-A4DB-4331E13DBD58}.Debug|x64.Build.0 = Release|x64 - {C5CDEDF5-BAFB-4D5B-A4DB-4331E13DBD58}.Release|Win32.ActiveCfg = Release|Win32 - {C5CDEDF5-BAFB-4D5B-A4DB-4331E13DBD58}.Release|Win32.Build.0 = Release|Win32 - {C5CDEDF5-BAFB-4D5B-A4DB-4331E13DBD58}.Release|x64.ActiveCfg = Release|x64 - {C5CDEDF5-BAFB-4D5B-A4DB-4331E13DBD58}.Release|x64.Build.0 = Release|x64 - {BB048D6F-F001-4E9B-95F4-886081E0807A}.Debug|Win32.ActiveCfg = Debug|Win32 - {BB048D6F-F001-4E9B-95F4-886081E0807A}.Debug|Win32.Build.0 = Debug|Win32 - {BB048D6F-F001-4E9B-95F4-886081E0807A}.Debug|x64.ActiveCfg = Release|x64 - {BB048D6F-F001-4E9B-95F4-886081E0807A}.Debug|x64.Build.0 = Release|x64 - {BB048D6F-F001-4E9B-95F4-886081E0807A}.Release|Win32.ActiveCfg = Release|Win32 - {BB048D6F-F001-4E9B-95F4-886081E0807A}.Release|Win32.Build.0 = Release|Win32 - {BB048D6F-F001-4E9B-95F4-886081E0807A}.Release|x64.ActiveCfg = Release|x64 - {BB048D6F-F001-4E9B-95F4-886081E0807A}.Release|x64.Build.0 = Release|x64 - {57661A2A-EE94-4E9C-B792-AB756533DEFA}.Debug|Win32.ActiveCfg = Debug|Win32 - {57661A2A-EE94-4E9C-B792-AB756533DEFA}.Debug|Win32.Build.0 = Debug|Win32 - {57661A2A-EE94-4E9C-B792-AB756533DEFA}.Debug|x64.ActiveCfg = Release|x64 - {57661A2A-EE94-4E9C-B792-AB756533DEFA}.Debug|x64.Build.0 = Release|x64 - {57661A2A-EE94-4E9C-B792-AB756533DEFA}.Release|Win32.ActiveCfg = Release|Win32 - {57661A2A-EE94-4E9C-B792-AB756533DEFA}.Release|Win32.Build.0 = Release|Win32 - {57661A2A-EE94-4E9C-B792-AB756533DEFA}.Release|x64.ActiveCfg = Release|x64 - {57661A2A-EE94-4E9C-B792-AB756533DEFA}.Release|x64.Build.0 = Release|x64 - {24B039D0-5A71-4F76-8908-BAD772FDBE1A}.Debug|Win32.ActiveCfg = Debug|Win32 - {24B039D0-5A71-4F76-8908-BAD772FDBE1A}.Debug|Win32.Build.0 = Debug|Win32 - {24B039D0-5A71-4F76-8908-BAD772FDBE1A}.Debug|x64.ActiveCfg = Release|x64 - {24B039D0-5A71-4F76-8908-BAD772FDBE1A}.Debug|x64.Build.0 = Release|x64 - {24B039D0-5A71-4F76-8908-BAD772FDBE1A}.Release|Win32.ActiveCfg = Release|Win32 - {24B039D0-5A71-4F76-8908-BAD772FDBE1A}.Release|Win32.Build.0 = Release|Win32 - {24B039D0-5A71-4F76-8908-BAD772FDBE1A}.Release|x64.ActiveCfg = Release|x64 - {24B039D0-5A71-4F76-8908-BAD772FDBE1A}.Release|x64.Build.0 = Release|x64 - {34FDE301-A29D-44ED-8ECC-15693F137DE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {34FDE301-A29D-44ED-8ECC-15693F137DE2}.Debug|Win32.Build.0 = Debug|Win32 - {34FDE301-A29D-44ED-8ECC-15693F137DE2}.Debug|x64.ActiveCfg = Release|x64 - {34FDE301-A29D-44ED-8ECC-15693F137DE2}.Debug|x64.Build.0 = Release|x64 - {34FDE301-A29D-44ED-8ECC-15693F137DE2}.Release|Win32.ActiveCfg = Release|Win32 - {34FDE301-A29D-44ED-8ECC-15693F137DE2}.Release|Win32.Build.0 = Release|Win32 - {34FDE301-A29D-44ED-8ECC-15693F137DE2}.Release|x64.ActiveCfg = Release|x64 - {34FDE301-A29D-44ED-8ECC-15693F137DE2}.Release|x64.Build.0 = Release|x64 - {075AF69B-71D6-43B9-B102-4649CB2CA40C}.Debug|Win32.ActiveCfg = Debug|Win32 - {075AF69B-71D6-43B9-B102-4649CB2CA40C}.Debug|Win32.Build.0 = Debug|Win32 - {075AF69B-71D6-43B9-B102-4649CB2CA40C}.Debug|x64.ActiveCfg = Release|x64 - {075AF69B-71D6-43B9-B102-4649CB2CA40C}.Debug|x64.Build.0 = Release|x64 - {075AF69B-71D6-43B9-B102-4649CB2CA40C}.Release|Win32.ActiveCfg = Release|Win32 - {075AF69B-71D6-43B9-B102-4649CB2CA40C}.Release|Win32.Build.0 = Release|Win32 - {075AF69B-71D6-43B9-B102-4649CB2CA40C}.Release|x64.ActiveCfg = Release|x64 - {075AF69B-71D6-43B9-B102-4649CB2CA40C}.Release|x64.Build.0 = Release|x64 - {6F0141F3-CF64-47D9-8EC2-80A38FAFDAC7}.Debug|Win32.ActiveCfg = Debug|Win32 - {6F0141F3-CF64-47D9-8EC2-80A38FAFDAC7}.Debug|Win32.Build.0 = Debug|Win32 - {6F0141F3-CF64-47D9-8EC2-80A38FAFDAC7}.Debug|x64.ActiveCfg = Release|x64 - {6F0141F3-CF64-47D9-8EC2-80A38FAFDAC7}.Debug|x64.Build.0 = Release|x64 - {6F0141F3-CF64-47D9-8EC2-80A38FAFDAC7}.Release|Win32.ActiveCfg = Release|Win32 - {6F0141F3-CF64-47D9-8EC2-80A38FAFDAC7}.Release|Win32.Build.0 = Release|Win32 - {6F0141F3-CF64-47D9-8EC2-80A38FAFDAC7}.Release|x64.ActiveCfg = Release|x64 - {6F0141F3-CF64-47D9-8EC2-80A38FAFDAC7}.Release|x64.Build.0 = Release|x64 - {73F0EEF6-CE5E-46EB-80B4-2B319AE2B258}.Debug|Win32.ActiveCfg = Debug|Win32 - {73F0EEF6-CE5E-46EB-80B4-2B319AE2B258}.Debug|Win32.Build.0 = Debug|Win32 - {73F0EEF6-CE5E-46EB-80B4-2B319AE2B258}.Debug|x64.ActiveCfg = Release|x64 - {73F0EEF6-CE5E-46EB-80B4-2B319AE2B258}.Debug|x64.Build.0 = Release|x64 - {73F0EEF6-CE5E-46EB-80B4-2B319AE2B258}.Release|Win32.ActiveCfg = Release|Win32 - {73F0EEF6-CE5E-46EB-80B4-2B319AE2B258}.Release|Win32.Build.0 = Release|Win32 - {73F0EEF6-CE5E-46EB-80B4-2B319AE2B258}.Release|x64.ActiveCfg = Release|x64 - {73F0EEF6-CE5E-46EB-80B4-2B319AE2B258}.Release|x64.Build.0 = Release|x64 - {6B0D59BA-B153-4DE8-8DD4-FBE5D810B033}.Debug|Win32.ActiveCfg = Debug|Win32 - {6B0D59BA-B153-4DE8-8DD4-FBE5D810B033}.Debug|Win32.Build.0 = Debug|Win32 - {6B0D59BA-B153-4DE8-8DD4-FBE5D810B033}.Debug|x64.ActiveCfg = Release|x64 - {6B0D59BA-B153-4DE8-8DD4-FBE5D810B033}.Debug|x64.Build.0 = Release|x64 - {6B0D59BA-B153-4DE8-8DD4-FBE5D810B033}.Release|Win32.ActiveCfg = Release|Win32 - {6B0D59BA-B153-4DE8-8DD4-FBE5D810B033}.Release|Win32.Build.0 = Release|Win32 - {6B0D59BA-B153-4DE8-8DD4-FBE5D810B033}.Release|x64.ActiveCfg = Release|x64 - {6B0D59BA-B153-4DE8-8DD4-FBE5D810B033}.Release|x64.Build.0 = Release|x64 - {89368D08-5E06-4530-B82A-AD2BC07B09E7}.Debug|Win32.ActiveCfg = Debug|Win32 - {89368D08-5E06-4530-B82A-AD2BC07B09E7}.Debug|Win32.Build.0 = Debug|Win32 - {89368D08-5E06-4530-B82A-AD2BC07B09E7}.Debug|x64.ActiveCfg = Release|x64 - {89368D08-5E06-4530-B82A-AD2BC07B09E7}.Debug|x64.Build.0 = Release|x64 - {89368D08-5E06-4530-B82A-AD2BC07B09E7}.Release|Win32.ActiveCfg = Release|Win32 - {89368D08-5E06-4530-B82A-AD2BC07B09E7}.Release|Win32.Build.0 = Release|Win32 - {89368D08-5E06-4530-B82A-AD2BC07B09E7}.Release|x64.ActiveCfg = Release|x64 - {89368D08-5E06-4530-B82A-AD2BC07B09E7}.Release|x64.Build.0 = Release|x64 - {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Debug|Win32.ActiveCfg = Debug|Win32 - {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Debug|Win32.Build.0 = Debug|Win32 - {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Debug|Win32.Deploy.0 = Debug|Win32 - {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Debug|x64.ActiveCfg = Release|x64 - {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Debug|x64.Build.0 = Release|x64 - {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Release|Win32.ActiveCfg = Release|Win32 - {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Release|Win32.Build.0 = Release|Win32 - {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Release|x64.ActiveCfg = Release|x64 - {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Release|x64.Build.0 = Release|x64 - {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Debug|Win32.ActiveCfg = Debug|Win32 - {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Debug|Win32.Build.0 = Debug|Win32 - {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Debug|x64.ActiveCfg = Release|x64 - {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Debug|x64.Build.0 = Release|x64 - {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Release|Win32.ActiveCfg = Release|Win32 - {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Release|Win32.Build.0 = Release|Win32 - {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Release|x64.ActiveCfg = Release|x64 - {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {C188871B-5F32-4946-B301-24CA2EBB275D} = {434670E6-C23F-4C53-B77F-64ABAB831AF3} - {EA2C0100-5CC5-4416-8216-059833CAACE2} = {434670E6-C23F-4C53-B77F-64ABAB831AF3} - {1DD04156-F096-4C41-9E1C-5BFD3234E9FD} = {434670E6-C23F-4C53-B77F-64ABAB831AF3} - {9D82C7EE-4167-4F5A-9764-B2C6B0EB9712} = {963CB590-B810-4DEE-8AA2-01077634616C} - {FDBEC4F9-AC8D-4197-BA6C-D042DF218A93} = {C7A6B4EC-6A37-4027-B9B1-84294440DE7A} - {80E38D71-CEC5-457F-88EC-24D3097C3470} = {963CB590-B810-4DEE-8AA2-01077634616C} - {85874531-681D-4F44-8A84-C8E939DA3FCB} = {963CB590-B810-4DEE-8AA2-01077634616C} - {55F71101-B302-4345-9F9F-3055E805422A} = {963CB590-B810-4DEE-8AA2-01077634616C} - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {72B6B5A6-4267-4FED-9F96-917C7974CE25} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {6F575493-CF43-43CB-8062-9F3D0722A624} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {069D6053-F39A-4418-BAA3-FA8D260C83D1} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {0F71052A-A773-4AB5-AE2A-50DBDFB9CF9E} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {CEFD949E-BCF2-4EDB-8168-0920924FE2D8} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {EF55A6DC-1861-4037-868A-9557ECAEBC27} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {C295FFC2-8CE5-4387-B237-E4E1B1AB9987} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {0489F164-DC8F-433C-8CFA-F7EB2A3356F1} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {8709993F-B08A-4156-BD93-581F297FE0A4} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {672B3FC9-0B31-45B4-AAB6-669073F2D291} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {160CD71B-1E13-4816-9977-8BBD73871F31} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {41C67B8B-D84D-42C2-B174-200B2ACB19C0} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {553C70DE-37B7-4C31-985B-591BEC238C9D} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {FF61361F-CB09-4C72-80E2-9CA2DA63910E} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {DA05D8B5-5E24-410E-A201-CC5905E327D3} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {ADAD973E-EAA8-446D-BCD3-83B53DBC3A3F} = {C7A6B4EC-6A37-4027-B9B1-84294440DE7A} - {B2846BD6-2332-4DA6-A13B-113318F76D5E} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {99D34DCB-A484-437C-9FC5-D4051FEDC18C} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {C5CDEDF5-BAFB-4D5B-A4DB-4331E13DBD58} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {BB048D6F-F001-4E9B-95F4-886081E0807A} = {C2EC0FC0-30E4-46AD-8D80-3AC8C05B7644} - {57661A2A-EE94-4E9C-B792-AB756533DEFA} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {24B039D0-5A71-4F76-8908-BAD772FDBE1A} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {34FDE301-A29D-44ED-8ECC-15693F137DE2} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {075AF69B-71D6-43B9-B102-4649CB2CA40C} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {6F0141F3-CF64-47D9-8EC2-80A38FAFDAC7} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {73F0EEF6-CE5E-46EB-80B4-2B319AE2B258} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {6B0D59BA-B153-4DE8-8DD4-FBE5D810B033} = {A028FD55-A97C-42FE-9199-FD9E95F57700} - {89368D08-5E06-4530-B82A-AD2BC07B09E7} = {C7A6B4EC-6A37-4027-B9B1-84294440DE7A} - {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8} = {531C0AB6-298D-4439-939A-38EE4F4E99CF} - {0F041791-1047-4C6A-A4C1-814E6957D5EB} = {531C0AB6-298D-4439-939A-38EE4F4E99CF} - EndGlobalSection -EndGlobal diff --git a/Plugin.Example/Plugin.Example.vcxproj b/Plugin.Example/Plugin.Example.vcxproj deleted file mode 100644 index 2df1c05..0000000 --- a/Plugin.Example/Plugin.Example.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {EA2C0100-5CC5-4416-8216-059833CAACE2} - PluginExample - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugin.Example/Plugin.Example.vcxproj.filters b/Plugin.Example/Plugin.Example.vcxproj.filters deleted file mode 100644 index d8f8e49..0000000 --- a/Plugin.Example/Plugin.Example.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/Plugin.Template/Plugin.Template.vcxproj b/Plugin.Template/Plugin.Template.vcxproj deleted file mode 100644 index e833ca4..0000000 --- a/Plugin.Template/Plugin.Template.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {1DD04156-F096-4C41-9E1C-5BFD3234E9FD} - PluginExample - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugin.Template/Plugin.Template.vcxproj.filters b/Plugin.Template/Plugin.Template.vcxproj.filters deleted file mode 100644 index d8f8e49..0000000 --- a/Plugin.Template/Plugin.Template.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/Plugin.props b/Plugin.props deleted file mode 100644 index 2e9dc5a..0000000 --- a/Plugin.props +++ /dev/null @@ -1,25 +0,0 @@ - - - - DynamicLibrary - - - - - - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\Plugins\ - $(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\ - - - - - ../Bot;%(AdditionalIncludeDirectories) - - - Bot.lib;%(AdditionalDependencies) - - - - diff --git a/PluginManager/PluginManager.vcxproj b/PluginManager/PluginManager.vcxproj deleted file mode 100644 index 66f4ca5..0000000 --- a/PluginManager/PluginManager.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {9D82C7EE-4167-4F5A-9764-B2C6B0EB9712} - PluginManager - - - - - - - - - - - - - - \ No newline at end of file diff --git a/PluginManager/PluginManager.vcxproj.filters b/PluginManager/PluginManager.vcxproj.filters deleted file mode 100644 index e0c94be..0000000 --- a/PluginManager/PluginManager.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/RenX.AlwaysRecord/RenX.AlwaysRecord.vcxproj b/RenX.AlwaysRecord/RenX.AlwaysRecord.vcxproj deleted file mode 100644 index bf93e37..0000000 --- a/RenX.AlwaysRecord/RenX.AlwaysRecord.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {C5CDEDF5-BAFB-4D5B-A4DB-4331E13DBD58} - RenX.AlwaysRecord - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.AlwaysRecord/RenX.AlwaysRecord.vcxproj.filters b/RenX.AlwaysRecord/RenX.AlwaysRecord.vcxproj.filters deleted file mode 100644 index 33b9987..0000000 --- a/RenX.AlwaysRecord/RenX.AlwaysRecord.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/RenX.Announcements/RenX.Announcements.vcxproj b/RenX.Announcements/RenX.Announcements.vcxproj deleted file mode 100644 index 4dc7a61..0000000 --- a/RenX.Announcements/RenX.Announcements.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {EF55A6DC-1861-4037-868A-9557ECAEBC27} - RenX.Announcements - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Announcements/RenX.Announcements.vcxproj.filters b/RenX.Announcements/RenX.Announcements.vcxproj.filters deleted file mode 100644 index 3873ea9..0000000 --- a/RenX.Announcements/RenX.Announcements.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/RenX.Commands/RenX.Commands.vcxproj b/RenX.Commands/RenX.Commands.vcxproj deleted file mode 100644 index b587f92..0000000 --- a/RenX.Commands/RenX.Commands.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {72B6B5A6-4267-4FED-9F96-917C7974CE25} - RenX.Commands - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Commands/RenX.Commands.vcxproj.filters b/RenX.Commands/RenX.Commands.vcxproj.filters deleted file mode 100644 index 44e9026..0000000 --- a/RenX.Commands/RenX.Commands.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/RenX.Core/RenX.Core.vcxproj b/RenX.Core/RenX.Core.vcxproj deleted file mode 100644 index efabb05..0000000 --- a/RenX.Core/RenX.Core.vcxproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - {9103DF3D-8B4A-48E5-A6B3-CBE2554630E2} - RenX.Core - - - - - - - RENX_EXPORTS;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Core/RenX.Core.vcxproj.filters b/RenX.Core/RenX.Core.vcxproj.filters deleted file mode 100644 index 112ba59..0000000 --- a/RenX.Core/RenX.Core.vcxproj.filters +++ /dev/null @@ -1,93 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/RenX.ExcessiveHeadshots/RenX.ExcessiveHeadshots.vcxproj b/RenX.ExcessiveHeadshots/RenX.ExcessiveHeadshots.vcxproj deleted file mode 100644 index 067876c..0000000 --- a/RenX.ExcessiveHeadshots/RenX.ExcessiveHeadshots.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {0F71052A-A773-4AB5-AE2A-50DBDFB9CF9E} - RenX.ExcessiveHeadshots - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.ExcessiveHeadshots/RenX.ExcessiveHeadshots.vcxproj.filters b/RenX.ExcessiveHeadshots/RenX.ExcessiveHeadshots.vcxproj.filters deleted file mode 100644 index ee1b3b9..0000000 --- a/RenX.ExcessiveHeadshots/RenX.ExcessiveHeadshots.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/RenX.ExtraLogging/RenX.ExtraLogging.vcxproj b/RenX.ExtraLogging/RenX.ExtraLogging.vcxproj deleted file mode 100644 index bc1f01d..0000000 --- a/RenX.ExtraLogging/RenX.ExtraLogging.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {CEFD949E-BCF2-4EDB-8168-0920924FE2D8} - RenX.ExtraLogging - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.ExtraLogging/RenX.ExtraLogging.vcxproj.filters b/RenX.ExtraLogging/RenX.ExtraLogging.vcxproj.filters deleted file mode 100644 index 69827b7..0000000 --- a/RenX.ExtraLogging/RenX.ExtraLogging.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/RenX.Greetings/RenX.Greetings.vcxproj b/RenX.Greetings/RenX.Greetings.vcxproj deleted file mode 100644 index 3a26dcd..0000000 --- a/RenX.Greetings/RenX.Greetings.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {8709993F-B08A-4156-BD93-581F297FE0A4} - RenX.Greetings - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Greetings/RenX.Greetings.vcxproj.filters b/RenX.Greetings/RenX.Greetings.vcxproj.filters deleted file mode 100644 index ebe475e..0000000 --- a/RenX.Greetings/RenX.Greetings.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/RenX.HybridUUID/RenX.HybridUUID.vcxproj b/RenX.HybridUUID/RenX.HybridUUID.vcxproj deleted file mode 100644 index 134d3e1..0000000 --- a/RenX.HybridUUID/RenX.HybridUUID.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {FF61361F-CB09-4C72-80E2-9CA2DA63910E} - RenX.HybridUUID - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.HybridUUID/RenX.HybridUUID.vcxproj.filters b/RenX.HybridUUID/RenX.HybridUUID.vcxproj.filters deleted file mode 100644 index 614996a..0000000 --- a/RenX.HybridUUID/RenX.HybridUUID.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/RenX.IRCJoin/RenX.IRCJoin.vcxproj b/RenX.IRCJoin/RenX.IRCJoin.vcxproj deleted file mode 100644 index c75236b..0000000 --- a/RenX.IRCJoin/RenX.IRCJoin.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {672B3FC9-0B31-45B4-AAB6-669073F2D291} - RenX.IRCJoin - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.IRCJoin/RenX.IRCJoin.vcxproj.filters b/RenX.IRCJoin/RenX.IRCJoin.vcxproj.filters deleted file mode 100644 index 155c61b..0000000 --- a/RenX.IRCJoin/RenX.IRCJoin.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/RenX.Ladder.All-Time/RenX.Ladder.All-Time.vcxproj b/RenX.Ladder.All-Time/RenX.Ladder.All-Time.vcxproj deleted file mode 100644 index 96803e6..0000000 --- a/RenX.Ladder.All-Time/RenX.Ladder.All-Time.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {24B039D0-5A71-4F76-8908-BAD772FDBE1A} - RenX.Ladder.All-Time - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Ladder.All-Time/RenX.Ladder.All-Time.vcxproj.filters b/RenX.Ladder.All-Time/RenX.Ladder.All-Time.vcxproj.filters deleted file mode 100644 index 3709421..0000000 --- a/RenX.Ladder.All-Time/RenX.Ladder.All-Time.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/RenX.Ladder.Daily/RenX.Ladder.Daily.vcxproj b/RenX.Ladder.Daily/RenX.Ladder.Daily.vcxproj deleted file mode 100644 index c1df958..0000000 --- a/RenX.Ladder.Daily/RenX.Ladder.Daily.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {73F0EEF6-CE5E-46EB-80B4-2B319AE2B258} - RenX.Ladder.Daily - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Ladder.Daily/RenX.Ladder.Daily.vcxproj.filters b/RenX.Ladder.Daily/RenX.Ladder.Daily.vcxproj.filters deleted file mode 100644 index be18db7..0000000 --- a/RenX.Ladder.Daily/RenX.Ladder.Daily.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/RenX.Ladder.Monthly/RenX.Ladder.Monthly.vcxproj b/RenX.Ladder.Monthly/RenX.Ladder.Monthly.vcxproj deleted file mode 100644 index 4ae3ed0..0000000 --- a/RenX.Ladder.Monthly/RenX.Ladder.Monthly.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {34FDE301-A29D-44ED-8ECC-15693F137DE2} - RenX.Ladder.Monthly - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Ladder.Monthly/RenX.Ladder.Monthly.vcxproj.filters b/RenX.Ladder.Monthly/RenX.Ladder.Monthly.vcxproj.filters deleted file mode 100644 index 49a7211..0000000 --- a/RenX.Ladder.Monthly/RenX.Ladder.Monthly.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/RenX.Ladder.Web/RenX.Ladder.Web.vcxproj b/RenX.Ladder.Web/RenX.Ladder.Web.vcxproj deleted file mode 100644 index 9d72647..0000000 --- a/RenX.Ladder.Web/RenX.Ladder.Web.vcxproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - {57661A2A-EE94-4E9C-B792-AB756533DEFA} - RenX.Ladder.Web - - - - - - - ../HTTPServer;%(AdditionalIncludeDirectories) - - - HTTPServer.lib;%(AdditionalDependencies) - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Ladder.Web/RenX.Ladder.Web.vcxproj.filters b/RenX.Ladder.Web/RenX.Ladder.Web.vcxproj.filters deleted file mode 100644 index eb497cd..0000000 --- a/RenX.Ladder.Web/RenX.Ladder.Web.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/RenX.Ladder.Weekly/RenX.Ladder.Weekly.vcxproj b/RenX.Ladder.Weekly/RenX.Ladder.Weekly.vcxproj deleted file mode 100644 index eec5e8b..0000000 --- a/RenX.Ladder.Weekly/RenX.Ladder.Weekly.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {6F0141F3-CF64-47D9-8EC2-80A38FAFDAC7} - RenX.Ladder.Weekly - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Ladder.Weekly/RenX.Ladder.Weekly.vcxproj.filters b/RenX.Ladder.Weekly/RenX.Ladder.Weekly.vcxproj.filters deleted file mode 100644 index cedc23e..0000000 --- a/RenX.Ladder.Weekly/RenX.Ladder.Weekly.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/RenX.Ladder.Yearly/RenX.Ladder.Yearly.vcxproj b/RenX.Ladder.Yearly/RenX.Ladder.Yearly.vcxproj deleted file mode 100644 index 55b80da..0000000 --- a/RenX.Ladder.Yearly/RenX.Ladder.Yearly.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {075AF69B-71D6-43B9-B102-4649CB2CA40C} - RenX.Ladder.Yearly - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Ladder.Yearly/RenX.Ladder.Yearly.vcxproj.filters b/RenX.Ladder.Yearly/RenX.Ladder.Yearly.vcxproj.filters deleted file mode 100644 index 4d9b89e..0000000 --- a/RenX.Ladder.Yearly/RenX.Ladder.Yearly.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/RenX.Ladder/RenX.Ladder.vcxproj b/RenX.Ladder/RenX.Ladder.vcxproj deleted file mode 100644 index 3d7e580..0000000 --- a/RenX.Ladder/RenX.Ladder.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {B2846BD6-2332-4DA6-A13B-113318F76D5E} - RenX.Ladder - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Ladder/RenX.Ladder.vcxproj.filters b/RenX.Ladder/RenX.Ladder.vcxproj.filters deleted file mode 100644 index 493cf0e..0000000 --- a/RenX.Ladder/RenX.Ladder.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/RenX.Listen/RenX.Listen.vcxproj b/RenX.Listen/RenX.Listen.vcxproj deleted file mode 100644 index ac85a14..0000000 --- a/RenX.Listen/RenX.Listen.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {DA05D8B5-5E24-410E-A201-CC5905E327D3} - RenX.Listen - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Listen/RenX.Listen.vcxproj.filters b/RenX.Listen/RenX.Listen.vcxproj.filters deleted file mode 100644 index f915368..0000000 --- a/RenX.Listen/RenX.Listen.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/RenX.Logging/RenX.Logging.vcxproj b/RenX.Logging/RenX.Logging.vcxproj deleted file mode 100644 index 94daef4..0000000 --- a/RenX.Logging/RenX.Logging.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {069D6053-F39A-4418-BAA3-FA8D260C83D1} - RenX.Logging - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Logging/RenX.Logging.vcxproj.filters b/RenX.Logging/RenX.Logging.vcxproj.filters deleted file mode 100644 index 8bc0aa5..0000000 --- a/RenX.Logging/RenX.Logging.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/RenX.Medals/RenX.Medals.vcxproj b/RenX.Medals/RenX.Medals.vcxproj deleted file mode 100644 index 8c5a297..0000000 --- a/RenX.Medals/RenX.Medals.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {C295FFC2-8CE5-4387-B237-E4E1B1AB9987} - RenX.Medals - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Medals/RenX.Medals.vcxproj.filters b/RenX.Medals/RenX.Medals.vcxproj.filters deleted file mode 100644 index d8b2074..0000000 --- a/RenX.Medals/RenX.Medals.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/RenX.MinPlayers/RenX.MinPlayers.vcxproj b/RenX.MinPlayers/RenX.MinPlayers.vcxproj deleted file mode 100644 index c424292..0000000 --- a/RenX.MinPlayers/RenX.MinPlayers.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {99D34DCB-A484-437C-9FC5-D4051FEDC18C} - RenX.MinPlayers - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.MinPlayers/RenX.MinPlayers.vcxproj.filters b/RenX.MinPlayers/RenX.MinPlayers.vcxproj.filters deleted file mode 100644 index 64d5196..0000000 --- a/RenX.MinPlayers/RenX.MinPlayers.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/RenX.ModSystem/RenX.ModSystem.vcxproj b/RenX.ModSystem/RenX.ModSystem.vcxproj deleted file mode 100644 index 9c25518..0000000 --- a/RenX.ModSystem/RenX.ModSystem.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {160CD71B-1E13-4816-9977-8BBD73871F31} - RenX.ModSystem - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.ModSystem/RenX.ModSystem.vcxproj.filters b/RenX.ModSystem/RenX.ModSystem.vcxproj.filters deleted file mode 100644 index 7b1ec02..0000000 --- a/RenX.ModSystem/RenX.ModSystem.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/RenX.Net/RenX.Net.vcxproj b/RenX.Net/RenX.Net.vcxproj deleted file mode 100644 index 3d772c1..0000000 --- a/RenX.Net/RenX.Net.vcxproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - {29C995BB-6A23-4704-BF8D-EA177D5FC7A5} - RenX.Net - - - - - - - ../HTTPServer;%(AdditionalIncludeDirectories) - - - HTTPServer.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Net/RenX.Net.vcxproj.filters b/RenX.Net/RenX.Net.vcxproj.filters deleted file mode 100644 index 66d45c6..0000000 --- a/RenX.Net/RenX.Net.vcxproj.filters +++ /dev/null @@ -1,41 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/RenX.Net/RenX_Net.cpp b/RenX.Net/RenX_Net.cpp deleted file mode 100644 index 471c869..0000000 --- a/RenX.Net/RenX_Net.cpp +++ /dev/null @@ -1,274 +0,0 @@ -/** - * Copyright (C) 2016 Jessica James. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Written by Jessica James - */ - -#include "RenX_Net.h" - -using namespace Jupiter::literals; - -constexpr ProductID RENEGADE_X = 0x01; - -constexpr RequestID REQUEST_SERVER_LIST = 0x01; // version_number -constexpr RequestID REQUEST_SERVER_LIST_UPDATE = 0x02; // version_number, revision_id -constexpr RequestID REQUEST_SERVER_DATA = 0x03; // server_id - -constexpr int REQUEST_SIZE_TABLE[] = -{ - -1, // Invalid request - sizeof(int32_t), // REQUEST_SERVER_LIST - sizeof(int32_t) + sizeof(int32_t) // REQUEST_SERVER_LIST_UPDATE - // sizeof (int32_t) // REQUEST_SERVER_DATA -}; - -constexpr size_t minimum_request_size = REQUEST_SIZE_TABLE[REQUEST_SERVER_LIST]; // Size of smallest request -constexpr size_t maximum_request_size = REQUEST_SIZE_TABLE[REQUEST_SERVER_LIST_UPDATE]; // Size of largest request - -// Size of packet header -constexpr size_t packet_header_size = sizeof(ProductID) + sizeof(RequestID); - -constexpr int getRequestSize(RequestID in_request_id) -{ - return in_request_id >= sizeof(REQUEST_SIZE_TABLE) / sizeof(int) - ? -1 // Invalid request - : REQUEST_SIZE_TABLE[in_request_id]; -} - -/** Plugin initialization and destruction */ - -bool RenX_NetPlugin::initialize() //(const Jupiter::CStringType &bind_address, uint16_t bind_port, bool &out_success, std::chrono::milliseconds in_timeout_period) -{ - m_timeout_period = std::chrono::milliseconds(this->config.getLongLong(Jupiter::ReferenceString::empty, "TimeoutPeriod"_jrs, 10000)); - - if (m_server_socket.bind(Jupiter::CStringS(this->config.get(Jupiter::ReferenceString::empty, "Address"_jrs)).c_str(), this->config.getInt(Jupiter::ReferenceString::empty, "Port"_jrs, 21338), true) == false) - return false; - - m_server_socket.setBlocking(false); - return true; -} - -RenX_NetPlugin::~RenX_NetPlugin() -{ - m_server_socket.close(); -} - -int RenX_NetPlugin::OnRehash() -{ - Jupiter::Plugin::OnRehash(); - - return 0; -} - -/** Server List functions */ - -void RenX_NetPlugin::assignServerIDs() -{ -} - -void RenX_NetPlugin::addServerToServerList(RenX::Server *server) -{ -} - -void RenX_NetPlugin::updateServerList() -{ -} - -/** Client processing */ - -void RenX_NetPlugin::process_request(RenX_NetPlugin::Client &client) -{ - size_t index; - const uint32_t *request_params; - ServerList *list; - - request_params = reinterpret_cast(client.m_request_buffer.ptr()); - - switch (client.m_request_id) - { - case REQUEST_SERVER_LIST: - index = 0; - if (m_server_list.size() != 0) - { - while (index != m_server_list.size()) - { - list = m_server_list.get(index); - if (list->version_number == *request_params) - { - client.sock.send(list->data); - break; - } - - if (++index == m_server_list.size()) - { - // Version not found - break; - } - } - } - // else // m_server_list not initialized correctly (misconfiguration) - break; - - default: // Invalid request. Reset timeout to destroy on next loop. - client.timeout = std::chrono::steady_clock::now(); - break; - } - - client.sock.shutdown(); -} - -int RenX_NetPlugin::think() -{ - RenX_NetPlugin::Client *client; - Jupiter::Socket *sock; - int request_packet_size; - Jupiter::DLList::Node *node; - Jupiter::DLList::Node *tmp; - - // handle new clients - while ((sock = m_server_socket.accept()) != nullptr) - { - sock->setBlocking(false); - request_packet_size = sock->peek(); - - if (request_packet_size > maximum_request_packet_size // This is larger than expected (invalid) request. Toss the socket. - || (request_packet_size <= 0 && sock->getLastError() != 10035)) // Error! - delete sock; - else - { - client = new RenX_NetPlugin::Client(); - client->sock = std::move(*sock); - client->timeout = std::chrono::steady_clock::now() + m_timeout_period; - - if (request_packet_size == expected_request_packet_size) // we have a full request - { - process_request(*client); - - m_clients_pending_close.add(client); - } - else // request is not complete; toss it to further processing - m_clients_processing.add(client); - } - } - - // check processing clients for remainder of data; timeout as necessary - if (m_clients_processing.size() != 0) - { - node = m_clients_processing.getNode(0); - while (node != nullptr) - { - client = node->data; - request_packet_size = client->sock.peek(); - - if (request_packet_size == expected_request_packet_size) // Full request - { - process_request(*client); - - tmp = node; - node = node->next; - - m_clients_processing.remove(tmp); - - client->timeout = std::chrono::steady_clock::now() + m_timeout_period; - m_clients_pending_close.add(client); - } - else if (request_packet_size > expected_request_packet_size // Invalid request - || client->timeout <= std::chrono::steady_clock::now() // Incomplete request & timed out - || (request_packet_size <= 0 && client->sock.getLastError() != 10035)) // Error! - { - client->sock.close(); - - tmp = node; - node = node->next; - - delete m_clients_processing.remove(tmp); - } - else // Incomplete request - node = node->next; - } - } - - // check old clients for clean close; timeout as necessary - if (m_clients_pending_close.size() != 0) - { - node = m_clients_pending_close.getNode(0); - while (node != nullptr) - { - client = node->data; - request_packet_size = client->sock.recv(); - - if (request_packet_size == 0 // Shutdown successfully - || (request_packet_size < 0 && client->sock.getLastError() != 10035) // Error! - || client->timeout <= std::chrono::steady_clock::now()) // Timeout - { - client->sock.close(); - - tmp = node; - node = node->next; - - delete m_clients_pending_close.remove(tmp); - } - else // Still pending; go to next - node = node->next; - } - } - - return 0; -} - -/** Events */ - -void RenX_NetPlugin::RenX_OnServerFullyConnected(RenX::Server *server) -{ - if (++m_server_id == 0) // Overflow; this will actually invalidate the results of any previous server list - this->assignServerIDs(); - else - server->varData.set(this->getName(), "i"_jrs, Jupiter::ReferenceString(reinterpret_cast(&m_server_id), sizeof(m_server_id))); - - // Server added; append - this->addServerToServerList(server); -} - -void RenX_NetPlugin::RenX_OnServerDisconnect(RenX::Server *server, RenX::DisconnectReason reason) -{ - // Server removed; update - this->updateServerList(); -} - -void RenX_NetPlugin::RenX_OnJoin(RenX::Server *server, const RenX::PlayerInfo *player) -{ - // User count changed; update - this->updateServerList(); -} - -void RenX_NetPlugin::RenX_OnPart(RenX::Server *server, const RenX::PlayerInfo *player) -{ - // User count changed; update - this->updateServerList(); -} - -void RenX_NetPlugin::RenX_OnMapLoad(RenX::Server *server, const Jupiter::ReadableString &map) -{ - // Level name changed; update - this->updateServerList(); -} - -// Plugin instantiation and entry point. -RenX_NetPlugin pluginInstance; - -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() -{ - return &pluginInstance; -} diff --git a/RenX.Net/RenX_Net.h b/RenX.Net/RenX_Net.h deleted file mode 100644 index 1bd8685..0000000 --- a/RenX.Net/RenX_Net.h +++ /dev/null @@ -1,93 +0,0 @@ -/** - * Copyright (C) 2016 Jessica James. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Written by Jessica James - */ - -#if !defined _RENX_NET_GAME_H_HEADER -#define _RENX_NET_GAME_H_HEADER - -#include -#include "Jupiter/Thinker.h" -#include "Jupiter/CString.h" -#include "Jupiter/TCPSocket.h" -#include "Jupiter/DLList.h" -#include "Jupiter/ArrayList.h" -#include "RenX_Plugin.h" -#include "RenX_Server.h" - -typedef uint8_t ProductID; -typedef uint8_t RequestID; -typedef uint32_t ServerID; - -class RenX_NetPlugin : public RenX::Plugin -{ -public: - - struct Client - { - Jupiter::Socket sock; - std::chrono::steady_clock::time_point timeout; - - ProductID m_product_id; - RequestID m_request_id; - Jupiter::String m_request_buffer; - }; - - struct ServerList - { - uint32_t version_number = 0; - uint32_t revision_id = 0; - - Jupiter::String data; - Jupiter::ArrayList servers; - }; - - void assignServerIDs(); - void addServerToServerList(RenX::Server *server); - void updateServerList(); - ~RenX_NetPlugin(); - -public: // Jupiter::Plugin - virtual bool initialize() override; - int OnRehash() override; - int think() override; - -public: // RenX::Plugin - void RenX_OnServerFullyConnected(RenX::Server *server) override; - void RenX_OnServerDisconnect(RenX::Server *server, RenX::DisconnectReason reason) override; - void RenX_OnJoin(RenX::Server *server, const RenX::PlayerInfo *player) override; - void RenX_OnPart(RenX::Server *server, const RenX::PlayerInfo *player) override; - void RenX_OnMapLoad(RenX::Server *server, const Jupiter::ReadableString &map) override; - -private: - void process_request(Client &client); - - std::chrono::milliseconds m_ping_frequency; - std::chrono::milliseconds m_ping_timeout; - - Jupiter::TCPSocket m_server_socket; - Jupiter::DLList m_clients; - Jupiter::DLList m_clients_pending_close; - - uint32_t m_server_id; - - uint32_t m_min_server_version; - uint32_t m_max_server_version; - - Jupiter::ArrayList m_server_list; -}; - -#endif // _RENX_SERVERLIST_GAME_H_HEADER \ No newline at end of file diff --git a/RenX.NicknameUUID/RenX.NicknameUUID.vcxproj b/RenX.NicknameUUID/RenX.NicknameUUID.vcxproj deleted file mode 100644 index e91b2ca..0000000 --- a/RenX.NicknameUUID/RenX.NicknameUUID.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {553C70DE-37B7-4C31-985B-591BEC238C9D} - RenX.NicknameUUID - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.NicknameUUID/RenX.NicknameUUID.vcxproj.filters b/RenX.NicknameUUID/RenX.NicknameUUID.vcxproj.filters deleted file mode 100644 index 5ec9c72..0000000 --- a/RenX.NicknameUUID/RenX.NicknameUUID.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/RenX.Plugin.Template/RenX.Plugin.Template.vcxproj b/RenX.Plugin.Template/RenX.Plugin.Template.vcxproj deleted file mode 100644 index ce17341..0000000 --- a/RenX.Plugin.Template/RenX.Plugin.Template.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {6F575493-CF43-43CB-8062-9F3D0722A624} - RenX.Plugin.Template - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Plugin.Template/RenX.Plugin.Template.vcxproj.filters b/RenX.Plugin.Template/RenX.Plugin.Template.vcxproj.filters deleted file mode 100644 index d8f8e49..0000000 --- a/RenX.Plugin.Template/RenX.Plugin.Template.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/RenX.Plugin.props b/RenX.Plugin.props deleted file mode 100644 index af80405..0000000 --- a/RenX.Plugin.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - ../RenX.Core;%(AdditionalIncludeDirectories) - - - RenX.Core.lib;%(AdditionalDependencies) - - - - diff --git a/RenX.ServerList/RenX.ServerList.vcxproj b/RenX.ServerList/RenX.ServerList.vcxproj deleted file mode 100644 index 3b2d5c8..0000000 --- a/RenX.ServerList/RenX.ServerList.vcxproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - {6B0D59BA-B153-4DE8-8DD4-FBE5D810B033} - RenX.ServerList - - - - - - - ../HTTPServer;%(AdditionalIncludeDirectories) - - - HTTPServer.lib;%(AdditionalDependencies) - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.ServerList/RenX.ServerList.vcxproj.filters b/RenX.ServerList/RenX.ServerList.vcxproj.filters deleted file mode 100644 index 0ef4778..0000000 --- a/RenX.ServerList/RenX.ServerList.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/RenX.SetJoin/RenX.SetJoin.vcxproj b/RenX.SetJoin/RenX.SetJoin.vcxproj deleted file mode 100644 index afa8537..0000000 --- a/RenX.SetJoin/RenX.SetJoin.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {0489F164-DC8F-433C-8CFA-F7EB2A3356F1} - RenX.SetJoin - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.SetJoin/RenX.SetJoin.vcxproj.filters b/RenX.SetJoin/RenX.SetJoin.vcxproj.filters deleted file mode 100644 index 6d6e4ba..0000000 --- a/RenX.SetJoin/RenX.SetJoin.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/RenX.Warn/RenX.Warn.vcxproj b/RenX.Warn/RenX.Warn.vcxproj deleted file mode 100644 index ed4f113..0000000 --- a/RenX.Warn/RenX.Warn.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {41C67B8B-D84D-42C2-B174-200B2ACB19C0} - RenX.Warn - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenX.Warn/RenX.Warn.vcxproj.filters b/RenX.Warn/RenX.Warn.vcxproj.filters deleted file mode 100644 index e01ee93..0000000 --- a/RenX.Warn/RenX.Warn.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/SetJoin/SetJoin.vcxproj b/SetJoin/SetJoin.vcxproj deleted file mode 100644 index f2cc2cb..0000000 --- a/SetJoin/SetJoin.vcxproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - {FDBEC4F9-AC8D-4197-BA6C-D042DF218A93} - SetJoin - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SetJoin/SetJoin.vcxproj.filters b/SetJoin/SetJoin.vcxproj.filters deleted file mode 100644 index 3e8f3d0..0000000 --- a/SetJoin/SetJoin.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/src/Bot/CMakeLists.txt b/src/Bot/CMakeLists.txt new file mode 100644 index 0000000..130b119 --- /dev/null +++ b/src/Bot/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(src) \ No newline at end of file diff --git a/Bot/Console_Command.h b/src/Bot/include/Console_Command.h similarity index 100% rename from Bot/Console_Command.h rename to src/Bot/include/Console_Command.h diff --git a/Bot/IRC_Bot.h b/src/Bot/include/IRC_Bot.h similarity index 98% rename from Bot/IRC_Bot.h rename to src/Bot/include/IRC_Bot.h index a6edbf0..e8b12a9 100644 --- a/Bot/IRC_Bot.h +++ b/src/Bot/include/IRC_Bot.h @@ -28,7 +28,7 @@ #include "Jupiter/IRC_Client.h" #include "Jupiter/ArrayList.h" #include "Jupiter/Rehash.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" /** Forward Declaration */ class IRCCommand; diff --git a/Bot/IRC_Command.h b/src/Bot/include/IRC_Command.h similarity index 99% rename from Bot/IRC_Command.h rename to src/Bot/include/IRC_Command.h index 374ab72..6ac4d13 100644 --- a/Bot/IRC_Command.h +++ b/src/Bot/include/IRC_Command.h @@ -27,7 +27,7 @@ #include "Jupiter/GenericCommand.h" #include "Jupiter/IRC_Client.h" #include "Jupiter/ArrayList.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "Jupiter_Bot.h" #include "ServerManager.h" #include "IRC_Bot.h" diff --git a/Bot/Jupiter_Bot.h b/src/Bot/include/Jupiter_Bot.h similarity index 83% rename from Bot/Jupiter_Bot.h rename to src/Bot/include/Jupiter_Bot.h index 7063a72..94e5f6a 100644 --- a/Bot/Jupiter_Bot.h +++ b/src/Bot/include/Jupiter_Bot.h @@ -24,18 +24,22 @@ * On anything other than Windows, JUPITER_BOT_API is defined as nothing, to prevent compiler errors. */ +/** JUPITER_EXPORT, JUPITER_IMPORT */ #if defined _WIN32 +#define JUPITER_EXPORT __declspec(dllexport) +#define JUPITER_IMPORT __declspec(dllimport) +#else // _WIN32 +#define JUPITER_EXPORT +#define JUPITER_IMPORT +#endif // _WIN32 +/** JUPITER_BOT_API */ #if defined JUPITER_BOT_EXPORTS -#define JUPITER_BOT_API __declspec(dllexport) +#define JUPITER_BOT_API JUPITER_EXPORT #else // JUPITER_BOT_EXPORTS -#define JUPITER_BOT_API __declspec(dllimport) +#define JUPITER_BOT_API JUPITER_IMPORT #endif // JUPITER_BOT_EXPORTS -#else // _WIN32 -#define JUPITER_BOT_API -#endif // _WIN32 - #if defined __cplusplus #include diff --git a/Bot/ServerManager.h b/src/Bot/include/ServerManager.h similarity index 100% rename from Bot/ServerManager.h rename to src/Bot/include/ServerManager.h diff --git a/src/Bot/src/CMakeLists.txt b/src/Bot/src/CMakeLists.txt new file mode 100644 index 0000000..322a346 --- /dev/null +++ b/src/Bot/src/CMakeLists.txt @@ -0,0 +1,25 @@ +cmake_minimum_required(VERSION 3.0) + +# Setup source files +set(SOURCE_FILES + Console_Command.cpp + IRC_Bot.cpp + IRC_Command.cpp + Main.cpp + ServerManager.cpp) + +# Setup executable build target +add_executable(Bot ${SOURCE_FILES}) + +# Setup include directories +target_include_directories(Bot PUBLIC ../include) + +# Setup additionally needed libs +target_link_libraries(Bot jupiter) + +# Enable exports +set_target_properties(Bot PROPERTIES + ENABLE_EXPORTS on) + +target_compile_definitions(Bot PRIVATE + JUPITER_BOT_EXPORTS) \ No newline at end of file diff --git a/Bot/Console_Command.cpp b/src/Bot/src/Console_Command.cpp similarity index 100% rename from Bot/Console_Command.cpp rename to src/Bot/src/Console_Command.cpp diff --git a/Bot/IRC_Bot.cpp b/src/Bot/src/IRC_Bot.cpp similarity index 100% rename from Bot/IRC_Bot.cpp rename to src/Bot/src/IRC_Bot.cpp diff --git a/Bot/IRC_Command.cpp b/src/Bot/src/IRC_Command.cpp similarity index 100% rename from Bot/IRC_Command.cpp rename to src/Bot/src/IRC_Command.cpp diff --git a/Bot/Main.cpp b/src/Bot/src/Main.cpp similarity index 97% rename from Bot/Main.cpp rename to src/Bot/src/Main.cpp index a4bf800..f5cc708 100644 --- a/Bot/Main.cpp +++ b/src/Bot/src/Main.cpp @@ -68,19 +68,18 @@ void inputLoop() { char input[INPUT_BUFFER_SIZE]; size_t input_length; - while (ftell(stdin) != -1) // This can be expanded later to check for EBADF specifically. + while (ftell(stdin) != -1 || errno != EBADF) { fgets(input, sizeof(input), stdin); input_length = strcspn(input, "\r\n"); check_input_processing: - console_input.input_mutex.lock(); + std::lock_guard guard(console_input.input_mutex); if (console_input.awaiting_processing == false) { console_input.input.set(input, input_length); console_input.awaiting_processing = true; - console_input.input_mutex.unlock(); } else // User input received before previous input was processed. { @@ -139,7 +138,7 @@ int main(int argc, const char **args) double time_taken = static_cast(std::chrono::duration_cast(std::chrono::steady_clock::now() - load_start).count()) / 1000.0; printf("Config loaded (%fms)." ENDL, time_taken); - + if (plugins_directory.isEmpty()) plugins_directory = o_config.get("PluginsDirectory"_jrs); @@ -177,7 +176,7 @@ int main(int argc, const char **args) load_start = std::chrono::steady_clock::now(); load_success = Jupiter::Plugin::load(plugin) != nullptr; time_taken = static_cast(std::chrono::duration_cast(std::chrono::steady_clock::now() - load_start).count()) / 1000.0; - + if (load_success) printf("\"%.*s\" loaded successfully (%fms)." ENDL, plugin.size(), plugin.ptr(), time_taken); else @@ -205,7 +204,7 @@ int main(int argc, const char **args) else ++index; Jupiter::Timer::check(); - + if (console_input.input_mutex.try_lock()) { if (console_input.awaiting_processing) diff --git a/Bot/ServerManager.cpp b/src/Bot/src/ServerManager.cpp similarity index 100% rename from Bot/ServerManager.cpp rename to src/Bot/src/ServerManager.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..4e28a1b --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,11 @@ +# Setup output paths for jupiter and Bot +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +set(CMAKE_SHARED_LIBRARY_PREFIX) + +# Add jupiter and Bot +add_subdirectory(Jupiter) +add_subdirectory(Bot) + +# Setup output paths for plugins +add_subdirectory(Plugins) diff --git a/src/Jupiter b/src/Jupiter new file mode 160000 index 0000000..cfcc27e --- /dev/null +++ b/src/Jupiter @@ -0,0 +1 @@ +Subproject commit cfcc27e7d9ca2263cab592e1f619e7d825f746e2 diff --git a/src/Plugins/CMakeLists.txt b/src/Plugins/CMakeLists.txt new file mode 100644 index 0000000..65fc57e --- /dev/null +++ b/src/Plugins/CMakeLists.txt @@ -0,0 +1,20 @@ +# Setup output paths +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/Plugins) + +macro(add_plugin target) + add_library(${target} SHARED ${ARGN}) + target_link_libraries(${target} Bot) +endmacro(add_plugin) + +# Add plugins +add_subdirectory(ChannelRelay) +add_subdirectory(CoreCommands) +add_subdirectory(ExtraCommands) +add_subdirectory(FunCommands) +add_subdirectory(HTTPServer) +add_subdirectory(IRC.Core) +add_subdirectory(PluginManager) +add_subdirectory(SetJoin) + +# Add RenX plugins +add_subdirectory(RenX) \ No newline at end of file diff --git a/src/Plugins/ChannelRelay/CMakeLists.txt b/src/Plugins/ChannelRelay/CMakeLists.txt new file mode 100644 index 0000000..76d4bbe --- /dev/null +++ b/src/Plugins/ChannelRelay/CMakeLists.txt @@ -0,0 +1,3 @@ +add_plugin(ChannelRelay + ChannelRelay.cpp + ChannelRelay.h) diff --git a/ChannelRelay/ChannelRelay.cpp b/src/Plugins/ChannelRelay/ChannelRelay.cpp similarity index 90% rename from ChannelRelay/ChannelRelay.cpp rename to src/Plugins/ChannelRelay/ChannelRelay.cpp index 195c5ee..5dd7a76 100644 --- a/ChannelRelay/ChannelRelay.cpp +++ b/src/Plugins/ChannelRelay/ChannelRelay.cpp @@ -17,7 +17,7 @@ */ #include "Jupiter/IRC_Client.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "ServerManager.h" #include "IRC_Bot.h" #include "ChannelRelay.h" @@ -56,9 +56,13 @@ void ChannelRelayPlugin::OnChat(Jupiter::IRC::Client *server, const Jupiter::Rea unsigned int count = server->getChannelCount(); unsigned int serverCount = serverManager->size(); char prefix = chan->getUserPrefix(nick); - Jupiter::String str = prefix == 0 - ? "<"_jrs + nick + "> "_jrs + message - : "<"_js + prefix + nick + "> "_jrs + message; + Jupiter::String str; + if (prefix == 0) { + str = "<"_jrs + nick + "> "_jrs + message; + } + else { + str = "<"_js + prefix + nick + "> "_jrs + message; + } Jupiter::IRC::Client *irc_server; @@ -77,7 +81,7 @@ void ChannelRelayPlugin::OnChat(Jupiter::IRC::Client *server, const Jupiter::Rea // Plugin instantiation and entry point. ChannelRelayPlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/ChannelRelay/ChannelRelay.h b/src/Plugins/ChannelRelay/ChannelRelay.h similarity index 100% rename from ChannelRelay/ChannelRelay.h rename to src/Plugins/ChannelRelay/ChannelRelay.h diff --git a/src/Plugins/CoreCommands/CMakeLists.txt b/src/Plugins/CoreCommands/CMakeLists.txt new file mode 100644 index 0000000..eb0c9e7 --- /dev/null +++ b/src/Plugins/CoreCommands/CMakeLists.txt @@ -0,0 +1,3 @@ +add_plugin(CoreCommands + CoreCommands.cpp + CoreCommands.h) diff --git a/CoreCommands/CoreCommands.cpp b/src/Plugins/CoreCommands/CoreCommands.cpp similarity index 98% rename from CoreCommands/CoreCommands.cpp rename to src/Plugins/CoreCommands/CoreCommands.cpp index 1893937..db0b318 100644 --- a/CoreCommands/CoreCommands.cpp +++ b/src/Plugins/CoreCommands/CoreCommands.cpp @@ -83,7 +83,7 @@ void HelpIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &in_ Jupiter::ArrayList cmds = source->getAccessCommands(channel, i); if (cmds.size() != 0) { - Jupiter::StringL &triggers = source->getTriggers(cmds); + Jupiter::StringL triggers = source->getTriggers(cmds); if (triggers.size() >= 0) source->sendNotice(nick, Jupiter::StringS::Format("Access level %d commands: %.*s", i, triggers.size(), triggers.ptr())); } @@ -174,7 +174,7 @@ GENERIC_COMMAND_AS_CONSOLE_COMMAND(RehashGenericCommand) // Plugin instantiation and entry point. CoreCommandsPlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/CoreCommands/CoreCommands.h b/src/Plugins/CoreCommands/CoreCommands.h similarity index 100% rename from CoreCommands/CoreCommands.h rename to src/Plugins/CoreCommands/CoreCommands.h diff --git a/src/Plugins/ExtraCommands/CMakeLists.txt b/src/Plugins/ExtraCommands/CMakeLists.txt new file mode 100644 index 0000000..c5089c3 --- /dev/null +++ b/src/Plugins/ExtraCommands/CMakeLists.txt @@ -0,0 +1,3 @@ +add_plugin(ExtraCommands + ExtraCommands.cpp + ExtraCommands.h) diff --git a/ExtraCommands/ExtraCommands.cpp b/src/Plugins/ExtraCommands/ExtraCommands.cpp similarity index 99% rename from ExtraCommands/ExtraCommands.cpp rename to src/Plugins/ExtraCommands/ExtraCommands.cpp index a8c6fde..6be2198 100644 --- a/ExtraCommands/ExtraCommands.cpp +++ b/src/Plugins/ExtraCommands/ExtraCommands.cpp @@ -385,7 +385,7 @@ GENERIC_COMMAND_AS_CONSOLE_COMMAND(IRCDisconnectGenericCommand) // Plugin instantiation and entry point. FunCommandsPlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/ExtraCommands/ExtraCommands.h b/src/Plugins/ExtraCommands/ExtraCommands.h similarity index 100% rename from ExtraCommands/ExtraCommands.h rename to src/Plugins/ExtraCommands/ExtraCommands.h diff --git a/src/Plugins/FunCommands/CMakeLists.txt b/src/Plugins/FunCommands/CMakeLists.txt new file mode 100644 index 0000000..4fc155b --- /dev/null +++ b/src/Plugins/FunCommands/CMakeLists.txt @@ -0,0 +1,3 @@ +add_plugin(FunCommands + FunCommands.cpp + FunCommands.h) diff --git a/FunCommands/FunCommands.cpp b/src/Plugins/FunCommands/FunCommands.cpp similarity index 99% rename from FunCommands/FunCommands.cpp rename to src/Plugins/FunCommands/FunCommands.cpp index df1d5da..c52bedc 100644 --- a/FunCommands/FunCommands.cpp +++ b/src/Plugins/FunCommands/FunCommands.cpp @@ -201,7 +201,7 @@ GENERIC_COMMAND_INIT(ResolveGenericCommand) // Plugin instantiation and entry point. ExtraCommandsPlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/FunCommands/FunCommands.h b/src/Plugins/FunCommands/FunCommands.h similarity index 100% rename from FunCommands/FunCommands.h rename to src/Plugins/FunCommands/FunCommands.h diff --git a/src/Plugins/HTTPServer/CMakeLists.txt b/src/Plugins/HTTPServer/CMakeLists.txt new file mode 100644 index 0000000..d88e9b2 --- /dev/null +++ b/src/Plugins/HTTPServer/CMakeLists.txt @@ -0,0 +1,8 @@ +add_plugin(HTTPServer + HTTPServer.cpp + HTTPServer.h) + +target_compile_definitions(HTTPServer PRIVATE + HTTPSERVER_EXPORTS) + +target_include_directories(HTTPServer PUBLIC .) \ No newline at end of file diff --git a/HTTPServer/HTTPServer.cpp b/src/Plugins/HTTPServer/HTTPServer.cpp similarity index 95% rename from HTTPServer/HTTPServer.cpp rename to src/Plugins/HTTPServer/HTTPServer.cpp index 08f8bf7..1f532f0 100644 --- a/HTTPServer/HTTPServer.cpp +++ b/src/Plugins/HTTPServer/HTTPServer.cpp @@ -43,7 +43,7 @@ Jupiter::HTTP::Server &getHTTPServer() return pluginInstance.server; } -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/HTTPServer/HTTPServer.h b/src/Plugins/HTTPServer/HTTPServer.h similarity index 88% rename from HTTPServer/HTTPServer.h rename to src/Plugins/HTTPServer/HTTPServer.h index 0dc4da7..8b38778 100644 --- a/HTTPServer/HTTPServer.h +++ b/src/Plugins/HTTPServer/HTTPServer.h @@ -24,23 +24,18 @@ * @brief Provides an interface to push HTTP data to HTTP clients. */ -#if defined _WIN32 - #include "Jupiter/Plugin.h" #include "Jupiter/Reference_String.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "Jupiter/HTTP_Server.h" +#include "Jupiter_Bot.h" #if defined HTTPSERVER_EXPORTS -#define HTTPSERVER_API __declspec(dllexport) +#define HTTPSERVER_API JUPITER_EXPORT #else // HTTPSERVER_EXPORTS -#define HTTPSERVER_API __declspec(dllimport) +#define HTTPSERVER_API JUPITER_IMPORT #endif // HTTPSERVER_EXPORTS -#else // _WIN32 -#define HTTPSERVER_API -#endif // _WIN32 - /** DLL Linkage Nagging */ #if defined _MSC_VER #pragma warning(push) diff --git a/src/Plugins/IRC.Core/CMakeLists.txt b/src/Plugins/IRC.Core/CMakeLists.txt new file mode 100644 index 0000000..4fe356c --- /dev/null +++ b/src/Plugins/IRC.Core/CMakeLists.txt @@ -0,0 +1,3 @@ +add_plugin(IRC.Core + IRC_Core.cpp + IRC_Core.h) diff --git a/IRC.Core/IRC_Core.cpp b/src/Plugins/IRC.Core/IRC_Core.cpp similarity index 97% rename from IRC.Core/IRC_Core.cpp rename to src/Plugins/IRC.Core/IRC_Core.cpp index 74bd8e2..27609bf 100644 --- a/IRC.Core/IRC_Core.cpp +++ b/src/Plugins/IRC.Core/IRC_Core.cpp @@ -77,7 +77,7 @@ void IRCCorePlugin::OnGenericCommandRemove(Jupiter::GenericCommand &in_command) // Plugin instantiation and entry point. IRCCorePlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/IRC.Core/IRC_Core.h b/src/Plugins/IRC.Core/IRC_Core.h similarity index 100% rename from IRC.Core/IRC_Core.h rename to src/Plugins/IRC.Core/IRC_Core.h diff --git a/src/Plugins/Plugin.Example/CMakeLists.txt b/src/Plugins/Plugin.Example/CMakeLists.txt new file mode 100644 index 0000000..ca72f44 --- /dev/null +++ b/src/Plugins/Plugin.Example/CMakeLists.txt @@ -0,0 +1,3 @@ +add_plugin(Plugin.Example + Example.cpp + Example.h) diff --git a/Plugin.Example/Example.cpp b/src/Plugins/Plugin.Example/Example.cpp similarity index 95% rename from Plugin.Example/Example.cpp rename to src/Plugins/Plugin.Example/Example.cpp index 27b4090..16f454e 100644 --- a/Plugin.Example/Example.cpp +++ b/src/Plugins/Plugin.Example/Example.cpp @@ -38,7 +38,7 @@ IRC_COMMAND_INIT(ExampleIRCCommand) // Plugin instantiation and entry point. ExamplePlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/Plugin.Example/Example.h b/src/Plugins/Plugin.Example/Example.h similarity index 100% rename from Plugin.Example/Example.h rename to src/Plugins/Plugin.Example/Example.h diff --git a/src/Plugins/Plugin.Template/CMakeLists.txt b/src/Plugins/Plugin.Template/CMakeLists.txt new file mode 100644 index 0000000..34e7932 --- /dev/null +++ b/src/Plugins/Plugin.Template/CMakeLists.txt @@ -0,0 +1,3 @@ +add_plugin(Plugin.Template + Example.cpp + Example.h) diff --git a/Plugin.Template/Example.cpp b/src/Plugins/Plugin.Template/Example.cpp similarity index 85% rename from Plugin.Template/Example.cpp rename to src/Plugins/Plugin.Template/Example.cpp index 30584ec..99670c4 100644 --- a/Plugin.Template/Example.cpp +++ b/src/Plugins/Plugin.Template/Example.cpp @@ -13,7 +13,7 @@ // Plugin instantiation and entry point. TPlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/Plugin.Template/Example.h b/src/Plugins/Plugin.Template/Example.h similarity index 100% rename from Plugin.Template/Example.h rename to src/Plugins/Plugin.Template/Example.h diff --git a/src/Plugins/PluginManager/CMakeLists.txt b/src/Plugins/PluginManager/CMakeLists.txt new file mode 100644 index 0000000..176a817 --- /dev/null +++ b/src/Plugins/PluginManager/CMakeLists.txt @@ -0,0 +1,3 @@ +add_plugin(PluginManager + PluginManager.cpp + PluginManager.h) diff --git a/PluginManager/PluginManager.cpp b/src/Plugins/PluginManager/PluginManager.cpp similarity index 98% rename from PluginManager/PluginManager.cpp rename to src/Plugins/PluginManager/PluginManager.cpp index 1fe052d..0c6c292 100644 --- a/PluginManager/PluginManager.cpp +++ b/src/Plugins/PluginManager/PluginManager.cpp @@ -87,7 +87,7 @@ GENERIC_COMMAND_AS_CONSOLE_COMMAND(PluginGenericCommand) // Plugin instantiation and entry point. PluginManager pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/PluginManager/PluginManager.h b/src/Plugins/PluginManager/PluginManager.h similarity index 100% rename from PluginManager/PluginManager.h rename to src/Plugins/PluginManager/PluginManager.h diff --git a/src/Plugins/RenX/CMakeLists.txt b/src/Plugins/RenX/CMakeLists.txt new file mode 100644 index 0000000..6e3e04e --- /dev/null +++ b/src/Plugins/RenX/CMakeLists.txt @@ -0,0 +1,38 @@ +# RenX.Core +add_subdirectory(RenX.Core) + +# TODOJJ: Move headers into an include dir +target_include_directories(RenX.Core PUBLIC + RenX.Core) + +macro(add_renx_plugin target) + add_library(${target} SHARED ${ARGN}) + target_link_libraries(${target} RenX.Core) +endmacro(add_renx_plugin) + +# Add plugins +add_subdirectory(RenX.AlwaysRecord) +add_subdirectory(RenX.Announcements) +add_subdirectory(RenX.Commands) +add_subdirectory(RenX.ExcessiveHeadshots) +add_subdirectory(RenX.ExtraLogging) +add_subdirectory(RenX.Greetings) +add_subdirectory(RenX.HybridUUID) +add_subdirectory(RenX.IRCJoin) +add_subdirectory(RenX.Ladder) +add_subdirectory(RenX.Ladder.All-Time) +add_subdirectory(RenX.Ladder.Daily) +add_subdirectory(RenX.Ladder.Monthly) +add_subdirectory(RenX.Ladder.Web) +add_subdirectory(RenX.Ladder.Weekly) +add_subdirectory(RenX.Ladder.Yearly) +add_subdirectory(RenX.Listen) +add_subdirectory(RenX.Logging) +add_subdirectory(RenX.Medals) +add_subdirectory(RenX.MinPlayers) +add_subdirectory(RenX.ModSystem) +add_subdirectory(RenX.NicknameUUID) +add_subdirectory(RenX.Plugin.Template) +add_subdirectory(RenX.ServerList) +add_subdirectory(RenX.SetJoin) +add_subdirectory(RenX.Warn) diff --git a/src/Plugins/RenX/RenX.AlwaysRecord/CMakeLists.txt b/src/Plugins/RenX/RenX.AlwaysRecord/CMakeLists.txt new file mode 100644 index 0000000..10e0bf4 --- /dev/null +++ b/src/Plugins/RenX/RenX.AlwaysRecord/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.AlwaysRecord + RenX_AlwaysRecord.cpp + RenX_AlwaysRecord.h) \ No newline at end of file diff --git a/RenX.AlwaysRecord/RenX_AlwaysRecord.cpp b/src/Plugins/RenX/RenX.AlwaysRecord/RenX_AlwaysRecord.cpp similarity index 94% rename from RenX.AlwaysRecord/RenX_AlwaysRecord.cpp rename to src/Plugins/RenX/RenX.AlwaysRecord/RenX_AlwaysRecord.cpp index b1c0174..ef24ec8 100644 --- a/RenX.AlwaysRecord/RenX_AlwaysRecord.cpp +++ b/src/Plugins/RenX/RenX.AlwaysRecord/RenX_AlwaysRecord.cpp @@ -29,7 +29,7 @@ void RenX_AlwaysRecord::RenX_OnMapStart(RenX::Server &server, const Jupiter::Rea // Plugin instantiation and entry point. RenX_AlwaysRecord pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.AlwaysRecord/RenX_AlwaysRecord.h b/src/Plugins/RenX/RenX.AlwaysRecord/RenX_AlwaysRecord.h similarity index 100% rename from RenX.AlwaysRecord/RenX_AlwaysRecord.h rename to src/Plugins/RenX/RenX.AlwaysRecord/RenX_AlwaysRecord.h diff --git a/src/Plugins/RenX/RenX.Announcements/CMakeLists.txt b/src/Plugins/RenX/RenX.Announcements/CMakeLists.txt new file mode 100644 index 0000000..1bfda66 --- /dev/null +++ b/src/Plugins/RenX/RenX.Announcements/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.Announcements + RenX_Announcements.cpp + RenX_Announcements.h) \ No newline at end of file diff --git a/RenX.Announcements/RenX_Announcements.cpp b/src/Plugins/RenX/RenX.Announcements/RenX_Announcements.cpp similarity index 98% rename from RenX.Announcements/RenX_Announcements.cpp rename to src/Plugins/RenX/RenX.Announcements/RenX_Announcements.cpp index ee31395..94e3025 100644 --- a/RenX.Announcements/RenX_Announcements.cpp +++ b/src/Plugins/RenX/RenX.Announcements/RenX_Announcements.cpp @@ -95,7 +95,7 @@ RenX_AnnouncementsPlugin::~RenX_AnnouncementsPlugin() RenX_AnnouncementsPlugin::announcementsFile.unload(); } -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.Announcements/RenX_Announcements.h b/src/Plugins/RenX/RenX.Announcements/RenX_Announcements.h similarity index 95% rename from RenX.Announcements/RenX_Announcements.h rename to src/Plugins/RenX/RenX.Announcements/RenX_Announcements.h index 805ac7a..1a9c169 100644 --- a/RenX.Announcements/RenX_Announcements.h +++ b/src/Plugins/RenX/RenX.Announcements/RenX_Announcements.h @@ -22,7 +22,7 @@ #include "Jupiter/Plugin.h" #include "Jupiter/Timer.h" #include "Jupiter/File.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "Jupiter/CString.h" #include "Jupiter/Reference_String.h" #include "RenX_Plugin.h" diff --git a/src/Plugins/RenX/RenX.Commands/CMakeLists.txt b/src/Plugins/RenX/RenX.Commands/CMakeLists.txt new file mode 100644 index 0000000..8258089 --- /dev/null +++ b/src/Plugins/RenX/RenX.Commands/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.Commands + RenX_Commands.cpp + RenX_Commands.h) \ No newline at end of file diff --git a/RenX.Commands/RenX_Commands.cpp b/src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp similarity index 98% rename from RenX.Commands/RenX_Commands.cpp rename to src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp index f9de819..306fe70 100644 --- a/RenX.Commands/RenX_Commands.cpp +++ b/src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp @@ -17,6 +17,7 @@ */ #include +#include #include "Jupiter/Functions.h" #include "IRC_Bot.h" #include "RenX_Commands.h" @@ -369,7 +370,7 @@ void PlayersIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString & for (auto node = server->players.begin(); node != server->players.end(); ++node) { - Jupiter::String &name = RenX::getFormattedPlayerName(*node); + Jupiter::String name = RenX::getFormattedPlayerName(*node); if (name.size() > STRING_LENGTH - 32) continue; // Name will be too long to send. switch (node->team) @@ -962,7 +963,7 @@ void SteamIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &ch { if (node->name.findi(parameters) != Jupiter::INVALID_INDEX) { - Jupiter::String &playerName = RenX::getFormattedPlayerName(*node); + Jupiter::String playerName = RenX::getFormattedPlayerName(*node); msg.format(IRCCOLOR "03[Steam] " IRCCOLOR "%.*s (ID: %d) ", playerName.size(), playerName.ptr(), node->id); if (node->steamid != 0) { @@ -1048,7 +1049,7 @@ void KillDeathRatioIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableS { if (node->name.findi(parameters) != Jupiter::INVALID_INDEX) { - Jupiter::String &playerName = RenX::getFormattedPlayerName(*node); + Jupiter::String playerName = RenX::getFormattedPlayerName(*node); msg.format(IRCBOLD "%.*s" IRCBOLD IRCCOLOR ": Kills: %u - Deaths: %u - KDR: %.2f", playerName.size(), playerName.ptr(), node->kills, node->deaths, static_cast(node->kills) / (node->deaths == 0 ? 1.0f : static_cast(node->deaths))); source->sendMessage(channel, msg); } @@ -1769,7 +1770,13 @@ void KickIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &cha RenX::Server *server; unsigned int kicks = 0; Jupiter::StringS name = Jupiter::StringS::getWord(parameters, 0, WHITESPACE); - Jupiter::StringS reason = parameters.wordCount(WHITESPACE) > 1 ? Jupiter::StringS::gotoWord(parameters, 1, WHITESPACE) : STRING_LITERAL_AS_REFERENCE("No reason"); + Jupiter::StringS reason; + if (parameters.wordCount(WHITESPACE) > 1) { + reason = Jupiter::StringS::gotoWord(parameters, 1, WHITESPACE); + } + else { + reason = STRING_LITERAL_AS_REFERENCE("No reason"); + }; for (size_t i = 0; i != servers.size(); i++) { server = servers.get(i); @@ -1884,7 +1891,7 @@ void BanSearchIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString if (isMatch(type)) { time_t current_time = std::chrono::system_clock::to_time_t(entry->timestamp); - Jupiter::StringS &ip_str = Jupiter::Socket::ntop4(entry->ip); + Jupiter::StringS ip_str = Jupiter::Socket::ntop4(entry->ip); strftime(timeStr, sizeof(timeStr), "%b %d %Y, %H:%M:%S", localtime(¤t_time)); if ((entry->flags & 0x7FFF) == 0) @@ -2025,7 +2032,13 @@ void KickBanIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString & RenX::Server *server; unsigned int kicks = 0; Jupiter::StringS name = Jupiter::StringS::getWord(parameters, 0, WHITESPACE); - Jupiter::StringS reason = parameters.wordCount(WHITESPACE) > 1 ? Jupiter::StringS::gotoWord(parameters, 1, WHITESPACE) : STRING_LITERAL_AS_REFERENCE("No reason"); + Jupiter::StringS reason; + if (parameters.wordCount(WHITESPACE) > 1) { + reason = Jupiter::StringS::gotoWord(parameters, 1, WHITESPACE); + } + else { + reason = STRING_LITERAL_AS_REFERENCE("No reason"); + } Jupiter::String banner(nick.size() + 4); banner += nick; banner += "@IRC"; @@ -2349,7 +2362,7 @@ void ExemptionSearchIRCCommand::trigger(IRC_Bot *source, const Jupiter::Readable if (isMatch(type)) { time_t current_time = std::chrono::system_clock::to_time_t(entry->timestamp); - Jupiter::StringS &ip_str = Jupiter::Socket::ntop4(entry->ip); + Jupiter::StringS ip_str = Jupiter::Socket::ntop4(entry->ip); strftime(timeStr, sizeof(timeStr), "%b %d %Y, %H:%M:%S", localtime(¤t_time)); if ((entry->flags & 0xFF) == 0) @@ -3075,7 +3088,7 @@ void HelpGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, co { for (int i = 0; i <= player->access; i++) { - Jupiter::ReadableString &msg = getAccessCommands(i); + auto msg = getAccessCommands(i); if (msg.isNotEmpty()) source->sendMessage(*player, getAccessCommands(i)); } @@ -3188,7 +3201,7 @@ void ModRequestGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *play size_t serverCount = serverManager->size(); IRC_Bot *server; unsigned int messageCount = 0; - Jupiter::String &fmtName = RenX::getFormattedPlayerName(*player); + Jupiter::String fmtName = RenX::getFormattedPlayerName(*player); Jupiter::StringL user_message = Jupiter::StringL::Format(IRCCOLOR "12[%.*s Request] " IRCCOLOR IRCBOLD "%.*s" IRCBOLD IRCCOLOR "07 has requested assistance in-game; please look in ", staff_word.size(), staff_word.ptr(), fmtName.size(), fmtName.ptr()); Jupiter::StringS channel_message = Jupiter::StringS::Format(IRCCOLOR "12[%.*s Request] " IRCCOLOR IRCBOLD "%.*s" IRCBOLD IRCCOLOR "07 has requested assistance in-game!" IRCCOLOR, staff_word.size(), staff_word.ptr(), fmtName.size(), fmtName.ptr()); @@ -3413,7 +3426,13 @@ void KickGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, co if (parameters.isNotEmpty()) { Jupiter::StringS name = Jupiter::StringS::getWord(parameters, 0, WHITESPACE); - Jupiter::StringS reason = parameters.wordCount(WHITESPACE) > 1 ? Jupiter::StringS::gotoWord(parameters, 1, WHITESPACE) : STRING_LITERAL_AS_REFERENCE("No reason"); + Jupiter::StringS reason; + if (parameters.wordCount(WHITESPACE) > 1) { + reason = Jupiter::StringS::gotoWord(parameters, 1, WHITESPACE); + } + else { + reason = STRING_LITERAL_AS_REFERENCE("No reason"); + } RenX::PlayerInfo *target = source->getPlayerByPartName(name); if (target == nullptr) source->sendMessage(*player, "Error: Player not found."_jrs); @@ -3454,7 +3473,13 @@ void TempBanGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, if (parameters.isNotEmpty()) { Jupiter::StringS name = Jupiter::StringS::getWord(parameters, 0, WHITESPACE); - Jupiter::StringS reason = parameters.wordCount(WHITESPACE) > 1 ? Jupiter::StringS::gotoWord(parameters, 1, WHITESPACE) : STRING_LITERAL_AS_REFERENCE("No reason"); + Jupiter::StringS reason; + if (parameters.wordCount(WHITESPACE) > 1) { + reason = Jupiter::StringS::gotoWord(parameters, 1, WHITESPACE); + } + else { + reason = STRING_LITERAL_AS_REFERENCE("No reason"); + } RenX::PlayerInfo *target = source->getPlayerByPartName(name); if (target == nullptr) source->sendMessage(*player, "Error: Player not found."_jrs); @@ -3496,7 +3521,13 @@ void KickBanGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, if (parameters.isNotEmpty()) { Jupiter::StringS name = Jupiter::StringS::getWord(parameters, 0, WHITESPACE); - Jupiter::StringS reason = parameters.wordCount(WHITESPACE) > 1 ? Jupiter::StringS::gotoWord(parameters, 1, WHITESPACE) : STRING_LITERAL_AS_REFERENCE("No reason"); + Jupiter::StringS reason; + if (parameters.wordCount(WHITESPACE) > 1) { + reason = Jupiter::StringS::gotoWord(parameters, 1, WHITESPACE); + } + else { + reason = STRING_LITERAL_AS_REFERENCE("No reason"); + } RenX::PlayerInfo *target = source->getPlayerByPartName(name); if (target == nullptr) source->sendMessage(*player, "Error: Player not found."_jrs); @@ -3635,7 +3666,7 @@ const Jupiter::ReadableString &PhaseBotsGameCommand::getHelp(const Jupiter::Read GAME_COMMAND_INIT(PhaseBotsGameCommand) -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.Commands/RenX_Commands.h b/src/Plugins/RenX/RenX.Commands/RenX_Commands.h similarity index 100% rename from RenX.Commands/RenX_Commands.h rename to src/Plugins/RenX/RenX.Commands/RenX_Commands.h diff --git a/src/Plugins/RenX/RenX.Core/CMakeLists.txt b/src/Plugins/RenX/RenX.Core/CMakeLists.txt new file mode 100644 index 0000000..068d9e4 --- /dev/null +++ b/src/Plugins/RenX/RenX.Core/CMakeLists.txt @@ -0,0 +1,28 @@ +add_plugin(RenX.Core + RenX.h + RenX_BanDatabase.cpp + RenX_BanDatabase.h + RenX_BuildingInfo.h + RenX_Core.cpp + RenX_Core.h + RenX_ExemptionDatabase.cpp + RenX_ExemptionDatabase.h + RenX_Functions.cpp + RenX_Functions.h + RenX_GameCommand.cpp + RenX_GameCommand.h + RenX_LadderDatabase.cpp + RenX_LadderDatabase.h + RenX_Map.cpp + RenX_Map.h + RenX_PlayerInfo.h + RenX_Plugin.cpp + RenX_Plugin.h + RenX_Server.cpp + RenX_Server.h + RenX_Tags.cpp + RenX_Tags.h + RenX_TeamInfo.h) + +target_compile_definitions(RenX.Core PRIVATE + RENX_EXPORTS) \ No newline at end of file diff --git a/RenX.Core/RenX.h b/src/Plugins/RenX/RenX.Core/RenX.h similarity index 91% rename from RenX.Core/RenX.h rename to src/Plugins/RenX/RenX.Core/RenX.h index e7b5546..d5a10f6 100644 --- a/RenX.Core/RenX.h +++ b/src/Plugins/RenX/RenX.Core/RenX.h @@ -18,24 +18,20 @@ #if !defined RENX_API +#include "Jupiter_Bot.h" + /** * @file RenX.h * @brief Defines RENX_API and some global enums for RenX. * On anything other than Windows, RENX_API is defined as nothing, to prevent compiler errors. */ -#if defined _WIN32 - #if defined RENX_EXPORTS -#define RENX_API __declspec(dllexport) +#define RENX_API JUPITER_EXPORT #else // RENX_EXPORTS -#define RENX_API __declspec(dllimport) +#define RENX_API JUPITER_IMPORT #endif // RENX_EXPORTS -#else // _WIN32 -#define RENX_API -#endif // _WIN32 - #if defined __cplusplus namespace RenX diff --git a/RenX.Core/RenX_BanDatabase.cpp b/src/Plugins/RenX/RenX.Core/RenX_BanDatabase.cpp similarity index 100% rename from RenX.Core/RenX_BanDatabase.cpp rename to src/Plugins/RenX/RenX.Core/RenX_BanDatabase.cpp diff --git a/RenX.Core/RenX_BanDatabase.h b/src/Plugins/RenX/RenX.Core/RenX_BanDatabase.h similarity index 99% rename from RenX.Core/RenX_BanDatabase.h rename to src/Plugins/RenX/RenX.Core/RenX_BanDatabase.h index 442cd07..714cd3c 100644 --- a/RenX.Core/RenX_BanDatabase.h +++ b/src/Plugins/RenX/RenX.Core/RenX_BanDatabase.h @@ -21,7 +21,7 @@ #include #include "Jupiter/Database.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "Jupiter/CString.h" #include "Jupiter/ArrayList.h" #include "RenX.h" diff --git a/RenX.Core/RenX_BuildingInfo.h b/src/Plugins/RenX/RenX.Core/RenX_BuildingInfo.h similarity index 96% rename from RenX.Core/RenX_BuildingInfo.h rename to src/Plugins/RenX/RenX.Core/RenX_BuildingInfo.h index 9a7484d..3e825bf 100644 --- a/RenX.Core/RenX_BuildingInfo.h +++ b/src/Plugins/RenX/RenX.Core/RenX_BuildingInfo.h @@ -24,7 +24,7 @@ * @brief Defines the BuildingInfo structure. */ -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "Jupiter/Config.h" #include "RenX.h" diff --git a/RenX.Core/RenX_Core.cpp b/src/Plugins/RenX/RenX.Core/RenX_Core.cpp similarity index 97% rename from RenX.Core/RenX_Core.cpp rename to src/Plugins/RenX/RenX.Core/RenX_Core.cpp index e8bed9a..c67dd73 100644 --- a/RenX.Core/RenX_Core.cpp +++ b/src/Plugins/RenX/RenX.Core/RenX_Core.cpp @@ -192,14 +192,14 @@ int RenX::Core::think() // Entry point -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } // Unload -extern "C" __declspec(dllexport) void unload(void) +extern "C" JUPITER_EXPORT void unload(void) { while (pluginInstance.getPlugins()->size() > 0) Jupiter::Plugin::free(pluginInstance.getPlugins()->remove(0)); diff --git a/RenX.Core/RenX_Core.h b/src/Plugins/RenX/RenX.Core/RenX_Core.h similarity index 100% rename from RenX.Core/RenX_Core.h rename to src/Plugins/RenX/RenX.Core/RenX_Core.h diff --git a/RenX.Core/RenX_ExemptionDatabase.cpp b/src/Plugins/RenX/RenX.Core/RenX_ExemptionDatabase.cpp similarity index 100% rename from RenX.Core/RenX_ExemptionDatabase.cpp rename to src/Plugins/RenX/RenX.Core/RenX_ExemptionDatabase.cpp diff --git a/RenX.Core/RenX_ExemptionDatabase.h b/src/Plugins/RenX/RenX.Core/RenX_ExemptionDatabase.h similarity index 98% rename from RenX.Core/RenX_ExemptionDatabase.h rename to src/Plugins/RenX/RenX.Core/RenX_ExemptionDatabase.h index 34a18e1..28a1097 100644 --- a/RenX.Core/RenX_ExemptionDatabase.h +++ b/src/Plugins/RenX/RenX.Core/RenX_ExemptionDatabase.h @@ -22,7 +22,7 @@ #include #include #include "Jupiter/Database.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "Jupiter/CString.h" #include "Jupiter/ArrayList.h" #include "RenX.h" diff --git a/RenX.Core/RenX_Functions.cpp b/src/Plugins/RenX/RenX.Core/RenX_Functions.cpp similarity index 100% rename from RenX.Core/RenX_Functions.cpp rename to src/Plugins/RenX/RenX.Core/RenX_Functions.cpp diff --git a/RenX.Core/RenX_Functions.h b/src/Plugins/RenX/RenX.Core/RenX_Functions.h similarity index 98% rename from RenX.Core/RenX_Functions.h rename to src/Plugins/RenX/RenX.Core/RenX_Functions.h index 730d90b..03cf6ab 100644 --- a/RenX.Core/RenX_Functions.h +++ b/src/Plugins/RenX/RenX.Core/RenX_Functions.h @@ -26,7 +26,7 @@ #include #include "Jupiter/Config.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "RenX.h" #include "RenX_Map.h" diff --git a/RenX.Core/RenX_GameCommand.cpp b/src/Plugins/RenX/RenX.Core/RenX_GameCommand.cpp similarity index 100% rename from RenX.Core/RenX_GameCommand.cpp rename to src/Plugins/RenX/RenX.Core/RenX_GameCommand.cpp diff --git a/RenX.Core/RenX_GameCommand.h b/src/Plugins/RenX/RenX.Core/RenX_GameCommand.h similarity index 98% rename from RenX.Core/RenX_GameCommand.h rename to src/Plugins/RenX/RenX.Core/RenX_GameCommand.h index 8850fce..e790877 100644 --- a/RenX.Core/RenX_GameCommand.h +++ b/src/Plugins/RenX/RenX.Core/RenX_GameCommand.h @@ -25,7 +25,7 @@ */ #include "Jupiter/Command.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "RenX.h" #include "RenX_Core.h" // getCore(). diff --git a/RenX.Core/RenX_LadderDatabase.cpp b/src/Plugins/RenX/RenX.Core/RenX_LadderDatabase.cpp similarity index 100% rename from RenX.Core/RenX_LadderDatabase.cpp rename to src/Plugins/RenX/RenX.Core/RenX_LadderDatabase.cpp diff --git a/RenX.Core/RenX_LadderDatabase.h b/src/Plugins/RenX/RenX.Core/RenX_LadderDatabase.h similarity index 99% rename from RenX.Core/RenX_LadderDatabase.h rename to src/Plugins/RenX/RenX.Core/RenX_LadderDatabase.h index 308bc5d..9cef38a 100644 --- a/RenX.Core/RenX_LadderDatabase.h +++ b/src/Plugins/RenX/RenX.Core/RenX_LadderDatabase.h @@ -22,7 +22,7 @@ #include #include #include "Jupiter/Database.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "Jupiter/ArrayList.h" #include "RenX.h" diff --git a/RenX.Core/RenX_Map.cpp b/src/Plugins/RenX/RenX.Core/RenX_Map.cpp similarity index 100% rename from RenX.Core/RenX_Map.cpp rename to src/Plugins/RenX/RenX.Core/RenX_Map.cpp diff --git a/RenX.Core/RenX_Map.h b/src/Plugins/RenX/RenX.Core/RenX_Map.h similarity index 96% rename from RenX.Core/RenX_Map.h rename to src/Plugins/RenX/RenX.Core/RenX_Map.h index 1d80f12..abc0e72 100644 --- a/RenX.Core/RenX_Map.h +++ b/src/Plugins/RenX/RenX.Core/RenX_Map.h @@ -24,7 +24,7 @@ * @brief Defines the RenX Map class */ -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "RenX.h" /** DLL Linkage Nagging */ diff --git a/RenX.Core/RenX_PlayerInfo.h b/src/Plugins/RenX/RenX.Core/RenX_PlayerInfo.h similarity index 97% rename from RenX.Core/RenX_PlayerInfo.h rename to src/Plugins/RenX/RenX.Core/RenX_PlayerInfo.h index da68ae3..0319dbd 100644 --- a/RenX.Core/RenX_PlayerInfo.h +++ b/src/Plugins/RenX/RenX.Core/RenX_PlayerInfo.h @@ -28,7 +28,7 @@ #include #include #include "Jupiter/Reference_String.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "Jupiter/Config.h" #include "RenX.h" diff --git a/RenX.Core/RenX_Plugin.cpp b/src/Plugins/RenX/RenX.Core/RenX_Plugin.cpp similarity index 100% rename from RenX.Core/RenX_Plugin.cpp rename to src/Plugins/RenX/RenX.Core/RenX_Plugin.cpp diff --git a/RenX.Core/RenX_Plugin.h b/src/Plugins/RenX/RenX.Core/RenX_Plugin.h similarity index 100% rename from RenX.Core/RenX_Plugin.h rename to src/Plugins/RenX/RenX.Core/RenX_Plugin.h diff --git a/RenX.Core/RenX_Server.cpp b/src/Plugins/RenX/RenX.Core/RenX_Server.cpp similarity index 98% rename from RenX.Core/RenX_Server.cpp rename to src/Plugins/RenX/RenX.Core/RenX_Server.cpp index 0b5f718..c709c16 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/src/Plugins/RenX/RenX.Core/RenX_Server.cpp @@ -17,7 +17,7 @@ */ #include -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "ServerManager.h" #include "IRC_Bot.h" #include "RenX_Server.h" @@ -622,7 +622,7 @@ void RenX::Server::banCheck(RenX::PlayerInfo &player) if (last_to_expire[6] != nullptr) // Alert { IRC_Bot *server; - Jupiter::String &fmtName = RenX::getFormattedPlayerName(player); + Jupiter::String fmtName = RenX::getFormattedPlayerName(player); Jupiter::StringL user_message = Jupiter::StringL::Format(IRCCOLOR "04[Alert] " IRCCOLOR IRCBOLD "%.*s" IRCBOLD IRCCOLOR " is marked for monitoring by %.*s for: \"%.*s\". Please keep an eye on them in ", fmtName.size(), fmtName.ptr(), last_to_expire[6]->banner.size(), last_to_expire[6]->banner.ptr(), last_to_expire[6]->reason.size(), last_to_expire[6]->reason.ptr()); Jupiter::StringS channel_message = Jupiter::StringS::Format(IRCCOLOR "04[Alert] " IRCCOLOR IRCBOLD "%.*s" IRCBOLD IRCCOLOR " is marked for monitoring by %.*s for: \"%.*s\"." IRCCOLOR, fmtName.size(), fmtName.ptr(), last_to_expire[6]->banner.size(), last_to_expire[6]->banner.ptr(), last_to_expire[6]->reason.size(), last_to_expire[6]->reason.ptr()); @@ -1606,9 +1606,9 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) else { /*e - lRCON Command; Conn4 executed: clientvarlist PlayerLog Kills PlayerKills BotKills Deaths Score Credits Character BoundVehicle Vehicle Spy RemoteC4 ATMine KDR Ping Admin Steam IP ID Name Team TeamNum - rPlayerLog Kills PlayerKills BotKills Deaths Score Credits Character BoundVehicle Vehicle Spy RemoteC4 ATMine KDR Ping Admin Steam IP ID Name Team TeamNum - rGDI,256,EKT-J 0 0 0 0 0 5217.9629 Rx_FamilyInfo_GDI_Soldier   False 0 0 0.0000 8 None 0x0110000104AE0666 127.0.0.1 256 EKT-J GDI 0 + lRCON�Command;�Conn4�executed:�clientvarlist PlayerLog�Kills�PlayerKills�BotKills�Deaths�Score�Credits�Character�BoundVehicle�Vehicle�Spy�RemoteC4�ATMine�KDR�Ping�Admin�Steam�IP�ID�Name�Team�TeamNum + rPlayerLog�Kills�PlayerKills�BotKills�Deaths�Score�Credits�Character�BoundVehicle�Vehicle�Spy�RemoteC4�ATMine�KDR�Ping�Admin�Steam�IP�ID�Name�Team�TeamNum + rGDI,256,EKT-J�0�0�0�0�0�5217.9629�Rx_FamilyInfo_GDI_Soldier���False�0�0�0.0000�8�None�0x0110000104AE0666�127.0.0.1�256�EKT-J�GDI�0 */ Jupiter::HashTable table; size_t i = tokens.token_count; @@ -1753,9 +1753,9 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) else { /* - lRCON Command; Conn4 executed: clientvarlist PlayerLog Kills PlayerKills BotKills Deaths Score Credits Character BoundVehicle Vehicle Spy RemoteC4 ATMine KDR Ping Admin Steam IP ID Name Team TeamNum - rPlayerLog Kills PlayerKills BotKills Deaths Score Credits Character BoundVehicle Vehicle Spy RemoteC4 ATMine KDR Ping Admin Steam IP ID Name Team TeamNum - rGDI,256,EKT-J 0 0 0 0 0 5217.9629 Rx_FamilyInfo_GDI_Soldier   False 0 0 0.0000 8 None 0x0110000104AE0666 127.0.0.1 256 EKT-J GDI 0 + lRCON�Command;�Conn4�executed:�clientvarlist PlayerLog�Kills�PlayerKills�BotKills�Deaths�Score�Credits�Character�BoundVehicle�Vehicle�Spy�RemoteC4�ATMine�KDR�Ping�Admin�Steam�IP�ID�Name�Team�TeamNum + rPlayerLog�Kills�PlayerKills�BotKills�Deaths�Score�Credits�Character�BoundVehicle�Vehicle�Spy�RemoteC4�ATMine�KDR�Ping�Admin�Steam�IP�ID�Name�Team�TeamNum + rGDI,256,EKT-J�0�0�0�0�0�5217.9629�Rx_FamilyInfo_GDI_Soldier���False�0�0�0.0000�8�None�0x0110000104AE0666�127.0.0.1�256�EKT-J�GDI�0 */ Jupiter::HashTable table; size_t i = tokens.token_count; @@ -1850,9 +1850,9 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) else { /* - lRCON Command; DevBot executed: binfo - rBuilding Health MaxHealth Armor MaxArmor Team Capturable Destroyed - rRx_Building_Refinery_GDI 2000 2000 2000 2000 GDI False False + lRCON�Command;�DevBot�executed:�binfo + rBuilding�Health�MaxHealth�Armor MaxArmor Team�Capturable Destroyed + rRx_Building_Refinery_GDI�2000�2000�2000 2000 GDI�False False */ Jupiter::HashTable table; size_t i = tokens.token_count; @@ -1926,7 +1926,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) { if (this->lastCommandParams.isEmpty()) { - // "Port" | Port | "Name" | Name | "Level" | Level | "Players" | Players | "Bots" | Bots | "LevelGUID" | Level GUID + // "Port"�| Port |�"Name" |�Name |�"Level"�| Level | "Players" | Players�| "Bots" | Bots | "LevelGUID" | Level GUID this->port = static_cast(tokens.getToken(1).asUnsignedInt(10)); this->serverName = tokens.getToken(3); this->map.name = tokens.getToken(5); diff --git a/RenX.Core/RenX_Server.h b/src/Plugins/RenX/RenX.Core/RenX_Server.h similarity index 99% rename from RenX.Core/RenX_Server.h rename to src/Plugins/RenX/RenX.Core/RenX_Server.h index 54e552b..2a760dd 100644 --- a/RenX.Core/RenX_Server.h +++ b/src/Plugins/RenX/RenX.Core/RenX_Server.h @@ -28,7 +28,7 @@ #include #include "Jupiter/TCPSocket.h" #include "Jupiter/ArrayList.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "Jupiter/CString.h" #include "Jupiter/Config.h" #include "Jupiter/Thinker.h" diff --git a/RenX.Core/RenX_Tags.cpp b/src/Plugins/RenX/RenX.Core/RenX_Tags.cpp similarity index 100% rename from RenX.Core/RenX_Tags.cpp rename to src/Plugins/RenX/RenX.Core/RenX_Tags.cpp diff --git a/RenX.Core/RenX_Tags.h b/src/Plugins/RenX/RenX.Core/RenX_Tags.h similarity index 99% rename from RenX.Core/RenX_Tags.h rename to src/Plugins/RenX/RenX.Core/RenX_Tags.h index 0d7c9ec..e4331d7 100644 --- a/RenX.Core/RenX_Tags.h +++ b/src/Plugins/RenX/RenX.Core/RenX_Tags.h @@ -24,7 +24,7 @@ * @brief Provides tag processing functions */ -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "Jupiter/CString.h" #include "RenX.h" #include "RenX_LadderDatabase.h" diff --git a/RenX.Core/RenX_TeamInfo.h b/src/Plugins/RenX/RenX.Core/RenX_TeamInfo.h similarity index 98% rename from RenX.Core/RenX_TeamInfo.h rename to src/Plugins/RenX/RenX.Core/RenX_TeamInfo.h index 643e4ee..d40dd30 100644 --- a/RenX.Core/RenX_TeamInfo.h +++ b/src/Plugins/RenX/RenX.Core/RenX_TeamInfo.h @@ -24,7 +24,7 @@ * @brief Defines the BuildingInfo structure. */ -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "RenX.h" /** DLL Linkage Nagging */ diff --git a/src/Plugins/RenX/RenX.ExcessiveHeadshots/CMakeLists.txt b/src/Plugins/RenX/RenX.ExcessiveHeadshots/CMakeLists.txt new file mode 100644 index 0000000..fb53454 --- /dev/null +++ b/src/Plugins/RenX/RenX.ExcessiveHeadshots/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.ExcessiveHeadshots + RenX_ExcessiveHeadshots.cpp + RenX_ExcessiveHeadshots.h) \ No newline at end of file diff --git a/RenX.ExcessiveHeadshots/ExcessiveHeadshots.cpp b/src/Plugins/RenX/RenX.ExcessiveHeadshots/RenX_ExcessiveHeadshots.cpp similarity index 97% rename from RenX.ExcessiveHeadshots/ExcessiveHeadshots.cpp rename to src/Plugins/RenX/RenX.ExcessiveHeadshots/RenX_ExcessiveHeadshots.cpp index de34656..89b8354 100644 --- a/RenX.ExcessiveHeadshots/ExcessiveHeadshots.cpp +++ b/src/Plugins/RenX/RenX.ExcessiveHeadshots/RenX_ExcessiveHeadshots.cpp @@ -18,7 +18,7 @@ #include #include "Jupiter/IRC_Client.h" -#include "ExcessiveHeadshots.h" +#include "RenX_ExcessiveHeadshots.h" #include "RenX_Server.h" #include "RenX_PlayerInfo.h" #include "RenX_Functions.h" @@ -72,7 +72,7 @@ void RenX_ExcessiveHeadshotsPlugin::RenX_OnKill(RenX::Server &server, const RenX // Plugin instantiation and entry point. RenX_ExcessiveHeadshotsPlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.ExcessiveHeadshots/ExcessiveHeadshots.h b/src/Plugins/RenX/RenX.ExcessiveHeadshots/RenX_ExcessiveHeadshots.h similarity index 100% rename from RenX.ExcessiveHeadshots/ExcessiveHeadshots.h rename to src/Plugins/RenX/RenX.ExcessiveHeadshots/RenX_ExcessiveHeadshots.h diff --git a/src/Plugins/RenX/RenX.ExtraLogging/CMakeLists.txt b/src/Plugins/RenX/RenX.ExtraLogging/CMakeLists.txt new file mode 100644 index 0000000..ee8c387 --- /dev/null +++ b/src/Plugins/RenX/RenX.ExtraLogging/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.ExtraLogging + RenX_ExtraLogging.cpp + RenX_ExtraLogging.h) \ No newline at end of file diff --git a/RenX.ExtraLogging/RenX_ExtraLogging.cpp b/src/Plugins/RenX/RenX.ExtraLogging/RenX_ExtraLogging.cpp similarity index 98% rename from RenX.ExtraLogging/RenX_ExtraLogging.cpp rename to src/Plugins/RenX/RenX.ExtraLogging/RenX_ExtraLogging.cpp index 3089af4..9c192b7 100644 --- a/RenX.ExtraLogging/RenX_ExtraLogging.cpp +++ b/src/Plugins/RenX/RenX.ExtraLogging/RenX_ExtraLogging.cpp @@ -121,7 +121,7 @@ void RenX_ExtraLoggingPlugin::RenX_OnRaw(RenX::Server &server, const Jupiter::Re // Plugin instantiation and entry point. RenX_ExtraLoggingPlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.ExtraLogging/RenX_ExtraLogging.h b/src/Plugins/RenX/RenX.ExtraLogging/RenX_ExtraLogging.h similarity index 95% rename from RenX.ExtraLogging/RenX_ExtraLogging.h rename to src/Plugins/RenX/RenX.ExtraLogging/RenX_ExtraLogging.h index 9652174..6b5443a 100644 --- a/RenX.ExtraLogging/RenX_ExtraLogging.h +++ b/src/Plugins/RenX/RenX.ExtraLogging/RenX_ExtraLogging.h @@ -20,7 +20,7 @@ #define _RENX_EXTRALOGGING_H_HEADER #include "Jupiter/Plugin.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "RenX_Plugin.h" class RenX_ExtraLoggingPlugin : public RenX::Plugin diff --git a/src/Plugins/RenX/RenX.Greetings/CMakeLists.txt b/src/Plugins/RenX/RenX.Greetings/CMakeLists.txt new file mode 100644 index 0000000..a7e98a7 --- /dev/null +++ b/src/Plugins/RenX/RenX.Greetings/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.Greetings + RenX_Greetings.cpp + RenX_Greetings.h) \ No newline at end of file diff --git a/RenX.Greetings/RenX_Greetings.cpp b/src/Plugins/RenX/RenX.Greetings/RenX_Greetings.cpp similarity index 98% rename from RenX.Greetings/RenX_Greetings.cpp rename to src/Plugins/RenX/RenX.Greetings/RenX_Greetings.cpp index 09a39c0..28d8b15 100644 --- a/RenX.Greetings/RenX_Greetings.cpp +++ b/src/Plugins/RenX/RenX.Greetings/RenX_Greetings.cpp @@ -84,7 +84,7 @@ bool RenX_GreetingsPlugin::initialize() // Plugin instantiation and entry point. RenX_GreetingsPlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.Greetings/RenX_Greetings.h b/src/Plugins/RenX/RenX.Greetings/RenX_Greetings.h similarity index 95% rename from RenX.Greetings/RenX_Greetings.h rename to src/Plugins/RenX/RenX.Greetings/RenX_Greetings.h index aed979e..781416d 100644 --- a/RenX.Greetings/RenX_Greetings.h +++ b/src/Plugins/RenX/RenX.Greetings/RenX_Greetings.h @@ -22,7 +22,7 @@ #include "Jupiter/Plugin.h" #include "Jupiter/Reference_String.h" #include "Jupiter/File.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "RenX_Plugin.h" class RenX_GreetingsPlugin : public RenX::Plugin diff --git a/src/Plugins/RenX/RenX.HybridUUID/CMakeLists.txt b/src/Plugins/RenX/RenX.HybridUUID/CMakeLists.txt new file mode 100644 index 0000000..6178946 --- /dev/null +++ b/src/Plugins/RenX/RenX.HybridUUID/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.HybridUUID + RenX_HybridUUID.cpp + RenX_HybridUUID.h) \ No newline at end of file diff --git a/RenX.HybridUUID/RenX_HybridUUID.cpp b/src/Plugins/RenX/RenX.HybridUUID/RenX_HybridUUID.cpp similarity index 95% rename from RenX.HybridUUID/RenX_HybridUUID.cpp rename to src/Plugins/RenX/RenX.HybridUUID/RenX_HybridUUID.cpp index e799362..8a67f44 100644 --- a/RenX.HybridUUID/RenX_HybridUUID.cpp +++ b/src/Plugins/RenX/RenX.HybridUUID/RenX_HybridUUID.cpp @@ -16,7 +16,7 @@ * Written by Jessica James */ -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "RenX_Core.h" #include "RenX_Server.h" #include "RenX_PlayerInfo.h" @@ -56,7 +56,7 @@ void RenX_HybridUUIDPlugin::RenX_OnServerCreate(RenX::Server &server) // Plugin instantiation and entry point. RenX_HybridUUIDPlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.HybridUUID/RenX_HybridUUID.h b/src/Plugins/RenX/RenX.HybridUUID/RenX_HybridUUID.h similarity index 100% rename from RenX.HybridUUID/RenX_HybridUUID.h rename to src/Plugins/RenX/RenX.HybridUUID/RenX_HybridUUID.h diff --git a/src/Plugins/RenX/RenX.IRCJoin/CMakeLists.txt b/src/Plugins/RenX/RenX.IRCJoin/CMakeLists.txt new file mode 100644 index 0000000..cb3df76 --- /dev/null +++ b/src/Plugins/RenX/RenX.IRCJoin/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.IRCJoin + RenX_IRCJoin.cpp + RenX_IRCJoin.h) \ No newline at end of file diff --git a/RenX.IRCJoin/RenX_IRCJoin.cpp b/src/Plugins/RenX/RenX.IRCJoin/RenX_IRCJoin.cpp similarity index 98% rename from RenX.IRCJoin/RenX_IRCJoin.cpp rename to src/Plugins/RenX/RenX.IRCJoin/RenX_IRCJoin.cpp index 93b309d..5ea17f8 100644 --- a/RenX.IRCJoin/RenX_IRCJoin.cpp +++ b/src/Plugins/RenX/RenX.IRCJoin/RenX_IRCJoin.cpp @@ -17,7 +17,7 @@ */ #include "Jupiter/IRC_Client.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "RenX_Core.h" #include "RenX_Server.h" #include "RenX_IRCJoin.h" @@ -114,7 +114,7 @@ int RenX_IRCJoinPlugin::OnRehash() // Plugin instantiation and entry point. RenX_IRCJoinPlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.IRCJoin/RenX_IRCJoin.h b/src/Plugins/RenX/RenX.IRCJoin/RenX_IRCJoin.h similarity index 100% rename from RenX.IRCJoin/RenX_IRCJoin.h rename to src/Plugins/RenX/RenX.IRCJoin/RenX_IRCJoin.h diff --git a/src/Plugins/RenX/RenX.Ladder.All-Time/CMakeLists.txt b/src/Plugins/RenX/RenX.Ladder.All-Time/CMakeLists.txt new file mode 100644 index 0000000..7cd2f93 --- /dev/null +++ b/src/Plugins/RenX/RenX.Ladder.All-Time/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.Ladder.All-Time + RenX_Ladder_All_Time.cpp + RenX_Ladder_All_Time.h) \ No newline at end of file diff --git a/RenX.Ladder.All-Time/RenX_Ladder_All_Time.cpp b/src/Plugins/RenX/RenX.Ladder.All-Time/RenX_Ladder_All_Time.cpp similarity index 96% rename from RenX.Ladder.All-Time/RenX_Ladder_All_Time.cpp rename to src/Plugins/RenX/RenX.Ladder.All-Time/RenX_Ladder_All_Time.cpp index 9ec945b..45a45a8 100644 --- a/RenX.Ladder.All-Time/RenX_Ladder_All_Time.cpp +++ b/src/Plugins/RenX/RenX.Ladder.All-Time/RenX_Ladder_All_Time.cpp @@ -38,7 +38,7 @@ bool RenX_Ladder_All_TimePlugin::initialize() // Plugin instantiation and entry point. RenX_Ladder_All_TimePlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.Ladder.All-Time/RenX_Ladder_All_Time.h b/src/Plugins/RenX/RenX.Ladder.All-Time/RenX_Ladder_All_Time.h similarity index 100% rename from RenX.Ladder.All-Time/RenX_Ladder_All_Time.h rename to src/Plugins/RenX/RenX.Ladder.All-Time/RenX_Ladder_All_Time.h diff --git a/src/Plugins/RenX/RenX.Ladder.Daily/CMakeLists.txt b/src/Plugins/RenX/RenX.Ladder.Daily/CMakeLists.txt new file mode 100644 index 0000000..5193ea6 --- /dev/null +++ b/src/Plugins/RenX/RenX.Ladder.Daily/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.Ladder.Daily + RenX_Ladder_Daily.cpp + RenX_Ladder_Daily.h) \ No newline at end of file diff --git a/RenX.Ladder.Daily/RenX_Ladder_Daily.cpp b/src/Plugins/RenX/RenX.Ladder.Daily/RenX_Ladder_Daily.cpp similarity index 96% rename from RenX.Ladder.Daily/RenX_Ladder_Daily.cpp rename to src/Plugins/RenX/RenX.Ladder.Daily/RenX_Ladder_Daily.cpp index bbd46ec..12c8f95 100644 --- a/RenX.Ladder.Daily/RenX_Ladder_Daily.cpp +++ b/src/Plugins/RenX/RenX.Ladder.Daily/RenX_Ladder_Daily.cpp @@ -52,7 +52,7 @@ void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server &, const Ren pluginInstance.last_sorted_day = tm_ptr->tm_wday; } -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.Ladder.Daily/RenX_Ladder_Daily.h b/src/Plugins/RenX/RenX.Ladder.Daily/RenX_Ladder_Daily.h similarity index 100% rename from RenX.Ladder.Daily/RenX_Ladder_Daily.h rename to src/Plugins/RenX/RenX.Ladder.Daily/RenX_Ladder_Daily.h diff --git a/src/Plugins/RenX/RenX.Ladder.Monthly/CMakeLists.txt b/src/Plugins/RenX/RenX.Ladder.Monthly/CMakeLists.txt new file mode 100644 index 0000000..206829b --- /dev/null +++ b/src/Plugins/RenX/RenX.Ladder.Monthly/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.Ladder.Monthly + RenX_Ladder_Monthly.cpp + RenX_Ladder_Monthly.h) \ No newline at end of file diff --git a/RenX.Ladder.Monthly/RenX_Ladder_Monthly.cpp b/src/Plugins/RenX/RenX.Ladder.Monthly/RenX_Ladder_Monthly.cpp similarity index 97% rename from RenX.Ladder.Monthly/RenX_Ladder_Monthly.cpp rename to src/Plugins/RenX/RenX.Ladder.Monthly/RenX_Ladder_Monthly.cpp index 8a89bf9..8bab2b9 100644 --- a/RenX.Ladder.Monthly/RenX_Ladder_Monthly.cpp +++ b/src/Plugins/RenX/RenX.Ladder.Monthly/RenX_Ladder_Monthly.cpp @@ -52,7 +52,7 @@ void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server &, const Ren pluginInstance.last_sorted_month = tm_ptr->tm_mon; } -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.Ladder.Monthly/RenX_Ladder_Monthly.h b/src/Plugins/RenX/RenX.Ladder.Monthly/RenX_Ladder_Monthly.h similarity index 100% rename from RenX.Ladder.Monthly/RenX_Ladder_Monthly.h rename to src/Plugins/RenX/RenX.Ladder.Monthly/RenX_Ladder_Monthly.h diff --git a/src/Plugins/RenX/RenX.Ladder.Web/CMakeLists.txt b/src/Plugins/RenX/RenX.Ladder.Web/CMakeLists.txt new file mode 100644 index 0000000..3c3321a --- /dev/null +++ b/src/Plugins/RenX/RenX.Ladder.Web/CMakeLists.txt @@ -0,0 +1,6 @@ +add_renx_plugin(RenX.Ladder.Web + RenX_Ladder_Web.cpp + RenX_Ladder_Web.h) + +target_link_libraries(RenX.Ladder.Web + HTTPServer) \ No newline at end of file diff --git a/RenX.Ladder.Web/RenX_Ladder_Web.cpp b/src/Plugins/RenX/RenX.Ladder.Web/RenX_Ladder_Web.cpp similarity index 99% rename from RenX.Ladder.Web/RenX_Ladder_Web.cpp rename to src/Plugins/RenX/RenX.Ladder.Web/RenX_Ladder_Web.cpp index 346def7..840f1e1 100644 --- a/RenX.Ladder.Web/RenX_Ladder_Web.cpp +++ b/src/Plugins/RenX/RenX.Ladder.Web/RenX_Ladder_Web.cpp @@ -567,7 +567,7 @@ Jupiter::ReadableString *handle_profile_page(const Jupiter::ReadableString &quer return pluginInstance.generate_profile_page(db, format, steam_id, html_form_response.table); } -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.Ladder.Web/RenX_Ladder_Web.h b/src/Plugins/RenX/RenX.Ladder.Web/RenX_Ladder_Web.h similarity index 100% rename from RenX.Ladder.Web/RenX_Ladder_Web.h rename to src/Plugins/RenX/RenX.Ladder.Web/RenX_Ladder_Web.h diff --git a/src/Plugins/RenX/RenX.Ladder.Weekly/CMakeLists.txt b/src/Plugins/RenX/RenX.Ladder.Weekly/CMakeLists.txt new file mode 100644 index 0000000..4b123b0 --- /dev/null +++ b/src/Plugins/RenX/RenX.Ladder.Weekly/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.Ladder.Weekly + RenX_Ladder_Weekly.cpp + RenX_Ladder_Weekly.h) \ No newline at end of file diff --git a/RenX.Ladder.Weekly/RenX_Ladder_Weekly.cpp b/src/Plugins/RenX/RenX.Ladder.Weekly/RenX_Ladder_Weekly.cpp similarity index 97% rename from RenX.Ladder.Weekly/RenX_Ladder_Weekly.cpp rename to src/Plugins/RenX/RenX.Ladder.Weekly/RenX_Ladder_Weekly.cpp index 6388a26..b026ee1 100644 --- a/RenX.Ladder.Weekly/RenX_Ladder_Weekly.cpp +++ b/src/Plugins/RenX/RenX.Ladder.Weekly/RenX_Ladder_Weekly.cpp @@ -53,7 +53,7 @@ void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server &, const Ren pluginInstance.last_sorted_day = tm_ptr->tm_wday; } -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.Ladder.Weekly/RenX_Ladder_Weekly.h b/src/Plugins/RenX/RenX.Ladder.Weekly/RenX_Ladder_Weekly.h similarity index 100% rename from RenX.Ladder.Weekly/RenX_Ladder_Weekly.h rename to src/Plugins/RenX/RenX.Ladder.Weekly/RenX_Ladder_Weekly.h diff --git a/src/Plugins/RenX/RenX.Ladder.Yearly/CMakeLists.txt b/src/Plugins/RenX/RenX.Ladder.Yearly/CMakeLists.txt new file mode 100644 index 0000000..14f2e2a --- /dev/null +++ b/src/Plugins/RenX/RenX.Ladder.Yearly/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.Ladder.Yearly + RenX_Ladder_Yearly.cpp + RenX_Ladder_Yearly.h) \ No newline at end of file diff --git a/RenX.Ladder.Yearly/RenX_Ladder_Yearly.cpp b/src/Plugins/RenX/RenX.Ladder.Yearly/RenX_Ladder_Yearly.cpp similarity index 97% rename from RenX.Ladder.Yearly/RenX_Ladder_Yearly.cpp rename to src/Plugins/RenX/RenX.Ladder.Yearly/RenX_Ladder_Yearly.cpp index 2e41718..7765275 100644 --- a/RenX.Ladder.Yearly/RenX_Ladder_Yearly.cpp +++ b/src/Plugins/RenX/RenX.Ladder.Yearly/RenX_Ladder_Yearly.cpp @@ -52,7 +52,7 @@ void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server &, const Ren pluginInstance.last_sorted_year = tm_ptr->tm_year; } -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.Ladder.Yearly/RenX_Ladder_Yearly.h b/src/Plugins/RenX/RenX.Ladder.Yearly/RenX_Ladder_Yearly.h similarity index 100% rename from RenX.Ladder.Yearly/RenX_Ladder_Yearly.h rename to src/Plugins/RenX/RenX.Ladder.Yearly/RenX_Ladder_Yearly.h diff --git a/src/Plugins/RenX/RenX.Ladder/CMakeLists.txt b/src/Plugins/RenX/RenX.Ladder/CMakeLists.txt new file mode 100644 index 0000000..81688a9 --- /dev/null +++ b/src/Plugins/RenX/RenX.Ladder/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.Ladder + RenX_Ladder.cpp + RenX_Ladder.h) \ No newline at end of file diff --git a/RenX.Ladder/RenX_Ladder.cpp b/src/Plugins/RenX/RenX.Ladder/RenX_Ladder.cpp similarity index 99% rename from RenX.Ladder/RenX_Ladder.cpp rename to src/Plugins/RenX/RenX.Ladder/RenX_Ladder.cpp index 209ec81..6884144 100644 --- a/RenX.Ladder/RenX_Ladder.cpp +++ b/src/Plugins/RenX/RenX.Ladder/RenX_Ladder.cpp @@ -202,7 +202,7 @@ const Jupiter::ReadableString &LadderGameCommand::getHelp(const Jupiter::Readabl GAME_COMMAND_INIT(LadderGameCommand) -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.Ladder/RenX_Ladder.h b/src/Plugins/RenX/RenX.Ladder/RenX_Ladder.h similarity index 100% rename from RenX.Ladder/RenX_Ladder.h rename to src/Plugins/RenX/RenX.Ladder/RenX_Ladder.h diff --git a/src/Plugins/RenX/RenX.Listen/CMakeLists.txt b/src/Plugins/RenX/RenX.Listen/CMakeLists.txt new file mode 100644 index 0000000..15db5db --- /dev/null +++ b/src/Plugins/RenX/RenX.Listen/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.Listen + RenX_Listen.cpp + RenX_Listen.h) \ No newline at end of file diff --git a/RenX.Listen/RenX_Listen.cpp b/src/Plugins/RenX/RenX.Listen/RenX_Listen.cpp similarity index 97% rename from RenX.Listen/RenX_Listen.cpp rename to src/Plugins/RenX/RenX.Listen/RenX_Listen.cpp index e04723c..d6e4e8b 100644 --- a/RenX.Listen/RenX_Listen.cpp +++ b/src/Plugins/RenX/RenX.Listen/RenX_Listen.cpp @@ -73,7 +73,7 @@ int RenX_ListenPlugin::OnRehash() // Plugin instantiation and entry point. RenX_ListenPlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.Listen/RenX_Listen.h b/src/Plugins/RenX/RenX.Listen/RenX_Listen.h similarity index 100% rename from RenX.Listen/RenX_Listen.h rename to src/Plugins/RenX/RenX.Listen/RenX_Listen.h diff --git a/src/Plugins/RenX/RenX.Logging/CMakeLists.txt b/src/Plugins/RenX/RenX.Logging/CMakeLists.txt new file mode 100644 index 0000000..312d3de --- /dev/null +++ b/src/Plugins/RenX/RenX.Logging/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.Logging + RenX_Logging.cpp + RenX_Logging.h) \ No newline at end of file diff --git a/RenX.Logging/RenX_Logging.cpp b/src/Plugins/RenX/RenX.Logging/RenX_Logging.cpp similarity index 99% rename from RenX.Logging/RenX_Logging.cpp rename to src/Plugins/RenX/RenX.Logging/RenX_Logging.cpp index dd43cf7..d5f052e 100644 --- a/RenX.Logging/RenX_Logging.cpp +++ b/src/Plugins/RenX/RenX.Logging/RenX_Logging.cpp @@ -2311,7 +2311,7 @@ int RenX_LoggingPlugin::OnRehash() // Plugin instantiation and entry point. RenX_LoggingPlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.Logging/RenX_Logging.h b/src/Plugins/RenX/RenX.Logging/RenX_Logging.h similarity index 100% rename from RenX.Logging/RenX_Logging.h rename to src/Plugins/RenX/RenX.Logging/RenX_Logging.h diff --git a/src/Plugins/RenX/RenX.Medals/CMakeLists.txt b/src/Plugins/RenX/RenX.Medals/CMakeLists.txt new file mode 100644 index 0000000..72e2894 --- /dev/null +++ b/src/Plugins/RenX/RenX.Medals/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.Medals + RenX_Medals.cpp + RenX_Medals.h) \ No newline at end of file diff --git a/RenX.Medals/RenX_Medals.cpp b/src/Plugins/RenX/RenX.Medals/RenX_Medals.cpp similarity index 99% rename from RenX.Medals/RenX_Medals.cpp rename to src/Plugins/RenX/RenX.Medals/RenX_Medals.cpp index 5b528e9..c55e8e7 100644 --- a/RenX.Medals/RenX_Medals.cpp +++ b/src/Plugins/RenX/RenX.Medals/RenX_Medals.cpp @@ -462,7 +462,7 @@ int getWorth(const RenX::PlayerInfo &player) return getRecs(player) - getNoobs(player); } -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.Medals/RenX_Medals.h b/src/Plugins/RenX/RenX.Medals/RenX_Medals.h similarity index 98% rename from RenX.Medals/RenX_Medals.h rename to src/Plugins/RenX/RenX.Medals/RenX_Medals.h index 1af2e29..6ecac29 100644 --- a/RenX.Medals/RenX_Medals.h +++ b/src/Plugins/RenX/RenX.Medals/RenX_Medals.h @@ -21,7 +21,7 @@ #include #include "Jupiter/Plugin.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "RenX_Plugin.h" #include "RenX_GameCommand.h" diff --git a/src/Plugins/RenX/RenX.MinPlayers/CMakeLists.txt b/src/Plugins/RenX/RenX.MinPlayers/CMakeLists.txt new file mode 100644 index 0000000..8ac80fa --- /dev/null +++ b/src/Plugins/RenX/RenX.MinPlayers/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.MinPlayers + RenX_MinPlayers.cpp + RenX_MinPlayers.h) \ No newline at end of file diff --git a/RenX.MinPlayers/RenX_MinPlayers.cpp b/src/Plugins/RenX/RenX.MinPlayers/RenX_MinPlayers.cpp similarity index 98% rename from RenX.MinPlayers/RenX_MinPlayers.cpp rename to src/Plugins/RenX/RenX.MinPlayers/RenX_MinPlayers.cpp index 09ed2d7..4ace315 100644 --- a/RenX.MinPlayers/RenX_MinPlayers.cpp +++ b/src/Plugins/RenX/RenX.MinPlayers/RenX_MinPlayers.cpp @@ -129,7 +129,7 @@ void RenX_MinPlayersPlugin::RenX_OnDie(RenX::Server &server, const RenX::PlayerI // Plugin instantiation and entry point. RenX_MinPlayersPlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.MinPlayers/RenX_MinPlayers.h b/src/Plugins/RenX/RenX.MinPlayers/RenX_MinPlayers.h similarity index 100% rename from RenX.MinPlayers/RenX_MinPlayers.h rename to src/Plugins/RenX/RenX.MinPlayers/RenX_MinPlayers.h diff --git a/src/Plugins/RenX/RenX.ModSystem/CMakeLists.txt b/src/Plugins/RenX/RenX.ModSystem/CMakeLists.txt new file mode 100644 index 0000000..39adfaa --- /dev/null +++ b/src/Plugins/RenX/RenX.ModSystem/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.ModSystem + RenX_ModSystem.cpp + RenX_ModSystem.h) \ No newline at end of file diff --git a/RenX.ModSystem/RenX_ModSystem.cpp b/src/Plugins/RenX/RenX.ModSystem/RenX_ModSystem.cpp similarity index 99% rename from RenX.ModSystem/RenX_ModSystem.cpp rename to src/Plugins/RenX/RenX.ModSystem/RenX_ModSystem.cpp index 62d57f2..584368b 100644 --- a/RenX.ModSystem/RenX_ModSystem.cpp +++ b/src/Plugins/RenX/RenX.ModSystem/RenX_ModSystem.cpp @@ -1093,7 +1093,7 @@ const Jupiter::ReadableString &ForceAuthGameCommand::getHelp(const Jupiter::Read GAME_COMMAND_INIT(ForceAuthGameCommand) -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.ModSystem/RenX_ModSystem.h b/src/Plugins/RenX/RenX.ModSystem/RenX_ModSystem.h similarity index 98% rename from RenX.ModSystem/RenX_ModSystem.h rename to src/Plugins/RenX/RenX.ModSystem/RenX_ModSystem.h index 0686098..2acad86 100644 --- a/RenX.ModSystem/RenX_ModSystem.h +++ b/src/Plugins/RenX/RenX.ModSystem/RenX_ModSystem.h @@ -22,7 +22,7 @@ #include #include "Jupiter/Plugin.h" #include "Jupiter/Reference_String.h" -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "IRC_Command.h" #include "RenX_Plugin.h" #include "RenX_GameCommand.h" diff --git a/src/Plugins/RenX/RenX.NicknameUUID/CMakeLists.txt b/src/Plugins/RenX/RenX.NicknameUUID/CMakeLists.txt new file mode 100644 index 0000000..1238471 --- /dev/null +++ b/src/Plugins/RenX/RenX.NicknameUUID/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.NicknameUUID + RenX_NicknameUUID.cpp + RenX_NicknameUUID.h) \ No newline at end of file diff --git a/RenX.NicknameUUID/RenX_NicknameUUID.cpp b/src/Plugins/RenX/RenX.NicknameUUID/RenX_NicknameUUID.cpp similarity index 95% rename from RenX.NicknameUUID/RenX_NicknameUUID.cpp rename to src/Plugins/RenX/RenX.NicknameUUID/RenX_NicknameUUID.cpp index d07838f..a164bd4 100644 --- a/RenX.NicknameUUID/RenX_NicknameUUID.cpp +++ b/src/Plugins/RenX/RenX.NicknameUUID/RenX_NicknameUUID.cpp @@ -16,7 +16,7 @@ * Written by Jessica James */ -#include "Jupiter/String.h" +#include "Jupiter/String.hpp" #include "RenX_Core.h" #include "RenX_Server.h" #include "RenX_PlayerInfo.h" @@ -52,7 +52,7 @@ void RenX_NicknameUUIDPlugin::RenX_OnServerCreate(RenX::Server &server) // Plugin instantiation and entry point. RenX_NicknameUUIDPlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.NicknameUUID/RenX_NicknameUUID.h b/src/Plugins/RenX/RenX.NicknameUUID/RenX_NicknameUUID.h similarity index 100% rename from RenX.NicknameUUID/RenX_NicknameUUID.h rename to src/Plugins/RenX/RenX.NicknameUUID/RenX_NicknameUUID.h diff --git a/src/Plugins/RenX/RenX.Plugin.Template/CMakeLists.txt b/src/Plugins/RenX/RenX.Plugin.Template/CMakeLists.txt new file mode 100644 index 0000000..8b5399b --- /dev/null +++ b/src/Plugins/RenX/RenX.Plugin.Template/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.Plugin.Template + Example.cpp + Example.h) \ No newline at end of file diff --git a/RenX.Plugin.Template/Example.cpp b/src/Plugins/RenX/RenX.Plugin.Template/Example.cpp similarity index 85% rename from RenX.Plugin.Template/Example.cpp rename to src/Plugins/RenX/RenX.Plugin.Template/Example.cpp index 359310b..bc22b36 100644 --- a/RenX.Plugin.Template/Example.cpp +++ b/src/Plugins/RenX/RenX.Plugin.Template/Example.cpp @@ -13,7 +13,7 @@ // Plugin instantiation and entry point. RenX_TPlugin pluginInstance; -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.Plugin.Template/Example.h b/src/Plugins/RenX/RenX.Plugin.Template/Example.h similarity index 100% rename from RenX.Plugin.Template/Example.h rename to src/Plugins/RenX/RenX.Plugin.Template/Example.h diff --git a/src/Plugins/RenX/RenX.ServerList/CMakeLists.txt b/src/Plugins/RenX/RenX.ServerList/CMakeLists.txt new file mode 100644 index 0000000..89ffe6c --- /dev/null +++ b/src/Plugins/RenX/RenX.ServerList/CMakeLists.txt @@ -0,0 +1,6 @@ +add_renx_plugin(RenX.ServerList + RenX_ServerList.cpp + RenX_ServerList.h) + +target_link_libraries(RenX.ServerList + HTTPServer) \ No newline at end of file diff --git a/RenX.ServerList/RenX_ServerList.cpp b/src/Plugins/RenX/RenX.ServerList/RenX_ServerList.cpp similarity index 99% rename from RenX.ServerList/RenX_ServerList.cpp rename to src/Plugins/RenX/RenX.ServerList/RenX_ServerList.cpp index 60b0723..814327b 100644 --- a/RenX.ServerList/RenX_ServerList.cpp +++ b/src/Plugins/RenX/RenX.ServerList/RenX_ServerList.cpp @@ -727,7 +727,7 @@ Jupiter::ReadableString *handle_game_server_list_page(const Jupiter::ReadableStr return pluginInstance.getServerListGame(); } -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.ServerList/RenX_ServerList.h b/src/Plugins/RenX/RenX.ServerList/RenX_ServerList.h similarity index 100% rename from RenX.ServerList/RenX_ServerList.h rename to src/Plugins/RenX/RenX.ServerList/RenX_ServerList.h diff --git a/src/Plugins/RenX/RenX.SetJoin/CMakeLists.txt b/src/Plugins/RenX/RenX.SetJoin/CMakeLists.txt new file mode 100644 index 0000000..c187181 --- /dev/null +++ b/src/Plugins/RenX/RenX.SetJoin/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.SetJoin + RenX_SetJoin.cpp + RenX_SetJoin.h) \ No newline at end of file diff --git a/RenX.SetJoin/RenX_SetJoin.cpp b/src/Plugins/RenX/RenX.SetJoin/RenX_SetJoin.cpp similarity index 98% rename from RenX.SetJoin/RenX_SetJoin.cpp rename to src/Plugins/RenX/RenX.SetJoin/RenX_SetJoin.cpp index dd903bc..2fe59eb 100644 --- a/RenX.SetJoin/RenX_SetJoin.cpp +++ b/src/Plugins/RenX/RenX.SetJoin/RenX_SetJoin.cpp @@ -160,7 +160,7 @@ const Jupiter::ReadableString &SetJoinGameCommand::getHelp(const Jupiter::Readab GAME_COMMAND_INIT(SetJoinGameCommand) -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.SetJoin/RenX_SetJoin.h b/src/Plugins/RenX/RenX.SetJoin/RenX_SetJoin.h similarity index 100% rename from RenX.SetJoin/RenX_SetJoin.h rename to src/Plugins/RenX/RenX.SetJoin/RenX_SetJoin.h diff --git a/src/Plugins/RenX/RenX.Warn/CMakeLists.txt b/src/Plugins/RenX/RenX.Warn/CMakeLists.txt new file mode 100644 index 0000000..4d2206b --- /dev/null +++ b/src/Plugins/RenX/RenX.Warn/CMakeLists.txt @@ -0,0 +1,3 @@ +add_renx_plugin(RenX.Warn + RenX_Warn.cpp + RenX_Warn.h) \ No newline at end of file diff --git a/RenX.Warn/RenX_Warn.cpp b/src/Plugins/RenX/RenX.Warn/RenX_Warn.cpp similarity index 99% rename from RenX.Warn/RenX_Warn.cpp rename to src/Plugins/RenX/RenX.Warn/RenX_Warn.cpp index 0ea3784..af165be 100644 --- a/RenX.Warn/RenX_Warn.cpp +++ b/src/Plugins/RenX/RenX.Warn/RenX_Warn.cpp @@ -249,7 +249,7 @@ const Jupiter::ReadableString &PardonGameCommand::getHelp(const Jupiter::Readabl GAME_COMMAND_INIT(PardonGameCommand) -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/RenX.Warn/RenX_Warn.h b/src/Plugins/RenX/RenX.Warn/RenX_Warn.h similarity index 100% rename from RenX.Warn/RenX_Warn.h rename to src/Plugins/RenX/RenX.Warn/RenX_Warn.h diff --git a/src/Plugins/SetJoin/CMakeLists.txt b/src/Plugins/SetJoin/CMakeLists.txt new file mode 100644 index 0000000..e093d1a --- /dev/null +++ b/src/Plugins/SetJoin/CMakeLists.txt @@ -0,0 +1,3 @@ +add_plugin(SetJoin + SetJoin.cpp + SetJoin.h) diff --git a/SetJoin/SetJoin.cpp b/src/Plugins/SetJoin/SetJoin.cpp similarity index 98% rename from SetJoin/SetJoin.cpp rename to src/Plugins/SetJoin/SetJoin.cpp index cfe300f..80c04f5 100644 --- a/SetJoin/SetJoin.cpp +++ b/src/Plugins/SetJoin/SetJoin.cpp @@ -115,7 +115,7 @@ IRC_COMMAND_INIT(DelJoinIRCCommand) // Plugin instantiation and entry point. -extern "C" __declspec(dllexport) Jupiter::Plugin *getPlugin() +extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() { return &pluginInstance; } diff --git a/SetJoin/SetJoin.h b/src/Plugins/SetJoin/SetJoin.h similarity index 100% rename from SetJoin/SetJoin.h rename to src/Plugins/SetJoin/SetJoin.h