MrMaho/MBMNET-APP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v2.9.0: MBMNET Shop (eigene App, auf Wunsch installierbar)

Browse Source 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Nico Meister
2026-10-18 17:46:42 +02:00
co-authored by Claude Opus 5.5
parent d264cd93cd
commit ca77952a9d
16 changed files with 1710 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/main.c
+105 -12
View File
@@ -15,6 +15,7 @@
#include "admin.h"
#include "ftpctl.h"
#include "spotpass.h"
#include "shopctl.h"
#define TOP_W 400
#define BOT_W 320
@@ -33,18 +34,31 @@
#define COL_AMBER C2D_Color32(0xF5, 0x9E, 0x0B, 0xFF)
#define COL_NINTENDO C2D_Color32(0xE6, 0x00, 0x12, 0xFF)
// Bedienelemente auf dem unteren Bildschirm. Die Werkzeuge gibt es nur für Admins.
enum { BTN_ENABLE, BTN_DISABLE, BTN_DIAG, BTN_FTP, BTN_UNLINK, BTN_SPOTPASS, BTN_REBOOT, BTN_COUNT };
// Bedienelemente auf dem unteren Bildschirm. Die Werkzeuge gibt es nur für Admins (mit SELECT),
// die Shop-Leiste nur ohne Werkzeuge.
enum { BTN_ENABLE, BTN_DISABLE, BTN_DIAG, BTN_FTP, BTN_UNLINK, BTN_SPOTPASS, BTN_REBOOT, BTN_SHOP, BTN_SHOP_DEL, BTN_COUNT };
typedef struct { float x, y, w, h; } Box;
#define TILE_Y 14
#define TILE_W 142
#define TILE_H_FULL 210
#define TILE_H_FULL 166
#define TILE_H_ADMIN 160
#define TOOL_COUNT 5
static const Box toolBoxes[TOOL_COUNT] = { { 12, 184, 56, 42 }, { 72, 184, 56, 42 }, { 132, 184, 56, 42 }, { 192, 184, 56, 42 }, { 252, 184, 56, 42 } };
static const Box shopBox = { 12, 188, 216, 40 }, shopDelBox = { 232, 188, 76, 40 };
static int shopVersion = -1; // installierte Version des MBMNET Shops (-1 = nicht installiert)
// Welche Knöpfe sind gerade da?
static bool visible(int btn, bool admin)
{
if (btn <= BTN_DISABLE) return true;
if (btn <= BTN_REBOOT) return admin;
if (btn == BTN_SHOP) return !admin;
return !admin && shopVersion >= 0; // Entfernen nur, wenn installiert
}
static Box box_of(int btn, bool admin)
{
float h = admin ? TILE_H_ADMIN : TILE_H_FULL;
@@ -55,6 +69,8 @@ static Box box_of(int btn, bool admin)
case BTN_FTP: return toolBoxes[1];
case BTN_UNLINK: return toolBoxes[2];
case BTN_SPOTPASS: return toolBoxes[3];
case BTN_SHOP: return shopBox;
case BTN_SHOP_DEL: return shopDelBox;
default: return toolBoxes[4];
}
}
@@ -189,12 +205,47 @@ static void draw_tile(int btn, bool sel, bool active, bool admin)
}
}
// Kleiner Einkaufswagen (wie das Symbol des MBMNET Shops)
static void draw_cart(float x, float y, float size)
{
float s = size / 100.0f, t = 9 * s;
round_rect(x, y, size, size, 22 * s, COL_RED);
C2D_DrawLine(x + 13 * s, y + 23 * s, COL_WHITE, x + 23 * s, y + 23 * s, COL_WHITE, t, 0.5f);
C2D_DrawLine(x + 23 * s, y + 23 * s, COL_WHITE, x + 33 * s, y + 61 * s, COL_WHITE, t, 0.5f);
C2D_DrawLine(x + 33 * s, y + 61 * s, COL_WHITE, x + 30 * s, y + 70 * s, COL_WHITE, t, 0.5f);
C2D_DrawLine(x + 30 * s, y + 70 * s, COL_WHITE, x + 78 * s, y + 70 * s, COL_WHITE, t, 0.5f);
C2D_DrawTriangle(x + 27 * s, y + 33 * s, COL_WHITE, x + 84 * s, y + 33 * s, COL_WHITE, x + 77 * s, y + 61 * s, COL_WHITE, 0.5f);
C2D_DrawTriangle(x + 27 * s, y + 33 * s, COL_WHITE, x + 77 * s, y + 61 * s, COL_WHITE, x + 33 * s, y + 61 * s, COL_WHITE, 0.5f);
C2D_DrawCircleSolid(x + 37 * s, y + 80 * s, 0.5f, 7 * s, COL_WHITE);
C2D_DrawCircleSolid(x + 72 * s, y + 80 * s, 0.5f, 7 * s, COL_WHITE);
}
static void draw_shop_bar(int selected)
{
bool busy = shopctl_job() == SHOPJOB_RUNNING;
bool outdated = shopVersion >= 0 && shopVersion < APP_TITLE_VERSION;
Box b = shopBox;
bool sel = selected == BTN_SHOP;
round_rect(b.x, b.y, b.w, b.h, 10, sel ? COL_CARD_HI : COL_CARD);
if (sel) C2D_DrawRectSolid(b.x, b.y + 10, 0.5f, 4, b.h - 20, COL_RED);
draw_cart(b.x + 10, b.y + 7, 26);
const char *label = busy ? "Shop wird installiert ..." : shopVersion < 0 ? "MBMNET Shop installieren"
: outdated ? "Shop aktualisieren" : "MBMNET Shop öffnen";
text(label, b.x + 44, b.y + 11, 0.5f, busy ? COL_AMBER : COL_WHITE, 0);
if (shopVersion < 0) return;
b = shopDelBox;
sel = selected == BTN_SHOP_DEL;
round_rect(b.x, b.y, b.w, b.h, 10, sel ? COL_CARD_HI : COL_CARD);
if (sel) C2D_DrawRectSolid(b.x, b.y + 10, 0.5f, 4, b.h - 20, COL_RED);
text("Entfernen", b.x + b.w / 2, b.y + 12, 0.42f, COL_MUTED, C2D_AlignCenter);
}
static void draw_bottom(int selected, PatchState st, bool admin)
{
C2D_DrawRectSolid(0, 0, 0, BOT_W, SCR_H, COL_BG);
draw_tile(BTN_ENABLE, selected == BTN_ENABLE, st == STATE_MBMNET, admin);
draw_tile(BTN_DISABLE, selected == BTN_DISABLE, st == STATE_ORIGINAL, admin);
if (!admin) return;
if (!admin) { draw_shop_bar(selected); return; }
const char *labels[TOOL_COUNT] = { "Diagnose", ftpOn ? "FTP aus" : "FTP an", "ID lösen", "SpotPass", "Neustart" };
for (int i = 0; i < TOOL_COUNT; i++) {
@@ -219,6 +270,7 @@ static void draw_bottom(int selected, PatchState st, bool admin)
static bool old_mbmnet_link(void) { FILE *f = fopen(UNLINKED_MARKER, "r"); if (f) fclose(f); return f != NULL; }
static int armed = -1; // Sicherheitsabfrage (zweimal antippen)
static bool launchShop; // Sprung in den MBMNET Shop vorbereitet: App beenden
// Name der MBMNET-ID, gemerkt beim Wechsel zu Nintendo. Der 3DS erlaubt dieselbe ID nicht in zwei Konto-Plätzen
// (022-2571): Heißt die Pretendo-ID genauso, muss sie beim Wechsel zurück zu MBMNET dort gelöst werden.
@@ -354,7 +406,7 @@ static bool run(int action, char *msg, size_t msglen)
bool confirmed = armed == action;
armed = -1;
// Während ein Update lädt oder installiert wird, nicht umschalten (der 3DS würde mittendrin neu starten)
if (action != BTN_DIAG && action != BTN_FTP && action != BTN_SPOTPASS && update_pending()) {
if (action != BTN_DIAG && action != BTN_FTP && action != BTN_SPOTPASS && action < BTN_SHOP && update_pending()) {
snprintf(msg, msglen, "Moment: Das Update auf v%s wird gerade installiert.\nDanach startet die App neu.", update_new_version());
return false;
}
@@ -386,6 +438,30 @@ static bool run(int action, char *msg, size_t msglen)
if (spotpass_test_start(MBMNET_SERVER, msg, msglen)) spotpassTestFrames = 0;
return false;
case BTN_REBOOT: return true;
case BTN_SHOP:
if (shopctl_job() == SHOPJOB_RUNNING) { snprintf(msg, msglen, "Der Shop wird gerade installiert ..."); return false; }
if (shopVersion >= 0 && shopVersion >= APP_TITLE_VERSION) {
if (shopctl_launch(msg, msglen)) launchShop = true;
return false;
}
if (shopVersion < 0 && !confirmed) {
armed = BTN_SHOP;
snprintf(msg, msglen, "MBMNET Shop installieren?\nEine eigene App mit Homebrew aus der Universal-DB\n"
"(Spiele, Tools, Emulatoren). Zum Bestätigen nochmal antippen.");
return false;
}
shopctl_install(MBMNET_SERVER);
snprintf(msg, msglen, shopVersion < 0 ? "Installiere den MBMNET Shop ..." : "Aktualisiere den MBMNET Shop ...");
return false;
case BTN_SHOP_DEL:
if (shopVersion < 0) return false;
if (!confirmed) {
armed = BTN_SHOP_DEL;
snprintf(msg, msglen, "MBMNET Shop entfernen?\nApps, die du darüber installiert hast, bleiben.\nZum Bestätigen nochmal antippen.");
return false;
}
if (shopctl_remove(msg, msglen)) shopVersion = -1;
return false;
}
return false;
}
@@ -396,8 +472,8 @@ int main(int argc, char **argv)
{
gfxInitDefault();
httpcInit(0);
// Als installierte CIA: am:net zum Installieren von Updates
bool am = !envIsHomebrew() && R_SUCCEEDED(amInit());
// am:net: Updates (als CIA) und den MBMNET Shop installieren. Unter Luma auch als .3dsx erlaubt.
bool am = R_SUCCEEDED(amInit());
C3D_Init(C3D_DEFAULT_CMDBUF_SIZE);
C2D_Init(C2D_DEFAULT_MAX_OBJECTS);
C2D_Prepare();
@@ -444,6 +520,9 @@ int main(int argc, char **argv)
}
// Das Hintergrund-Modul ist abgeschaltet (Kernel-Absturz): Reste wegräumen, nie wieder starten
ftpctl_cleanup_module();
// MBMNET Shop: installiert? Ältere Version gleich im Hintergrund aktualisieren.
shopVersion = am ? shopctl_version() : -1;
if (shopVersion >= 0 && shopVersion < APP_TITLE_VERSION) shopctl_install(server);
ftpOn = ftpctl_running();
int ftpCheckIn = 120;
@@ -459,22 +538,26 @@ int main(int argc, char **argv)
if (down & KEY_SELECT) toolsToggled = !toolsToggled;
// Werkzeuge nur mit SELECT, beim Öffnen immer aus
bool admin = toolsToggled;
if (!admin && selected >= BTN_DIAG) selected = BTN_ENABLE;
if (!visible(selected, admin)) selected = admin || selected <= BTN_REBOOT ? BTN_ENABLE : BTN_SHOP;
int action = -1;
// Oben die beiden Kacheln, unten (nur mit Werkzeugen) Diagnose / FTP / ID lösen / SpotPass / Neustart
bool left = down & (KEY_LEFT | KEY_CPAD_LEFT), right = down & (KEY_RIGHT | KEY_CPAD_RIGHT);
bool up = down & (KEY_UP | KEY_CPAD_UP), dn = down & (KEY_DOWN | KEY_CPAD_DOWN);
if (selected < BTN_DIAG) { if (left || right) selected ^= 1; }
else if (selected >= BTN_SHOP) { if ((left || right) && shopVersion >= 0) selected = selected == BTN_SHOP ? BTN_SHOP_DEL : BTN_SHOP; }
else if (left) selected = selected == BTN_DIAG ? BTN_REBOOT : selected - 1;
else if (right) selected = selected == BTN_REBOOT ? BTN_DIAG : selected + 1;
if (admin && down & (KEY_DOWN | KEY_CPAD_DOWN) && selected < BTN_DIAG) selected = selected == BTN_ENABLE ? BTN_DIAG : BTN_REBOOT;
if (down & (KEY_UP | KEY_CPAD_UP) && selected >= BTN_DIAG) selected = selected == BTN_REBOOT ? BTN_DISABLE : BTN_ENABLE;
if (dn && selected < BTN_DIAG) selected = admin ? (selected == BTN_ENABLE ? BTN_DIAG : BTN_REBOOT)
: (selected == BTN_DISABLE && shopVersion >= 0 ? BTN_SHOP_DEL : BTN_SHOP);
else if (up && selected >= BTN_SHOP) selected = selected == BTN_SHOP_DEL ? BTN_DISABLE : BTN_ENABLE;
else if (up && selected >= BTN_DIAG) selected = selected == BTN_REBOOT ? BTN_DISABLE : BTN_ENABLE;
if (down & KEY_A) action = selected;
if (down & KEY_TOUCH) {
touchPosition tp;
hidTouchRead(&tp);
for (int i = 0; i < (admin ? BTN_COUNT : BTN_DIAG); i++)
if (inside(box_of(i, admin), tp)) selected = action = i;
for (int i = 0; i < BTN_COUNT; i++)
if (visible(i, admin) && inside(box_of(i, admin), tp)) selected = action = i;
}
if (queued >= 0) {
int a = queued;
@@ -506,6 +589,15 @@ int main(int argc, char **argv)
}
lastUpd = upd;
// MBMNET Shop fertig installiert (oder fehlgeschlagen)
ShopJob sj = shopctl_job();
if (sj == SHOPJOB_DONE || sj == SHOPJOB_FAILED) {
snprintf(msg, sizeof(msg), "%s", shopctl_message());
shopctl_acknowledge();
shopVersion = shopctl_version();
}
if (launchShop) break;
// SpotPass-Test: jede Sekunde nachsehen
if (spotpassTestFrames >= 0 && ++spotpassTestFrames % 60 == 0 &&
!spotpass_test_poll(spotpassTestFrames / 60, msg, sizeof(msg)))
@@ -533,6 +625,7 @@ int main(int argc, char **argv)
}
ftpctl_stop(NULL, 0);
shopctl_exit();
admin_finish();
update_finish();
frdswitch_exit();