From cf891e458ac4c168c27848a613ed56e9f373a515 Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Sun, 24 Mar 2024 00:51:33 +0100
Subject: [PATCH] chore: move json classes to json folder

---
 src/ObjCommon/Game/T6/{Material => Json}/JsonMaterial.h | 2 +-
 src/ObjCommon/Game/T6/Material/JsonMaterial.cpp         | 0
 src/ObjCommon/{Utils => Json}/JsonOptional.h            | 0
 src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp  | 2 +-
 src/ObjWriting/Game/T6/Material/JsonMaterialWriter.cpp  | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename src/ObjCommon/Game/T6/{Material => Json}/JsonMaterial.h (99%)
 delete mode 100644 src/ObjCommon/Game/T6/Material/JsonMaterial.cpp
 rename src/ObjCommon/{Utils => Json}/JsonOptional.h (100%)

diff --git a/src/ObjCommon/Game/T6/Material/JsonMaterial.h b/src/ObjCommon/Game/T6/Json/JsonMaterial.h
similarity index 99%
rename from src/ObjCommon/Game/T6/Material/JsonMaterial.h
rename to src/ObjCommon/Game/T6/Json/JsonMaterial.h
index b5fd2ae9..83762f74 100644
--- a/src/ObjCommon/Game/T6/Material/JsonMaterial.h
+++ b/src/ObjCommon/Game/T6/Json/JsonMaterial.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Game/T6/T6.h"
-#include "Utils/JsonOptional.h"
 
+#include "Json/JsonOptional.h"
 #include <memory>
 #include <nlohmann/json.hpp>
 #include <optional>
diff --git a/src/ObjCommon/Game/T6/Material/JsonMaterial.cpp b/src/ObjCommon/Game/T6/Material/JsonMaterial.cpp
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/ObjCommon/Utils/JsonOptional.h b/src/ObjCommon/Json/JsonOptional.h
similarity index 100%
rename from src/ObjCommon/Utils/JsonOptional.h
rename to src/ObjCommon/Json/JsonOptional.h
diff --git a/src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp b/src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp
index 16975cd8..db3d8f61 100644
--- a/src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp
+++ b/src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp
@@ -1,7 +1,7 @@
 #include "JsonMaterialLoader.h"
 
 #include "Game/T6/CommonT6.h"
-#include "Game/T6/Material/JsonMaterial.h"
+#include "Game/T6/Json/JsonMaterial.h"
 
 #include <format>
 #include <iomanip>
diff --git a/src/ObjWriting/Game/T6/Material/JsonMaterialWriter.cpp b/src/ObjWriting/Game/T6/Material/JsonMaterialWriter.cpp
index c31b075c..c622717c 100644
--- a/src/ObjWriting/Game/T6/Material/JsonMaterialWriter.cpp
+++ b/src/ObjWriting/Game/T6/Material/JsonMaterialWriter.cpp
@@ -1,7 +1,7 @@
 #include "JsonMaterialWriter.h"
 
 #include "Game/T6/CommonT6.h"
-#include "Game/T6/Material/JsonMaterial.h"
+#include "Game/T6/Json/JsonMaterial.h"
 #include "MaterialConstantZoneState.h"
 
 #include <iomanip>