qloak/cafeberry
1
0
Fork 0
forked from cafeberry/cafeberry
Code Pull Requests Activity

fix: the cheeky fix for orbis

Browse Source
This commit is contained in:
str1k3r
2026-08-30 20:05:33 -04:00
parent fc1a6a80e3
commit 41b976ed9e
7 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Common/Consoles_App.cpp
+3 -5
View File
@@ -4419,9 +4419,7 @@ int CMinecraftApp::EthernetDisconnectReturned(void *pParam,int iPad,const C4JSto
else
{
// 4J-PB - turn off the PSN store icon just in case this happened when we were in one of the DLC menus
#ifdef __ORBIS__
sceNpCommerceHidePsStoreIcon();
#elif defined __PSVITA__
#if defined __PSVITA__ || defined __ORBIS__
app.GetCommerce()->HidePsStoreIcon();
#endif
app.SetAction(iPad,eAppAction_EthernetDisconnectedReturned_Menus);
@@ -6648,7 +6646,7 @@ wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey)
switch(uiVKey)
{
case VK_PAD_A:
#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__) || defined(_WINDOWS64)
if( InputManager.IsCircleCrossSwapped() ) replacement = L"ButtonB";
else replacement = L"ButtonA";
#else
@@ -10048,7 +10046,7 @@ enum ETitleUpdateTexturePacks
};
#ifdef _WINDOWS64
wstring titleUpdateTexturePackRoot = L"Windows64\\DLC\\";
wstring titleUpdateTexturePackRoot = L"Windows64Media\\DLC\\";
#elif defined(__ORBIS__)
wstring titleUpdateTexturePackRoot = L"app0/Orbis/DLC/";
#elif defined(__PSVITA__)
Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
+1 -3
View File
@@ -54,9 +54,7 @@ void CPlatformNetworkManagerSony::HandleStateChange(SQRNetworkManager::eSQRNetwo
else if( newState == SQRNetworkManager::SNM_STATE_JOINING )
{
// 4J Stu - We may be accepting an invite from the DLC menu, so hide the icon
#ifdef __ORBIS__
sceNpCommerceHidePsStoreIcon();
#elif defined __PSVITA__
#if defined __PSVITA__ || defined __ORBIS__
app.GetCommerce()->HidePsStoreIcon();
#endif
m_bLeavingGame = false;
Minecraft.Client/Common/Network/Sony/SonyCommerce.h
+1 -2
View File
@@ -170,8 +170,7 @@ public:
virtual void CheckForTrialUpgradeKey() = 0;
virtual bool LicenseChecked() = 0;
// str1k3r: Currently does not work on Orbis.
#if defined __PSVITA__ // || defined __ORBIS__
#if defined __PSVITA__ || defined __ORBIS__
virtual void ShowPsStoreIcon() = 0;
virtual void HidePsStoreIcon() = 0;
#endif
Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
+4 -10
View File
@@ -53,10 +53,8 @@ UIScene_DLCMainMenu::UIScene_DLCMainMenu(int iPad, void *initData, UILayer *pare
TelemetryManager->RecordMenuShown(iPad, eUIScene_DLCMainMenu, 0);
#ifdef __ORBIS__
sceNpCommerceShowPsStoreIcon(SCE_NP_COMMERCE_PS_STORE_ICON_RIGHT);
#elif defined __PSVITA__
sceNpCommerce2ShowPsStoreIcon(SCE_NP_COMMERCE2_ICON_DISP_RIGHT);
#if defined __ORBIS__ || defined __PSVITA__
app.GetCommerce()->ShowPsStoreIcon();
#endif
#if ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ )
@@ -98,9 +96,7 @@ void UIScene_DLCMainMenu::handleInput(int iPad, int key, bool repeat, bool press
case ACTION_MENU_CANCEL:
if(pressed)
{
#ifdef __ORBIS__
sceNpCommerceHidePsStoreIcon();
#elif defined __PSVITA__
#if defined __PSVITA__ || defined __ORBIS__
app.GetCommerce()->HidePsStoreIcon();
#endif
navigateBack();
@@ -172,9 +168,7 @@ int UIScene_DLCMainMenu::ExitDLCMainMenu(void *pParam,int iPad,C4JStorage::EMess
{
UIScene_DLCMainMenu* pClass = (UIScene_DLCMainMenu*)pParam;
#ifdef __ORBIS__
sceNpCommerceHidePsStoreIcon();
#elif defined __PSVITA__
#if defined __PSVITA__ || defined __ORBIS__
app.GetCommerce()->HidePsStoreIcon();
#endif
pClass->navigateBack();
Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
+2 -4
View File
@@ -105,10 +105,8 @@ int UIScene_DLCOffersMenu::ExitDLCOffersMenu(void *pParam,int iPad,C4JStorage::E
{
UIScene_DLCOffersMenu* pClass = (UIScene_DLCOffersMenu*)pParam;
#ifdef __ORBIS__
sceNpCommerceHidePsStoreIcon();
#elif defined __PSVITA__
app.GetCommerce()->HidePsStoreIcon();
#if defined __PSVITA__ || defined __ORBIS__
app.GetCommerce()->HidePsStoreIcon();
#endif
ui.NavigateToHomeMenu();//iPad,eUIScene_MainMenu);
Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp
+21 -1
View File
@@ -44,12 +44,13 @@ bool SonyCommerce_Orbis::m_bLicenseChecked=false; // Check the trial/
#ifndef __ORBIS__ // sce::Toolkit::NP::Utilities::Future is not implemented in SDK 1.70
#if 0 // sce::Toolkit::NP::Utilities::Future is not implemented in SDK 1.70
sce::Toolkit::NP::Utilities::Future<std::vector<sce::Toolkit::NP::ProductInfo> > g_productList;
sce::Toolkit::NP::Utilities::Future<sce::Toolkit::NP::CategoryInfo> g_categoryInfo;
sce::Toolkit::NP::Utilities::Future<sce::Toolkit::NP::ProductInfoDetailed> g_detailedProductInfo;
#endif
static bool s_showingPSStoreIcon = false;
SonyCommerce_Orbis::ProductInfoDetailed s_trialUpgradeProductInfoDetailed;
void SonyCommerce_Orbis::Delete()
@@ -1304,6 +1305,25 @@ void SonyCommerce_Orbis::DownloadAlreadyPurchased_Game( CallbackFunc cb, LPVOID
LeaveCriticalSection(&m_queueLock);
}
void SonyCommerce_Orbis::ShowPsStoreIcon()
{
if(!s_showingPSStoreIcon)
{
sceNpCommerceShowPsStoreIcon(SCE_NP_COMMERCE_PS_STORE_ICON_RIGHT);
s_showingPSStoreIcon = true;
}
}
void SonyCommerce_Orbis::HidePsStoreIcon()
{
if(s_showingPSStoreIcon)
{
sceNpCommerceHidePsStoreIcon();
s_showingPSStoreIcon = false;
}
}
/*
bool g_bDoCommerceCreateSession = false;
Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h
+2
View File
@@ -179,4 +179,6 @@ public:
virtual void CheckForTrialUpgradeKey();
virtual bool LicenseChecked();
virtual void ShowPsStoreIcon();
virtual void HidePsStoreIcon();
};