Add game version to json, format, remove CS2_ONLY

Author: xPaw

.clang-format

@@ -0,0 +1,39 @@
+Language: Cpp
+ColumnLimit: 0
+UseTab: AlignWithSpaces
+TabWidth: 4
+IndentWidth: 4
+ContinuationIndentWidth: 4
+AccessModifierOffset: -4
+NamespaceIndentation: None
+BreakBeforeBraces: Custom
+SpaceBeforeParens: ControlStatements
+PointerAlignment: Left
+ReferenceAlignment: Left
+AlignAfterOpenBracket: DontAlign
+AllowShortBlocksOnASingleLine: Empty
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+IndentCaseLabels: true
+BraceWrapping:
+  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: Always
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+  BeforeCatch: true
+  BeforeElse: true
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+SortIncludes: false
+InsertBraces: false
+FixNamespaceComments: true
+SpaceBeforeCaseColon: false
+SpacesInParens: Never
+Cpp11BracedListStyle: false

src/main/appframework.cpp

@@ -30,15 +30,12 @@
 
 static DumperApplication g_Application;
 
-#define CS2_ONLY (1<<0)
-
 struct AppSystemInfo
 {
 	bool gameBin;
 	const char* moduleName;
 	std::string interfaceVersion;
 	bool connect = true;
-	uint64_t flags = 0;
 };
 
 std::vector<AppSystemInfo> g_appSystems{
@@ -47,12 +44,14 @@ std::vector<AppSystemInfo> g_appSystems{
 	{ true, "client", "Source2ClientConfig001" },
 	{ false, "engine2", SOURCE2ENGINETOSERVER_INTERFACE_VERSION },
 	{ true, "host", "GameSystem2HostHook" },
-	{ true, "matchmaking", MATCHFRAMEWORK_INTERFACE_VERSION, true, CS2_ONLY },
+#ifdef GAME_CS2
+	{ true, "matchmaking", MATCHFRAMEWORK_INTERFACE_VERSION },
+#endif
 	{ true, "server", SOURCE2SERVERCONFIG_INTERFACE_VERSION },
 	{ false, "animationsystem", ANIMATIONSYSTEM_INTERFACE_VERSION },
 	{ false, "materialsystem2", TEXTLAYOUT_INTERFACE_VERSION },
 	{ false, "meshsystem", MESHSYSTEM_INTERFACE_VERSION, false },
-	{ false, "networksystem", NETWORKSYSTEM_INTERFACE_VERSION, false}, // can't connect on linux cuz of missing gameinfo	in IApplication
+	{ false, "networksystem", NETWORKSYSTEM_INTERFACE_VERSION, false }, // can't connect on linux cuz of missing gameinfo	in IApplication
 	{ false, "panorama", PANORAMAUIENGINE_INTERFACE_VERSION },
 	{ false, "particles", PARTICLESYSTEMMGR_INTERFACE_VERSION, false }, // needs renderdevice interface
 	{ false, "pulse_system", PULSESYSTEM_INTERFACE_VERSION },
@@ -148,16 +147,12 @@ void InitializeAppSystems()
 	spdlog::info("Initializing app systems");
 	for (const auto& appSystem : g_appSystems)
 	{
-#ifndef GAME_CS2
-		if ((appSystem.flags & CS2_ONLY) != 0)
-			continue;
-#endif // !GAME_CS2
-
 		std::string path = appSystem.gameBin ? fmt::format("../../{}/bin/{}", GAME_PATH, PLATFORM_FOLDER) : "";
 
 		auto targetPath = (std::filesystem::current_path() / path / (MODULE_PREFIX + std::string(appSystem.moduleName) + MODULE_EXT)).lexically_normal().generic_string();
 
-		if (!std::filesystem::exists(targetPath)) {
+		if (!std::filesystem::exists(targetPath))
+		{
 			spdlog::info("Skipping module as it does not exist: {}", targetPath);
 			continue;
 		}

src/main/dumpers/schemas/filesystem_exporter.cpp

@@ -34,21 +34,23 @@ namespace Dumpers::Schemas::FilesystemExporter
 std::string CommentBlock(std::string str)
 {
 	size_t pos = 0;
-	while ((pos = str.find('\n', pos)) != std::string::npos) {
+	while ((pos = str.find('\n', pos)) != std::string::npos)
+	{
 		str.replace(pos, 1, "\n//");
 		pos += 3;
 	}
 
 	return str;
 }
 
-
 void OutputMetadataEntry(const IntermediateMetadata& entry, std::ofstream& output, bool tabulate)
 {
 	output << (tabulate ? "\t" : "") << "// " << entry.name;
 
-	if (entry.hasValue) {
-		if (entry.stringValue) {
+	if (entry.hasValue)
+	{
+		if (entry.stringValue)
+		{
 			output << " = " << CommentBlock(*entry.stringValue);
 		}
 		else
@@ -135,7 +137,7 @@ void DumpEnums(const std::vector<IntermediateSchemaEnum>& enums, std::filesystem
 
 		std::ofstream output((schemaPath / intermediateEnum.module / sanitizedFileName).replace_extension(".h"));
 
-		for(const auto& metadata : intermediateEnum.metadata)
+		for (const auto& metadata : intermediateEnum.metadata)
 		{
 			OutputMetadataEntry(metadata, output, false);
 		}
@@ -146,7 +148,7 @@ void DumpEnums(const std::vector<IntermediateSchemaEnum>& enums, std::filesystem
 		for (const auto& member : intermediateEnum.members)
 		{
 			// Output metadata entires as comments before the field definition
-			for(const auto& metadata: member.metadata)
+			for (const auto& metadata : member.metadata)
 			{
 				OutputMetadataEntry(metadata, output, true);
 			}

src/main/dumpers/schemas/json_exporter.cpp

@@ -56,89 +56,89 @@ json SerializeType(CSchemaType* type)
 
 	switch (type->m_eTypeCategory)
 	{
-	case SCHEMA_TYPE_BUILTIN:
-		j["category"] = "builtin";
-		j["name"] = type->m_sTypeName.String();
-		break;
-	case SCHEMA_TYPE_POINTER:
-		j["category"] = "ptr";
-		j["inner"] = SerializeType(static_cast<CSchemaType_Ptr*>(type)->m_pObjectType);
-		break;
-	case SCHEMA_TYPE_FIXED_ARRAY:
-	{
-		auto* arr = static_cast<CSchemaType_FixedArray*>(type);
-		j["category"] = "fixed_array";
-		j["count"] = arr->m_nElementCount;
-		j["inner"] = SerializeType(arr->m_pElementType);
-		break;
-	}
-	case SCHEMA_TYPE_ATOMIC:
-	{
-		j["category"] = "atomic";
-
-		// Extract outer name from m_sTypeName before '<'
-		std::string typeName = type->m_sTypeName.String();
-		auto pos = typeName.find('<');
-		if (pos != std::string::npos)
-		{
-			auto name = typeName.substr(0, pos);
-			// Trim trailing whitespace
-			while (!name.empty() && name.back() == ' ')
-				name.pop_back();
-			j["name"] = name;
-		}
-		else
-		{
-			j["name"] = typeName;
-		}
-
-		if (type->m_eAtomicCategory == SCHEMA_ATOMIC_T ||
-			type->m_eAtomicCategory == SCHEMA_ATOMIC_COLLECTION_OF_T)
+		case SCHEMA_TYPE_BUILTIN:
+			j["category"] = "builtin";
+			j["name"] = type->m_sTypeName.String();
+			break;
+		case SCHEMA_TYPE_POINTER:
+			j["category"] = "ptr";
+			j["inner"] = SerializeType(static_cast<CSchemaType_Ptr*>(type)->m_pObjectType);
+			break;
+		case SCHEMA_TYPE_FIXED_ARRAY:
 		{
-			j["inner"] = SerializeType(static_cast<CSchemaType_Atomic_T*>(type)->m_pTemplateType);
+			auto* arr = static_cast<CSchemaType_FixedArray*>(type);
+			j["category"] = "fixed_array";
+			j["count"] = arr->m_nElementCount;
+			j["inner"] = SerializeType(arr->m_pElementType);
+			break;
 		}
-		else if (type->m_eAtomicCategory == SCHEMA_ATOMIC_TT)
+		case SCHEMA_TYPE_ATOMIC:
 		{
-			auto* tt = static_cast<CSchemaType_Atomic_TT*>(type);
-			j["inner"] = SerializeType(tt->m_pTemplateType);
-			j["inner2"] = SerializeType(tt->m_pTemplateType2);
+			j["category"] = "atomic";
+
+			// Extract outer name from m_sTypeName before '<'
+			std::string typeName = type->m_sTypeName.String();
+			auto pos = typeName.find('<');
+			if (pos != std::string::npos)
+			{
+				auto name = typeName.substr(0, pos);
+				// Trim trailing whitespace
+				while (!name.empty() && name.back() == ' ')
+					name.pop_back();
+				j["name"] = name;
+			}
+			else
+			{
+				j["name"] = typeName;
+			}
+
+			if (type->m_eAtomicCategory == SCHEMA_ATOMIC_T ||
+				type->m_eAtomicCategory == SCHEMA_ATOMIC_COLLECTION_OF_T)
+			{
+				j["inner"] = SerializeType(static_cast<CSchemaType_Atomic_T*>(type)->m_pTemplateType);
+			}
+			else if (type->m_eAtomicCategory == SCHEMA_ATOMIC_TT)
+			{
+				auto* tt = static_cast<CSchemaType_Atomic_TT*>(type);
+				j["inner"] = SerializeType(tt->m_pTemplateType);
+				j["inner2"] = SerializeType(tt->m_pTemplateType2);
+			}
+			break;
 		}
-		break;
-	}
-	case SCHEMA_TYPE_DECLARED_CLASS:
-	{
-		j["category"] = "declared_class";
-		auto* classType = static_cast<CSchemaType_DeclaredClass*>(type);
-		if (classType->m_pClassInfo && classType->m_pClassInfo->m_pszName)
+		case SCHEMA_TYPE_DECLARED_CLASS:
 		{
-			j["name"] = classType->m_pClassInfo->m_pszName;
-			j["module"] = classType->m_pClassInfo->m_pszProjectName;
+			j["category"] = "declared_class";
+			auto* classType = static_cast<CSchemaType_DeclaredClass*>(type);
+			if (classType->m_pClassInfo && classType->m_pClassInfo->m_pszName)
+			{
+				j["name"] = classType->m_pClassInfo->m_pszName;
+				j["module"] = classType->m_pClassInfo->m_pszProjectName;
+			}
+			else
+				j["name"] = type->m_sTypeName.String();
+			break;
 		}
-		else
-			j["name"] = type->m_sTypeName.String();
-		break;
-	}
-	case SCHEMA_TYPE_DECLARED_ENUM:
-	{
-		j["category"] = "declared_enum";
-		auto* enumType = static_cast<CSchemaType_DeclaredEnum*>(type);
-		if (enumType->m_pEnumInfo && enumType->m_pEnumInfo->m_pszName)
+		case SCHEMA_TYPE_DECLARED_ENUM:
 		{
-			j["name"] = enumType->m_pEnumInfo->m_pszName;
-			j["module"] = enumType->m_pEnumInfo->m_pszProjectName;
+			j["category"] = "declared_enum";
+			auto* enumType = static_cast<CSchemaType_DeclaredEnum*>(type);
+			if (enumType->m_pEnumInfo && enumType->m_pEnumInfo->m_pszName)
+			{
+				j["name"] = enumType->m_pEnumInfo->m_pszName;
+				j["module"] = enumType->m_pEnumInfo->m_pszProjectName;
+			}
+			else
+				j["name"] = type->m_sTypeName.String();
+			break;
 		}
-		else
+		case SCHEMA_TYPE_BITFIELD:
+			j["category"] = "bitfield";
+			j["count"] = static_cast<CSchemaType_Bitfield*>(type)->m_nBitfieldCount;
+			break;
+		default:
+			j["category"] = "builtin";
 			j["name"] = type->m_sTypeName.String();
-		break;
-	}
-	case SCHEMA_TYPE_BITFIELD:
-		j["category"] = "bitfield";
-		j["count"] = static_cast<CSchemaType_Bitfield*>(type)->m_nBitfieldCount;
-		break;
-	default:
-		j["category"] = "builtin";
-		j["name"] = type->m_sTypeName.String();
-		break;
+			break;
 	}
 
 	return j;
@@ -167,7 +167,7 @@ void DumpClasses(const std::vector<IntermediateSchemaClass>& classes, json& clas
 			parents.push_back(std::move(parentObj));
 		}
 
-		if(parents.size())
+		if (parents.size())
 			classObj["parents"] = std::move(parents);
 
 		json fields = json::array();
@@ -180,7 +180,7 @@ void DumpClasses(const std::vector<IntermediateSchemaClass>& classes, json& clas
 			fieldObj["type"] = SerializeType(field.type);
 
 			auto fieldMetadataArr = SerializeMetadataArray(field.metadata);
-			if(fieldMetadataArr.size())
+			if (fieldMetadataArr.size())
 				fieldObj["metadata"] = std::move(fieldMetadataArr);
 
 			fields.push_back(fieldObj);
@@ -192,7 +192,7 @@ void DumpClasses(const std::vector<IntermediateSchemaClass>& classes, json& clas
 		classesArray.push_back(std::move(classObj));
 	}
 }
-	
+
 void DumpEnums(const std::vector<IntermediateSchemaEnum>& enums, json& enumsArray)
 {
 	for (const auto& intermediateEnum : enums)
@@ -220,7 +220,7 @@ void DumpEnums(const std::vector<IntermediateSchemaEnum>& enums, json& enumsArra
 			members.push_back(std::move(memberObj));
 		}
 
-		if(members.size())
+		if (members.size())
 			enumObj["members"] = std::move(members);
 
 		enumsArray.push_back(std::move(enumObj));
@@ -238,6 +238,15 @@ void Dump(const std::vector<IntermediateSchemaEnum>& enums, const std::vector<In
 	DumpClasses(classes, classesArray);
 	DumpEnums(enums, enumsArray);
 
+	if (!Globals::sourceRevision.empty())
+		root["revision"] = std::stoi(Globals::sourceRevision);
+
+	if (!Globals::versionDate.empty())
+		root["version_date"] = Globals::versionDate;
+
+	if (!Globals::versionTime.empty())
+		root["version_time"] = Globals::versionTime;
+
 	root["classes"] = classesArray;
 	root["enums"] = enumsArray;