From 00a75e94cb2b4796d8d199ee3c18a13302ac3648 Mon Sep 17 00:00:00 2001 From: Maple Nebel Date: Sat, 16 May 2026 22:18:39 +0200 Subject: [PATCH 01/20] initial spfn commit --- Makefile | 2 +- common/inkay_config.h | 2 +- plugin/Makefile | 2 +- plugin/src/main.cpp | 66 ++++++++++++++++++++++++++++++++++++++++-- src/iosu_url_patches.h | 56 +++++++++++++++++------------------ src/lang/de_DE.lang | 8 ++--- src/lang/en_US.lang | 8 ++--- src/lang/es_ES.lang | 8 ++--- src/lang/fr_FR.lang | 8 ++--- src/lang/it_IT.lang | 8 ++--- src/lang/ja_JP.lang | 8 ++--- src/lang/nl_NL.lang | 8 ++--- src/lang/pt_BR.lang | 8 ++--- src/lang/ru_RU.lang | 8 ++--- src/lang/zh_CN.lang | 8 ++--- src/lang/zh_Hant.lang | 8 ++--- src/main.cpp | 4 +-- 17 files changed, 140 insertions(+), 80 deletions(-) diff --git a/Makefile b/Makefile index fa5360d..624a492 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ WUT_ROOT := $(DEVKITPRO)/wut # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files #------------------------------------------------------------------------------- -TARGET := Inkay-pretendo +TARGET := Inkay-spfn BUILD := build SOURCES := src src/patches src/utils src/ext/inih common DATA := data diff --git a/common/inkay_config.h b/common/inkay_config.h index 0293c20..64a20fd 100644 --- a/common/inkay_config.h +++ b/common/inkay_config.h @@ -15,7 +15,7 @@ #endif #ifndef NETWORK_BASEURL -#define NETWORK_BASEURL "pretendo.cc" +#define NETWORK_BASEURL "spfn.cc" #endif #endif //INKAY_INKAY_CONFIG_H diff --git a/plugin/Makefile b/plugin/Makefile index dfcda53..6553ec1 100644 --- a/plugin/Makefile +++ b/plugin/Makefile @@ -19,7 +19,7 @@ WUMS_ROOT := $(DEVKITPRO)/wums # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files #------------------------------------------------------------------------------- -TARGET := Inkay-pretendo +TARGET := Inkay-spfn BUILD := build SOURCES := src src/utils ../common DATA := data diff --git a/plugin/src/main.cpp b/plugin/src/main.cpp index e95eaac..57ba9d1 100644 --- a/plugin/src/main.cpp +++ b/plugin/src/main.cpp @@ -21,6 +21,9 @@ #include #include #include "config.h" +#include +#include +#include #include "module.h" #define INKAY_VERSION "v3.0.0" @@ -29,16 +32,72 @@ Mandatory plugin information. If not set correctly, the loader will refuse to use the plugin. **/ -WUPS_PLUGIN_NAME("Inkay"); -WUPS_PLUGIN_DESCRIPTION("Pretendo Network Patcher"); +WUPS_PLUGIN_NAME("Inkay(SPFN)"); +WUPS_PLUGIN_DESCRIPTION("SPFN Network Patcher"); WUPS_PLUGIN_VERSION(INKAY_VERSION); -WUPS_PLUGIN_AUTHOR("Pretendo contributors"); +WUPS_PLUGIN_AUTHOR("Pretendo contributors and RusticMaple"); WUPS_PLUGIN_LICENSE("GPLv3"); WUPS_USE_STORAGE("inkay"); WUPS_USE_WUT_DEVOPTAB(); +bool is_current_game_splatoon(){ + auto current_game = OSGetTitleID(); + + if( + current_game == 0x0005000010162B00 || + current_game == 0x0005000010176900 || + current_game == 0x0005000010176A00 + ){ + return true; + } + return false; +} + +void splatoon_patcher(){ + if(is_current_game_splatoon()){ + NotificationModule_AddInfoNotification("Splatoon Detected, applying patch"); + + auto rpl_count = OSDynLoad_GetNumberOfRPLs(); + + std::vector rpls(rpl_count); + + if(!OSDynLoad_GetRPLInfo(0, rpl_count, rpls.data())){ + NotificationModule_AddInfoNotification("failed to get rpls"); + } + + for(auto rpl: rpls){ + if(rpl.name != 0){ + if(strstr(rpl.name, "Gambit") != NULL){ + NotificationModule_AddInfoNotification(rpl.name); + auto text_color = NMColor(); + text_color.r = 255; + text_color.g = 255; + text_color.b = 255; + text_color.a = 255; + + auto bg_color = NMColor(); + bg_color.r = 0; + bg_color.g = 0; + bg_color.b = 0; + bg_color.a = 0; + + NotificationModule_AddInfoNotificationEx(rpl.name, 30.0f, text_color, bg_color, nullptr, nullptr, true); + + NotificationModule_AddInfoNotification("applying patches!!!!"); + + void* game_data_region = (void*)rpl.dataAddr; + + auto str_loc = (char*)(0x000009ac + (uint32_t)game_data_region); + + strcpy(str_loc, "https://s-res.spfn.net/post"); + } + } + } + } +} + INITIALIZE_PLUGIN() { WHBLogCafeInit(); WHBLogUdpInit(); @@ -63,6 +122,7 @@ DEINITIALIZE_PLUGIN() { ON_APPLICATION_START() { // Tell the module the plugin is running! + splatoon_patcher(); Inkay_SetPluginRunning(); } diff --git a/src/iosu_url_patches.h b/src/iosu_url_patches.h index b500fc6..bf289f1 100644 --- a/src/iosu_url_patches.h +++ b/src/iosu_url_patches.h @@ -8,35 +8,35 @@ typedef struct URL_Patch { static const URL_Patch url_patches[] = { //nim-boss .rodata - {0xE2282550, "http://pushmore.wup.shop.pretendo.cc/pushmore/r/%s"}, - {0xE229A0A0, "http://npns-dev.c.app.pretendo.cc/bst.dat"}, - {0xE229A0D0, "http://npns-dev.c.app.pretendo.cc/bst2.dat"}, - {0xE2281964, "https://tagaya.wup.shop.pretendo.cc/tagaya/versionlist/%s/%s/%s"}, - {0xE22819B4, "https://tagaya.wup.shop.pretendo.cc/tagaya/versionlist/%s/%s/latest_version"}, - {0xE2282584, "http://pushmo.wup.shop.pretendo.cc/pushmo/d/%s/%u"}, - {0xE22825B8, "http://pushmo.wup.shop.pretendo.cc/pushmo/c/%u/%u"}, - {0xE2282DB4, "https://ecs.wup.shop.pretendo.cc/ecs/services/ECommerceSOAP"}, - {0xE22830A0, "https://ecs.wup.shop.pretendo.cc/ecs/services/ECommerceSOAP"}, - {0xE22830E0, "https://nus.wup.shop.pretendo.cc/nus/services/NetUpdateSOAP"}, - {0xE2299990, "nppl.app.pretendo.cc"}, - {0xE229A600, "https://pls.wup.shop.pretendo.cc/pls/upload"}, - {0xE229A6AC, "https://npvk-dev.app.pretendo.cc/reports"}, - {0xE229A6D8, "https://npvk.app.pretendo.cc/reports"}, - {0xE229B1F4, "https://npts.app.pretendo.cc/p01/tasksheet/%s/%s/%s/%s?c=%s&l=%s"}, - {0xE229B238, "https://npts.app.pretendo.cc/p01/tasksheet/%s/%s/%s?c=%s&l=%s"}, - {0xE22AB2D8, "https://idbe-wup.cdn.pretendo.cc/icondata/%02X/%016llX.idbe"}, - {0xE22AB318, "https://idbe-ctr.cdn.pretendo.cc/icondata/%02X/%016llX.idbe"}, - {0xE22AB358, "https://idbe-wup.cdn.pretendo.cc/icondata/%02X/%016llX-%d.idbe"}, - {0xE22AB398, "https://idbe-ctr.cdn.pretendo.cc/icondata/%02X/%016llX-%d.idbe"}, - {0xE22B3EF8, "https://ecs.c.shop.pretendo.cc"}, - {0xE22B3F30, "https://ecs.c.shop.pretendo.cc/ecs/services/ECommerceSOAP"}, - {0xE22B3F70, "https://ias.c.shop.pretendo.cc/ias/services/IdentityAuthenticationSOAP"}, - {0xE22B3FBC, "https://cas.c.shop.pretendo.cc/cas/services/CatalogingSOAP"}, - {0xE22B3FFC, "https://nus.c.shop.pretendo.cc/nus/services/NetUpdateSOAP"}, - {0xE229DE0C, "n.app.pretendo.cc"}, + {0xE2282550, "http://pushmorewupshop.spfn.net/pushmore/r/%s"}, + {0xE229A0A0, "http://npns-devcapp.spfn.net/bst.dat"}, + {0xE229A0D0, "http://npns-devcapp.spfn.net/bst2.dat"}, + {0xE2281964, "https://tagayawupshop.spfn.net/tagaya/versionlist/%s/%s/%s"}, + {0xE22819B4, "https://tagayawupshop.spfn.net/tagaya/versionlist/%s/%s/latest_version"}, + {0xE2282584, "http://pushmowupshop.spfn.net/pushmo/d/%s/%u"}, + {0xE22825B8, "http://pushmowupshop.spfn.net/pushmo/c/%u/%u"}, + {0xE2282DB4, "https://ecswupshop.spfn.net/ecs/services/ECommerceSOAP"}, + {0xE22830A0, "https://ecswupshop.spfn.net/ecs/services/ECommerceSOAP"}, + {0xE22830E0, "https://nuswupshop.spfn.net/nus/services/NetUpdateSOAP"}, + {0xE2299990, "npplapp.spfn.net"}, + {0xE229A600, "https://plswupshop.spfn.net/pls/upload"}, + {0xE229A6AC, "https://npvk-devapp.spfn.net/reports"}, + {0xE229A6D8, "https://npvkapp.spfn.net/reports"}, + {0xE229B1F4, "https://nptsapp.spfn.net/p01/tasksheet/%s/%s/%s/%s?c=%s&l=%s"}, + {0xE229B238, "https://nptsapp.spfn.net/p01/tasksheet/%s/%s/%s?c=%s&l=%s"}, + {0xE22AB2D8, "https://idbe-wupcdn.spfn.net/icondata/%02X/%016llX.idbe"}, + {0xE22AB318, "https://idbe-ctrcdn.spfn.net/icondata/%02X/%016llX.idbe"}, + {0xE22AB358, "https://idbe-wupcdn.spfn.net/icondata/%02X/%016llX-%d.idbe"}, + {0xE22AB398, "https://idbe-ctrcdn.spfn.net/icondata/%02X/%016llX-%d.idbe"}, + {0xE22B3EF8, "https://ecscshop.spfn.net"}, + {0xE22B3F30, "https://ecscshop.spfn.net/ecs/services/ECommerceSOAP"}, + {0xE22B3F70, "https://iascshop.spfn.net/ias/services/IdentityAuthenticationSOAP"}, + {0xE22B3FBC, "https://cascshop.spfn.net/cas/services/CatalogingSOAP"}, + {0xE22B3FFC, "https://nuscshop.spfn.net/nus/services/NetUpdateSOAP"}, + {0xE229DE0C, "n.app.spfn.net"}, //nim-boss .bss - {0xE24B8A24, "https://nppl.app.pretendo.cc/p01/policylist/1/1/UNK"}, - {0xE31930D4, "https://%s%saccount.pretendo.cc/v%u/api/"} + {0xE24B8A24, "https://npplapp.spfn.net/p01/policylist/1/1/UNK"}, + {0xE31930D4, "https://%s%saccount.spfn.net/v%u/api/"} }; diff --git a/src/lang/de_DE.lang b/src/lang/de_DE.lang index 19a57dd..106ee37 100644 --- a/src/lang/de_DE.lang +++ b/src/lang/de_DE.lang @@ -1,13 +1,13 @@ .plugin_name="Inkay" ,.network_category="Netzwerkauswahl" -,.connect_to_network_setting="Verbinde zum Pretendo Network" +,.connect_to_network_setting="Verbinde zum SPFN" ,.other_category="Andere Einstellungen" ,.reset_wwp_setting="Wara Wara Plaza zurücksetzen" ,.press_a_action="Drücke A" ,.restart_to_apply_action="Neustarten zum Anwenden" ,.need_menu_action="Nur vom Wii U-Menü aus" ,.using_nintendo_network="Nutze Nintendo Network" -,.using_pretendo_network="Nutze Pretendo Network" +,.using_pretendo_network="Nutze SPFN" ,.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="SPFN Patch fehlgeschlagen - nutze Aroma Updater zum Reparieren (686-1001 Module missing)" +,.module_init_not_found="SPFN Patch fehlgeschlagen - nutze Aroma Updater zum Reparieren (686-1002 Module init)" diff --git a/src/lang/en_US.lang b/src/lang/en_US.lang index 09ebe6a..4a2d963 100644 --- a/src/lang/en_US.lang +++ b/src/lang/en_US.lang @@ -1,13 +1,13 @@ .plugin_name="Inkay" ,.network_category="Network selection" -,.connect_to_network_setting="Connect to Pretendo Network" +,.connect_to_network_setting="Connect to SPFN" ,.other_category="Other settings" ,.reset_wwp_setting="Reset Wara Wara Plaza" ,.press_a_action="Press A" ,.restart_to_apply_action="Restart to apply" ,.need_menu_action="From WiiU menu only" ,.using_nintendo_network="Using Nintendo Network" -,.using_pretendo_network="Using Pretendo Network" +,.using_pretendo_network="Using SPFN" ,.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)" +,.module_not_found="SPFN patch failed - use Aroma Updater to repair (686-1001 Module missing)" +,.module_init_not_found="SPFN patch failed - use Aroma Updater to repair (686-1002 Module init)" diff --git a/src/lang/es_ES.lang b/src/lang/es_ES.lang index f84b918..2c98b40 100644 --- a/src/lang/es_ES.lang +++ b/src/lang/es_ES.lang @@ -1,13 +1,13 @@ .plugin_name="Inkay" ,.network_category="Seleccionar red" -,.connect_to_network_setting="Conectar a Pretendo Network" +,.connect_to_network_setting="Conectar a SPFN" ,.other_category="Otros ajustes" ,.reset_wwp_setting="Restablecer Plaza Wara Wara" ,.press_a_action="Pulsa A" ,.restart_to_apply_action="Reiniciar para aplicar" ,.need_menu_action="Solo desde el Menú de Wii U" ,.using_nintendo_network="Usando Nintendo Network" -,.using_pretendo_network="Usando Pretendo Network" +,.using_pretendo_network="Usando SPFN" ,.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)" +,.module_not_found="Ha fallado el parche SPFN - usa Aroma Updater para repararlo (686-1001 Falta un módulo)" +,.module_init_not_found="Ha fallado el parche SPFN - usa Aroma Updater para repararlo (686-1002 Inicialización del módulo)" diff --git a/src/lang/fr_FR.lang b/src/lang/fr_FR.lang index 901a2a2..58204e1 100644 --- a/src/lang/fr_FR.lang +++ b/src/lang/fr_FR.lang @@ -1,13 +1,13 @@ .plugin_name="Inkay" ,.network_category="Sélection du réseau" -,.connect_to_network_setting="Connexion au Pretendo Network" +,.connect_to_network_setting="Connexion au SPFN" ,.other_category="Autres paramètres" ,.reset_wwp_setting="Réinitialiser la place WaraWara" ,.press_a_action="Appuyez sur A" ,.restart_to_apply_action="Redémarrer pour appliquer" ,.need_menu_action="(retournez d'abord au menu Wii U)" ,.using_nintendo_network="Réseau sélectionné : Nintendo Network" -,.using_pretendo_network="Réseau sélectionné : Pretendo Network" +,.using_pretendo_network="Réseau sélectionné : SPFN" ,.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)" +,.module_not_found="Le patch SPFN a rencontré un problème, veuillez le réparer avec Aroma Updater (686-1001 Module missing)" +,.module_init_not_found="Le patch SPFN a rencontré un problème, veuillez le réparer avec Aroma Updater (686-1002 Module init)" diff --git a/src/lang/it_IT.lang b/src/lang/it_IT.lang index 6702add..9f49582 100644 --- a/src/lang/it_IT.lang +++ b/src/lang/it_IT.lang @@ -1,13 +1,13 @@ .plugin_name="Inkay" ,.network_category="Seleziona la rete" -,.connect_to_network_setting="Connettiti a Pretendo Network" +,.connect_to_network_setting="Connettiti a SPFN" ,.other_category="Altre impostazioni" ,.reset_wwp_setting="Ripristina Wara Wara Plaza" ,.press_a_action="Premi A" ,.restart_to_apply_action="Riavvia per applicare" ,.need_menu_action="Solo dal menu WiiU" ,.using_nintendo_network="In uso Nintendo Network" -,.using_pretendo_network="In uso Pretendo Network" +,.using_pretendo_network="In uso SPFN" ,.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 di SPFN fallita - usa Aroma Updater per correggere (686-1001 Modulo mancante)" +,.module_init_not_found="Patch di SPFN fallita - usa Aroma Updater per correggere (686-1002 Module init)" diff --git a/src/lang/ja_JP.lang b/src/lang/ja_JP.lang index 77214c5..73a419f 100644 --- a/src/lang/ja_JP.lang +++ b/src/lang/ja_JP.lang @@ -1,13 +1,13 @@ .plugin_name="Inkay" ,.network_category="ネットワークの選択" -,.connect_to_network_setting="Pretendoネットワークに接続する" +,.connect_to_network_setting="SPFNネットワークに接続する" ,.other_category="その他の設定" ,.reset_wwp_setting="わらわら広場をリセット" ,.press_a_action="Ａボタンを押そう" ,.restart_to_apply_action="再起動後に反映されます" ,.need_menu_action="Wii Uメニューからのみ実行可能" ,.using_nintendo_network="選択済み：ニンテンドーネットワーク" -,.using_pretendo_network="選択済み：Pretendo ネットワーク" +,.using_pretendo_network="選択済み：SPFN ネットワーク" ,.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)" +,.module_not_found="SPFN パッチに失敗しました。Aroma Updaterを使用して解決してみてください。(686-1001 Module missing)" +,.module_init_not_found="SPFN パッチに失敗しました。Aroma Updaterを使用して解決してみてください。(686-1002 Module init)" diff --git a/src/lang/nl_NL.lang b/src/lang/nl_NL.lang index 9e67847..65d51fb 100644 --- a/src/lang/nl_NL.lang +++ b/src/lang/nl_NL.lang @@ -1,13 +1,13 @@ .plugin_name="Inkay" ,.network_category="Netwerkselectie" -,.connect_to_network_setting="Verbind met het Pretendo-netwerk" +,.connect_to_network_setting="Verbind met het SPFN-netwerk" ,.other_category="Overige instellingen" ,.reset_wwp_setting="Reset het Wara Wara Plaza" ,.press_a_action="Druk A" ,.restart_to_apply_action="Herstart om toe te passen" ,.need_menu_action="Alleen vanuit het WiiU-menu" ,.using_nintendo_network="Nintendo Network wordt gebruikt" -,.using_pretendo_network="Pretendo Network wordt gebruikt" +,.using_pretendo_network="SPFN 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_not_found="SPFN patch mislukt - gebruik Aroma Updater om het te herstellen (686-1001 Module ontbreekt)" +,.module_init_not_found="SPFN patch mislukt - gebruik Aroma Updater om het te herstellen (686-1002 Module init)" diff --git a/src/lang/pt_BR.lang b/src/lang/pt_BR.lang index 511d5ab..a776724 100644 --- a/src/lang/pt_BR.lang +++ b/src/lang/pt_BR.lang @@ -1,13 +1,13 @@ .plugin_name="Inkay" ,.network_category="Selecionar rede" -,.connect_to_network_setting="Conecta-se à Pretendo Network" +,.connect_to_network_setting="Conecta-se à SPFN" ,.other_category="Outras configurações" ,.reset_wwp_setting="Resetar Wara Wara Plaza" ,.press_a_action="Aperte A" ,.restart_to_apply_action="Reinicie para aplicar" ,.need_menu_action="Apenas no menu do Wii U" ,.using_nintendo_network="Usando Nintendo Network" -,.using_pretendo_network="Usando Pretendo Network" +,.using_pretendo_network="Usando SPFN" ,.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)" +,.module_not_found="Atualização do SPFN falhou - use o Aroma Updater para corrigir (686-1001 Módulo faltando)" +,.module_init_not_found="Atualização do SPFN falhou - use o Aroma Updater para corrigir (686-1002 Módulo de início)" diff --git a/src/lang/ru_RU.lang b/src/lang/ru_RU.lang index 3dc9c9c..a1a8451 100644 --- a/src/lang/ru_RU.lang +++ b/src/lang/ru_RU.lang @@ -1,13 +1,13 @@ .plugin_name="Inkay" ,.network_category="Выбор сети" -,.connect_to_network_setting="Подключиться к Pretendo Network" +,.connect_to_network_setting="Подключиться к SPFN" ,.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" +,.using_pretendo_network="Используется SPFN" ,.multiplayer_port_display="Используем UDP-порт %hu для сетевой игры" -,.module_not_found="Ошибка установки патча Pretendo - для восстановления, запустите Aroma Updater (686-1001 Модуль отсутствует)" -,.module_init_not_found="Ошибка установки патча Pretendo - для восстановления, запустите Aroma Updater (686-1002 Инициализация модуля)" +,.module_not_found="Ошибка установки патча SPFN - для восстановления, запустите Aroma Updater (686-1001 Модуль отсутствует)" +,.module_init_not_found="Ошибка установки патча SPFN - для восстановления, запустите Aroma Updater (686-1002 Инициализация модуля)" diff --git a/src/lang/zh_CN.lang b/src/lang/zh_CN.lang index 5191686..f9b5eec 100644 --- a/src/lang/zh_CN.lang +++ b/src/lang/zh_CN.lang @@ -1,13 +1,13 @@ .plugin_name="Inkay" ,.network_category="选择网络" -,.connect_to_network_setting="连接到Pretendo Network" +,.connect_to_network_setting="连接到SPFN" ,.other_category="其他设置" ,.reset_wwp_setting="重置Wara Wara Plaza" ,.press_a_action="请按 A" ,.restart_to_apply_action="重启以应用设置" ,.need_menu_action="仅来自WiiU Menu" ,.using_nintendo_network="使用 Nintendo Network" -,.using_pretendo_network="使用 Pretendo Network" +,.using_pretendo_network="使用 SPFN" ,.multiplayer_port_display="多人游戏使用 UDP 端口 %hu" -,.module_not_found="Pretendo Network 补丁失败 - 使用 Aroma Updater 修复（686-1001 模块丢失）" -,.module_init_not_found="Pretendo Network 补丁失败 - 使用 Aroma Updater 修复（686-1002 模块初始化）" +,.module_not_found="SPFN 补丁失败 - 使用 Aroma Updater 修复（686-1001 模块丢失）" +,.module_init_not_found="SPFN 补丁失败 - 使用 Aroma Updater 修复（686-1002 模块初始化）" diff --git a/src/lang/zh_Hant.lang b/src/lang/zh_Hant.lang index f68d3a2..8d550f7 100644 --- a/src/lang/zh_Hant.lang +++ b/src/lang/zh_Hant.lang @@ -1,13 +1,13 @@ .plugin_name="Inkay" ,.network_category="選擇網路" -,.connect_to_network_setting="連接到Pretendo Network" +,.connect_to_network_setting="連接到SPFN" ,.other_category="其他設定" ,.reset_wwp_setting="重置Wara Wara Plaza" ,.press_a_action="請按 A" ,.restart_to_apply_action="重啓以套用設定" ,.need_menu_action="僅來自WiiU Menu" ,.using_nintendo_network="使用 Nintendo Network" -,.using_pretendo_network="使用 Pretendo Network" +,.using_pretendo_network="使用 SPFN" ,.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)" +,.module_not_found="SPFN patch failed - use Aroma Updater to repair (686-1001 Module missing)" +,.module_init_not_found="SPFN patch failed - use Aroma Updater to repair (686-1002 Module init)" diff --git a/src/main.cpp b/src/main.cpp index 4930ac0..1e83168 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -46,9 +46,9 @@ If not set correctly, the loader will refuse to use the plugin. **/ WUMS_MODULE_EXPORT_NAME("inkay"); -WUMS_MODULE_DESCRIPTION("Pretendo Network Patcher"); +WUMS_MODULE_DESCRIPTION("SPFN Network Patcher"); WUMS_MODULE_VERSION(INKAY_VERSION); -WUMS_MODULE_AUTHOR("Pretendo contributors"); +WUMS_MODULE_AUTHOR("Pretendo contributors and RusticMaple"); WUMS_MODULE_LICENSE("GPLv3"); WUMS_DEPENDS_ON(homebrew_functionpatcher); From d01d322003d07b9a34bfe52b66889a6588bbf021 Mon Sep 17 00:00:00 2001 From: kitten Date: Mon, 18 May 2026 21:38:18 +0200 Subject: [PATCH 02/20] ci: try to fix up to work (it prob wont) --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5eaaa2e..3c29369 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,12 +8,12 @@ on: jobs: build-inkay: - runs-on: ubuntu-22.04 + runs-on: debian-trixie steps: - uses: actions/checkout@v6 - name: build toolchain container run: docker build . -t builder - - uses: ammaraskar/gcc-problem-matcher@master + - uses: https://github.com/ammaraskar/gcc-problem-matcher@master - name: build Inkay run: docker run --rm -v ${PWD}:/app -w /app builder - uses: actions/upload-artifact@v6 From c2e1eef7e5089b9aaaacf52e274bdb837f33046d Mon Sep 17 00:00:00 2001 From: kitten Date: Mon, 18 May 2026 21:41:50 +0200 Subject: [PATCH 03/20] ci: downgrade to v3 --- .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 3c29369..02ca802 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - uses: https://github.com/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@v3 with: name: inkay path: dist/ From bf5336cba939c7facfbb6fcdca5dbd14a0c34fbd Mon Sep 17 00:00:00 2001 From: Spacebot Date: Sat, 16 May 2026 20:30:46 +0000 Subject: [PATCH 04/20] Add renovate.json --- renovate.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..9775346 --- /dev/null +++ b/renovate.json @@ -0,0 +1,3 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json" +} From 7403eaecd3a44d7e15e831192aa0a179f6d85a48 Mon Sep 17 00:00:00 2001 From: Spacebot Date: Mon, 18 May 2026 20:00:48 +0000 Subject: [PATCH 05/20] Update ghcr.io/wiiu-env/wiiumodulesystem Docker tag to v20250219 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a195fbc..d45375f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ 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/wiiumodulesystem:20250219 /artifacts $DEVKITPRO COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20240505 /artifacts $DEVKITPRO WORKDIR /app From 4c432b753ccc470bede7c39a5c1ba93c4d638c83 Mon Sep 17 00:00:00 2001 From: kitten Date: Sun, 24 May 2026 21:57:29 +0200 Subject: [PATCH 06/20] chore: remove mentions of spfn.cc --- common/inkay_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/inkay_config.h b/common/inkay_config.h index 64a20fd..fad1699 100644 --- a/common/inkay_config.h +++ b/common/inkay_config.h @@ -15,7 +15,7 @@ #endif #ifndef NETWORK_BASEURL -#define NETWORK_BASEURL "spfn.cc" +#define NETWORK_BASEURL "spfn.net" #endif #endif //INKAY_INKAY_CONFIG_H From 998abca20035ca69ecc6fc883454f2f5464460d3 Mon Sep 17 00:00:00 2001 From: Spacebot Date: Thu, 18 Jun 2026 15:15:47 +0000 Subject: [PATCH 07/20] Update actions/checkout action to v7 --- .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 02ca802..3eb8d31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: build-inkay: runs-on: debian-trixie steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: build toolchain container run: docker build . -t builder - uses: https://github.com/ammaraskar/gcc-problem-matcher@master From 1796ebebb5322c87cfbe951a582ed23d7fbce83a Mon Sep 17 00:00:00 2001 From: red binder Date: Sat, 18 Jul 2026 00:50:36 +0200 Subject: [PATCH 08/20] OLV changes --- plugin/src/main.cpp | 2 +- src/patches/olv_applet.cpp | 62 ++++++++++++++++++++++++++++++++------ src/patches/olv_urls.h | 4 +-- 3 files changed, 55 insertions(+), 13 deletions(-) diff --git a/plugin/src/main.cpp b/plugin/src/main.cpp index 57ba9d1..516146d 100644 --- a/plugin/src/main.cpp +++ b/plugin/src/main.cpp @@ -91,7 +91,7 @@ void splatoon_patcher(){ auto str_loc = (char*)(0x000009ac + (uint32_t)game_data_region); - strcpy(str_loc, "https://s-res.spfn.net/post"); + strcpy(str_loc, "https://splatpost.spbr.net/post"); } } } diff --git a/src/patches/olv_applet.cpp b/src/patches/olv_applet.cpp index 8f97a79..2860027 100644 --- a/src/patches/olv_applet.cpp +++ b/src/patches/olv_applet.cpp @@ -46,7 +46,7 @@ constexpr struct olv_allowlist original_entry = { constexpr struct olv_allowlist new_entry = { .scheme = "https", - .domain = "." NETWORK_BASEURL, + .domain = ".projectrose.cafe", .path = "", .flags = {1, 1, 1, 1, 1}, }; @@ -77,6 +77,7 @@ const replacement replacements[] = { }; static std::optional rootca_pem_handle{}; +static std::optional valid_tld_handle{}; std::vector olv_patches; DECL_FUNCTION(int, FSOpenFile, FSClient *client, FSCmdBlock *block, char *path, const char *mode, uint32_t *handle, @@ -106,33 +107,74 @@ DECL_FUNCTION(int, FSOpenFile, FSClient *client, FSCmdBlock *block, char *path, DEBUG_FUNCTION_LINE_VERBOSE("Inkay: Found Miiverse CA, replacing..."); return ret; } + else if (strcmp("vol/content/browser/effective_tld_names.dat", path) == 0) + { + // we patch the TLD because .cafe isnt on the list (projectrose.cafe) + int ret = real_FSOpenFile(client, block, path, mode, handle, error); + valid_tld_handle = *handle; + DEBUG_FUNCTION_LINE_VERBOSE("Inkay: Found Miiverse TLD List, patching..."); + return ret; + } return real_FSOpenFile(client, block, path, mode, handle, error); } DECL_FUNCTION(FSStatus, FSReadFile, FSClient *client, FSCmdBlock *block, uint8_t *buffer, uint32_t size, uint32_t count, - FSFileHandle handle, uint32_t unk1, uint32_t flags) { - if (size != 1) { - DEBUG_FUNCTION_LINE("Inkay: Miiverse CA replacement failed!"); + FSFileHandle handle, uint32_t unk1, uint32_t flags) +{ + if (size != 1) + { + DEBUG_FUNCTION_LINE("Inkay: Miiverse CA/LTD replacement failed!"); } - if (rootca_pem_handle && *rootca_pem_handle == handle) { - strlcpy((char *) buffer, (const char *) ca_pem, size * count); + if (rootca_pem_handle && *rootca_pem_handle == handle) + { + strlcpy((char *)buffer, (const char *)ca_pem, size * count); - //this can't be done above (in the FSOpenFile hook) since it's not loaded yet. - //the hardcoded offsets suck but they really are at Random Places In The Heap - replaceBulk(0x11000000, 0x02000000, replacements); - return (FSStatus) count; + // this can't be done above (in the FSOpenFile hook) since it's not loaded yet. + // the hardcoded offsets suck but they really are at Random Places In The Heap + return (FSStatus)count; + } + else if (valid_tld_handle && *valid_tld_handle == handle) + { + // we patch the tld "aero"... + FSStatus ret = real_FSReadFile( + client, block, buffer, size, count, handle, unk1, flags); + + if (ret > 0) + { + uint32_t totalSize = size * count; + char *buf = (char *)buffer; + + for (uint32_t i = 0; i + 4 <= totalSize; i++) + { + if (memcmp(&buf[i], "aero", 4) == 0) + { + memcpy(&buf[i], "cafe", 4); + + DEBUG_FUNCTION_LINE_VERBOSE( + "Inkay: patched TLD aero -> cafe"); + } + } + } + + return ret; } return real_FSReadFile(client, block, buffer, size, count, handle, unk1, flags); } + DECL_FUNCTION(FSStatus, FSCloseFile, FSClient *client, FSCmdBlock *block, FSFileHandle handle, FSErrorFlag errorMask) { if (handle == rootca_pem_handle) { rootca_pem_handle.reset(); } + if (handle == valid_tld_handle) + { + valid_tld_handle.reset(); + } + return real_FSCloseFile(client, block, handle, errorMask); } diff --git a/src/patches/olv_urls.h b/src/patches/olv_urls.h index 323498f..aa055fc 100644 --- a/src/patches/olv_urls.h +++ b/src/patches/olv_urls.h @@ -18,9 +18,9 @@ #include "inkay_config.h" constexpr char original_url[] = "discovery.olv.nintendo.net/v1/endpoint"; -constexpr char new_url[] = "discovery.olv." NETWORK_BASEURL "/v1/endpoint"; +constexpr char new_url[] = "disco.olv.projectrose.cafe/v1/endpoint"; -_Static_assert(sizeof(original_url) > sizeof(new_url), +_Static_assert(sizeof(original_url) >= sizeof(new_url), "new_url too long! Must be less than 38chars."); bool setup_olv_libs(); From d5f9207deb8d7e5e3fae3f379ac4f85d0a5e470d Mon Sep 17 00:00:00 2001 From: 2Epik4u <2Epikk4u@proton.me> Date: Sun, 19 Jul 2026 19:53:42 -0400 Subject: [PATCH 09/20] dont send splatoon patches if nn is enabled --- plugin/src/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugin/src/main.cpp b/plugin/src/main.cpp index 516146d..5f1b343 100644 --- a/plugin/src/main.cpp +++ b/plugin/src/main.cpp @@ -56,6 +56,10 @@ bool is_current_game_splatoon(){ } void splatoon_patcher(){ + if (!Config::connect_to_network) { + DEBUG_FUNCTION_LINE_VERBOSE("Inkay: Splatoon patches skipped"); + return; + } if(is_current_game_splatoon()){ NotificationModule_AddInfoNotification("Splatoon Detected, applying patch"); From 6df031b26d1e8aa6b562d72ae032bf9b99d78328 Mon Sep 17 00:00:00 2001 From: Ash Date: Wed, 29 Jul 2026 21:28:40 +1000 Subject: [PATCH 10/20] 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 11/20] 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 12/20] 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}}" From e421ac5a4083367f2cde37d38ca9ca2a492e82fe Mon Sep 17 00:00:00 2001 From: red binder Date: Sat, 8 Aug 2026 02:08:37 +0200 Subject: [PATCH 13/20] malamar changes --- .github/dependabot.yml | 19 ------------- .github/workflows/ci.yml | 22 --------------- Makefile | 2 +- README.md | 25 +++++++---------- common/inkay_config.h | 2 +- plugin/Makefile | 2 +- plugin/src/main.cpp | 4 +-- src/iosu_url_patches.h | 56 +++++++++++++++++++------------------- src/lang/en_US.lang | 2 +- src/patches/olv_applet.cpp | 4 +-- src/patches/olv_urls.h | 2 +- 11 files changed, 47 insertions(+), 93 deletions(-) delete mode 100644 .github/dependabot.yml delete mode 100644 .github/workflows/ci.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 815be86..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,19 +0,0 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file - -version: 2 -updates: - - package-ecosystem: "docker" # See documentation for possible values - directory: "/" # Location of package manifests - schedule: - interval: "weekly" - commit-message: - prefix: "chore: " - - package-ecosystem: "github-actions" # See documentation for possible values - directory: "/" # Location of package manifests - schedule: - interval: "weekly" - commit-message: - prefix: "chore: " diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 3eb8d31..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Inkay-CI -permissions: - contents: read - -on: -- push -- pull_request - -jobs: - build-inkay: - runs-on: debian-trixie - steps: - - uses: actions/checkout@v7 - - name: build toolchain container - run: docker build . -t builder - - uses: https://github.com/ammaraskar/gcc-problem-matcher@master - - name: build Inkay - run: docker run --rm -v ${PWD}:/app -w /app builder - - uses: actions/upload-artifact@v3 - with: - name: inkay - path: dist/ diff --git a/Makefile b/Makefile index 624a492..1a50efc 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ WUT_ROOT := $(DEVKITPRO)/wut # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files #------------------------------------------------------------------------------- -TARGET := Inkay-spfn +TARGET := Malamar-spfn BUILD := build SOURCES := src src/patches src/utils src/ext/inih common DATA := data diff --git a/README.md b/README.md index 5e42d0b..560fb2d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ -# Inkay - Aroma patches for Pretendo +# Malamar - Aroma patches for Splatfestival Network/Spacebar -[![Pretendo network logo](https://github.com/PretendoNetwork/website/raw/master/public/assets/images/opengraph/opengraph-image.png)](https://pretendo.network) - -Inkay is an Aroma/WUPS plugin that patches various Nintendo Network URLs on a Wii U to use Pretendo Network instead. It also (for the time being) bypasses SSL verification in most cases. It redirects Nintendo Network in: +Malamar is an Aroma/WUPS plugin based on Pretendo's Malamar that patches various Nintendo Network URLs on a Wii U to use Splatfestival/Spacebar Network instead. It also (for the time being) bypasses SSL verification in most cases. It redirects Nintendo Network in: - IOSU-side connections (Friends, SpotPass, accounts etc.) - Account Settings @@ -11,27 +9,27 @@ Inkay is an Aroma/WUPS plugin that patches various Nintendo Network URLs on a Wi - Miiverse (in-game) - Miiverse applet -Inkay also includes game-specific patches to add extra features: +Malamar also includes game-specific patches to add extra features: - Modpack-specific matchmaking for global, regional rooms (by simulating extra DLC) - **Mario Kart 8** - P2P port override for better connection stability (if you port forward) - **Minecraft: Wii U Edition**, **Mario Kart 8**, **Splatoon** ## Requirements -Inkay is only supported on the release version of Aroma configured for autoboot/coldboot. Other configurations (specifically lacking coldboot) may cause issues with SpotPass. +Malamar is only supported on the release version of Aroma configured for autoboot/coldboot. Other configurations (specifically lacking coldboot) may cause issues with SpotPass. ## Safety -Inkay's patches are all temporary, and only applied in-memory without modifying your console. The SSL patch, while also temporary, could reduce the overall security of your console while active - this is because it no longer checks if a server is verified. However, this does not apply to the Internet Browser, where SSL still works as expected. +Malamar's patches are all temporary, and only applied in-memory without modifying your console. The SSL patch, while also temporary, could reduce the overall security of your console while active - this is because it no longer checks if a server is verified. However, this does not apply to the Internet Browser, where SSL still works as expected. ## Compiling - Docker -Inkay's dependencies and build tooling can be handled as a container, which is recommended for WUPS plugins. Using `docker` or `podman`: +Malamar's dependencies and build tooling can be handled as a container, which is recommended for WUPS plugins. Using `docker` or `podman`: ```shell -docker build -t inkay . -docker run --rm -v $(pwd):/app inkay make +docker build -t malamar . +docker run --rm -v $(pwd):/app malamar make # you can replace "make" with other commands - e.g. make clean ``` If using `podman` on SELinux systems (like Fedora Linux), you might need to use `$(pwd):/app:Z` instead of `$(pwd):/app`. ## Compiling - System -Inkay has the following dependencies aside from devkitPPC and wut: +Malamar has the following dependencies aside from devkitPPC and wut: - [WiiUPluginSystem](https://github.com/wiiu-env/WiiUPluginSystem) - [WiiUModuleSystem](https://github.com/wiiu-env/WiiUModuleSystem) - [libmocha](https://github.com/wiiu-env/libmocha) @@ -39,7 +37,4 @@ Inkay has the following dependencies aside from devkitPPC and wut: - [libnotifications](https://github.com/wiiu-env/libnotifications/) - [libfunctionpatcher](https://github.com/wiiu-env/libfunctionpatcher) -Each of these should be `make install`-able. After that, you can compile Inkay with `make`. - -## TODO -See [Issues](https://github.com/PretendoNetwork/Inkay/issues). +Each of these should be `make install`-able. After that, you can compile Malamar with `make`. diff --git a/common/inkay_config.h b/common/inkay_config.h index fad1699..906d60f 100644 --- a/common/inkay_config.h +++ b/common/inkay_config.h @@ -15,7 +15,7 @@ #endif #ifndef NETWORK_BASEURL -#define NETWORK_BASEURL "spfn.net" +#define NETWORK_BASEURL "spbr.net" #endif #endif //INKAY_INKAY_CONFIG_H diff --git a/plugin/Makefile b/plugin/Makefile index 6553ec1..a4baa3d 100644 --- a/plugin/Makefile +++ b/plugin/Makefile @@ -19,7 +19,7 @@ WUMS_ROOT := $(DEVKITPRO)/wums # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files #------------------------------------------------------------------------------- -TARGET := Inkay-spfn +TARGET := Malamar-spfn BUILD := build SOURCES := src src/utils ../common DATA := data diff --git a/plugin/src/main.cpp b/plugin/src/main.cpp index 5f1b343..7d3ad2e 100644 --- a/plugin/src/main.cpp +++ b/plugin/src/main.cpp @@ -32,10 +32,10 @@ Mandatory plugin information. If not set correctly, the loader will refuse to use the plugin. **/ -WUPS_PLUGIN_NAME("Inkay(SPFN)"); +WUPS_PLUGIN_NAME("Malamar (SPFN)"); WUPS_PLUGIN_DESCRIPTION("SPFN Network Patcher"); WUPS_PLUGIN_VERSION(INKAY_VERSION); -WUPS_PLUGIN_AUTHOR("Pretendo contributors and RusticMaple"); +WUPS_PLUGIN_AUTHOR("redbinder0526, kittentm and Pretendo contributors"); WUPS_PLUGIN_LICENSE("GPLv3"); WUPS_USE_STORAGE("inkay"); diff --git a/src/iosu_url_patches.h b/src/iosu_url_patches.h index bf289f1..3b84b54 100644 --- a/src/iosu_url_patches.h +++ b/src/iosu_url_patches.h @@ -8,35 +8,35 @@ typedef struct URL_Patch { static const URL_Patch url_patches[] = { //nim-boss .rodata - {0xE2282550, "http://pushmorewupshop.spfn.net/pushmore/r/%s"}, - {0xE229A0A0, "http://npns-devcapp.spfn.net/bst.dat"}, - {0xE229A0D0, "http://npns-devcapp.spfn.net/bst2.dat"}, - {0xE2281964, "https://tagayawupshop.spfn.net/tagaya/versionlist/%s/%s/%s"}, - {0xE22819B4, "https://tagayawupshop.spfn.net/tagaya/versionlist/%s/%s/latest_version"}, - {0xE2282584, "http://pushmowupshop.spfn.net/pushmo/d/%s/%u"}, - {0xE22825B8, "http://pushmowupshop.spfn.net/pushmo/c/%u/%u"}, - {0xE2282DB4, "https://ecswupshop.spfn.net/ecs/services/ECommerceSOAP"}, - {0xE22830A0, "https://ecswupshop.spfn.net/ecs/services/ECommerceSOAP"}, - {0xE22830E0, "https://nuswupshop.spfn.net/nus/services/NetUpdateSOAP"}, - {0xE2299990, "npplapp.spfn.net"}, - {0xE229A600, "https://plswupshop.spfn.net/pls/upload"}, - {0xE229A6AC, "https://npvk-devapp.spfn.net/reports"}, - {0xE229A6D8, "https://npvkapp.spfn.net/reports"}, - {0xE229B1F4, "https://nptsapp.spfn.net/p01/tasksheet/%s/%s/%s/%s?c=%s&l=%s"}, - {0xE229B238, "https://nptsapp.spfn.net/p01/tasksheet/%s/%s/%s?c=%s&l=%s"}, - {0xE22AB2D8, "https://idbe-wupcdn.spfn.net/icondata/%02X/%016llX.idbe"}, - {0xE22AB318, "https://idbe-ctrcdn.spfn.net/icondata/%02X/%016llX.idbe"}, - {0xE22AB358, "https://idbe-wupcdn.spfn.net/icondata/%02X/%016llX-%d.idbe"}, - {0xE22AB398, "https://idbe-ctrcdn.spfn.net/icondata/%02X/%016llX-%d.idbe"}, - {0xE22B3EF8, "https://ecscshop.spfn.net"}, - {0xE22B3F30, "https://ecscshop.spfn.net/ecs/services/ECommerceSOAP"}, - {0xE22B3F70, "https://iascshop.spfn.net/ias/services/IdentityAuthenticationSOAP"}, - {0xE22B3FBC, "https://cascshop.spfn.net/cas/services/CatalogingSOAP"}, - {0xE22B3FFC, "https://nuscshop.spfn.net/nus/services/NetUpdateSOAP"}, - {0xE229DE0C, "n.app.spfn.net"}, + {0xE2282550, "http://pushmorewupshop.spbr.net/pushmore/r/%s"}, + {0xE229A0A0, "http://npns-devcapp.spbr.net/bst.dat"}, + {0xE229A0D0, "http://npns-devcapp.spbr.net/bst2.dat"}, + {0xE2281964, "https://tagayawupshop.spbr.net/tagaya/versionlist/%s/%s/%s"}, + {0xE22819B4, "https://tagayawupshop.spbr.net/tagaya/versionlist/%s/%s/latest_version"}, + {0xE2282584, "http://pushmowupshop.spbr.net/pushmo/d/%s/%u"}, + {0xE22825B8, "http://pushmowupshop.spbr.net/pushmo/c/%u/%u"}, + {0xE2282DB4, "https://ecswupshop.spbr.net/ecs/services/ECommerceSOAP"}, + {0xE22830A0, "https://ecswupshop.spbr.net/ecs/services/ECommerceSOAP"}, + {0xE22830E0, "https://nuswupshop.spbr.net/nus/services/NetUpdateSOAP"}, + {0xE2299990, "policylist.spbr.net"}, + {0xE229A600, "https://plswupshop.spbr.net/pls/upload"}, + {0xE229A6AC, "https://npvk-devapp.spbr.net/reports"}, + {0xE229A6D8, "https://npvkapp.spbr.net/reports"}, + {0xE229B1F4, "https://tasksheets.spbr.net/p01/tasksheet/%s/%s/%s/%s?c=%s&l=%s"}, + {0xE229B238, "https://tasksheets.spbr.net/p01/tasksheet/%s/%s/%s?c=%s&l=%s"}, + {0xE22AB2D8, "https://idbe-wupcdn.spbr.net/icondata/%02X/%016llX.idbe"}, + {0xE22AB318, "https://idbe-ctrcdn.spbr.net/icondata/%02X/%016llX.idbe"}, + {0xE22AB358, "https://idbe-wupcdn.spbr.net/icondata/%02X/%016llX-%d.idbe"}, + {0xE22AB398, "https://idbe-ctrcdn.spbr.net/icondata/%02X/%016llX-%d.idbe"}, + {0xE22B3EF8, "https://ecscshop.spbr.net"}, + {0xE22B3F30, "https://ecscshop.spbr.net/ecs/services/ECommerceSOAP"}, + {0xE22B3F70, "https://iascshop.spbr.net/ias/services/IdentityAuthenticationSOAP"}, + {0xE22B3FBC, "https://cascshop.spbr.net/cas/services/CatalogingSOAP"}, + {0xE22B3FFC, "https://nuscshop.spbr.net/nus/services/NetUpdateSOAP"}, + {0xE229DE0C, "n.app.spbr.net"}, //nim-boss .bss - {0xE24B8A24, "https://npplapp.spfn.net/p01/policylist/1/1/UNK"}, - {0xE31930D4, "https://%s%saccount.spfn.net/v%u/api/"} + {0xE24B8A24, "https://policylist.spbr.net/p01/policylist/1/1/UNK"}, + {0xE31930D4, "https://%s%saccount.spbr.net/v%u/api/"} }; diff --git a/src/lang/en_US.lang b/src/lang/en_US.lang index 4a2d963..389fa6e 100644 --- a/src/lang/en_US.lang +++ b/src/lang/en_US.lang @@ -1,4 +1,4 @@ -.plugin_name="Inkay" +.plugin_name="Malamar" ,.network_category="Network selection" ,.connect_to_network_setting="Connect to SPFN" ,.other_category="Other settings" diff --git a/src/patches/olv_applet.cpp b/src/patches/olv_applet.cpp index 2860027..5b38688 100644 --- a/src/patches/olv_applet.cpp +++ b/src/patches/olv_applet.cpp @@ -46,7 +46,7 @@ constexpr struct olv_allowlist original_entry = { constexpr struct olv_allowlist new_entry = { .scheme = "https", - .domain = ".projectrose.cafe", + .domain = ".spbr.net", .path = "", .flags = {1, 1, 1, 1, 1}, }; @@ -109,7 +109,7 @@ DECL_FUNCTION(int, FSOpenFile, FSClient *client, FSCmdBlock *block, char *path, } else if (strcmp("vol/content/browser/effective_tld_names.dat", path) == 0) { - // we patch the TLD because .cafe isnt on the list (projectrose.cafe) + // we patch the TLD because .cafe isnt on the list int ret = real_FSOpenFile(client, block, path, mode, handle, error); valid_tld_handle = *handle; DEBUG_FUNCTION_LINE_VERBOSE("Inkay: Found Miiverse TLD List, patching..."); diff --git a/src/patches/olv_urls.h b/src/patches/olv_urls.h index aa055fc..0e6ca69 100644 --- a/src/patches/olv_urls.h +++ b/src/patches/olv_urls.h @@ -18,7 +18,7 @@ #include "inkay_config.h" constexpr char original_url[] = "discovery.olv.nintendo.net/v1/endpoint"; -constexpr char new_url[] = "disco.olv.projectrose.cafe/v1/endpoint"; +constexpr char new_url[] = "discovery.olv.spbr.net/v1/endpoint"; _Static_assert(sizeof(original_url) >= sizeof(new_url), "new_url too long! Must be less than 38chars."); From 257d4ba119998500198fed8ee4cc8c8348d9449b Mon Sep 17 00:00:00 2001 From: red binder Date: Sat, 8 Aug 2026 02:17:48 +0200 Subject: [PATCH 14/20] fix language file issues --- src/lang/en_US.lang | 1 - src/lang/ko_KR.lang | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lang/en_US.lang b/src/lang/en_US.lang index 8e658d5..6ff8663 100644 --- a/src/lang/en_US.lang +++ b/src/lang/en_US.lang @@ -1,7 +1,6 @@ .plugin_name="Malamar" ,.network_category="Network selection" ,.connect_to_network_setting="Connect to SPFN" -,.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" diff --git a/src/lang/ko_KR.lang b/src/lang/ko_KR.lang index b732072..9392a9e 100644 --- a/src/lang/ko_KR.lang +++ b/src/lang/ko_KR.lang @@ -1,6 +1,6 @@ .plugin_name="Inkay" ,.network_category="네트워크 선택" -,.connect_to_network_setting="Pretendo Network 사용" +,.connect_to_network_setting="SPFN 사용" ,.show_startup_toast_setting="" ,.other_category="기타 설정" ,.reset_wwp_setting="Wara Wara Plaza 초기화" @@ -8,7 +8,7 @@ ,.restart_to_apply_action="재시작 후 적용" ,.need_menu_action="Wii U 메뉴에서만" ,.using_nintendo_network="Nintendo Network 사용 중" -,.using_pretendo_network="Pretendo Network 사용 중" +,.using_pretendo_network="SPFN 사용 중" ,.multiplayer_port_display="멀티플레이어에 UDP 포트 %hu을(를) 사용합니다" ,.module_not_found="패치를 적용하는 데 실패했습니다. Aroma Updater로 복구해 주세요. (686-1001 모듈 없음)" ,.module_init_not_found="패치를 적용하는 데 실패했습니다. Aroma Updater로 복구해 주세요. (686-1002 모듈 초기화)" From 04bbcbfda9db6c7ec844af0121468fd2c612017f Mon Sep 17 00:00:00 2001 From: red binder Date: Sat, 8 Aug 2026 02:25:26 +0200 Subject: [PATCH 15/20] fix language AGAIN --- common/lang.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/lang.cpp b/common/lang.cpp index ac39d15..c5506c5 100644 --- a/common/lang.cpp +++ b/common/lang.cpp @@ -25,9 +25,6 @@ config_strings get_config_strings(inkay_language language) { case inkay_language::SimplifiedChinese: return { #include "zh_CN.lang" }; - case inkay_language::TraditionalChinese: return { -#include "zh_Hant.lang" - }; case inkay_language::Portuguese: return { #include "pt_BR.lang" }; From bc2014fbe8cb762e54acfea98658e9b853a60d27 Mon Sep 17 00:00:00 2001 From: kitten Date: Sat, 8 Aug 2026 02:36:04 +0200 Subject: [PATCH 16/20] ci: fix for fj actions --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 792dce0..ad80363 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,15 +8,16 @@ on: jobs: build-inkay: - runs-on: ubuntu-22.04 + runs-on: debian-trixie steps: - uses: actions/checkout@v7 - name: build toolchain container run: docker build . -t builder - - uses: ammaraskar/gcc-problem-matcher@master + - uses: https://github.com/ammaraskar/gcc-problem-matcher@master - name: build Inkay run: docker run --rm -v ${PWD}:/app -w /app builder - - uses: actions/upload-artifact@v7 + - uses: actions/upload-artifact@v3 with: name: inkay - path: dist/ + path: dis + t/ \ No newline at end of file From dc1466eb362ac368e57d0cdfe101e6e3d6f5fe31 Mon Sep 17 00:00:00 2001 From: redbinder0526 Date: Sat, 8 Aug 2026 02:39:17 +0200 Subject: [PATCH 17/20] fix ci --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad80363..f4895b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,5 +19,4 @@ jobs: - uses: actions/upload-artifact@v3 with: name: inkay - path: dis - t/ \ No newline at end of file + path: dist/ \ No newline at end of file From 14501054acb3f76ddd56541eede1d0d3c7673c25 Mon Sep 17 00:00:00 2001 From: kitten Date: Sat, 8 Aug 2026 02:40:52 +0200 Subject: [PATCH 18/20] Delete .github/workflows/codeql.yml --- .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 e0192d2..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: '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}}" From cc7d9e8d845ad063620407f9dbbe8c266d662693 Mon Sep 17 00:00:00 2001 From: redbinder0526 Date: Sat, 8 Aug 2026 02:45:12 +0200 Subject: [PATCH 19/20] Update src/lang/zh_CN.lang --- src/lang/zh_CN.lang | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lang/zh_CN.lang b/src/lang/zh_CN.lang index a49aa85..b8ac1ec 100644 --- a/src/lang/zh_CN.lang +++ b/src/lang/zh_CN.lang @@ -1,7 +1,6 @@ .plugin_name="Inkay" ,.network_category="选择网络" ,.connect_to_network_setting="连接到SPFN" -,.connect_to_network_setting="连接到Pretendo Network" ,.other_category="其他设置" ,.reset_wwp_setting="重置Wara Wara Plaza" ,.press_a_action="请按 A" From 56a115ca79b9336be74d25e5c4f8ab28b6707393 Mon Sep 17 00:00:00 2001 From: kittentm Date: Sat, 8 Aug 2026 19:14:24 +0200 Subject: [PATCH 20/20] a bunch of bullshit --- plugin/src/main.cpp | 21 ++++++++++++++++++++- src/main.cpp | 20 +++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/plugin/src/main.cpp b/plugin/src/main.cpp index ccff31a..166ce2c 100644 --- a/plugin/src/main.cpp +++ b/plugin/src/main.cpp @@ -32,7 +32,26 @@ Mandatory plugin information. If not set correctly, the loader will refuse to use the plugin. **/ -WUPS_PLUGIN_NAME("Malamar (SPFN)"); +WUPS_META(name, "Malamar (SPFN)"); +WUPS_META(wups, WUPS_VERSION_STR); +WUPS_USE_WUT_MALLOC(); +WUPS_USE_WUT_SOCKETS(); +WUPS_USE_WUT_NEWLIB(); +WUPS___INIT_WRAPPER(); +WUPS___FINI_WRAPPER(); +WUPS_INIT_CONFIG_FUNCTIONS(); +WUPS_META(buildtimestamp, __DATE__ " " __TIME__); +extern const char wups_meta_plugin_name[] WUPS_SECTION("meta"); +const char wups_meta_plugin_name[] = "Malamar (SPFN)"; +extern const char wups_meta_info_dump[] WUPS_SECTION("meta"); +const char wups_meta_info_dump[] = "(plugin: Malamar (SPFN);" \ + "wups " WUPS_VERSION_STR ";" \ + "buildtime: " __DATE__ " " __TIME__ ")"; +extern const char wups_meta_info_linking_order[] WUPS_SECTION("meta"); +const char wups_meta_info_linking_order[] = "Loading \"Malamar (SPFN)\" failed.\n" \ + "Function \"wut_get_thread_specific\" returned unexpected value.\n" \ + "Please check linking order (expected \"-lwups -lwut\")"; + WUPS_PLUGIN_DESCRIPTION("SPFN Network Patcher"); WUPS_PLUGIN_VERSION(INKAY_VERSION); WUPS_PLUGIN_AUTHOR("redbinder0526, kittentm and Pretendo contributors"); diff --git a/src/main.cpp b/src/main.cpp index 5d03f81..4c6aee4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -45,7 +45,25 @@ Mandatory plugin information. If not set correctly, the loader will refuse to use the plugin. **/ -WUMS_MODULE_EXPORT_NAME("inkay"); +WUMS_META(export_name, "inkay"); +WUMS_META(wums, WUMS_VERSION); +WUMS_USE_WUT_MALLOC(); +WUMS_USE_WUT_SOCKETS(); +WUMS_USE_WUT_NEWLIB(); +WUMS___INIT_WRAPPER(); +WUMS___FINI_WRAPPER(); +WUMS_META(buildtimestamp, __DATE__ " " __TIME__); +extern const char wums_meta_module_name[] WUMS_SECTION("meta"); +const char wums_meta_module_name[] = "inkay"; +extern const char wums_meta_info_dump[] WUMS_SECTION("meta"); +const char wums_meta_info_dump[] = "(module: inkay;" \ + "wums " WUMS_VERSION ";" \ + "buildtime: " __DATE__ " " __TIME__ ")"; +extern const char wums_meta_info_linking_order[] WUMS_SECTION("meta"); +const char wums_meta_info_linking_order[] = "Loading module \"inkay\" failed.\n" \ + "Function \"wut_get_thread_specific\" returned unexpected value.\n" \ + "Please check linking order (expected \"-lwums -lwut\")"; + WUMS_MODULE_DESCRIPTION("SPFN Network Patcher"); WUMS_MODULE_VERSION(INKAY_VERSION); WUMS_MODULE_AUTHOR("Pretendo contributors and RusticMaple");