Modded resources/content-repentogon support

libzhl/functions/ASM.zhl

@@ -165,4 +165,7 @@ asm Minimap_Render_SetShaderPreImageRender "e8????????80bd????????000f84????????
 // EntityPlus patches
 asm EntityPlus_PlayerForceCamo "8b0d????????6a03e8????????84c00f85";
 
-asm LostSoulHeartTypeSkipSpawnPuddle "80be????????000f85????????e8????????8b0d";
+asm LostSoulHeartTypeSkipSpawnPuddle "80be????????000f85????????e8????????8b0d";
+
+// Localization Modded Folders
+asm RedirectToLocalizedResources "6a0668????????8d4d??c645??01";

libzhl/functions/Manager.zhl

@@ -75,6 +75,9 @@ __thiscall bool Manager::IsSteamCloudEnabled();
 "558bec6aff68????????64a1????????50535657a1????????33c5508d45??64a3????????8bd98db3":
 __thiscall void Manager::destructor();
 
+"a1????????8b80????????83f813":
+static char* Manager::GetLanguage();
+
 struct Manager depends (Seeds, GameState, StringTable, PersistentGameData, NightmareScene, UnknownGameStartStruct, ModManager, KAGE_SmartPointer_ImageBase, Cutscene, OptionsConfig, AchievementOverlay, SoundEffects, ItemConfig, EntityConfig, ANM2, Font, ChallengeParam, Music, NetplayManager, DailyChallenge) { {{
 	inline int GetState() { return this->_state; }
 	inline PersistentGameData* GetPersistentGameData() { return &this->_persistentGameData; }

libzhl/functions/ModManager.zhl

@@ -33,8 +33,9 @@ __thiscall void ModManager::Reset();
 "558bec83e4f851568bf1e8????????8bcee8????????8bce":
 __thiscall void ModManager::TriggerResize();
 
-struct ModManager depends (ModEntry) {
+struct ModManager depends (ModEntry, RedirectedPath) {
 	vector_ModEntryPointer _mods : 0x0;
+	RedirectedPath* _redirectedPathsMap[32768] : 0xc;
 	int _modBanStatus : 0x2025c;
 } : 0x20260;
 

libzhl/functions/RedirectedPath.zhl

@@ -0,0 +1,6 @@
+struct RedirectedPath depends (ModEntry) {
+	uint32_t _primaryHash : 0x0;
+	uint32_t _secondaryHash : 0x4;
+	ModEntry* _modEntry : 0x8;
+	std_string _filePath : 0xc;
+} : 0x24;

repentogon/Patches/ASMPatches.cpp

@@ -39,6 +39,7 @@
 #include "ASMPatches/ASMStatusEffects.h"
 #include "ASMPatches/ASMTweaks.h"
 #include "ASMPatches/ASMTweaks.h"
+#include "ASMPatches/ASMLocalization.h"
 #include "ASMPatches/ASMFixes.h"
 #include "ASMPatches/ASMSplitTears.h"
 #include "ASMPatches/ASMCamera.h"
@@ -283,6 +284,7 @@ void PerformASMPatches() {
 	ASMPatches::__ItemPoolManagerExtra();
 	ASMPatchesForCardsExtras();
 	ASMPatchesForCustomModManager();
+	ASMPatchRedirectToLocalizationFolders();
 	ASMFixes();
 	HookImGui();
 

repentogon/Patches/ASMPatches/ASMLocalization.cpp

@@ -0,0 +1,94 @@
+#include "IsaacRepentance.h"
+#include "HookSystem.h"
+
+#include "ASMPatcher.hpp"
+#include "../ASMPatches.h"
+#include "ASMDefinition.h"
+
+bool __stdcall TryToRedirectToLocalizedResources(std::string& resFileString, std::string& targetFile, ModEntry** modEntry, RedirectedPath* redirectPath) {
+	auto* manager = g_Manager->GetModManager();
+	auto* langCode = g_Manager->GetLanguage();
+
+	if (targetFile[0] == '\0') {
+		return false;
+	}
+
+	auto buildAndCheckPath = [&](const std::string& postfix, bool useLangCode) -> bool {
+		std::string potentialPath = resFileString + postfix;
+
+		if (useLangCode && g_Manager->_stringTable.language != 0 && langCode && langCode[0] != '\0') {
+			potentialPath = potentialPath + "." + langCode;
+		}
+
+		potentialPath = potentialPath + "/" + targetFile;
+
+		if (g_ContentManager.GetMountedFilePath(potentialPath.c_str()) != NULL) {
+			resFileString = potentialPath;
+			redirectPath->_modEntry = *modEntry;
+			redirectPath->_filePath = resFileString;
+			std::cout << "[REPENTOGON] Patched " << resFileString << std::endl;
+			return true;
+		}
+		return false;
+	};
+
+	if (buildAndCheckPath("-repentogon", false)) return true;
+
+	return false;
+}
+
+void ASMPatchRedirectToLocalizedResources() {
+	ASMPatch::SavedRegisters savedRegisters(ASMPatch::SavedRegisters::Registers::GP_REGISTERS, true);
+	ASMPatch patch;
+
+	void* addr = sASMDefinitionHolder->GetDefinition(&AsmDefinitions::RedirectToLocalizedResources);
+	printf("[REPENTOGON] Patching ModManager::TryRedirectPath for resources folder redirect at %p\n", addr);
+
+	patch.PreserveRegisters(savedRegisters)
+		.Push(ASMPatch::Registers::EBP, -0xa0) // RedirectedPath*
+		.Push(ASMPatch::Registers::ESI) // ModEntry
+		.Push(ASMPatch::Registers::EBP, -0xa4) // Target file
+		.Push(ASMPatch::Registers::EAX) //Mod resources folder
+		.AddInternalCall(TryToRedirectToLocalizedResources)
+		.AddBytes("\x84\xC0") // test al, al
+		.RestoreRegisters(savedRegisters)
+		.AddConditionalRelativeJump(ASMPatcher::CondJumps::JNE, (char*)addr + 0x2D4) // jump for true
+		.AddBytes(ByteBuffer().AddAny((char*)addr, 0x7))  // Restore the commands we overwrote
+		.AddRelativeJump((char*)addr + 0x7);
+	sASMPatcher.PatchAt(addr, &patch);
+}
+
+HOOK_METHOD(ModEntry, GetContentPath, (std::string* resFileString, const std::string* targetFile) -> void) {
+	super(resFileString, targetFile);
+	auto* manager = g_Manager->GetModManager();
+	auto* langCode = g_Manager->GetLanguage();
+
+	if (targetFile->empty()) {
+		return;
+	}
+
+	auto buildAndCheckPath = [&](const std::string& postfix, bool useLangCode) -> bool {
+		auto copyOfContentDirectory = _contentDirectory.substr(0, _contentDirectory.length() - 1);
+		std::string potentialPath = copyOfContentDirectory + postfix;
+
+		if (useLangCode && g_Manager->_stringTable.language != 0 && langCode && langCode[0] != '\0') {
+			potentialPath = potentialPath + "." + langCode;
+		}
+
+		potentialPath = potentialPath + "/" + *targetFile;
+
+		if (g_ContentManager.GetMountedFilePath(potentialPath.c_str()) != NULL) {
+			*resFileString = potentialPath;
+			std::cout << "[REPENTOGON] Patched path: " << *resFileString << std::endl;
+			return true;
+		}
+		return false;
+	};
+
+	if (buildAndCheckPath("-repentogon", false)) return;
+
+}
+
+void ASMPatchRedirectToLocalizationFolders() {
+	ASMPatchRedirectToLocalizedResources();
+}

repentogon/Patches/ASMPatches/ASMLocalization.h

@@ -0,0 +1,3 @@
+#pragma once
+
+void ASMPatchRedirectToLocalizationFolders();

repentogon/Patches/NullItemsAndCostumes.cpp

@@ -26,7 +26,7 @@ void UpdateLastModId( ModEntry* mod, char* xmlpath) {
 	else {
 		lastModIdButCooler = "BaseGame";
 	}
-	if ((stringlower(xmlpath).find("/content/") != string::npos) || (stringlower(xmlpath).find("/content-dlc3/") != string::npos)) {
+	if ((stringlower(xmlpath).find("/content/") != string::npos) || (stringlower(xmlpath).find("/content-repentogon/") != string::npos) || (stringlower(xmlpath).find("/content-dlc3/") != string::npos)) {
 		iscontent = true;
 	}
 	else {
@@ -40,7 +40,10 @@ void UpdateLastModId( ModEntry* mod, char* xmlpath) {
 			last = path.find("/resources");
 		}
 		else if (last <= 0) {
-			last = path.find("/content-dlc3");
+			size_t repentogonPos = path.find("/content-repentogon");
+			size_t dlc3Pos = path.find("/content-dlc3");
+			last = (repentogonPos != string::npos && (dlc3Pos == string::npos || repentogonPos < dlc3Pos))
+				? repentogonPos : dlc3Pos;
 		}
 		path = path.substr(first, last - first); //when the id is null(which it can fucking be) just use the folder name as ID...
 		lastModIdButCooler = path;

repentogon/Patches/XMLData.cpp

@@ -275,7 +275,7 @@ void ProcessModEntry(char* xmlpath,ModEntry* mod) {
 	else {
 		lastmodid = "BaseGame";
 	}
-	if ((stringlower(xmlpath).find("/content/") != string::npos) || (stringlower(xmlpath).find("/content-dlc3/") != string::npos)) {
+	if ((stringlower(xmlpath).find("/content/") != string::npos) || (stringlower(xmlpath).find("/content-repentogon/") != string::npos) || (stringlower(xmlpath).find("/content-dlc3/") != string::npos)) {
 		iscontent = true;
 	}
 	else {
@@ -289,7 +289,10 @@ void ProcessModEntry(char* xmlpath,ModEntry* mod) {
 			last = path.find("/resources");
 		}
 		else if (last <= 0) {
-			last = path.find("/content-dlc3");
+			size_t repentogonPos = path.find("/content-repentogon");
+			size_t dlc3Pos = path.find("/content-dlc3");
+			last = (repentogonPos != string::npos && (dlc3Pos == string::npos || repentogonPos < dlc3Pos))
+				? repentogonPos : dlc3Pos;
 		}
 		path = path.substr(first, last - first); //when the id is null(which it can fucking be) just use the folder name as ID...
 		lastmodid = new char[path.length() + 1]; //this is the sort of stuff I dont like about C++

repentogon/Patches/XMLData.h

@@ -960,7 +960,7 @@ inline bool XMLParse(xml_document<char>* xmldoc, char* xml, const string& dir) {
 }
 
 inline char* GetResources(const string& dir, const string& filename) {
-	vector<string> paths = { dir + "\\resources-dlc3\\" + filename, dir + "\\resources\\" + filename };
+	vector<string> paths = { dir + "\\resources-repentogon\\", dir + "\\resources-dlc3\\" + filename, dir + "\\resources\\" + filename };
 	for (const string& path : paths) {
 		ifstream file(path.c_str());
 		if (file.is_open()) {
@@ -1065,7 +1065,7 @@ inline void LoadCustomXML(CustomXML xml) {
 	for (ModEntry* mod : g_Manager->GetModManager()->_mods) {
 		if (mod->IsEnabled()) {
 			string dir = filesystem::current_path().parent_path().string() + "\\mods\\" + mod->GetDir();
-			vector<string> paths = { dir + "\\resources-dlc3\\" + xml.filename, dir + "\\resources\\" + xml.filename };
+			vector<string> paths = { dir + "\\resources-repentogon\\", dir + "\\resources-dlc3\\" + xml.filename, dir + "\\resources\\" + xml.filename };
 			for (const string& path : paths) {
 				if (filesystem::exists(path)) {
 					targetresource = path;
@@ -1082,7 +1082,7 @@ inline void LoadCustomXML(CustomXML xml) {
 	for (ModEntry* mod : g_Manager->GetModManager()->_mods) {
 		if (mod->IsEnabled()) {
 			string dir = filesystem::current_path().parent_path().string() + "\\mods\\" + mod->GetDir();
-			vector<string> paths = { dir + "\\content-dlc3\\" + xml.filename, dir + "\\content\\" + xml.filename };
+			vector<string> paths = { dir + "\\content-repentogon\\" + xml.filename, dir + "\\content-dlc3\\" + xml.filename, dir + "\\content\\" + xml.filename };
 			for (const string& path : paths) {
 				if (filesystem::exists(path)) {
 					lastmodid = string(mod->GetId());

repentogon/REPENTOGONFileMap.cpp

@@ -14,6 +14,7 @@ namespace REPENTOGONFileMap {
 	std::vector<std::wstring> _stringByFType = {
 		L"resources",
 		L"resources-dlc3",
+		L"resources-repentogon"
 		L"",
 	};
 	std::wstring _modsPath = L"";

repentogon/REPENTOGONFileMap.h

@@ -8,6 +8,7 @@ namespace REPENTOGONFileMap {
     enum FolderType {
         RESOURCES,
         RESOURCES_DLC3,
+        RESOURCES_REPENTOGON,
         LAST
     };
     struct FileMapEntry {