Refactor the GServer

.clang-format

@@ -1,8 +1,9 @@
 # Generated from CLion C/C++ Code Style settings
 BasedOnStyle: LLVM
-AccessModifierOffset: 0
+AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: None
+AlignEscapedNewlines: Left
 AlignOperands: Align
 AllowAllArgumentsOnNextLine: false
 AllowAllConstructorInitializersOnNextLine: false
@@ -11,40 +12,49 @@ AllowShortBlocksOnASingleLine: Always
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: Always
-AllowShortLambdasOnASingleLine: All
+AllowShortLambdasOnASingleLine: Empty
 AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterReturnType: None
 AlwaysBreakTemplateDeclarations: Yes
 BreakBeforeBraces: Custom
 BraceWrapping:
-  AfterCaseLabel: false
-  AfterClass: false
-  AfterControlStatement: Never
-  AfterEnum: false
-  AfterFunction: false
-  AfterNamespace: false
-  AfterUnion: false
-  BeforeCatch: false
-  BeforeElse: false
+  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: Always
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+  AfterExternBlock: true
+  BeforeCatch: true
+  BeforeElse: true
+  BeforeLambdaBody: true
+  BeforeWhile: true
   IndentBraces: false
   SplitEmptyFunction: false
   SplitEmptyRecord: true
+  SplitEmptyNamespace: true
 BreakBeforeBinaryOperators: None
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: BeforeColon
 BreakInheritanceList: BeforeColon
+Cpp11BracedListStyle: false
 ColumnLimit: 0
 CompactNamespaces: false
 ContinuationIndentWidth: 4
+IndentAccessModifiers: false
 IndentCaseLabels: true
-IndentPPDirectives: None
+IndentPPDirectives: BeforeHash
 IndentWidth: 4
+InsertNewlineAtEOF: true
 KeepEmptyLinesAtTheStartOfBlocks: true
+LambdaBodyIndentation: Signature
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: All
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
-PointerAlignment: Right
+PointerAlignment: Left
 ReflowComments: false
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
@@ -56,7 +66,7 @@ SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
 SpaceBeforeRangeBasedForLoopColon: false
 SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 0
+SpacesBeforeTrailingComments: 1
 SpacesInAngles: false
 SpacesInCStyleCastParentheses: false
 SpacesInContainerLiterals: false

.gitignore

@@ -27,4 +27,5 @@ dependencies/v8*
 lib/
 out/
 packages/
+vcpkg_installed/
 CMakeSettings.json

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "cmake/nuget"]
 	path = cmake/nuget
 	url = https://github.com/katusk/CMakeNuGetTools
+[submodule "vcpkg"]
+	path = vcpkg
+	url = https://github.com/microsoft/vcpkg.git

CMakeLists.txt

@@ -20,6 +20,17 @@
 #
 
 cmake_minimum_required(VERSION 3.0.0)
+
+# Make it easier for Windows users to get the required packages.
+# This needs to go before the project() call.
+if(WIN32)
+	set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file")
+	set(VCPKG_TARGET_TRIPLET "x64-windows-static")
+	if(V8NPCSERVER)
+		set(VCPKG_MANIFEST_FEATURES "npcserver")
+	endif()
+endif()
+
 project(GS2Emu VERSION 3.0.9 DESCRIPTION "Graal Online v1.411 to v6.037 compatible server" LANGUAGES C CXX)
 
 set(CMAKE_DEBUG_POSTFIX _d)
@@ -182,7 +193,8 @@ elseif(WIN32)
 		include(CheckCXXCompilerFlag)
 		CHECK_CXX_COMPILER_FLAG("/std:c++latest" _cpp_latest_flag_supported)
 		if (_cpp_latest_flag_supported)
-			add_compile_options("/std:c++latest")
+			set(CMAKE_CXX_STANDARD 23)
+			#add_compile_options("/std:c++latest")
 			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE")
 		endif()
 
@@ -205,7 +217,7 @@ elseif(WIN32)
 		cmake_policy(SET CMP0043 NEW)
 
 		# hack to fix clion + msvc together
