From 28ecee3a1d530ed0d373c13282e78bf9331e226c Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Fri, 13 Sep 2024 21:50:28 +0200
Subject: [PATCH] chore: move t6 xmodel json to proper folder

---
 src/ObjCommon/Game/T6/{Json => XModel}/JsonXModel.h | 4 ----
 src/ObjCommon/Json/JsonCommon.h                     | 3 +++
 src/ObjLoading/Game/T6/XModel/XModelLoaderT6.cpp    | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename src/ObjCommon/Game/T6/{Json => XModel}/JsonXModel.h (90%)

diff --git a/src/ObjCommon/Game/T6/Json/JsonXModel.h b/src/ObjCommon/Game/T6/XModel/JsonXModel.h
similarity index 90%
rename from src/ObjCommon/Game/T6/Json/JsonXModel.h
rename to src/ObjCommon/Game/T6/XModel/JsonXModel.h
index 26e0c2f5..79e6eb06 100644
--- a/src/ObjCommon/Game/T6/Json/JsonXModel.h
+++ b/src/ObjCommon/Game/T6/XModel/JsonXModel.h
@@ -1,11 +1,7 @@
 #pragma once
 
-#include "Game/T6/T6.h"
-
 #include "Json/JsonCommon.h"
-#include "Json/JsonExtension.h"
 #include <memory>
-#include <nlohmann/json.hpp>
 #include <optional>
 #include <string>
 #include <vector>
diff --git a/src/ObjCommon/Json/JsonCommon.h b/src/ObjCommon/Json/JsonCommon.h
index f1a9291e..6ac71235 100644
--- a/src/ObjCommon/Json/JsonCommon.h
+++ b/src/ObjCommon/Json/JsonCommon.h
@@ -1,7 +1,10 @@
 #pragma once
 
 #include "Json/JsonExtension.h"
+
+#pragma warning(push, 0)
 #include <nlohmann/json.hpp>
+#pragma warning(pop)
 
 class JsonVec2
 {
diff --git a/src/ObjLoading/Game/T6/XModel/XModelLoaderT6.cpp b/src/ObjLoading/Game/T6/XModel/XModelLoaderT6.cpp
index 32e830a9..3beb26cb 100644
--- a/src/ObjLoading/Game/T6/XModel/XModelLoaderT6.cpp
+++ b/src/ObjLoading/Game/T6/XModel/XModelLoaderT6.cpp
@@ -1,7 +1,7 @@
 #include "XModelLoaderT6.h"
 
 #include "Game/T6/CommonT6.h"
-#include "Game/T6/Json/JsonXModel.h"
+#include "Game/T6/XModel/JsonXModel.h"
 
 #define GAME_NAMESPACE T6