From 979d9de91ae6ad26916a9a5bcba0f95cf9931007 Mon Sep 17 00:00:00 2001 From: ADev531 Date: Mon, 21 Jul 2025 20:58:20 +0900 Subject: [PATCH 01/24] feat: added korean --- src/lang/ko_KR.lang | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/lang/ko_KR.lang diff --git a/src/lang/ko_KR.lang b/src/lang/ko_KR.lang new file mode 100644 index 0000000..de04939 --- /dev/null +++ b/src/lang/ko_KR.lang @@ -0,0 +1,13 @@ +.plugin_name="Inkay" +,.network_category="네트워크 선택" +,.connect_to_network_setting="Pretendo Network 사용" +,.other_category="기타 설정" +,.reset_wwp_setting="Wara Wara Plaza 초기화" +,.press_a_action="A 버튼을 누르세요" +,.restart_to_apply_action="재시작 후 적용" +,.need_menu_action="Wii U 메뉴에서만" +,.using_nintendo_network="Nintendo Network 사용 중" +,.using_pretendo_network="Pretendo Network 사용 중" +,.multiplayer_port_display="멀티플레이어에 UDP 포트 %hu을(를) 사용합니다" +,.module_not_found="패치를 적용하는 데 실패했습니다. Aroma Updater로 복구해 주세요. (686-1001 모듈 없음)" +,.module_init_not_found="패치를 적용하는 데 실패했습니다. Aroma Updater로 복구해 주세요. (686-1002 모듈 초기화)" From 907de64376d0fde58776b1e819f687dad992c9d3 Mon Sep 17 00:00:00 2001 From: ADev531 Date: Mon, 21 Jul 2025 20:59:55 +0900 Subject: [PATCH 02/24] feat: added language changing --- common/lang.cpp | 24 +++++++++--------- common/lang.h | 22 ++++++++++++++-- plugin/src/config.cpp | 59 ++++++++++++++++++++++++++++++++++++++++++- plugin/src/config.h | 5 ++++ plugin/src/module.cpp | 10 ++++---- src/main.cpp | 14 +++++----- 6 files changed, 107 insertions(+), 27 deletions(-) diff --git a/common/lang.cpp b/common/lang.cpp index 3f32b17..d22c07f 100644 --- a/common/lang.cpp +++ b/common/lang.cpp @@ -4,40 +4,40 @@ #include "lang.h" -config_strings get_config_strings(nn::swkbd::LanguageType language) { +config_strings get_config_strings(inkay_language language) { switch (language) { - case nn::swkbd::LanguageType::English: + case inkay_language::English: default: return { #include "en_US.lang" }; - case nn::swkbd::LanguageType::Spanish: return { + case inkay_language::Spanish: return { #include "es_ES.lang" }; - case nn::swkbd::LanguageType::French: return { + case inkay_language::French: return { #include "fr_FR.lang" }; - case nn::swkbd::LanguageType::Italian: return { + case inkay_language::Italian: return { #include "it_IT.lang" }; - case nn::swkbd::LanguageType::German: return { + case inkay_language::German: return { #include "de_DE.lang" }; - case nn::swkbd::LanguageType::SimplifiedChinese: return { + case inkay_language::SimplifiedChinese: return { #include "zh_CN.lang" }; - case nn::swkbd::LanguageType::TraditionalChinese: return { + case inkay_language::TraditionalChinese: return { #include "zh_Hant.lang" }; - case nn::swkbd::LanguageType::Portuguese: return { + case inkay_language::Portuguese: return { #include "pt_BR.lang" }; - case nn::swkbd::LanguageType::Japanese: return { + case inkay_language::Japanese: return { #include "ja_JP.lang" }; - case nn::swkbd::LanguageType::Dutch: return { + case inkay_language::Dutch: return { #include "nl_NL.lang" }; - case nn::swkbd::LanguageType::Russian: return { + case inkay_language::Russian: return { #include "ru_RU.lang" }; } diff --git a/common/lang.h b/common/lang.h index 6e557fe..7fdbe24 100644 --- a/common/lang.h +++ b/common/lang.h @@ -1,7 +1,25 @@ #pragma once #include -#include + +enum inkay_language { + Japanese = 0, + English, + French, + German, + Italian, + Spanish, + SimplifiedChinese, + Korean, + Dutch, + Portuguese, + Russian, + TraditionalChinese, + Invalid, + // custom ones + System, + EnUwU, +}; struct config_strings { const char *plugin_name; @@ -19,4 +37,4 @@ struct config_strings { std::string_view module_init_not_found; }; -config_strings get_config_strings(nn::swkbd::LanguageType language); +config_strings get_config_strings(inkay_language language); diff --git a/plugin/src/config.cpp b/plugin/src/config.cpp index 98c2323..3079bc8 100644 --- a/plugin/src/config.cpp +++ b/plugin/src/config.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -42,6 +43,8 @@ bool Config::connect_to_network = true; bool Config::need_relaunch = false; bool Config::unregister_task_item_pressed = false; bool Config::is_wiiu_menu = false; +uint32_t Config::language = 13; +inkay_language Config::current_language = English; static WUPSConfigAPICallbackStatus report_error(WUPSConfigAPIStatus err) { DEBUG_FUNCTION_LINE_VERBOSE("WUPS config error: %s", WUPSConfigAPI_GetStatusStr(err)); @@ -64,6 +67,21 @@ static void connect_to_network_changed(ConfigItemBoolean* item, bool new_value) if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); } +static void language_changed(ConfigItemMultipleValues* item, uint32_t new_value) { + DEBUG_FUNCTION_LINE_VERBOSE("language changed to: %d", new_value); + if (new_value != Config::language) { + if (new_value == inkay_language::System) + Config::current_language = (inkay_language)get_system_language(); + else + Config::current_language = (inkay_language)new_value; + } + Config::language = new_value; + + WUPSStorageError res; + res = WUPSStorageAPI::Store("language", Config::language); + if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); +} + static void unregister_task_item_on_input_cb(void *context, WUPSConfigSimplePadData input) { if (!Config::unregister_task_item_pressed && Config::is_wiiu_menu && ((input.buttons_d & WUPS_CONFIG_BUTTON_A) == WUPS_CONFIG_BUTTON_A)) { @@ -124,7 +142,7 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa Config::is_wiiu_menu = (current_title_id == wiiu_menu_tid); // get translation strings - strings = get_config_strings(get_system_language()); + strings = get_config_strings(Config::current_language); // create root config category WUPSConfigCategory root = WUPSConfigCategory(rootHandle); @@ -181,6 +199,29 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa err = WUPSConfigAPI_Category_AddItem(other_cat->getHandle(), unregisterTasksItem); if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + constexpr WUPSConfigItemMultipleValues::ValuePair languages[] = { + {0, "Japanese"}, + {1, "English"}, + {2, "French"}, + {3, "German"}, + {4, "Spanish"}, + {5, "Italian"}, + {6, "Simplified Chinese"}, + {7, "Korean"}, + {8, "Dutch"}, + {9, "Portuguese"}, + {10, "Russian"}, + {11, "Traditional Chinese"}, + {13, "System"}, + {14, "English (UwU)"}, + }; + + auto language_item = WUPSConfigItemMultipleValues::CreateFromValue("language", "Language", 13, Config::language, languages, &language_changed, err); + if (!language_item) return report_error(err); + + res = other_cat->add(std::move(*language_item), err); + if (!res) report_error(err); + res = root.add(std::move(*other_cat), err); if (!res) return report_error(err); @@ -228,6 +269,22 @@ void Config::Init() { } else if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); + res = WUPSStorageAPI::Get("language", Config::language); + if (res == WUPS_STORAGE_ERROR_NOT_FOUND) { + DEBUG_FUNCTION_LINE("Language value not found, attempting to create"); + + // Add the value to the storage. + res = WUPSStorageAPI::Store("language", Config::language); + if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); + } + else if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); + + // Set the language that's currently used + if (Config::language == inkay_language::System) + Config::current_language = (inkay_language)get_system_language(); + else + Config::current_language = (inkay_language)Config::language; + // Save storage res = WUPSStorageAPI::SaveStorage(); if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); diff --git a/plugin/src/config.h b/plugin/src/config.h index 0928d5e..fc84610 100644 --- a/plugin/src/config.h +++ b/plugin/src/config.h @@ -5,12 +5,16 @@ #ifndef INKAY_CONFIG_H #define INKAY_CONFIG_H +#include +#include "lang.h" + class Config { public: static void Init(); // wups config items static bool connect_to_network; + static uint32_t language; // private stuff static bool need_relaunch; @@ -18,6 +22,7 @@ public: // private stuff static bool is_wiiu_menu; + static inkay_language current_language; static bool unregister_task_item_pressed; }; diff --git a/plugin/src/module.cpp b/plugin/src/module.cpp index c20d980..586a4c7 100644 --- a/plugin/src/module.cpp +++ b/plugin/src/module.cpp @@ -18,22 +18,22 @@ #include "Notification.h" #include "utils/logger.h" -#include "sysconfig.h" +#include "config.h" #include "lang.h" #include static OSDynLoad_Module module; -static void (*moduleInitialize)(bool) = nullptr; +static void (*moduleInitialize)(bool, inkay_language) = nullptr; static InkayStatus (*moduleGetStatus)() = nullptr; static void (*moduleSetPluginRunning)() = nullptr; static const char *get_module_not_found_message() { - return get_config_strings(get_system_language()).module_not_found.data(); + return get_config_strings(Config::current_language).module_not_found.data(); } static const char *get_module_init_not_found_message() { - return get_config_strings(get_system_language()).module_init_not_found.data(); + return get_config_strings(Config::current_language).module_init_not_found.data(); } void Inkay_Initialize(bool apply_patches) { @@ -54,7 +54,7 @@ void Inkay_Initialize(bool apply_patches) { return; } - moduleInitialize(apply_patches); + moduleInitialize(apply_patches, Config::current_language); } void Inkay_Finalize() { diff --git a/src/main.cpp b/src/main.cpp index 4930ac0..008c976 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -93,18 +93,18 @@ static bool is555(MCPSystemVersion version) { return (version.major == 5) && (version.minor == 5) && (version.patch >= 5); } -static const char *get_nintendo_network_message() { +static const char *get_nintendo_network_message(inkay_language language) { // TL note: "Nintendo Network" is a proper noun - "Network" is part of the name // TL note: "Using" instead of "Connected" is deliberate - we don't know if a successful connection exists, we are // only specifying what we'll *attempt* to connect to - return get_config_strings(get_system_language()).using_nintendo_network.data(); + return get_config_strings(language).using_nintendo_network.data(); } -static const char *get_pretendo_message() { +static const char *get_pretendo_message(inkay_language language) { // TL note: "Pretendo Network" is also a proper noun - though "Pretendo" alone can refer to us as a project // TL note: "Using" instead of "Connected" is deliberate - we don't know if a successful connection exists, we are // only specifying what we'll *attempt* to connect to - return get_config_strings(get_system_language()).using_pretendo_network.data(); + return get_config_strings(language).using_pretendo_network.data(); } static void Inkay_SetPluginRunning() { @@ -122,7 +122,7 @@ static InkayStatus Inkay_GetStatus() { } } -static void Inkay_Initialize(bool apply_patches) { +static void Inkay_Initialize(bool apply_patches, inkay_language language) { if (Config::initialized) return; @@ -150,12 +150,12 @@ static void Inkay_Initialize(bool apply_patches) { DEBUG_FUNCTION_LINE_VERBOSE("Pretendo URL and NoSSL patches applied successfully."); - ShowNotification(get_pretendo_message()); + ShowNotification(get_pretendo_message(language)); Config::initialized = true; } else { DEBUG_FUNCTION_LINE_VERBOSE("Pretendo URL and NoSSL patches skipped."); - ShowNotification(get_nintendo_network_message()); + ShowNotification(get_nintendo_network_message(language)); Config::initialized = true; return; } From 6e1122e1b3a2cfe92a7877512ebad2a961e775ba Mon Sep 17 00:00:00 2001 From: ADev531 Date: Mon, 21 Jul 2025 21:15:09 +0900 Subject: [PATCH 03/24] fix: added Korean and UwU to language changer --- common/lang.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/lang.cpp b/common/lang.cpp index d22c07f..ac39d15 100644 --- a/common/lang.cpp +++ b/common/lang.cpp @@ -40,5 +40,11 @@ config_strings get_config_strings(inkay_language language) { case inkay_language::Russian: return { #include "ru_RU.lang" }; + case inkay_language::Korean: return { +#include "ko_KR.lang" + }; + case inkay_language::EnUwU: return { +#include "en@uwu.lang" + }; } } From a25a09cede18c779d348e3237fb13c179435af5f Mon Sep 17 00:00:00 2001 From: adev531 Date: Thu, 29 Jan 2026 13:45:00 +0900 Subject: [PATCH 04/24] fix: swap Italian and Spanish option on plugin settings --- common/lang.h | 3 ++- plugin/src/config.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/lang.h b/common/lang.h index 7fdbe24..29994b2 100644 --- a/common/lang.h +++ b/common/lang.h @@ -3,6 +3,7 @@ #include enum inkay_language { + // Wii U System Languages Japanese = 0, English, French, @@ -16,7 +17,7 @@ enum inkay_language { Russian, TraditionalChinese, Invalid, - // custom ones + // Custom Languages System, EnUwU, }; diff --git a/plugin/src/config.cpp b/plugin/src/config.cpp index 3079bc8..9533b1c 100644 --- a/plugin/src/config.cpp +++ b/plugin/src/config.cpp @@ -204,8 +204,8 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa {1, "English"}, {2, "French"}, {3, "German"}, - {4, "Spanish"}, - {5, "Italian"}, + {4, "Italian"}, + {5, "Spanish"}, {6, "Simplified Chinese"}, {7, "Korean"}, {8, "Dutch"}, From 285d9f51fb6334e076f1a01b9cc50f05975a4f67 Mon Sep 17 00:00:00 2001 From: Aaron Dewes Date: Tue, 16 Sep 2025 22:27:07 +0200 Subject: [PATCH 05/24] Translated using Weblate (German) Currently translated at 92.3% (12 of 13 strings) Translation: Pretendo Network/Inkay Translate-URL: https://hosted.weblate.org/projects/pretendonetwork/inkay/de/ --- src/lang/de_DE.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/de_DE.lang b/src/lang/de_DE.lang index 19a57dd..d8c572c 100644 --- a/src/lang/de_DE.lang +++ b/src/lang/de_DE.lang @@ -9,5 +9,5 @@ ,.using_nintendo_network="Nutze Nintendo Network" ,.using_pretendo_network="Nutze Pretendo Network" ,.multiplayer_port_display="Nutze UDP Port %hu für Mehrspieler" -,.module_not_found="Pretendo Patch fehlgeschlagen - nutze Aroma Updater zum Reparieren (686-1001 Module missing)" -,.module_init_not_found="Pretendo Patch fehlgeschlagen - nutze Aroma Updater zum Reparieren (686-1002 Module init)" +,.module_not_found="Pretendo Network Patch fehlgeschlagen - nutze Aroma Updater zum Reparieren (686-1001 Module missing)" +,.module_init_not_found="Pretendo Network Patch fehlgeschlagen - nutze Aroma Updater zum Reparieren (686-1002 Module init)" From 1f2660f2c162e35ce930c2a4a6e7aa524f21df70 Mon Sep 17 00:00:00 2001 From: Fefuchs Date: Fri, 19 Sep 2025 10:26:41 +0200 Subject: [PATCH 06/24] Translated using Weblate (German) Currently translated at 100.0% (13 of 13 strings) Translation: Pretendo Network/Inkay Translate-URL: https://hosted.weblate.org/projects/pretendonetwork/inkay/de/ --- src/lang/de_DE.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/de_DE.lang b/src/lang/de_DE.lang index d8c572c..4837d27 100644 --- a/src/lang/de_DE.lang +++ b/src/lang/de_DE.lang @@ -1,6 +1,6 @@ .plugin_name="Inkay" ,.network_category="Netzwerkauswahl" -,.connect_to_network_setting="Verbinde zum Pretendo Network" +,.connect_to_network_setting="Mit Pretendo Network verbinden" ,.other_category="Andere Einstellungen" ,.reset_wwp_setting="Wara Wara Plaza zurücksetzen" ,.press_a_action="Drücke A" From 9e90882ec876512a5613ef5877949734e690a3c9 Mon Sep 17 00:00:00 2001 From: BBasilio2001 Date: Thu, 25 Sep 2025 12:22:19 +0200 Subject: [PATCH 07/24] Translated using Weblate (Chinese (Traditional Han script)) Currently translated at 100.0% (13 of 13 strings) Translation: Pretendo Network/Inkay Translate-URL: https://hosted.weblate.org/projects/pretendonetwork/inkay/zh_Hant/ --- src/lang/zh_Hant.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lang/zh_Hant.lang b/src/lang/zh_Hant.lang index f68d3a2..50ff0dd 100644 --- a/src/lang/zh_Hant.lang +++ b/src/lang/zh_Hant.lang @@ -8,6 +8,6 @@ ,.need_menu_action="僅來自WiiU Menu" ,.using_nintendo_network="使用 Nintendo Network" ,.using_pretendo_network="使用 Pretendo Network" -,.multiplayer_port_display="Using UDP port %hu for multiplayer" -,.module_not_found="Pretendo Network patch failed - use Aroma Updater to repair (686-1001 Module missing)" -,.module_init_not_found="Pretendo Network patch failed - use Aroma Updater to repair (686-1002 Module init)" +,.multiplayer_port_display="使用 UDP 端口 %hu 進行多人遊戲" +,.module_not_found="Pretendo Network 補丁失敗 - 請使用 Aroma Updater 修復（缺少 686-1001 模組）" +,.module_init_not_found="Pretendo Network 補丁失敗 - 請使用 Aroma Updater 修復（缺少 686-1002 模組）" From 7be7a0040aac3bcaf8272215cdc101805342742a Mon Sep 17 00:00:00 2001 From: kip Date: Wed, 11 Feb 2026 14:46:36 +0100 Subject: [PATCH 08/24] Translated using Weblate (Italian) Currently translated at 100.0% (13 of 13 strings) Translation: Pretendo Network/Inkay Translate-URL: https://hosted.weblate.org/projects/pretendonetwork/inkay/it/ --- src/lang/it_IT.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/it_IT.lang b/src/lang/it_IT.lang index 6702add..30495ab 100644 --- a/src/lang/it_IT.lang +++ b/src/lang/it_IT.lang @@ -9,5 +9,5 @@ ,.using_nintendo_network="In uso Nintendo Network" ,.using_pretendo_network="In uso Pretendo Network" ,.multiplayer_port_display="È in uso la porta UDP %hu per il multigiocatore" -,.module_not_found="Patch di Pretendo fallita - usa Aroma Updater per correggere (686-1001 Modulo mancante)" -,.module_init_not_found="Patch di Pretendo fallita - usa Aroma Updater per correggere (686-1002 Module init)" +,.module_not_found="Patch Pretendo Network fallita - usa Aroma Updater per riparare (686-1001 Modulo mancante)" +,.module_init_not_found="Patch Pretendo Network fallita - usa Aroma Updater per riparare (686-1002 Module init)" From 48ae2f97e093c7c8f28fcd47d835339211a4942e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Mar 2026 07:28:53 +0000 Subject: [PATCH 09/24] chore: bump actions/upload-artifact from 6 to 7 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6 to 7. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5eaaa2e..dcd6868 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - uses: ammaraskar/gcc-problem-matcher@master - name: build Inkay run: docker run --rm -v ${PWD}:/app -w /app builder - - uses: actions/upload-artifact@v6 + - uses: actions/upload-artifact@v7 with: name: inkay path: dist/ From cbe54f5467f11bd7c87fbb89f69c81de67d6c062 Mon Sep 17 00:00:00 2001 From: Valentijn Date: Wed, 25 Feb 2026 10:28:36 +0100 Subject: [PATCH 10/24] Translated using Weblate (Dutch) Currently translated at 84.6% (11 of 13 strings) Translation: Pretendo Network/Inkay Translate-URL: https://hosted.weblate.org/projects/pretendonetwork/inkay/nl/ --- src/lang/nl_NL.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/nl_NL.lang b/src/lang/nl_NL.lang index 9e67847..665c622 100644 --- a/src/lang/nl_NL.lang +++ b/src/lang/nl_NL.lang @@ -10,4 +10,4 @@ ,.using_pretendo_network="Pretendo Network wordt gebruikt" ,.multiplayer_port_display="Gebruikt UDP port %hu voor multiplayer" ,.module_not_found="Pretendo patch mislukt - gebruik Aroma Updater om het te herstellen (686-1001 Module ontbreekt)" -,.module_init_not_found="Pretendo patch mislukt - gebruik Aroma Updater om het te herstellen (686-1002 Module init)" +,.module_init_not_found="Pretendo-Netwerk patch mislukt - gebruik Aroma Updater om het te herstellen (686-1002 Module init)" From 7bb99c30d1c9b826ecd3c553ed7fa8242cb306a7 Mon Sep 17 00:00:00 2001 From: Valentijn Date: Thu, 7 May 2026 17:21:40 +0200 Subject: [PATCH 11/24] Translated using Weblate (Dutch) Currently translated at 100.0% (13 of 13 strings) Translation: Pretendo Network/Inkay Translate-URL: https://hosted.weblate.org/projects/pretendonetwork/inkay/nl/ --- src/lang/nl_NL.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/nl_NL.lang b/src/lang/nl_NL.lang index 665c622..f96206f 100644 --- a/src/lang/nl_NL.lang +++ b/src/lang/nl_NL.lang @@ -1,6 +1,6 @@ .plugin_name="Inkay" ,.network_category="Netwerkselectie" -,.connect_to_network_setting="Verbind met het Pretendo-netwerk" +,.connect_to_network_setting="Verbind met het Pretendo-Netwerk" ,.other_category="Overige instellingen" ,.reset_wwp_setting="Reset het Wara Wara Plaza" ,.press_a_action="Druk A" From b04ebb8624b79ce3ae0190a7849341a4c454c257 Mon Sep 17 00:00:00 2001 From: Jas Date: Thu, 21 May 2026 13:37:36 -0400 Subject: [PATCH 12/24] feat: make startup toast optional added a configuration option to show/hide startup toast --- common/lang.h | 1 + plugin/src/config.cpp | 28 +++++++++++++++++++++++++++- plugin/src/config.h | 2 ++ plugin/src/main.cpp | 2 +- plugin/src/module.cpp | 6 +++--- plugin/src/module.h | 2 +- src/config.cpp | 1 + src/config.h | 2 ++ src/lang/en_US.lang | 1 + src/main.cpp | 12 +++++++++--- 10 files changed, 48 insertions(+), 9 deletions(-) diff --git a/common/lang.h b/common/lang.h index 6e557fe..c7fb606 100644 --- a/common/lang.h +++ b/common/lang.h @@ -7,6 +7,7 @@ struct config_strings { const char *plugin_name; std::string_view network_category; std::string_view connect_to_network_setting; + std::string_view show_startup_toast_setting; std::string_view other_category; std::string_view reset_wwp_setting; std::string_view press_a_action; diff --git a/plugin/src/config.cpp b/plugin/src/config.cpp index 98c2323..1e459dc 100644 --- a/plugin/src/config.cpp +++ b/plugin/src/config.cpp @@ -39,6 +39,7 @@ static config_strings strings; bool Config::connect_to_network = true; +bool Config::show_startup_toast = true; bool Config::need_relaunch = false; bool Config::unregister_task_item_pressed = false; bool Config::is_wiiu_menu = false; @@ -64,6 +65,15 @@ static void connect_to_network_changed(ConfigItemBoolean* item, bool new_value) if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); } +static void show_startup_toast_changed(ConfigItemBoolean* item, bool new_value) { + DEBUG_FUNCTION_LINE_VERBOSE("show_startup_toast changed to: %d", new_value); + Config::show_startup_toast = new_value; + + WUPSStorageError res; + res = WUPSStorageAPI::Store("show_startup_toast", Config::show_startup_toast); + if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); +} + static void unregister_task_item_on_input_cb(void *context, WUPSConfigSimplePadData input) { if (!Config::unregister_task_item_pressed && Config::is_wiiu_menu && ((input.buttons_d & WUPS_CONFIG_BUTTON_A) == WUPS_CONFIG_BUTTON_A)) { @@ -156,6 +166,9 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa auto other_cat = WUPSConfigCategory::Create(strings.other_category, err); if (!other_cat) return report_error(err); + auto startup_toast_item = WUPSConfigItemBoolean::Create("show_startup_toast", strings.show_startup_toast_setting, true, Config::show_startup_toast, &show_startup_toast_changed, err); + if (!startup_toast_item) return report_error(err); + WUPSConfigAPIItemCallbacksV2 unregisterTasksItemCallbacks = { .getCurrentValueDisplay = unregister_task_item_get_display_value, .getCurrentValueSelectedDisplay = unregister_task_item_get_display_value, @@ -181,6 +194,9 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa err = WUPSConfigAPI_Category_AddItem(other_cat->getHandle(), unregisterTasksItem); if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + res = other_cat->add(std::move(*startup_toast_item), err); + if (!res) return report_error(err); + res = root.add(std::move(*other_cat), err); if (!res) return report_error(err); @@ -210,7 +226,7 @@ void Config::Init() { if (cres != WUPSCONFIG_API_RESULT_SUCCESS) return (void)report_error(cres); WUPSStorageError res; - // Try to get value from storage + // Try to get values from storage res = WUPSStorageAPI::Get("connect_to_network", Config::connect_to_network); if (res == WUPS_STORAGE_ERROR_NOT_FOUND) { DEBUG_FUNCTION_LINE("Connect to network value not found, attempting to migrate/create"); @@ -228,6 +244,16 @@ void Config::Init() { } else if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); + res = WUPSStorageAPI::Get("show_startup_toast", Config::show_startup_toast); + if (res == WUPS_STORAGE_ERROR_NOT_FOUND) { + DEBUG_FUNCTION_LINE("Show startup toast value not found, attempting to create"); + + // Add the value to the storage if it's missing. + res = WUPSStorageAPI::Store("show_startup_toast", show_startup_toast); + if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); + } + else if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); + // Save storage res = WUPSStorageAPI::SaveStorage(); if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); diff --git a/plugin/src/config.h b/plugin/src/config.h index 0928d5e..78850c6 100644 --- a/plugin/src/config.h +++ b/plugin/src/config.h @@ -12,6 +12,8 @@ public: // wups config items static bool connect_to_network; + static bool show_startup_toast; + // private stuff static bool need_relaunch; diff --git a/plugin/src/main.cpp b/plugin/src/main.cpp index e95eaac..535c266 100644 --- a/plugin/src/main.cpp +++ b/plugin/src/main.cpp @@ -50,7 +50,7 @@ INITIALIZE_PLUGIN() { } // if using pretendo then (try to) apply the ssl patches - Inkay_Initialize(Config::connect_to_network); + Inkay_Initialize(Config::connect_to_network, Config::show_startup_toast); } DEINITIALIZE_PLUGIN() { diff --git a/plugin/src/module.cpp b/plugin/src/module.cpp index c20d980..9de83ce 100644 --- a/plugin/src/module.cpp +++ b/plugin/src/module.cpp @@ -24,7 +24,7 @@ #include static OSDynLoad_Module module; -static void (*moduleInitialize)(bool) = nullptr; +static void (*moduleInitialize)(bool, bool) = nullptr; static InkayStatus (*moduleGetStatus)() = nullptr; static void (*moduleSetPluginRunning)() = nullptr; @@ -36,7 +36,7 @@ static const char *get_module_init_not_found_message() { return get_config_strings(get_system_language()).module_init_not_found.data(); } -void Inkay_Initialize(bool apply_patches) { +void Inkay_Initialize(bool apply_patches, bool show_startup_toast) { if (module) { return; } @@ -54,7 +54,7 @@ void Inkay_Initialize(bool apply_patches) { return; } - moduleInitialize(apply_patches); + moduleInitialize(apply_patches, show_startup_toast); } void Inkay_Finalize() { diff --git a/plugin/src/module.h b/plugin/src/module.h index ab7836d..22e2356 100644 --- a/plugin/src/module.h +++ b/plugin/src/module.h @@ -24,7 +24,7 @@ enum class InkayStatus { Error = -1 ///< Failed to retrieve the module status }; -void Inkay_Initialize(bool apply_patches); +void Inkay_Initialize(bool apply_patches, bool show_startup_toast); void Inkay_Finalize(); InkayStatus Inkay_GetStatus(); void Inkay_SetPluginRunning(); diff --git a/src/config.cpp b/src/config.cpp index 66a78c4..8400d21 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -18,6 +18,7 @@ #include "config.h" bool Config::connect_to_network = false; +bool Config::show_startup_toast = false; bool Config::initialized = false; bool Config::shown_warning = false; bool Config::plugin_is_loaded = false; diff --git a/src/config.h b/src/config.h index 8455bb0..faecea9 100644 --- a/src/config.h +++ b/src/config.h @@ -10,6 +10,8 @@ public: static bool connect_to_network; + static bool show_startup_toast; + static bool initialized; static bool shown_warning; diff --git a/src/lang/en_US.lang b/src/lang/en_US.lang index 09ebe6a..1fb1fd0 100644 --- a/src/lang/en_US.lang +++ b/src/lang/en_US.lang @@ -1,6 +1,7 @@ .plugin_name="Inkay" ,.network_category="Network selection" ,.connect_to_network_setting="Connect to Pretendo Network" +,.show_startup_toast_setting="Show startup toast" ,.other_category="Other settings" ,.reset_wwp_setting="Reset Wara Wara Plaza" ,.press_a_action="Press A" diff --git a/src/main.cpp b/src/main.cpp index 4930ac0..2e63a2a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -122,10 +122,12 @@ static InkayStatus Inkay_GetStatus() { } } -static void Inkay_Initialize(bool apply_patches) { +static void Inkay_Initialize(bool apply_patches, bool show_startup_toast) { if (Config::initialized) return; + Config::show_startup_toast = show_startup_toast; + if (Config::block_initialize) { ShowNotification("Cannot load Inkay while the system is running. Please restart the console"); return; @@ -150,12 +152,16 @@ static void Inkay_Initialize(bool apply_patches) { DEBUG_FUNCTION_LINE_VERBOSE("Pretendo URL and NoSSL patches applied successfully."); - ShowNotification(get_pretendo_message()); + if (Config::show_startup_toast) { + ShowNotification(get_pretendo_message()); + } Config::initialized = true; } else { DEBUG_FUNCTION_LINE_VERBOSE("Pretendo URL and NoSSL patches skipped."); - ShowNotification(get_nintendo_network_message()); + if(Config::show_startup_toast) { + ShowNotification(get_nintendo_network_message()); + } Config::initialized = true; return; } From a43aed245619826fb38337ffa131a8ec0ce075c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2026 07:23:48 +0000 Subject: [PATCH 13/24] chore: bump actions/checkout from 6 to 7 Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dcd6868..792dce0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: build-inkay: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: build toolchain container run: docker build . -t builder - uses: ammaraskar/gcc-problem-matcher@master From 82cca21ff354280a2ec87a1859930348eda83b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B3pez=20Guimaraes?= Date: Mon, 20 Jul 2026 14:40:35 +0100 Subject: [PATCH 14/24] chore: Bump version to v3.1.0 --- plugin/src/main.cpp | 2 +- src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/src/main.cpp b/plugin/src/main.cpp index 535c266..8363ca9 100644 --- a/plugin/src/main.cpp +++ b/plugin/src/main.cpp @@ -23,7 +23,7 @@ #include "config.h" #include "module.h" -#define INKAY_VERSION "v3.0.0" +#define INKAY_VERSION "v3.1.0" /** Mandatory plugin information. diff --git a/src/main.cpp b/src/main.cpp index b91d271..df482b3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,7 +39,7 @@ #include "ca_pem.h" -#define INKAY_VERSION "v3.0.0" +#define INKAY_VERSION "v3.1.0" /** Mandatory plugin information. From 8cfbf64d545d4eaa207929a55e649426e141b289 Mon Sep 17 00:00:00 2001 From: Ash Logan Date: Mon, 27 Jul 2026 21:42:35 +1000 Subject: [PATCH 15/24] chore: update toolchain --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index a195fbc..f249c75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM ghcr.io/wiiu-env/devkitppc:20250608 +FROM ghcr.io/wiiu-env/devkitppc:20260504 -COPY --from=ghcr.io/wiiu-env/libnotifications:20240426 /artifacts $DEVKITPRO -COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO -COPY --from=ghcr.io/wiiu-env/libkernel:20230621 /artifacts $DEVKITPRO -COPY --from=ghcr.io/wiiu-env/libmocha:20231127 /artifacts $DEVKITPRO -COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20250208 /artifacts $DEVKITPRO -COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20240505 /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/libnotifications:20260404 /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20260331 /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/libkernel:20260331 /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/libmocha:20260331 /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20260418 /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20260503 /artifacts $DEVKITPRO WORKDIR /app CMD make -f Makefile -j$(nproc) From e5020b88d044e99239b773fb6ae25be034f577b5 Mon Sep 17 00:00:00 2001 From: Ash Logan Date: Mon, 27 Jul 2026 21:42:57 +1000 Subject: [PATCH 16/24] fix: don't pull devoptab and sockets requires new-ish aroma for LoggingModule i guess --- plugin/src/main.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/plugin/src/main.cpp b/plugin/src/main.cpp index 8363ca9..20e5db0 100644 --- a/plugin/src/main.cpp +++ b/plugin/src/main.cpp @@ -37,11 +37,8 @@ WUPS_PLUGIN_LICENSE("GPLv3"); WUPS_USE_STORAGE("inkay"); -WUPS_USE_WUT_DEVOPTAB(); - INITIALIZE_PLUGIN() { - WHBLogCafeInit(); - WHBLogUdpInit(); + WHBLogModuleInit(); Config::Init(); @@ -57,8 +54,7 @@ DEINITIALIZE_PLUGIN() { Inkay_Finalize(); NotificationModule_DeInitLibrary(); - WHBLogCafeDeinit(); - WHBLogUdpDeinit(); + WHBLogModuleDeinit(); } ON_APPLICATION_START() { From ccf5370f84b36acdbb63bfb1c62c2e10217909b2 Mon Sep 17 00:00:00 2001 From: Ash Logan Date: Mon, 27 Jul 2026 22:27:13 +1000 Subject: [PATCH 17/24] feat: switch config to C API and add missing strings ~40% bianry size reduction from RTTI/exceptions overhead --- common/lang.h | 5 + plugin/src/config.cpp | 275 ++++++++++++++++++++++-------------------- src/lang/de_DE.lang | 1 + src/lang/en@uwu.lang | 6 +- src/lang/en_US.lang | 5 + src/lang/es_ES.lang | 1 + src/lang/fr_FR.lang | 1 + src/lang/it_IT.lang | 1 + src/lang/ja_JP.lang | 1 + src/lang/ko_KR.lang | 1 + src/lang/nl_NL.lang | 1 + src/lang/pt_BR.lang | 1 + src/lang/ru_RU.lang | 1 + src/lang/zh_CN.lang | 1 + src/lang/zh_Hant.lang | 1 + 15 files changed, 169 insertions(+), 133 deletions(-) diff --git a/common/lang.h b/common/lang.h index 692f9ec..d004ef8 100644 --- a/common/lang.h +++ b/common/lang.h @@ -37,6 +37,11 @@ struct config_strings { std::string_view multiplayer_port_display; std::string_view module_not_found; std::string_view module_init_not_found; + std::string_view setting_yes; + std::string_view setting_no; + std::string_view language_setting; + std::string_view language_name; + std::string_view system_language; }; config_strings get_config_strings(inkay_language language); diff --git a/plugin/src/config.cpp b/plugin/src/config.cpp index 5e68c15..eb8d153 100644 --- a/plugin/src/config.cpp +++ b/plugin/src/config.cpp @@ -56,67 +56,63 @@ static void report_storage_error(WUPSStorageError err) { DEBUG_FUNCTION_LINE_VERBOSE("WUPS storage error: %s", WUPSStorageAPI_GetStatusStr(err)); } -static void connect_to_network_changed(ConfigItemBoolean* item, bool new_value) { +static void connect_to_network_changed(ConfigItemBoolean *item, bool new_value) { DEBUG_FUNCTION_LINE_VERBOSE("connect_to_network changed to: %d", new_value); if (new_value != Config::connect_to_network) { Config::need_relaunch = true; } Config::connect_to_network = new_value; - WUPSStorageError res; - res = WUPSStorageAPI::Store("connect_to_network", Config::connect_to_network); + WUPSStorageError res = WUPSStorageAPI_StoreBool(nullptr, "connect_to_network", Config::connect_to_network); if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); } -static void language_changed(ConfigItemMultipleValues* item, uint32_t new_value) { +static void language_changed(ConfigItemMultipleValues *item, uint32_t new_value) { DEBUG_FUNCTION_LINE_VERBOSE("language changed to: %d", new_value); if (new_value != Config::language) { if (new_value == inkay_language::System) - Config::current_language = (inkay_language)get_system_language(); + Config::current_language = (inkay_language) get_system_language(); else - Config::current_language = (inkay_language)new_value; + Config::current_language = (inkay_language) new_value; } Config::language = new_value; - WUPSStorageError res; - res = WUPSStorageAPI::Store("language", Config::language); + WUPSStorageError res = WUPSStorageAPI_StoreU32(nullptr, "language", Config::language); if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); } -static void show_startup_toast_changed(ConfigItemBoolean* item, bool new_value) { +static void show_startup_toast_changed(ConfigItemBoolean *item, bool new_value) { DEBUG_FUNCTION_LINE_VERBOSE("show_startup_toast changed to: %d", new_value); Config::show_startup_toast = new_value; - WUPSStorageError res; - res = WUPSStorageAPI::Store("show_startup_toast", Config::show_startup_toast); + WUPSStorageError res = WUPSStorageAPI_StoreBool(nullptr, "show_startup_toast", Config::show_startup_toast); if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); } static void unregister_task_item_on_input_cb(void *context, WUPSConfigSimplePadData input) { - if (!Config::unregister_task_item_pressed && Config::is_wiiu_menu && ((input.buttons_d & WUPS_CONFIG_BUTTON_A) == WUPS_CONFIG_BUTTON_A)) { - + if (!Config::unregister_task_item_pressed && Config::is_wiiu_menu && ( + (input.buttons_d & WUPS_CONFIG_BUTTON_A) == WUPS_CONFIG_BUTTON_A)) { nn::act::Initialize(); Initialize__Q2_2nn4bossFv(); - for (uint8_t i = 1; i <= nn::act::GetNumOfAccounts(); i++) - { - if (nn::act::IsSlotOccupied(i) && nn::act::IsNetworkAccountEx(i)) - { - nn::boss::Task task{}; - nn::act::PersistentId persistentId = nn::act::GetPersistentIdEx(i); + for (uint8_t i = 1; i <= nn::act::GetNumOfAccounts(); i++) { + if (nn::act::IsSlotOccupied(i) && nn::act::IsNetworkAccountEx(i)) { + nn::boss::Task task{}; + nn::act::PersistentId persistentId = nn::act::GetPersistentIdEx(i); - __ct__Q3_2nn4boss4TaskFv(&task); - Initialize__Q3_2nn4boss4TaskFPCcUi(&task, "oltopic", persistentId); + __ct__Q3_2nn4boss4TaskFv(&task); + Initialize__Q3_2nn4boss4TaskFPCcUi(&task, "oltopic", persistentId); - // bypasses compiler warning about unused variable - #ifdef DEBUG - uint32_t res = Unregister__Q3_2nn4boss4TaskFv(&task); - DEBUG_FUNCTION_LINE_VERBOSE("Unregistered oltopic for: SlotNo %d | Persistent ID %08x -> 0x%08x", i, persistentId, res); - #else - Unregister__Q3_2nn4boss4TaskFv(&task); - #endif - } - } + // bypasses compiler warning about unused variable +#ifdef DEBUG + uint32_t res = Unregister__Q3_2nn4boss4TaskFv(&task); + DEBUG_FUNCTION_LINE_VERBOSE("Unregistered oltopic for: SlotNo %d | Persistent ID %08x -> 0x%08x", i, + persistentId, res); +#else + Unregister__Q3_2nn4boss4TaskFv(&task); +#endif + } + } Finalize__Q2_2nn4bossFv(); nn::act::Finalize(); @@ -136,16 +132,15 @@ static int32_t unregister_task_item_get_display_value(void *context, char *out_b } } - if ((int)string.length() > out_size - 1) return -1; + if ((int) string.length() > out_size - 1) return -1; string.copy(out_buf, string.length()); out_buf[string.length()] = '\0'; return 0; } -static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHandle rootHandle) { +static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHandle root_cat) { WUPSConfigAPIStatus err; - bool res; uint64_t current_title_id = OSGetTitleID(); uint64_t wiiu_menu_tid = _SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_WII_U_MENU); @@ -154,101 +149,124 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa // get translation strings strings = get_config_strings(Config::current_language); - // create root config category - WUPSConfigCategory root = WUPSConfigCategory(rootHandle); + // Network submenu + // Connect to Pretendo Network Yes/No + // Using UDP port 5000 for multiplayer - auto network_cat = WUPSConfigCategory::Create(strings.network_category, err); - if (!network_cat) return report_error(err); + WUPSConfigCategoryHandle network_cat; + err = WUPSConfigAPI_Category_Create({strings.network_category.data()}, &network_cat); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); - // config id display name default current value changed callback - auto connect_item = WUPSConfigItemBoolean::Create("connect_to_network", strings.connect_to_network_setting, true, Config::connect_to_network, &connect_to_network_changed, err); - if (!connect_item) return report_error(err); + WUPSConfigItemHandle connect_item; + err = WUPSConfigItemBoolean_CreateEx( + "connect_to_network", strings.connect_to_network_setting.data(), true, Config::connect_to_network, + &connect_to_network_changed, strings.setting_yes.data(), strings.setting_no.data(), &connect_item); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); - res = network_cat->add(std::move(*connect_item), err); - if (!res) return report_error(err); + err = WUPSConfigAPI_Category_AddItem(network_cat, connect_item); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); - { - uint16_t port = get_console_peertopeer_port(); - char buffer[256]; - snprintf(buffer, sizeof(buffer), strings.multiplayer_port_display.data(), port); - auto multiplayer_port_display = WUPSConfigItemStub::Create(buffer, err); - if (!multiplayer_port_display) return report_error(err); + const uint16_t port = get_console_peertopeer_port(); + char buffer[256]; + snprintf(buffer, sizeof(buffer), strings.multiplayer_port_display.data(), port); - res = network_cat->add(std::move(*multiplayer_port_display), err); - if (!res) return report_error(err); - } + WUPSConfigItemHandle multiplayer_port_display; + err = WUPSConfigItemStub_Create(buffer, &multiplayer_port_display); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); - res = root.add(std::move(*network_cat), err); - if (!res) return report_error(err); + err = WUPSConfigAPI_Category_AddItem(network_cat, multiplayer_port_display); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); - auto other_cat = WUPSConfigCategory::Create(strings.other_category, err); - if (!other_cat) return report_error(err); + // Add to root and finish + err = WUPSConfigAPI_Category_AddCategory(root_cat, network_cat); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); - auto startup_toast_item = WUPSConfigItemBoolean::Create("show_startup_toast", strings.show_startup_toast_setting, true, Config::show_startup_toast, &show_startup_toast_changed, err); - if (!startup_toast_item) return report_error(err); + // Other category + // Reset Wara Wara Plaza Press A + // Language English/Spanish/etc.. + // Show startup toast Yes/No - WUPSConfigAPIItemCallbacksV2 unregisterTasksItemCallbacks = { - .getCurrentValueDisplay = unregister_task_item_get_display_value, - .getCurrentValueSelectedDisplay = unregister_task_item_get_display_value, - .onSelected = nullptr, - .restoreDefault = nullptr, - .isMovementAllowed = nullptr, - .onCloseCallback = nullptr, - .onInput = unregister_task_item_on_input_cb, - .onInputEx = nullptr, - .onDelete = nullptr - }; - - WUPSConfigAPIItemOptionsV2 unregisterTasksItemOptions = { - .displayName = strings.reset_wwp_setting.data(), - .context = nullptr, - .callbacks = unregisterTasksItemCallbacks, - }; + WUPSConfigCategoryHandle other_cat; + err = WUPSConfigAPI_Category_Create({strings.other_category.data()}, &other_cat); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); WUPSConfigItemHandle unregisterTasksItem; - err = WUPSConfigAPI_Item_Create(unregisterTasksItemOptions, &unregisterTasksItem); + err = WUPSConfigAPI_Item_Create({ + .displayName = strings.reset_wwp_setting.data(), + .context = nullptr, + .callbacks = { + .getCurrentValueDisplay = unregister_task_item_get_display_value, + .getCurrentValueSelectedDisplay = unregister_task_item_get_display_value, + .onSelected = nullptr, + .restoreDefault = nullptr, + .isMovementAllowed = nullptr, + .onCloseCallback = nullptr, + .onInput = unregister_task_item_on_input_cb, + .onInputEx = nullptr, + .onDelete = nullptr + }, + }, &unregisterTasksItem); if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); - err = WUPSConfigAPI_Category_AddItem(other_cat->getHandle(), unregisterTasksItem); + err = WUPSConfigAPI_Category_AddItem(other_cat, unregisterTasksItem); if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); - constexpr WUPSConfigItemMultipleValues::ValuePair languages[] = { - {0, "Japanese"}, - {1, "English"}, - {2, "French"}, - {3, "German"}, - {4, "Italian"}, - {5, "Spanish"}, - {6, "Simplified Chinese"}, - {7, "Korean"}, - {8, "Dutch"}, - {9, "Portuguese"}, - {10, "Russian"}, - {11, "Traditional Chinese"}, - {13, "System"}, - {14, "English (UwU)"}, + // TODO localise these! + constexpr std::array languages = { + { + {0, "Japanese"}, + {1, "English"}, + {2, "French"}, + {3, "German"}, + {4, "Italian"}, + {5, "Spanish"}, + {6, "Simplified Chinese"}, + {7, "Korean"}, + {8, "Dutch"}, + {9, "Portuguese"}, + {10, "Russian"}, + {11, "Traditional Chinese"}, + {13, "System"}, + {14, "English (UwU)"}, + } }; - auto language_item = WUPSConfigItemMultipleValues::CreateFromValue("language", "Language", 13, Config::language, languages, &language_changed, err); - if (!language_item) return report_error(err); + constexpr auto find_lang = [languages](const uint32_t lang) -> int { + return std::ranges::find_if(languages, [lang](auto const l) { return l.value == lang; }) - + std::begin(languages); + }; + constexpr int system_language = find_lang(13 /* System */); + const int current_language = find_lang(Config::language); - res = other_cat->add(std::move(*language_item), err); - if (!res) return report_error(err); + WUPSConfigItemHandle language_item; + err = WUPSConfigItemMultipleValues_Create("language", strings.language_setting.data(), system_language, + current_language, + const_cast(languages.data()), // Yikes! + languages.size(), &language_changed, &language_item); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); - res = other_cat->add(std::move(*startup_toast_item), err); - if (!res) return report_error(err); + err = WUPSConfigAPI_Category_AddItem(other_cat, language_item); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + WUPSConfigItemHandle startup_toast_item; + err = WUPSConfigItemBoolean_CreateEx("show_startup_toast", strings.show_startup_toast_setting.data(), true, + Config::show_startup_toast, &show_startup_toast_changed, + strings.setting_yes.data(), strings.setting_no.data(), &startup_toast_item); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); - res = root.add(std::move(*other_cat), err); - if (!res) return report_error(err); + err = WUPSConfigAPI_Category_AddItem(other_cat, startup_toast_item); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + + // finish up + err = WUPSConfigAPI_Category_AddCategory(root_cat, other_cat); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); return WUPSCONFIG_API_CALLBACK_RESULT_SUCCESS; } static void ConfigMenuClosedCallback() { // Save all changes - WUPSStorageError res; - res = WUPSStorageAPI::SaveStorage(); + WUPSStorageError res = WUPSStorageAPI_SaveStorage(false); if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); if (Config::need_relaunch) { @@ -260,59 +278,54 @@ static void ConfigMenuClosedCallback() { } void Config::Init() { - WUPSConfigAPIStatus cres; - // Init the config api - WUPSConfigAPIOptionsV1 configOptions = { .name = "Inkay" }; - cres = WUPSConfigAPI_Init(configOptions, ConfigMenuOpenedCallback, ConfigMenuClosedCallback); - if (cres != WUPSCONFIG_API_RESULT_SUCCESS) return (void)report_error(cres); + WUPSConfigAPIStatus cres = + WUPSConfigAPI_Init({.name = "Inkay"}, ConfigMenuOpenedCallback, ConfigMenuClosedCallback); + if (cres != WUPSCONFIG_API_RESULT_SUCCESS) return (void) report_error(cres); WUPSStorageError res; // Try to get values from storage - res = WUPSStorageAPI::Get("connect_to_network", Config::connect_to_network); + res = WUPSStorageAPI_GetBool(nullptr, "connect_to_network", &Config::connect_to_network); if (res == WUPS_STORAGE_ERROR_NOT_FOUND) { - DEBUG_FUNCTION_LINE("Connect to network value not found, attempting to migrate/create"); + DEBUG_FUNCTION_LINE_VERBOSE("Connect to network value not found, attempting to migrate/create"); bool skipPatches = false; - if (WUPSStorageAPI::Get("skipPatches", skipPatches) == WUPS_STORAGE_ERROR_SUCCESS) { + if (WUPSStorageAPI_GetBool(nullptr, "skipPatches", &skipPatches) == WUPS_STORAGE_ERROR_SUCCESS) { // Migrate old config value Config::connect_to_network = !skipPatches; - WUPSStorageAPI::DeleteItem("skipPatches"); + WUPSStorageAPI_DeleteItem(nullptr, "skipPatches"); } - - // Add the value to the storage if it's missing. - res = WUPSStorageAPI::Store("connect_to_network", connect_to_network); - if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); - } - else if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); - res = WUPSStorageAPI::Get("language", Config::language); + // Add the value to the storage if it's missing. + res = WUPSStorageAPI_StoreBool(nullptr, "connect_to_network", connect_to_network); + if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); + } else if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); + + res = WUPSStorageAPI_GetU32(nullptr, "language", &Config::language); if (res == WUPS_STORAGE_ERROR_NOT_FOUND) { - DEBUG_FUNCTION_LINE("Language value not found, attempting to create"); + DEBUG_FUNCTION_LINE_VERBOSE("Language value not found, attempting to create"); // Add the value to the storage. - res = WUPSStorageAPI::Store("language", Config::language); + res = WUPSStorageAPI_StoreU32(nullptr, "language", Config::language); if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); - } - else if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); - - res = WUPSStorageAPI::Get("show_startup_toast", Config::show_startup_toast); + } else if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); + + res = WUPSStorageAPI_GetBool(nullptr, "show_startup_toast", &Config::show_startup_toast); if (res == WUPS_STORAGE_ERROR_NOT_FOUND) { - DEBUG_FUNCTION_LINE("Show startup toast value not found, attempting to create"); - + DEBUG_FUNCTION_LINE_VERBOSE("Show startup toast value not found, attempting to create"); + // Add the value to the storage if it's missing. - res = WUPSStorageAPI::Store("show_startup_toast", show_startup_toast); + res = WUPSStorageAPI_StoreBool(nullptr, "show_startup_toast", show_startup_toast); if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); - } - else if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); + } else if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); // Set the language that's currently used if (Config::language == inkay_language::System) - Config::current_language = (inkay_language)get_system_language(); + Config::current_language = (inkay_language) get_system_language(); else - Config::current_language = (inkay_language)Config::language; + Config::current_language = (inkay_language) Config::language; // Save storage - res = WUPSStorageAPI::SaveStorage(); + res = WUPSStorageAPI_SaveStorage(false); if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res); } diff --git a/src/lang/de_DE.lang b/src/lang/de_DE.lang index 4837d27..422ca1b 100644 --- a/src/lang/de_DE.lang +++ b/src/lang/de_DE.lang @@ -11,3 +11,4 @@ ,.multiplayer_port_display="Nutze UDP Port %hu für Mehrspieler" ,.module_not_found="Pretendo Network Patch fehlgeschlagen - nutze Aroma Updater zum Reparieren (686-1001 Module missing)" ,.module_init_not_found="Pretendo Network Patch fehlgeschlagen - nutze Aroma Updater zum Reparieren (686-1002 Module init)" +,.language_name="Deutsch" diff --git a/src/lang/en@uwu.lang b/src/lang/en@uwu.lang index 3e55000..10244a7 100644 --- a/src/lang/en@uwu.lang +++ b/src/lang/en@uwu.lang @@ -1,5 +1,3 @@ - - .plugin_name="Inky ^w^" ,.network_category="Newowk sewectiown! :3" ,.connect_to_network_setting="use dah pretender!!!!" @@ -13,3 +11,7 @@ ,.multiplayer_port_display="mah secret word is %hu... ur modem will know" ,.module_not_found="oh noez! pls get aroma updater help :( (686-1001 Module missing)" ,.module_init_not_found="oh noez! pls get aroma updater help :( (686-1002 Module init)" +,.setting_yes="yaah!" +,.setting_no="nu >w<" +,.language_name="kitteh speak!!" +,.system_language="System" diff --git a/src/lang/en_US.lang b/src/lang/en_US.lang index 1fb1fd0..863dcc6 100644 --- a/src/lang/en_US.lang +++ b/src/lang/en_US.lang @@ -12,3 +12,8 @@ ,.multiplayer_port_display="Using UDP port %hu for multiplayer" ,.module_not_found="Pretendo Network patch failed - use Aroma Updater to repair (686-1001 Module missing)" ,.module_init_not_found="Pretendo Network patch failed - use Aroma Updater to repair (686-1002 Module init)" +,.setting_yes="Yes" +,.setting_no="No" +,.language_setting="Language" +,.language_name="English" +,.system_language="System" diff --git a/src/lang/es_ES.lang b/src/lang/es_ES.lang index f84b918..4633eb7 100644 --- a/src/lang/es_ES.lang +++ b/src/lang/es_ES.lang @@ -11,3 +11,4 @@ ,.multiplayer_port_display="Usando puerto UDP %hu para multijugador" ,.module_not_found="Ha fallado el parche Pretendo Network - usa Aroma Updater para repararlo (686-1001 Falta un módulo)" ,.module_init_not_found="Ha fallado el parche Pretendo Network - usa Aroma Updater para repararlo (686-1002 Inicialización del módulo)" +,.language_name="Español" diff --git a/src/lang/fr_FR.lang b/src/lang/fr_FR.lang index 901a2a2..3bb410f 100644 --- a/src/lang/fr_FR.lang +++ b/src/lang/fr_FR.lang @@ -11,3 +11,4 @@ ,.multiplayer_port_display="Le port UDP %hu sera utilisé pour le multijoueur" ,.module_not_found="Le patch Pretendo Network a rencontré un problème, veuillez le réparer avec Aroma Updater (686-1001 Module missing)" ,.module_init_not_found="Le patch Pretendo Network a rencontré un problème, veuillez le réparer avec Aroma Updater (686-1002 Module init)" +,.language_name="Français" diff --git a/src/lang/it_IT.lang b/src/lang/it_IT.lang index 30495ab..a1bc8ef 100644 --- a/src/lang/it_IT.lang +++ b/src/lang/it_IT.lang @@ -11,3 +11,4 @@ ,.multiplayer_port_display="È in uso la porta UDP %hu per il multigiocatore" ,.module_not_found="Patch Pretendo Network fallita - usa Aroma Updater per riparare (686-1001 Modulo mancante)" ,.module_init_not_found="Patch Pretendo Network fallita - usa Aroma Updater per riparare (686-1002 Module init)" +,.language_name="Italiano" diff --git a/src/lang/ja_JP.lang b/src/lang/ja_JP.lang index 77214c5..3cc6b26 100644 --- a/src/lang/ja_JP.lang +++ b/src/lang/ja_JP.lang @@ -11,3 +11,4 @@ ,.multiplayer_port_display="マルチプレイに UDPポート %hu を使用します" ,.module_not_found="Pretendo パッチに失敗しました。Aroma Updaterを使用して解決してみてください。(686-1001 Module missing)" ,.module_init_not_found="Pretendo パッチに失敗しました。Aroma Updaterを使用して解決してみてください。(686-1002 Module init)" +,.language_name="日本語" diff --git a/src/lang/ko_KR.lang b/src/lang/ko_KR.lang index de04939..9152519 100644 --- a/src/lang/ko_KR.lang +++ b/src/lang/ko_KR.lang @@ -11,3 +11,4 @@ ,.multiplayer_port_display="멀티플레이어에 UDP 포트 %hu을(를) 사용합니다" ,.module_not_found="패치를 적용하는 데 실패했습니다. Aroma Updater로 복구해 주세요. (686-1001 모듈 없음)" ,.module_init_not_found="패치를 적용하는 데 실패했습니다. Aroma Updater로 복구해 주세요. (686-1002 모듈 초기화)" +,.language_name="한국어" diff --git a/src/lang/nl_NL.lang b/src/lang/nl_NL.lang index f96206f..ad3ef7c 100644 --- a/src/lang/nl_NL.lang +++ b/src/lang/nl_NL.lang @@ -11,3 +11,4 @@ ,.multiplayer_port_display="Gebruikt UDP port %hu voor multiplayer" ,.module_not_found="Pretendo patch mislukt - gebruik Aroma Updater om het te herstellen (686-1001 Module ontbreekt)" ,.module_init_not_found="Pretendo-Netwerk patch mislukt - gebruik Aroma Updater om het te herstellen (686-1002 Module init)" +,.language_name="Nederlands" diff --git a/src/lang/pt_BR.lang b/src/lang/pt_BR.lang index 511d5ab..3da427e 100644 --- a/src/lang/pt_BR.lang +++ b/src/lang/pt_BR.lang @@ -11,3 +11,4 @@ ,.multiplayer_port_display="Usando UDP port %hu para a jogatina multiplayer" ,.module_not_found="Atualização do Pretendo falhou - use o Aroma Updater para corrigir (686-1001 Módulo faltando)" ,.module_init_not_found="Atualização do Pretendo falhou - use o Aroma Updater para corrigir (686-1002 Módulo de início)" +,.language_name="Português" diff --git a/src/lang/ru_RU.lang b/src/lang/ru_RU.lang index 3dc9c9c..64e7a66 100644 --- a/src/lang/ru_RU.lang +++ b/src/lang/ru_RU.lang @@ -11,3 +11,4 @@ ,.multiplayer_port_display="Используем UDP-порт %hu для сетевой игры" ,.module_not_found="Ошибка установки патча Pretendo - для восстановления, запустите Aroma Updater (686-1001 Модуль отсутствует)" ,.module_init_not_found="Ошибка установки патча Pretendo - для восстановления, запустите Aroma Updater (686-1002 Инициализация модуля)" +,.language_name="Русский язык" diff --git a/src/lang/zh_CN.lang b/src/lang/zh_CN.lang index 5191686..bfac85f 100644 --- a/src/lang/zh_CN.lang +++ b/src/lang/zh_CN.lang @@ -11,3 +11,4 @@ ,.multiplayer_port_display="多人游戏使用 UDP 端口 %hu" ,.module_not_found="Pretendo Network 补丁失败 - 使用 Aroma Updater 修复（686-1001 模块丢失）" ,.module_init_not_found="Pretendo Network 补丁失败 - 使用 Aroma Updater 修复（686-1002 模块初始化）" +,.language_name="中文（简体）" diff --git a/src/lang/zh_Hant.lang b/src/lang/zh_Hant.lang index 50ff0dd..9531502 100644 --- a/src/lang/zh_Hant.lang +++ b/src/lang/zh_Hant.lang @@ -11,3 +11,4 @@ ,.multiplayer_port_display="使用 UDP 端口 %hu 進行多人遊戲" ,.module_not_found="Pretendo Network 補丁失敗 - 請使用 Aroma Updater 修復（缺少 686-1001 模組）" ,.module_init_not_found="Pretendo Network 補丁失敗 - 請使用 Aroma Updater 修復（缺少 686-1002 模組）" +,.language_name="中文（繁體）" From 158c597aeb8cc9bb72e20b4bf0dc336dee28c2f5 Mon Sep 17 00:00:00 2001 From: Ash Logan Date: Mon, 27 Jul 2026 22:32:02 +1000 Subject: [PATCH 18/24] fix: shrink log data size slightly --- plugin/src/module.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/src/module.cpp b/plugin/src/module.cpp index 94325cd..8a550f7 100644 --- a/plugin/src/module.cpp +++ b/plugin/src/module.cpp @@ -48,7 +48,7 @@ void Inkay_Initialize(bool apply_patches, bool show_startup_toast) { } if (OSDynLoad_FindExport(module, OS_DYNLOAD_EXPORT_FUNC, "Inkay_Initialize", reinterpret_cast(&moduleInitialize)) != OS_DYNLOAD_OK) { - DEBUG_FUNCTION_LINE("Failed to find initialization function"); + DEBUG_FUNCTION_LINE("Failed to find function %s", "Inkay_Initialize"); ShowNotification(get_module_init_not_found_message()); OSDynLoad_Release(module); return; @@ -72,7 +72,7 @@ InkayStatus Inkay_GetStatus() { } if (!moduleGetStatus && OSDynLoad_FindExport(module, OS_DYNLOAD_EXPORT_FUNC, "Inkay_GetStatus", reinterpret_cast(&moduleGetStatus)) != OS_DYNLOAD_OK) { - DEBUG_FUNCTION_LINE("Failed to find status function"); + DEBUG_FUNCTION_LINE("Failed to find function %s", "Inkay_GetStatus"); return InkayStatus::Error; } @@ -85,7 +85,7 @@ void Inkay_SetPluginRunning() { } if (!moduleSetPluginRunning && OSDynLoad_FindExport(module, OS_DYNLOAD_EXPORT_FUNC, "Inkay_SetPluginRunning", reinterpret_cast(&moduleSetPluginRunning)) != OS_DYNLOAD_OK) { - DEBUG_FUNCTION_LINE("Failed to find \"Inkay_SetPluginRunning\" function"); + DEBUG_FUNCTION_LINE("Failed to find function %s", "Inkay_SetPluginRunning"); return; } From 39dc7d8c8ad3be57470270c42de8d9a0fc3e591e Mon Sep 17 00:00:00 2001 From: Ash Logan Date: Tue, 28 Jul 2026 22:49:32 +1000 Subject: [PATCH 19/24] fix: bad debug prints --- common/sysconfig.cpp | 4 ++-- plugin/src/main.cpp | 4 ++-- src/utils/replace_mem.cpp | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common/sysconfig.cpp b/common/sysconfig.cpp index ec56614..bb13d4b 100644 --- a/common/sysconfig.cpp +++ b/common/sysconfig.cpp @@ -53,7 +53,7 @@ nn::swkbd::LanguageType get_system_language() { return nn::swkbd::LanguageType::English; } - DEBUG_FUNCTION_LINE_VERBOSE("System language found: %d", language); + DEBUG_FUNCTION_LINE_VERBOSE("System language found: %d", static_cast(language)); cached_language = language; return language; } @@ -80,7 +80,7 @@ static void get_mcp_config() { mcp_os_version = os_version; DEBUG_FUNCTION_LINE_VERBOSE("Running on %d.%d.%d%c; %s%s", - os_version.major, os_version.minor, os_version.patch, os_version.region + os_version.major, os_version.minor, os_version.patch, os_version.region, config.code_id, config.serial_id ); } diff --git a/plugin/src/main.cpp b/plugin/src/main.cpp index 20e5db0..a8466e6 100644 --- a/plugin/src/main.cpp +++ b/plugin/src/main.cpp @@ -38,7 +38,7 @@ WUPS_PLUGIN_LICENSE("GPLv3"); WUPS_USE_STORAGE("inkay"); INITIALIZE_PLUGIN() { - WHBLogModuleInit(); + WHBLogCafeInit(); Config::Init(); @@ -54,7 +54,7 @@ DEINITIALIZE_PLUGIN() { Inkay_Finalize(); NotificationModule_DeInitLibrary(); - WHBLogModuleDeinit(); + WHBLogCafeDeinit(); } ON_APPLICATION_START() { diff --git a/src/utils/replace_mem.cpp b/src/utils/replace_mem.cpp index 03e94b2..1c7003b 100644 --- a/src/utils/replace_mem.cpp +++ b/src/utils/replace_mem.cpp @@ -85,7 +85,6 @@ bool replace_unsigned(U *addr, U original_value, U new_value) { ); DCFlushRange(addr, sizeof(new_value)); - DEBUG_FUNCTION_LINE_VERBOSE("%08x is now %08x", inst, *inst); return *addr == new_value; } template bool replace_unsigned(uint64_t *, uint64_t, uint64_t); From df01b5b1dd7a5232fd03f15f292e7fc3b522c64a Mon Sep 17 00:00:00 2001 From: Ash Logan Date: Tue, 28 Jul 2026 22:49:56 +1000 Subject: [PATCH 20/24] feat(config): include line number in error reporting --- plugin/src/config.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/plugin/src/config.cpp b/plugin/src/config.cpp index eb8d153..21d4146 100644 --- a/plugin/src/config.cpp +++ b/plugin/src/config.cpp @@ -47,8 +47,8 @@ bool Config::is_wiiu_menu = false; uint32_t Config::language = 13; inkay_language Config::current_language = English; -static WUPSConfigAPICallbackStatus report_error(WUPSConfigAPIStatus err) { - DEBUG_FUNCTION_LINE_VERBOSE("WUPS config error: %s", WUPSConfigAPI_GetStatusStr(err)); +static WUPSConfigAPICallbackStatus report_error(WUPSConfigAPIStatus err, int line) { + DEBUG_FUNCTION_LINE_VERBOSE("WUPS config error: %s (L%04d)", WUPSConfigAPI_GetStatusStr(err), line); return WUPSCONFIG_API_CALLBACK_RESULT_ERROR; } @@ -155,16 +155,16 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa WUPSConfigCategoryHandle network_cat; err = WUPSConfigAPI_Category_Create({strings.network_category.data()}, &network_cat); - if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__); WUPSConfigItemHandle connect_item; err = WUPSConfigItemBoolean_CreateEx( "connect_to_network", strings.connect_to_network_setting.data(), true, Config::connect_to_network, &connect_to_network_changed, strings.setting_yes.data(), strings.setting_no.data(), &connect_item); - if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__); err = WUPSConfigAPI_Category_AddItem(network_cat, connect_item); - if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__); const uint16_t port = get_console_peertopeer_port(); char buffer[256]; @@ -172,14 +172,14 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa WUPSConfigItemHandle multiplayer_port_display; err = WUPSConfigItemStub_Create(buffer, &multiplayer_port_display); - if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__); err = WUPSConfigAPI_Category_AddItem(network_cat, multiplayer_port_display); - if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__); // Add to root and finish err = WUPSConfigAPI_Category_AddCategory(root_cat, network_cat); - if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__); // Other category // Reset Wara Wara Plaza Press A @@ -188,7 +188,7 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa WUPSConfigCategoryHandle other_cat; err = WUPSConfigAPI_Category_Create({strings.other_category.data()}, &other_cat); - if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__); WUPSConfigItemHandle unregisterTasksItem; err = WUPSConfigAPI_Item_Create({ @@ -206,10 +206,10 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa .onDelete = nullptr }, }, &unregisterTasksItem); - if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__); err = WUPSConfigAPI_Category_AddItem(other_cat, unregisterTasksItem); - if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__); // TODO localise these! constexpr std::array languages = { @@ -243,23 +243,23 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa current_language, const_cast(languages.data()), // Yikes! languages.size(), &language_changed, &language_item); - if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__); err = WUPSConfigAPI_Category_AddItem(other_cat, language_item); - if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__); WUPSConfigItemHandle startup_toast_item; err = WUPSConfigItemBoolean_CreateEx("show_startup_toast", strings.show_startup_toast_setting.data(), true, Config::show_startup_toast, &show_startup_toast_changed, strings.setting_yes.data(), strings.setting_no.data(), &startup_toast_item); - if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__); err = WUPSConfigAPI_Category_AddItem(other_cat, startup_toast_item); - if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__); // finish up err = WUPSConfigAPI_Category_AddCategory(root_cat, other_cat); - if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err); + if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__); return WUPSCONFIG_API_CALLBACK_RESULT_SUCCESS; } @@ -281,7 +281,7 @@ void Config::Init() { // Init the config api WUPSConfigAPIStatus cres = WUPSConfigAPI_Init({.name = "Inkay"}, ConfigMenuOpenedCallback, ConfigMenuClosedCallback); - if (cres != WUPSCONFIG_API_RESULT_SUCCESS) return (void) report_error(cres); + if (cres != WUPSCONFIG_API_RESULT_SUCCESS) return (void) report_error(cres, __LINE__); WUPSStorageError res; // Try to get values from storage From 10688b5ac20c6505f77758e613f9dc7a1af9f9f2 Mon Sep 17 00:00:00 2001 From: Ash Logan Date: Tue, 28 Jul 2026 22:50:05 +1000 Subject: [PATCH 21/24] fix(lang): include missing strings as blank --- src/lang/de_DE.lang | 5 +++++ src/lang/en@uwu.lang | 2 ++ src/lang/es_ES.lang | 5 +++++ src/lang/fr_FR.lang | 5 +++++ src/lang/it_IT.lang | 5 +++++ src/lang/ja_JP.lang | 5 +++++ src/lang/ko_KR.lang | 5 +++++ src/lang/nl_NL.lang | 5 +++++ src/lang/pt_BR.lang | 5 +++++ src/lang/ru_RU.lang | 5 +++++ src/lang/zh_CN.lang | 5 +++++ src/lang/zh_Hant.lang | 5 +++++ 12 files changed, 57 insertions(+) diff --git a/src/lang/de_DE.lang b/src/lang/de_DE.lang index 422ca1b..96ba508 100644 --- a/src/lang/de_DE.lang +++ b/src/lang/de_DE.lang @@ -1,6 +1,7 @@ .plugin_name="Inkay" ,.network_category="Netzwerkauswahl" ,.connect_to_network_setting="Mit Pretendo Network verbinden" +,.show_startup_toast_setting="" ,.other_category="Andere Einstellungen" ,.reset_wwp_setting="Wara Wara Plaza zurücksetzen" ,.press_a_action="Drücke A" @@ -11,4 +12,8 @@ ,.multiplayer_port_display="Nutze UDP Port %hu für Mehrspieler" ,.module_not_found="Pretendo Network Patch fehlgeschlagen - nutze Aroma Updater zum Reparieren (686-1001 Module missing)" ,.module_init_not_found="Pretendo Network Patch fehlgeschlagen - nutze Aroma Updater zum Reparieren (686-1002 Module init)" +,.setting_yes="" +,.setting_no="" +,.language_setting="" ,.language_name="Deutsch" +,.system_language="" diff --git a/src/lang/en@uwu.lang b/src/lang/en@uwu.lang index 10244a7..26abcc4 100644 --- a/src/lang/en@uwu.lang +++ b/src/lang/en@uwu.lang @@ -1,6 +1,7 @@ .plugin_name="Inky ^w^" ,.network_category="Newowk sewectiown! :3" ,.connect_to_network_setting="use dah pretender!!!!" +,.show_startup_toast_setting="show da deets :3" ,.other_category="oth3r stuffzz" ,.reset_wwp_setting="warah wara go BYEBYE x3c" ,.press_a_action="Press A plz?" @@ -13,5 +14,6 @@ ,.module_init_not_found="oh noez! pls get aroma updater help :( (686-1002 Module init)" ,.setting_yes="yaah!" ,.setting_no="nu >w<" +,.language_setting="spek..." ,.language_name="kitteh speak!!" ,.system_language="System" diff --git a/src/lang/es_ES.lang b/src/lang/es_ES.lang index 4633eb7..9815206 100644 --- a/src/lang/es_ES.lang +++ b/src/lang/es_ES.lang @@ -1,6 +1,7 @@ .plugin_name="Inkay" ,.network_category="Seleccionar red" ,.connect_to_network_setting="Conectar a Pretendo Network" +,.show_startup_toast_setting="" ,.other_category="Otros ajustes" ,.reset_wwp_setting="Restablecer Plaza Wara Wara" ,.press_a_action="Pulsa A" @@ -11,4 +12,8 @@ ,.multiplayer_port_display="Usando puerto UDP %hu para multijugador" ,.module_not_found="Ha fallado el parche Pretendo Network - usa Aroma Updater para repararlo (686-1001 Falta un módulo)" ,.module_init_not_found="Ha fallado el parche Pretendo Network - usa Aroma Updater para repararlo (686-1002 Inicialización del módulo)" +,.setting_yes="" +,.setting_no="" +,.language_setting="" ,.language_name="Español" +,.system_language="" diff --git a/src/lang/fr_FR.lang b/src/lang/fr_FR.lang index 3bb410f..d13c8da 100644 --- a/src/lang/fr_FR.lang +++ b/src/lang/fr_FR.lang @@ -1,6 +1,7 @@ .plugin_name="Inkay" ,.network_category="Sélection du réseau" ,.connect_to_network_setting="Connexion au Pretendo Network" +,.show_startup_toast_setting="" ,.other_category="Autres paramètres" ,.reset_wwp_setting="Réinitialiser la place WaraWara" ,.press_a_action="Appuyez sur A" @@ -11,4 +12,8 @@ ,.multiplayer_port_display="Le port UDP %hu sera utilisé pour le multijoueur" ,.module_not_found="Le patch Pretendo Network a rencontré un problème, veuillez le réparer avec Aroma Updater (686-1001 Module missing)" ,.module_init_not_found="Le patch Pretendo Network a rencontré un problème, veuillez le réparer avec Aroma Updater (686-1002 Module init)" +,.setting_yes="" +,.setting_no="" +,.language_setting="" ,.language_name="Français" +,.system_language="" diff --git a/src/lang/it_IT.lang b/src/lang/it_IT.lang index a1bc8ef..be3162d 100644 --- a/src/lang/it_IT.lang +++ b/src/lang/it_IT.lang @@ -1,6 +1,7 @@ .plugin_name="Inkay" ,.network_category="Seleziona la rete" ,.connect_to_network_setting="Connettiti a Pretendo Network" +,.show_startup_toast_setting="" ,.other_category="Altre impostazioni" ,.reset_wwp_setting="Ripristina Wara Wara Plaza" ,.press_a_action="Premi A" @@ -11,4 +12,8 @@ ,.multiplayer_port_display="È in uso la porta UDP %hu per il multigiocatore" ,.module_not_found="Patch Pretendo Network fallita - usa Aroma Updater per riparare (686-1001 Modulo mancante)" ,.module_init_not_found="Patch Pretendo Network fallita - usa Aroma Updater per riparare (686-1002 Module init)" +,.setting_yes="" +,.setting_no="" +,.language_setting="" ,.language_name="Italiano" +,.system_language="" diff --git a/src/lang/ja_JP.lang b/src/lang/ja_JP.lang index 3cc6b26..3471f34 100644 --- a/src/lang/ja_JP.lang +++ b/src/lang/ja_JP.lang @@ -1,6 +1,7 @@ .plugin_name="Inkay" ,.network_category="ネットワークの選択" ,.connect_to_network_setting="Pretendoネットワークに接続する" +,.show_startup_toast_setting="" ,.other_category="その他の設定" ,.reset_wwp_setting="わらわら広場をリセット" ,.press_a_action="Ａボタンを押そう" @@ -11,4 +12,8 @@ ,.multiplayer_port_display="マルチプレイに UDPポート %hu を使用します" ,.module_not_found="Pretendo パッチに失敗しました。Aroma Updaterを使用して解決してみてください。(686-1001 Module missing)" ,.module_init_not_found="Pretendo パッチに失敗しました。Aroma Updaterを使用して解決してみてください。(686-1002 Module init)" +,.setting_yes="" +,.setting_no="" +,.language_setting="" ,.language_name="日本語" +,.system_language="" diff --git a/src/lang/ko_KR.lang b/src/lang/ko_KR.lang index 9152519..b732072 100644 --- a/src/lang/ko_KR.lang +++ b/src/lang/ko_KR.lang @@ -1,6 +1,7 @@ .plugin_name="Inkay" ,.network_category="네트워크 선택" ,.connect_to_network_setting="Pretendo Network 사용" +,.show_startup_toast_setting="" ,.other_category="기타 설정" ,.reset_wwp_setting="Wara Wara Plaza 초기화" ,.press_a_action="A 버튼을 누르세요" @@ -11,4 +12,8 @@ ,.multiplayer_port_display="멀티플레이어에 UDP 포트 %hu을(를) 사용합니다" ,.module_not_found="패치를 적용하는 데 실패했습니다. Aroma Updater로 복구해 주세요. (686-1001 모듈 없음)" ,.module_init_not_found="패치를 적용하는 데 실패했습니다. Aroma Updater로 복구해 주세요. (686-1002 모듈 초기화)" +,.setting_yes="" +,.setting_no="" +,.language_setting="" ,.language_name="한국어" +,.system_language="" diff --git a/src/lang/nl_NL.lang b/src/lang/nl_NL.lang index ad3ef7c..3712ff2 100644 --- a/src/lang/nl_NL.lang +++ b/src/lang/nl_NL.lang @@ -1,6 +1,7 @@ .plugin_name="Inkay" ,.network_category="Netwerkselectie" ,.connect_to_network_setting="Verbind met het Pretendo-Netwerk" +,.show_startup_toast_setting="" ,.other_category="Overige instellingen" ,.reset_wwp_setting="Reset het Wara Wara Plaza" ,.press_a_action="Druk A" @@ -11,4 +12,8 @@ ,.multiplayer_port_display="Gebruikt UDP port %hu voor multiplayer" ,.module_not_found="Pretendo patch mislukt - gebruik Aroma Updater om het te herstellen (686-1001 Module ontbreekt)" ,.module_init_not_found="Pretendo-Netwerk patch mislukt - gebruik Aroma Updater om het te herstellen (686-1002 Module init)" +,.setting_yes="" +,.setting_no="" +,.language_setting="" ,.language_name="Nederlands" +,.system_language="" diff --git a/src/lang/pt_BR.lang b/src/lang/pt_BR.lang index 3da427e..5bcf4c1 100644 --- a/src/lang/pt_BR.lang +++ b/src/lang/pt_BR.lang @@ -1,6 +1,7 @@ .plugin_name="Inkay" ,.network_category="Selecionar rede" ,.connect_to_network_setting="Conecta-se à Pretendo Network" +,.show_startup_toast_setting="" ,.other_category="Outras configurações" ,.reset_wwp_setting="Resetar Wara Wara Plaza" ,.press_a_action="Aperte A" @@ -11,4 +12,8 @@ ,.multiplayer_port_display="Usando UDP port %hu para a jogatina multiplayer" ,.module_not_found="Atualização do Pretendo falhou - use o Aroma Updater para corrigir (686-1001 Módulo faltando)" ,.module_init_not_found="Atualização do Pretendo falhou - use o Aroma Updater para corrigir (686-1002 Módulo de início)" +,.setting_yes="" +,.setting_no="" +,.language_setting="" ,.language_name="Português" +,.system_language="" diff --git a/src/lang/ru_RU.lang b/src/lang/ru_RU.lang index 64e7a66..327a47b 100644 --- a/src/lang/ru_RU.lang +++ b/src/lang/ru_RU.lang @@ -1,6 +1,7 @@ .plugin_name="Inkay" ,.network_category="Выбор сети" ,.connect_to_network_setting="Подключиться к Pretendo Network" +,.show_startup_toast_setting="" ,.other_category="Другие настройки" ,.reset_wwp_setting="Сбросить Wara Wara Plaza" ,.press_a_action="Нажмите A" @@ -11,4 +12,8 @@ ,.multiplayer_port_display="Используем UDP-порт %hu для сетевой игры" ,.module_not_found="Ошибка установки патча Pretendo - для восстановления, запустите Aroma Updater (686-1001 Модуль отсутствует)" ,.module_init_not_found="Ошибка установки патча Pretendo - для восстановления, запустите Aroma Updater (686-1002 Инициализация модуля)" +,.setting_yes="" +,.setting_no="" +,.language_setting="" ,.language_name="Русский язык" +,.system_language="" diff --git a/src/lang/zh_CN.lang b/src/lang/zh_CN.lang index bfac85f..e653106 100644 --- a/src/lang/zh_CN.lang +++ b/src/lang/zh_CN.lang @@ -1,6 +1,7 @@ .plugin_name="Inkay" ,.network_category="选择网络" ,.connect_to_network_setting="连接到Pretendo Network" +,.show_startup_toast_setting="" ,.other_category="其他设置" ,.reset_wwp_setting="重置Wara Wara Plaza" ,.press_a_action="请按 A" @@ -11,4 +12,8 @@ ,.multiplayer_port_display="多人游戏使用 UDP 端口 %hu" ,.module_not_found="Pretendo Network 补丁失败 - 使用 Aroma Updater 修复（686-1001 模块丢失）" ,.module_init_not_found="Pretendo Network 补丁失败 - 使用 Aroma Updater 修复（686-1002 模块初始化）" +,.setting_yes="" +,.setting_no="" +,.language_setting="" ,.language_name="中文（简体）" +,.system_language="" diff --git a/src/lang/zh_Hant.lang b/src/lang/zh_Hant.lang index 9531502..a9b82cf 100644 --- a/src/lang/zh_Hant.lang +++ b/src/lang/zh_Hant.lang @@ -1,6 +1,7 @@ .plugin_name="Inkay" ,.network_category="選擇網路" ,.connect_to_network_setting="連接到Pretendo Network" +,.show_startup_toast_setting="" ,.other_category="其他設定" ,.reset_wwp_setting="重置Wara Wara Plaza" ,.press_a_action="請按 A" @@ -11,4 +12,8 @@ ,.multiplayer_port_display="使用 UDP 端口 %hu 進行多人遊戲" ,.module_not_found="Pretendo Network 補丁失敗 - 請使用 Aroma Updater 修復（缺少 686-1001 模組）" ,.module_init_not_found="Pretendo Network 補丁失敗 - 請使用 Aroma Updater 修復（缺少 686-1002 模組）" +,.setting_yes="" +,.setting_no="" +,.language_setting="" ,.language_name="中文（繁體）" +,.system_language="" From 6df031b26d1e8aa6b562d72ae032bf9b99d78328 Mon Sep 17 00:00:00 2001 From: Ash Date: Wed, 29 Jul 2026 21:28:40 +1000 Subject: [PATCH 22/24] Create codeql.yml --- .github/workflows/codeql.yml | 101 +++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000..32eabd0 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,101 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL Advanced" + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + schedule: + - cron: '31 9 * * 0' + +jobs: + analyze: + name: Analyze (${{ matrix.language }}) + # Runner size impacts CodeQL analysis time. To learn more, please see: + # - https://gh.io/recommended-hardware-resources-for-running-codeql + # - https://gh.io/supported-runners-and-hardware-resources + # - https://gh.io/using-larger-runners (GitHub.com only) + # Consider using larger runners or machines with greater resources for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + permissions: + # required for all workflows + security-events: write + + # required to fetch internal or private CodeQL packs + packages: read + + # only required for workflows in private repositories + actions: read + contents: read + + strategy: + fail-fast: false + matrix: + include: + - language: actions + build-mode: none + - language: c-cpp + build-mode: none + # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift' + # Use `c-cpp` to analyze code written in C, C++ or both + # Use 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, + # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. + # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how + # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Add any setup steps before running the `github/codeql-action/init` action. + # This includes steps like installing compilers or runtimes (`actions/setup-node` + # or others). This is typically only required for manual builds. + # - name: Setup runtime (example) + # uses: actions/setup-example@v1 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v4 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + # If the analyze step fails for one of the languages you are analyzing with + # "We were unable to automatically build your code", modify the matrix above + # to set the build mode to "manual" for that language. Then modify this step + # to build your code. + # ℹ️ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + - name: Run manual build steps + if: matrix.build-mode == 'manual' + shell: bash + run: | + echo 'If you are using a "manual" build mode for one or more of the' \ + 'languages you are analyzing, replace this with the commands to build' \ + 'your code, for example:' + echo ' make bootstrap' + echo ' make release' + exit 1 + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v4 + with: + category: "/language:${{matrix.language}}" From 890be941a91e05e27b15e1dd697b6c96988a7232 Mon Sep 17 00:00:00 2001 From: Ash Logan Date: Wed, 29 Jul 2026 21:33:03 +1000 Subject: [PATCH 23/24] Revert "Create codeql.yml" This reverts commit 6df031b26d1e8aa6b562d72ae032bf9b99d78328. --- .github/workflows/codeql.yml | 101 ----------------------------------- 1 file changed, 101 deletions(-) delete mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml deleted file mode 100644 index 32eabd0..0000000 --- a/.github/workflows/codeql.yml +++ /dev/null @@ -1,101 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL Advanced" - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - schedule: - - cron: '31 9 * * 0' - -jobs: - analyze: - name: Analyze (${{ matrix.language }}) - # Runner size impacts CodeQL analysis time. To learn more, please see: - # - https://gh.io/recommended-hardware-resources-for-running-codeql - # - https://gh.io/supported-runners-and-hardware-resources - # - https://gh.io/using-larger-runners (GitHub.com only) - # Consider using larger runners or machines with greater resources for possible analysis time improvements. - runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} - permissions: - # required for all workflows - security-events: write - - # required to fetch internal or private CodeQL packs - packages: read - - # only required for workflows in private repositories - actions: read - contents: read - - strategy: - fail-fast: false - matrix: - include: - - language: actions - build-mode: none - - language: c-cpp - build-mode: none - # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift' - # Use `c-cpp` to analyze code written in C, C++ or both - # Use 'java-kotlin' to analyze code written in Java, Kotlin or both - # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both - # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, - # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. - # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how - # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - # Add any setup steps before running the `github/codeql-action/init` action. - # This includes steps like installing compilers or runtimes (`actions/setup-node` - # or others). This is typically only required for manual builds. - # - name: Setup runtime (example) - # uses: actions/setup-example@v1 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v4 - with: - languages: ${{ matrix.language }} - build-mode: ${{ matrix.build-mode }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - # If the analyze step fails for one of the languages you are analyzing with - # "We were unable to automatically build your code", modify the matrix above - # to set the build mode to "manual" for that language. Then modify this step - # to build your code. - # ℹ️ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - name: Run manual build steps - if: matrix.build-mode == 'manual' - shell: bash - run: | - echo 'If you are using a "manual" build mode for one or more of the' \ - 'languages you are analyzing, replace this with the commands to build' \ - 'your code, for example:' - echo ' make bootstrap' - echo ' make release' - exit 1 - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v4 - with: - category: "/language:${{matrix.language}}" From 5960ff1e40768da216f06d25a4f26cb391a08ca1 Mon Sep 17 00:00:00 2001 From: Ash Date: Wed, 29 Jul 2026 21:38:46 +1000 Subject: [PATCH 24/24] Create codeql.yml --- .github/workflows/codeql.yml | 101 +++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000..e0192d2 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,101 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL Advanced" + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + schedule: + - cron: '25 19 * * 2' + +jobs: + analyze: + name: Analyze (${{ matrix.language }}) + # Runner size impacts CodeQL analysis time. To learn more, please see: + # - https://gh.io/recommended-hardware-resources-for-running-codeql + # - https://gh.io/supported-runners-and-hardware-resources + # - https://gh.io/using-larger-runners (GitHub.com only) + # Consider using larger runners or machines with greater resources for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + permissions: + # required for all workflows + security-events: write + + # required to fetch internal or private CodeQL packs + packages: read + + # only required for workflows in private repositories + actions: read + contents: read + + strategy: + fail-fast: false + matrix: + include: + - language: actions + build-mode: none + - language: c-cpp + build-mode: none + # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift' + # Use `c-cpp` to analyze code written in C, C++ or both + # Use 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, + # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. + # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how + # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Add any setup steps before running the `github/codeql-action/init` action. + # This includes steps like installing compilers or runtimes (`actions/setup-node` + # or others). This is typically only required for manual builds. + # - name: Setup runtime (example) + # uses: actions/setup-example@v1 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v4 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + # If the analyze step fails for one of the languages you are analyzing with + # "We were unable to automatically build your code", modify the matrix above + # to set the build mode to "manual" for that language. Then modify this step + # to build your code. + # ℹ️ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + - name: Run manual build steps + if: matrix.build-mode == 'manual' + shell: bash + run: | + echo 'If you are using a "manual" build mode for one or more of the' \ + 'languages you are analyzing, replace this with the commands to build' \ + 'your code, for example:' + echo ' make bootstrap' + echo ' make release' + exit 1 + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v4 + with: + category: "/language:${{matrix.language}}"