-		if (CLIONHAX)
+		#if (CLIONHAX)
 			set(CompilerFlags
 					CMAKE_CXX_FLAGS
 					CMAKE_CXX_FLAGS_DEBUG
@@ -217,7 +229,7 @@ elseif(WIN32)
 			foreach(CompilerFlag ${CompilerFlags})
 				string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
 			endforeach()
-		endif()
+		#endif()
 	endif()
 
 	if( MINGW )

Catch_tests/TPlayer/TPlayer_tests.cpp → Catch_tests/Player/Player_tests.cpp

@@ -1,15 +1,15 @@
 #define CATCH_CONFIG_MAIN
 #include "catch2/catch_all.hpp"
-#include <TPlayer.h>
-#include <TServer.h>
+#include <Player.h>
+#include <Server.h>
 
-SCENARIO( "TPlayer", "[object]" ) {
+SCENARIO( "Player", "[object]" ) {
 
-	GIVEN( "TPlayer" ) {
+	GIVEN( "Player" ) {
 		int id = 123;
-		auto* server = new TServer("test");
+		auto* server = new Server("test");
 		auto* socket = new CSocket();
-		auto* player = new TPlayer(server, (CSocket*)socket, id);
+		auto* player = new Player(server, (CSocket*)socket, id);
 
 		WHEN( "getting player id" ) {
 			THEN( "id should be " << id ) {

cmake/AddTest.cmake

@@ -14,7 +14,7 @@ function(add_test_og TARGET_NAME TARGET_PATH)
   target_include_directories(${TARGET_NAME} PUBLIC ${GS2COMPILER_INCLUDE_DIRECTORY})
 
   target_include_directories(${TARGET_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/server/include)
-  target_include_directories(${TARGET_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/server/include/TLevel)
+  target_include_directories(${TARGET_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/server/include/Level)
   target_include_directories(${TARGET_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/server/include/Scripting)
   target_include_directories(${TARGET_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/server/include/Scripting/v8)
   target_include_directories(${TARGET_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/server/include/Scripting/interface)

cmake/FindV8.cmake

@@ -141,8 +141,8 @@ if(NOT V8_LIBRARY OR NOT V8_INCLUDE_DIR)
 		message("Mingw package search failed, looking for nuget package")
 
 		if (NOT V8_LIBRARY AND NOT V8_INCLUDE_DIR AND MSVC)
-			file(DOWNLOAD https://dist.nuget.org/win-x86-commandline/latest/nuget.exe ${CMAKE_BINARY_DIR}/nuget.exe)
-			set(NUGET_COMMAND ${CMAKE_BINARY_DIR}/nuget.exe)
+			file(DOWNLOAD https://dist.nuget.org/win-x86-commandline/latest/nuget.exe "${CMAKE_BINARY_DIR}/nuget.exe")
+			set(NUGET_COMMAND "${CMAKE_BINARY_DIR}/nuget.exe")
 			include("${CMAKE_SOURCE_DIR}/cmake/nuget/cmake/NuGetTools.cmake")
 			# Call this once before any other nuget_* calls.
 			nuget_initialize()

docs/tobedone.txt

@@ -2,7 +2,7 @@
 		// Send PM
 		case NCI_SENDPM:
 		{
-			TPlayer *player = server->getPlayer(pPacket.readGUShort());
+			TPlayer *player = m_server->getPlayer(pPacket.readGUShort());
 			if (player != 0)
 				player->sendPacket(CString() >> (char)PLO_PRIVATEMESSAGE >> (short)id << pPacket.readString(""));
 			break;
@@ -11,7 +11,7 @@
 	// Send RPG Message
 		case NCI_SENDRPGMESSAGE:
 		{
-			TPlayer *player = server->getPlayer(pPacket.readGUShort());
+			TPlayer *player = m_server->getPlayer(pPacket.readGUShort());
 			if (player != 0 && player->isClient() && player->getVersion() >= CLVER_2_1)
 				player->sendPacket(CString() >> (char)PLO_RPGWINDOW << "\"" << pPacket.readString("") << "\"");
 			break;
@@ -20,7 +20,7 @@
 // NPCServer -> Player --> Sign Message
 		case NCI_SAY2SIGN:
 		{
-			TPlayer* pl = server->getPlayer(pPacket.readGUShort());
+			TPlayer* pl = m_server->getPlayer(pPacket.readGUShort());
 			if (pl != 0)
 				pl->sendPacket(CString() >> (char)PLO_SAY2 << pPacket.readString("").replaceAll("\n", "#b"));
 			break;

server/CMakeLists.txt

@@ -24,26 +24,26 @@ include(CheckSymbolExists)
 
 set(
 	SOURCES
-	src/CFileSystem.cpp
-	src/main.cpp
-	src/TAccount.cpp
-	src/TMap.cpp
-	src/TNPC.cpp
-	src/TScriptClass.cpp
-	src/TServer.cpp
-	src/TServerList.cpp
-	src/TUpdatePackage.cpp
-	src/TWeapon.cpp
-	src/Scripting/GS2ScriptManager.cpp
-	src/TriggerCommandHandlers.cpp
-	${PROJECT_SOURCE_DIR}/bin/servers/default/bootstrap.js
+	"src/FileSystem.cpp"
+	"src/main.cpp"
+	"src/Account.cpp"
+	"src/Map.cpp"
+	"src/NPC.cpp"
+	"src/ScriptClass.cpp"
+	"src/Server.cpp"
+	"src/ServerList.cpp"
+	"src/UpdatePackage.cpp"
+	"src/Weapon.cpp"
+	"src/Scripting/GS2ScriptManager.cpp"
+	"src/TriggerCommandHandlers.cpp"
+	"${PROJECT_SOURCE_DIR}/bin/servers/default/bootstrap.js"
 )
 
-file(GLOB TPLAYER_SOURCES src/TPlayer/**.cpp)
-list(APPEND SOURCES ${TPLAYER_SOURCES})
+file(GLOB PLAYER_SOURCES src/Player/**.cpp)
+list(APPEND SOURCES ${PLAYER_SOURCES})
 
-file(GLOB TLEVEL_SOURCES src/TLevel/**.cpp)
-list(APPEND SOURCES ${TLEVEL_SOURCES})
+file(GLOB LEVEL_SOURCES src/Level/**.cpp)
+list(APPEND SOURCES ${LEVEL_SOURCES})
 
 file(GLOB MISC_SOURCES src/Misc/**.cpp)
 list(APPEND SOURCES ${MISC_SOURCES})
@@ -59,24 +59,25 @@ include(bin2h)
 set(EXE_HEADERS "")
 set(
 	HEADERS
-	${PROJECT_BINARY_DIR}/server/include/IConfig.h
-	include/CFileSystem.h
-	include/main.h
-	include/TAccount.h
-	include/TMap.h
-	include/TNPC.h
-	include/TPlayer.h
-	include/TScriptClass.h
-	include/TServer.h
-	include/TServerList.h
-	include/TUpdatePackage.h
-	include/TWeapon.h
-	include/Scripting/GS2ScriptManager.h
-	include/Scripting/ScriptOrigin.h
-	include/Scripting/SourceCode.h)
-
-file(GLOB TLEVEL_HEADERS include/TLevel/**.h)
-list(APPEND HEADERS ${TLEVEL_HEADERS})
+	"${PROJECT_BINARY_DIR}/server/include/IConfig.h"
+	"include/FileSystem.h"
+	"include/main.h"
+	"include/Account.h"
+	"include/Map.h"
+	"include/NPC.h"
+	"include/Player.h"
+	"include/ScriptClass.h"
+	"include/Server.h"
+	"include/ServerList.h"
+	"include/UpdatePackage.h"
+	"include/Weapon.h"
+	"include/Scripting/GS2ScriptManager.h"
+	"include/Scripting/ScriptOrigin.h"
+	"include/Scripting/SourceCode.h"
+)
+
+file(GLOB LEVEL_HEADERS include/Level/**.h)
+list(APPEND HEADERS ${LEVEL_HEADERS})
 
 file(GLOB MISC_HEADERS include/Misc/**.h)
 list(APPEND HEADERS ${MISC_HEADERS})
@@ -139,7 +140,7 @@ include_directories(
 	${PROJECT_BINARY_DIR}/server/include
 	${PROJECT_SOURCE_DIR}/server/include
 	${PROJECT_SOURCE_DIR}/server/include/Misc
-	${PROJECT_SOURCE_DIR}/server/include/TLevel
+	${PROJECT_SOURCE_DIR}/server/include/Level
 	${PROJECT_SOURCE_DIR}/server/include/utilities
 	${PROJECT_SOURCE_DIR}/server/include/Scripting
 	${PROJECT_SOURCE_DIR}/server/include/Scripting/interface