The-Homebrew-Cloud/sdcafiine_plugin
2
0
Fork 0
mirror of https://github.com/wiiu-env/sdcafiine_plugin.git synced 2024-09-28 19:08:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add a option to disable/enable this feature under "SdCaffine->Advanced Settings->Enable Save Redirection"

Browse Source
This commit is contained in:
Lekoopapaul 2024-05-29 22:24:09 +02:00
parent ed641b2e85
commit d2922bcd3a
4 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/globals.cpp
View File

@ -3,6 +3,7 @@
bool gAutoApplySingleModpack = DEFAULT_AUTO_APPLY_SINGLE_MODPACK; bool gAutoApplySingleModpack = DEFAULT_AUTO_APPLY_SINGLE_MODPACK;
bool gSkipPrepareIfSingleModpack = DEFAULT_SKIP_PREPARE_IF_SINGLE_MODPACK; bool gSkipPrepareIfSingleModpack = DEFAULT_SKIP_PREPARE_IF_SINGLE_MODPACK;
bool gSDCafiineEnabled = DEFAULT_SDCAFIINE_ENABLED; bool gSDCafiineEnabled = DEFAULT_SDCAFIINE_ENABLED;
bool gSaveRedirectionEnabled = DEFAULT_SAVE_REDIRECTION_ENABLED;
CRLayerHandle gContentLayerHandle = 0; CRLayerHandle gContentLayerHandle = 0;

3
src/globals.h
View File

@ -8,14 +8,17 @@
#define AUTO_APPLY_SINGLE_MODPACK_STRING "autoApplySingleModpack" #define AUTO_APPLY_SINGLE_MODPACK_STRING "autoApplySingleModpack"
#define SKIP_PREPARE_FOR_SINGLE_MODPACK_STRING "skipPrepareForSingleModpack" #define SKIP_PREPARE_FOR_SINGLE_MODPACK_STRING "skipPrepareForSingleModpack"
#define SDCAFIINE_ENABLED_STRING "sdCafiineEnabled" #define SDCAFIINE_ENABLED_STRING "sdCafiineEnabled"
#define SAVE_REDIRECTION_ENABLED_STRING "saveRedirectionEnabled"
#define DEFAULT_AUTO_APPLY_SINGLE_MODPACK false #define DEFAULT_AUTO_APPLY_SINGLE_MODPACK false
#define DEFAULT_SKIP_PREPARE_IF_SINGLE_MODPACK false #define DEFAULT_SKIP_PREPARE_IF_SINGLE_MODPACK false
#define DEFAULT_SDCAFIINE_ENABLED true #define DEFAULT_SDCAFIINE_ENABLED true
#define DEFAULT_SAVE_REDIRECTION_ENABLED true
extern bool gAutoApplySingleModpack; extern bool gAutoApplySingleModpack;
extern bool gSkipPrepareIfSingleModpack; extern bool gSkipPrepareIfSingleModpack;
extern bool gSDCafiineEnabled; extern bool gSDCafiineEnabled;
extern bool gSaveRedirectionEnabled;
extern CRLayerHandle gAocLayerHandle; extern CRLayerHandle gAocLayerHandle;
extern CRLayerHandle gContentLayerHandle; extern CRLayerHandle gContentLayerHandle;

58
src/modpackSelector.cpp
View File

