Skip to content

Mod json rework #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sitton76 wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

Mod json rework #1

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
289cb2e
Changed method of mod loading to read off a .json file
sitton76 Jul 19, 2023
297cdd4
Forgot to include the last entry in the .json file
sitton76 Jul 19, 2023
05d8fe4
Added proper logging messages + fallback to old behavior when .json f…
sitton76 Jul 19, 2023
9bd20bd
Added comments and additional logging when using the fallback behavior
sitton76 Jul 19, 2023
46d5a43
Made it so it only loads mods from the /mods folder, added check to p…
sitton76 Jul 20, 2023
eb79f37
Cleaned up outdated comments
sitton76 Jul 21, 2023
757d4b2
Merge branch 'mod_json_rework' of https://github.com/sitton76/Shipwri…
sitton76 Aug 15, 2023
c20018e
Synced to current SoH, updated LUS, possibly fixed Linux appimage loa…
sitton76 Aug 15, 2023
9054ddf
Removed the testing spdlog calls
sitton76 Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 31 additions & 6 deletions soh/soh/OTRGlobals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
#include <Window.h>
#include <GameVersions.h>

#include <nlohmann/json.hpp>
using json = nlohmann::json;

#include "z64animation.h"
#include "z64bgcheck.h"
#include "Enhancements/gameconsole.h"
Expand Down Expand Up @@ -220,12 +223,34 @@ OTRGlobals::OTRGlobals() {
if (std::filesystem::exists(sohOtrPath)) {
OTRFiles.push_back(sohOtrPath);
}

std::string patchesPath = LUS::Context::LocateFileAcrossAppDirs("mods", appShortName);
if (patchesPath.length() > 0 && std::filesystem::exists(patchesPath)) {
if (std::filesystem::is_directory(patchesPath)) {
for (const auto& p : std::filesystem::recursive_directory_iterator(patchesPath)) {
if (StringHelper::IEquals(p.path().extension().string(), ".otr")) {
OTRFiles.push_back(p.path().generic_string());
std::string sohJsonPath = LUS::Context::LocateFileAcrossAppDirs("shipofharkinian.json", appShortName);
bool useLoadOrder = false;
if (std::filesystem::exists(sohJsonPath)) {
std::ifstream sohJsonData(sohJsonPath);
json modData = json::parse(sohJsonData);
if (modData.contains("Mod-Load-Order")) {
useLoadOrder = true;
int modCountInt = modData["Mod-Load-Order"]["List-size"];
int iter_count = 1;
while (iter_count <= modCountInt) {
std::string foundModEntry = modData["Mod-Load-Order"][std::to_string(iter_count)];
std::string gotModPath = patchesPath + "/" + foundModEntry;
if (std::filesystem::exists(gotModPath)) {
OTRFiles.push_back(gotModPath);
}
iter_count += 1;
}
}
}
if (useLoadOrder == false) {
if (patchesPath.length() > 0 && std::filesystem::exists(patchesPath)) {
if (std::filesystem::is_directory(patchesPath)) {
for (const auto& p : std::filesystem::recursive_directory_iterator(patchesPath)) {
if (StringHelper::IEquals(p.path().extension().string(), ".otr")) {
OTRFiles.push_back(p.path().generic_string());
}
}
}
}
Expand Down Expand Up @@ -2174,4 +2199,4 @@ extern "C" void EntranceTracker_SetLastEntranceOverride(s16 entranceIndex) {

extern "C" void Gfx_RegisterBlendedTexture(const char* name, u8* mask, u8* replacement) {
gfx_register_blended_texture(name, mask, replacement);
}
}