From f26ca6b40df547f6ac2cafc459fa0829a13ac01d Mon Sep 17 00:00:00 2001
From: Lion Kortlepel <development@kortlepel.com>
Date: Fri, 11 Feb 2022 10:18:56 +0100
Subject: [PATCH] add nlohmann/json

this will conflict with a change in the http branch, but i dont care
right now
---
 .gitmodules     | 5 ++++-
 deps/json       | 1 +
 src/TServer.cpp | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 160000 deps/json

diff --git a/.gitmodules b/.gitmodules
index 178fa5a..b54a97b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,4 +21,7 @@
 	url = https://github.com/nih-at/libzip
 [submodule "deps/cpp-httplib"]
 	path = deps/cpp-httplib
-	url = https://github.com/yhirose/cpp-httplib
\ No newline at end of file
+	url = https://github.com/yhirose/cpp-httplib
+[submodule "deps/json"]
+	path = deps/json
+	url = https://github.com/nlohmann/json
diff --git a/deps/json b/deps/json
new file mode 160000
index 0000000..eb21824
--- /dev/null
+++ b/deps/json
@@ -0,0 +1 @@
+Subproject commit eb2182414749825be086c825edb5229e5c28503d
diff --git a/src/TServer.cpp b/src/TServer.cpp
index 0f1ad32..8f389cf 100644
--- a/src/TServer.cpp
+++ b/src/TServer.cpp
@@ -7,13 +7,15 @@
 #include <any>
 #include <sstream>
 
+#include <nlohmann/json.hpp>
+
 #include "LuaAPI.h"
 
 #undef GetObject // Fixes Windows
 
 #include "Json.h"
 
-namespace json = rapidjson;
+namespace json = nlohmann::json;
 
 TServer::TServer(const std::vector<std::string_view>& Arguments) {
     beammp_info("BeamMP Server v" + Application::ServerVersionString());