@ -13,10 +13,10 @@
#include <malloc.h> #include <malloc.h>
#include <map> #include <map>
#include <memory/mappedmemory.h> #include <memory/mappedmemory.h>
#include <nn/act.h>
#include <string> #include <string>
#include <utils/logger.h> #include <utils/logger.h>
#include <wups/storage.h> #include <wups/storage.h>
#include <nn/act.h>
#define TEXT_SEL(x, text1, text2) ((x) ? (text1) : (text2)) #define TEXT_SEL(x, text1, text2) ((x) ? (text1) : (text2))
@ -314,37 +314,39 @@ void HandleMultiModPacks(uint64_t titleID) {
KPADShutdown(); KPADShutdown();
} }
bool ReplaceContentInternal(const std::string &basePath, const std::string &subdir, CRLayerHandle *layerHandle,FSLayerType layerType); bool ReplaceContentInternal(const std::string &basePath, const std::string &subdir, CRLayerHandle *layerHandle, FSLayerType layerType);
bool ReplaceContent(const std::string &basePath, const std::string &modpack) { bool ReplaceContent(const std::string &basePath, const std::string &modpack) {
bool saveRes = ReplaceContentInternal(basePath, "save", &gSaveLayerHandle,FS_LAYER_TYPE_SAVE_REPLACE); if (gSaveRedirectionEnabled) {
bool saveRes = ReplaceContentInternal(basePath, "save", &gSaveLayerHandle, FS_LAYER_TYPE_SAVE_REPLACE);
if(!saveRes){ if (!saveRes) {
auto screenWasAllocated = screenBuffer_0 != nullptr; auto screenWasAllocated = screenBuffer_0 != nullptr;
if (!ScreenInit()) { if (!ScreenInit()) {
OSFatal("SDCafiine plugin: Failed to apply the modpack."); OSFatal("SDCafiine plugin: Failed to apply the modpack.");
}
uint32_t sleepTime = 3000;
DEBUG_FUNCTION_LINE_ERR("Failed to apply the save redirection. Starting without mods.");
OSScreenClearBufferEx(SCREEN_TV, 0);
OSScreenClearBufferEx(SCREEN_DRC, 0);
console_print_pos(-2, -1, "SDCafiine plugin " VERSION VERSION_EXTRA);
console_print_pos(-2, 1, "Failed to apply the save redirection. Starting without mods...");
OSScreenFlipBuffersEx(SCREEN_TV);
OSScreenFlipBuffersEx(SCREEN_DRC);
OSSleepTicks(OSMillisecondsToTicks(sleepTime));
if (!screenWasAllocated) {
ScreenDeInit();
}
return false;
} }
uint32_t sleepTime = 3000;
DEBUG_FUNCTION_LINE_ERR("Failed to apply the save redirection. Starting without mods.");
OSScreenClearBufferEx(SCREEN_TV, 0);
OSScreenClearBufferEx(SCREEN_DRC, 0);
console_print_pos(-2, -1, "SDCafiine plugin " VERSION VERSION_EXTRA);
console_print_pos(-2, 1, "Failed to apply the save redirection. Starting without mods...");
OSScreenFlipBuffersEx(SCREEN_TV);
OSScreenFlipBuffersEx(SCREEN_DRC);
OSSleepTicks(OSMillisecondsToTicks(sleepTime));
if (!screenWasAllocated) {
ScreenDeInit();
}
return false;
} }
bool contentRes = ReplaceContentInternal(basePath, "content", &gContentLayerHandle,FS_LAYER_TYPE_CONTENT_MERGE); bool contentRes = ReplaceContentInternal(basePath, "content", &gContentLayerHandle, FS_LAYER_TYPE_CONTENT_MERGE);
bool aocRes = ReplaceContentInternal(basePath, "aoc", &gAocLayerHandle,FS_LAYER_TYPE_AOC_MERGE); bool aocRes = ReplaceContentInternal(basePath, "aoc", &gAocLayerHandle, FS_LAYER_TYPE_AOC_MERGE);
if (!contentRes && !aocRes) { if (!contentRes && !aocRes) {
auto screenWasAllocated = screenBuffer_0 != nullptr; auto screenWasAllocated = screenBuffer_0 != nullptr;
@ -406,10 +408,10 @@ bool ReplaceContent(const std::string &basePath, const std::string &modpack) {
return true; return true;
} }
bool ReplaceContentInternal(const std::string &basePath, const std::string &subdir, CRLayerHandle *layerHandle,FSLayerType layerType) { bool ReplaceContentInternal(const std::string &basePath, const std::string &subdir, CRLayerHandle *layerHandle, FSLayerType layerType) {
std::string layerName = "SDCafiine Plus /vol/" + subdir; std::string layerName = "SDCafiine Plus /vol/" + subdir;
std::string fullPath = basePath + "/" + subdir; std::string fullPath = basePath + "/" + subdir;
if(layerType == FS_LAYER_TYPE_SAVE_REPLACE){ if (layerType == FS_LAYER_TYPE_SAVE_REPLACE) {
nn::act::Initialize(); nn::act::Initialize();
nn::act::PersistentId id = nn::act::GetPersistentId(); nn::act::PersistentId id = nn::act::GetPersistentId();
nn::act::Finalize(); nn::act::Finalize();
@ -418,8 +420,8 @@ bool ReplaceContentInternal(const std::string &basePath, const std::string &subd
snprintf(user, 9, "%08x", 0x80000000 | id); snprintf(user, 9, "%08x", 0x80000000 | id);
mkdir(fullPath.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); mkdir(fullPath.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
mkdir((fullPath+"/"+"common").c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); mkdir((fullPath + "/" + "common").c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
mkdir((fullPath+"/"+user).c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); mkdir((fullPath + "/" + user).c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
} }
struct stat st {}; struct stat st {};
if (stat(fullPath.c_str(), &st) < 0) { if (stat(fullPath.c_str(), &st) < 0) {

11
src/utils/config.cpp
View File

@ -18,6 +18,8 @@ static void bool_item_callback(ConfigItemBoolean *item, bool newValue) {
gSkipPrepareIfSingleModpack = newValue; gSkipPrepareIfSingleModpack = newValue;
} else if (std::string_view(SDCAFIINE_ENABLED_STRING) == item->identifier) { } else if (std::string_view(SDCAFIINE_ENABLED_STRING) == item->identifier) {
gSDCafiineEnabled = newValue; gSDCafiineEnabled = newValue;
} else if (std::string_view(SAVE_REDIRECTION_ENABLED_STRING) == item->identifier) {
gSaveRedirectionEnabled = newValue;
} else { } else {
DEBUG_FUNCTION_LINE_WARN("Unexpected boolean item: %s", item->identifier); DEBUG_FUNCTION_LINE_WARN("Unexpected boolean item: %s", item->identifier);
return; return;
@ -50,6 +52,11 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa
"Skip \"Preparing modpack...\" screen", "Skip \"Preparing modpack...\" screen",
DEFAULT_SKIP_PREPARE_IF_SINGLE_MODPACK, gSkipPrepareIfSingleModpack, DEFAULT_SKIP_PREPARE_IF_SINGLE_MODPACK, gSkipPrepareIfSingleModpack,
&bool_item_callback)); &bool_item_callback));
advancedSettings.add(WUPSConfigItemBoolean::Create(SAVE_REDIRECTION_ENABLED_STRING,
"Enable Save Redirection (game needs to be restarted)",
DEFAULT_SAVE_REDIRECTION_ENABLED, gSaveRedirectionEnabled,
&bool_item_callback));
root.add(std::move(advancedSettings)); root.add(std::move(advancedSettings));
} catch (std::exception &e) { } catch (std::exception &e) {
@ -79,7 +86,9 @@ void InitStorageAndConfig() {
if ((err = WUPSStorageAPI::GetOrStoreDefault(SKIP_PREPARE_FOR_SINGLE_MODPACK_STRING, gSkipPrepareIfSingleModpack, DEFAULT_SKIP_PREPARE_IF_SINGLE_MODPACK)) != WUPS_STORAGE_ERROR_SUCCESS) { if ((err = WUPSStorageAPI::GetOrStoreDefault(SKIP_PREPARE_FOR_SINGLE_MODPACK_STRING, gSkipPrepareIfSingleModpack, DEFAULT_SKIP_PREPARE_IF_SINGLE_MODPACK)) != WUPS_STORAGE_ERROR_SUCCESS) {
DEBUG_FUNCTION_LINE_ERR("Failed to get or create item \"%s\": %s (%d)", gSkipPrepareIfSingleModpack, WUPSStorageAPI_GetStatusStr(err), err); DEBUG_FUNCTION_LINE_ERR("Failed to get or create item \"%s\": %s (%d)", gSkipPrepareIfSingleModpack, WUPSStorageAPI_GetStatusStr(err), err);
} }
if ((err = WUPSStorageAPI::GetOrStoreDefault(SAVE_REDIRECTION_ENABLED_STRING, gSaveRedirectionEnabled, DEFAULT_SAVE_REDIRECTION_ENABLED)) != WUPS_STORAGE_ERROR_SUCCESS) {
DEBUG_FUNCTION_LINE_ERR("Failed to get or create item \"%s\": %s (%d)", gSaveRedirectionEnabled, WUPSStorageAPI_GetStatusStr(err), err);
}
if ((err = WUPSStorageAPI::SaveStorage()) != WUPS_STORAGE_ERROR_SUCCESS) { if ((err = WUPSStorageAPI::SaveStorage()) != WUPS_STORAGE_ERROR_SUCCESS) {
DEBUG_FUNCTION_LINE_ERR("Failed to save storage: %s (%d)", WUPSStorageAPI_GetStatusStr(err), err); DEBUG_FUNCTION_LINE_ERR("Failed to save storage: %s (%d)", WUPSStorageAPI_GetStatusStr(err), err);
} }