From e979be42b252aa54b2a69712522a6e900a9b4ff4 Mon Sep 17 00:00:00 2001
From: Matthew Toro <matthewtoro@live.com>
Date: Fri, 3 Apr 2026 02:41:10 -0400
Subject: [PATCH] refactored the nlomann json library to be in the
 include/common. seems quite odd this wasn't the case.

---
 Minecraft.Server/Access/BanManager.cpp                          | 2 +-
 Minecraft.Server/Access/WhitelistManager.cpp                    | 2 +-
 Minecraft.Server/Common/AccessStorageUtils.h                    | 2 +-
 .../Common}/vendor/nlohmann/LICENSE.MIT                         | 0
 {Minecraft.Server => include/Common}/vendor/nlohmann/json.hpp   | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename {Minecraft.Server => include/Common}/vendor/nlohmann/LICENSE.MIT (100%)
 rename {Minecraft.Server => include/Common}/vendor/nlohmann/json.hpp (100%)

diff --git a/Minecraft.Server/Access/BanManager.cpp b/Minecraft.Server/Access/BanManager.cpp
index 59f5bccc..5447ab87 100644
--- a/Minecraft.Server/Access/BanManager.cpp
+++ b/Minecraft.Server/Access/BanManager.cpp
@@ -7,7 +7,7 @@
 #include "..\Common\NetworkUtils.h"
 #include "..\Common\StringUtils.h"
 #include "..\ServerLogger.h"
-#include "..\vendor\nlohmann\json.hpp"
+#include "Common/vendor/nlohmann/json.hpp"
 
 #include <algorithm>
 #include <stdio.h>
diff --git a/Minecraft.Server/Access/WhitelistManager.cpp b/Minecraft.Server/Access/WhitelistManager.cpp
index 33ea7e46..3629914e 100644
--- a/Minecraft.Server/Access/WhitelistManager.cpp
+++ b/Minecraft.Server/Access/WhitelistManager.cpp
@@ -6,7 +6,7 @@
 #include "..\Common\FileUtils.h"
 #include "..\Common\StringUtils.h"
 #include "..\ServerLogger.h"
-#include "..\vendor\nlohmann\json.hpp"
+#include "Common/vendor/nlohmann/json.hpp"
 
 #include <algorithm>
 
diff --git a/Minecraft.Server/Common/AccessStorageUtils.h b/Minecraft.Server/Common/AccessStorageUtils.h
index c5d3477c..26d0c80e 100644
--- a/Minecraft.Server/Common/AccessStorageUtils.h
+++ b/Minecraft.Server/Common/AccessStorageUtils.h
@@ -3,7 +3,7 @@
 #include "FileUtils.h"
 #include "StringUtils.h"
 
-#include "..\vendor\nlohmann\json.hpp"
+#include "Common/vendor/nlohmann/json.hpp"
 
 #include <stdio.h>
 
diff --git a/Minecraft.Server/vendor/nlohmann/LICENSE.MIT b/include/Common/vendor/nlohmann/LICENSE.MIT
similarity index 100%
rename from Minecraft.Server/vendor/nlohmann/LICENSE.MIT
rename to include/Common/vendor/nlohmann/LICENSE.MIT
diff --git a/Minecraft.Server/vendor/nlohmann/json.hpp b/include/Common/vendor/nlohmann/json.hpp
similarity index 100%
rename from Minecraft.Server/vendor/nlohmann/json.hpp
rename to include/Common/vendor/nlohmann/json.hpp