Add load_order and incompatibilities to modinfo.json, fix NKH bug causing only one mods textures to load

Author: DisabledMallis

Diff for: Common/Mod/ModInfo.cpp

@@ -149,6 +149,27 @@ nlohmann::json ModInfo::Serialize() {
 	if (this->website.length() > 0) {
 		result["website"] = this->website;
 	}
+	if (this->loadOrder.has_value()) {
+		if (this->loadOrder == LoadOrder::BASE)
+		{
+			result["load_order"] = "BASE";
+		}
+		if (this->loadOrder == LoadOrder::FIRST)
+		{
+			result["load_order"] = "FIRST";
+		}
+		if (this->loadOrder == LoadOrder::ANY)
+		{
+			result["load_order"] = "ANY";
+		}
+		if (this->loadOrder == LoadOrder::LAST)
+		{
+			result["load_order"] = "LAST";
+		}
+	}
+	if (!this->incompatibilites.empty()) {
+		result["incompatibilities"] = this->incompatibilites;
+	}
 	return result;
 }
 

Diff for: NKHook5/Assets/AssetServer.cpp

@@ -66,7 +66,7 @@ std::shared_ptr<Asset> AssetServer::Serve(fs::path assetPath, std::vector<uint8_
 	AssetBin theBin = FromPath(assetPath);
 
 	//JSON files are only found in the json bin
-	if (theBin == AssetBin::JSON) {
+	if (theBin == AssetBin::JSON || assetPath.filename().string().ends_with(".json")) {
 		auto toCache = this->ServeJSON(assetPath, vanilla);
 		this->cache.push_back(toCache);
 		return toCache;
@@ -126,12 +126,15 @@ std::shared_ptr<Asset> AssetServer::ServeJSON(fs::path assetPath, std::vector<ui
 			nlohmann::ordered_json vanillaJson = nlohmann::ordered_json::parse(vanillaStr, nullptr, true, true);
 			merged.Add(vanillaJson);
 		}
-
+		
 		for (std::shared_ptr<Asset> find : finds) {
 			const std::vector<uint8_t>& findData = find->GetData();
 			std::string findStr(findData.begin(), findData.end());
 			nlohmann::ordered_json findJson = nlohmann::ordered_json::parse(findStr, nullptr, true, true);
-			merged.Add(findJson);
+			if (ExtensionManager::GetByTarget(assetPath.string()).empty())
+				merged.Add(findJson);
+			else
+				merged.Add(findJson, MergeMode::INSERTIVE);
 		}
 
 		nlohmann::ordered_json mergedJson = merged.GetMerged();

Diff for: NKHook5/Patches/CBloonsTD5Game/Constructor.cpp

@@ -56,6 +56,21 @@ namespace NKHook5
                         Print("An error occured while preparing mod initialization: %s", ex.what());
                     }
                 }
+                //Compatibility check
+                if (sources[LoadOrder::BASE].size() > 1)
+                {
+                    Print(LogLevel::ERR, "Multiple mods tried to have a BASE load order! Below are the incompatible mods:");
+                    for (ModAssetSource* source : sources[LoadOrder::BASE])
+                    {
+                        Print(LogLevel::ERR, "%s", source->GetModArch()->GetInfo().GetName().c_str());
+                    }
+                    Print(LogLevel::ERR, "You may only have ONE of these mods at a time.");
+
+                    MessageBoxA(nullptr, "You have incompatible mods! Read the console for more information.", "Compatibility check", MB_OK);
+                    Print("Press enter to quit...");
+                    std::cin.get();
+                    exit(-1);
+                }
                 LoadOrder priorityList[] = {
                     LoadOrder::BASE,
                     LoadOrder::FIRST,
@@ -75,6 +90,11 @@ namespace NKHook5
                                 {
                                     Print(LogLevel::ERR, "'%s' uses MergeIgnore, but without 'BASE' load_order!", modArch->GetInfo().GetName().c_str());
                                     Print(LogLevel::SUCCESS, "Add a 'load_order' entry to the mod's modinfo.json file with the value 'BASE'");
+
+                                    MessageBoxA(nullptr, "A compatibility check failed, read the console for more info.", "Compatibility check", MB_OK);
+                                    Print("Press enter to quit...");
+                                    std::cin.get();
+                                    exit(-1);
                                 }
                             }
                             const ModInfo& modInfo = modArch->GetInfo();