Updated Json Material loader to support passing JSON instead of a stream, and added techset loading code

src/ObjLoading/Game/T6/ObjLoaderT6.cpp

@@ -49,6 +49,7 @@
 #include "ZBarrier/GdtLoaderZBarrierT6.h"
 #include "ZBarrier/RawLoaderZBarrierT6.h"
 #include "CustomMap/LoaderCustomMapT6.h"
+#include "TechniqueSet/LoaderTechniqueSetT6.h"
 
 #include <format>
 #include <memory>
@@ -393,7 +394,7 @@ namespace T6
             // collection.AddAssetCreator(std::make_unique<AssetLoaderXAnim>(memory));
             collection.AddAssetCreator(xmodel::CreateLoaderT6(memory, searchPath, zone));
             collection.AddAssetCreator(material::CreateLoaderT6(memory, searchPath));
-            collection.AddAssetCreator(CreateTechniqueSetLoader(memory, searchPath));
+            collection.AddAssetCreator(technique_set::CreateLoaderT6(memory, searchPath));
             collection.AddAssetCreator(image::CreateLoaderEmbeddedT6(memory, searchPath));
             collection.AddAssetCreator(image::CreateLoaderExternalT6(memory, searchPath));
             collection.AddAssetCreator(image::CreateLoadDefLoaderT6(memory, searchPath));

src/ObjLoading/Game/T6/TechniqueSet/LoaderTechniqueSetT6.cpp

@@ -176,10 +176,10 @@ namespace
     };
 } // namespace
 
-namespace T6
+namespace technique_set
 {
-    std::unique_ptr<AssetCreator<AssetTechniqueSet>> CreateTechniqueSetLoader(MemoryManager& memory, ISearchPath& searchPath)
+    std::unique_ptr<AssetCreator<AssetTechniqueSet>> CreateLoaderT6(MemoryManager& memory, ISearchPath& searchPath)
     {
         return std::make_unique<TechniqueSetLoader>(memory, searchPath);
     }
-} // namespace T6
+} // namespace technique_set

src/ObjLoading/Game/T6/TechniqueSet/LoaderTechniqueSetT6.h

@@ -7,7 +7,7 @@
 
 #include <memory>
 
-namespace T6
+namespace technique_set
 {
-    std::unique_ptr<AssetCreator<AssetTechniqueSet>> CreateTechniqueSetLoader(MemoryManager& memory, ISearchPath& searchPath);
+    std::unique_ptr<AssetCreator<T6::AssetTechniqueSet>> CreateLoaderT6(MemoryManager& memory, ISearchPath& searchPath);
-} // namespace T6
+} // namespace technique_set

src/ObjLoading/Material/JsonMaterialLoader.cpp.template

@@ -42,7 +42,9 @@
 
 #include <format>
 #include <iostream>
+#include <nlohmann/json.hpp>
 
+using namespace nlohmann;
 using namespace GAME;
 
 namespace
@@ -59,39 +61,30 @@ namespace
 
         bool Load(json& jRoot, Material& material) const
         {
-            try
+			std::string type;
-            {
+			unsigned version;
-                std::string type;
+	
-                unsigned version;
+			jRoot.at("_type").get_to(type);
-
+			jRoot.at("_version").get_to(version);
-                jRoot.at("_type").get_to(type);
+	
-                jRoot.at("_version").get_to(version);
+			if (type != "material" || version != 1u)
-
+			{
-                if (type != "material" || version != 1u)
+				con::error("Tried to load material \"{}\" but did not find expected type material of version 1", material.info.name);
-                {
+				return false;
-                    con::error("Tried to load material \"{}\" but did not find expected type material of version 1", material.info.name);
+			}
-                    return false;
-                }
             
 #ifndef FEATURE_T6 // T6 did not have this check in version 1, so to stay backwards compatible, let it stay that way
-                std::string game;
+            std::string game;
-                jRoot.at("_game").get_to(game);
+            jRoot.at("_game").get_to(game);
-                if (game != GAME_LOWER)
+            if (game != GAME_LOWER)
-                {
+            {
-                    con::error("Tried to load material \"{}\" but \"_game\" did not find expected type value {}", material.info.name, GAME_LOWER);
+                con::error("Tried to load material \"{}\" but \"_game\" did not find expected type value {}", material.info.name, GAME_LOWER);
-                    return false;
+                return false;
-                }
+            }
 #endif
 
-                const auto jMaterial = jRoot.get<JsonMaterial>();
+            const auto jMaterial = jRoot.get<JsonMaterial>();
-                return CreateMaterialFromJson(jMaterial, material);
+            return CreateMaterialFromJson(jMaterial, material);
-            }
-            catch (const json::exception& e)
-            {
-                con::error("Failed to parse json of material: {}", e.what());
-            }
-
-            return false;
         }
 
     private:
@@ -528,9 +521,17 @@ namespace GAME
 	{
 		const JsonLoader loader(memory, context, registration);
 	
-		auto jRoot = json::parse(stream);
+		try
-	
+        {
-		return loader.Load(jRoot, material);
+			auto jRoot = json::parse(stream);
+			
+			return loader.Load(jRoot, material);
+		}
+        catch (const json::exception& e)
+        {
+            con::error("Failed to parse json of material: {}", e.what());
+			return false;
+        }
 	}
 	
 	bool LoadMaterialAsJson(