From f8c69e47154d9fa79ae4e7de12fd261310452c55 Mon Sep 17 00:00:00 2001 From: piebot Date: Mon, 13 Jul 2026 15:13:47 +0300 Subject: [PATCH] fix(PSVita): fix compile errors from missing sceNp functions --- .gitignore | 6 +++ Minecraft.Client/Minecraft.Client.vcxproj | 4 ++ .../Minecraft.Client.vcxproj.filters | 6 +++ .../PSVita/Network/SQRNetworkManager_Vita.h | 2 + Minecraft.Client/PSVita/OldSdk.cpp | 51 ++++++++++++++++++ Minecraft.Client/PSVita/OldSdk.h | 53 +++++++++++++++++++ README.md | 2 +- 7 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 Minecraft.Client/PSVita/OldSdk.cpp create mode 100644 Minecraft.Client/PSVita/OldSdk.h diff --git a/.gitignore b/.gitignore index 4e952f26..1c074c2b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ /ORBIS_Release /PS3_Debug /PS3_Release +/PSVita_Debug +/PSVita_Release /X360_Debug /X360_Release /Release @@ -14,6 +16,8 @@ /Minecraft.Client/ORBIS_Release /Minecraft.Client/PS3_Debug /Minecraft.Client/PS3_Release +/Minecraft.Client/PSVita_Debug +/Minecraft.Client/PSVita_Release /Minecraft.Client/X360_Debug /Minecraft.Client/X360_Release /Minecraft.Client/Debug @@ -25,6 +29,8 @@ /Minecraft.World/ORBIS_Release /Minecraft.World/PS3_Debug /Minecraft.World/PS3_Release +/Minecraft.World/PSVita_Debug +/Minecraft.World/PSVita_Release /Minecraft.World/X360_Debug /Minecraft.World/X360_Release /Minecraft.World/Debug diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj index b7b62029..1d2f0337 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj +++ b/Minecraft.Client/Minecraft.Client.vcxproj @@ -17167,6 +17167,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true true @@ -17485,6 +17486,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true + true true @@ -32817,6 +32819,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true true @@ -33133,6 +33136,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true + true true diff --git a/Minecraft.Client/Minecraft.Client.vcxproj.filters b/Minecraft.Client/Minecraft.Client.vcxproj.filters index 7e2caa1b..ad3f55ca 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj.filters +++ b/Minecraft.Client/Minecraft.Client.vcxproj.filters @@ -3772,6 +3772,9 @@ Common\Source Files\Leaderboards + + PSVita + @@ -5913,6 +5916,9 @@ Common\Source Files\Leaderboards + + PSVita + diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h index a9246faa..f1a85feb 100644 --- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h +++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h @@ -10,6 +10,8 @@ #include "..\..\Common\Network\Sony\SQRNetworkManager.h" +#include "../OldSdk.h" + class SQRNetworkPlayer; class ISQRNetworkManagerListener; class SonyVoiceChat_Vita; diff --git a/Minecraft.Client/PSVita/OldSdk.cpp b/Minecraft.Client/PSVita/OldSdk.cpp new file mode 100644 index 00000000..cefe2288 --- /dev/null +++ b/Minecraft.Client/PSVita/OldSdk.cpp @@ -0,0 +1,51 @@ +#include "OldSdk.h" + + +int sceNpBasicGetFriendOnlineStatus(const SceNpId *friendId, SceNpBasicOnlineStatus *status) { + if (status) *status = SCE_NP_BASIC_ONLINE_STATUS_UNKNOWN; + return -1; +} + +int sceNpBasicGetFriendContextState(const SceNpId *friendId, SceNpBasicFriendContextState *state) { + if (state) *state = SCE_NP_BASIC_FRIEND_CONTEXT_STATE_UNKNOWN; + return -1; +} + +int sceNpBasicGetGamePresenceOfFriend(const SceNpId *friendId, SceNpBasicGamePresence *presence) { + if (presence) memset(presence, 0, sizeof(SceNpBasicGamePresence)); + return -1; +} + +int sceNpBasicGetFriendListEntryCount(SceSize *count) { + if (count) *count = 0; + return 0; +} + +int sceNpBasicGetFriendListEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved) { + if (retrieved) *retrieved = 0; + return 0; +} + +int sceNpBasicGetFriendRequestEntryCount(SceSize *count) { + if (count) *count = 0; + return 0; +} + +int sceNpBasicGetFriendRequestEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved) { + if (retrieved) *retrieved = 0; + return 0; +} + +int sceNpBasicGetRequestedFriendRequestEntryCount(SceSize *count) { + if (count) *count = 0; + return 0; +} + +int sceNpBasicGetRequestedFriendRequestEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved) { + if (retrieved) *retrieved = 0; + return 0; +} + +SceInt32 sceAppUtilAppEventParseNpBasicJoinablePresence(const SceAppUtilAppEventParam *eventParam, SceAppUtilNpBasicJoinablePresenceParam *param) { + return -1; +} \ No newline at end of file diff --git a/Minecraft.Client/PSVita/OldSdk.h b/Minecraft.Client/PSVita/OldSdk.h new file mode 100644 index 00000000..2739b5f6 --- /dev/null +++ b/Minecraft.Client/PSVita/OldSdk.h @@ -0,0 +1,53 @@ +#pragma once +#ifndef _OLD_SDK_H +#define _OLD_SDK_H 1 + +#include +#include +#include +#include +#include + +typedef enum { + SCE_NP_BASIC_ONLINE_STATUS_UNKNOWN = 0, + SCE_NP_BASIC_ONLINE_STATUS_OFFLINE = 1, + SCE_NP_BASIC_ONLINE_STATUS_AFK = 2, + SCE_NP_BASIC_ONLINE_STATUS_ONLINE = 3 +} SceNpBasicOnlineStatus; + +typedef void(*SceNpBasicFriendOnlineStatusEventHandler)( + const SceNpId *friendId, + SceNpBasicOnlineStatus status, + void *userdata + ); + +typedef enum { + SCE_NP_BASIC_FRIEND_CONTEXT_STATE_UNKNOWN = 0, + SCE_NP_BASIC_FRIEND_CONTEXT_STATE_OUT_OF_CONTEXT = 1, + SCE_NP_BASIC_FRIEND_CONTEXT_STATE_IN_CONTEXT = 2 +} SceNpBasicFriendContextState; + +typedef void(*SceNpBasicFriendContextEventHandler)( + const SceNpId *friendId, + SceNpBasicFriendContextState state, + void *userdata + ); +typedef struct SceAppUtilNpBasicJoinablePresenceParam { + SceNpCommunicationId commId; + SceNpId npId; +} SceAppUtilNpBasicJoinablePresenceParam; + +int sceNpBasicGetFriendOnlineStatus(const SceNpId *friendId, SceNpBasicOnlineStatus *status); +int sceNpBasicGetFriendContextState(const SceNpId *friendId, SceNpBasicFriendContextState *state); +int sceNpBasicGetGamePresenceOfFriend(const SceNpId *friendId, SceNpBasicGamePresence *presence); +int sceNpBasicGetFriendListEntryCount(SceSize *count); +int sceNpBasicGetFriendListEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved); +int sceNpBasicGetFriendRequestEntryCount(SceSize *count); +int sceNpBasicGetFriendRequestEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved); +int sceNpBasicGetRequestedFriendRequestEntryCount(SceSize *count); +int sceNpBasicGetRequestedFriendRequestEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved); +SceInt32 sceAppUtilAppEventParseNpBasicJoinablePresence(const SceAppUtilAppEventParam *eventParam, SceAppUtilNpBasicJoinablePresenceParam *param); + +#define SCE_APPUTIL_APPEVENT_TYPE_NP_BASIC_JOINABLE_PRESENCE (3) + +#endif \ No newline at end of file diff --git a/README.md b/README.md index 33431202..2467e544 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# mc-pie-LCE +# Acacia Log This project is a modified version of the December 17th 2014 Codebase, aimed at backporting the newer title updates back to the codebase, with cross-play across all platfoms (including PC). # Status