str1k3r/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: mostly fix orbis builds, update telemetry enum

Browse Source
This commit is contained in:
str1k3r
2026-07-09 06:05:47 -04:00
parent 33208b11fa
commit df18bf9847
13 changed files with 89 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Common/Consoles_App.cpp
+3 -1
View File
@@ -4407,7 +4407,9 @@ 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
#if defined __ORBIS__ || defined __PSVITA__
#if defined __ORBIS__
sceNpCommerceHidePsStoreIcon();
#elif defined __PSVITA__
app.GetCommerce()->HidePsStoreIcon();
#endif
app.SetAction(iPad,eAppAction_EthernetDisconnectedReturned_Menus);
Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
+3 -1
View File
@@ -54,7 +54,9 @@ 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
#if defined __ORBIS__ || defined __PSVITA__
#ifdef __ORBIS__
sceNpCommerceHidePsStoreIcon();
#elif defined __PSVITA__
app.GetCommerce()->HidePsStoreIcon();
#endif
m_bLeavingGame = false;
Minecraft.Client/Common/Network/Sony/SonyCommerce.h
+2 -1
View File
@@ -170,7 +170,8 @@ public:
virtual void CheckForTrialUpgradeKey() = 0;
virtual bool LicenseChecked() = 0;
#if defined __ORBIS__ || defined __PSVITA__
// str1k3r: Currently does not work on Orbis.
#if defined __PSVITA__ // || __ORBIS__
virtual void ShowPsStoreIcon() = 0;
virtual void HidePsStoreIcon() = 0;
#endif
Minecraft.Client/Common/UI/UIController.cpp
+14 -2
View File
@@ -2506,17 +2506,29 @@ void UIController::ClearPressStart()
C4JStorage::EMessageResult UIController::RequestAlertMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString)
{
#ifndef __ORBIS__
return RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, pwchFormatString, 0, false);
#else
return RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, NULL, pwchFormatString, 0, false);
#endif
}
C4JStorage::EMessageResult UIController::RequestErrorMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString)
{
return RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, pwchFormatString, 0, true);
#ifndef __ORBIS__
return RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, pwchFormatString, 0, false);
#else
return RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, NULL, pwchFormatString, 0, false);
#endif
}
#ifndef __ORBIS__
C4JStorage::EMessageResult UIController::RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,
int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString,DWORD dwFocusButton, bool bIsError)
#else
C4JStorage::EMessageResult UIController::RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,
int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, C4JStringTable *pStringTable, WCHAR *pwchFormatString,DWORD dwFocusButton, bool bIsError)
#endif
{
MessageBoxInfo param;
param.uiTitle = uiTitle;
Minecraft.Client/Common/UI/UIController.h
+9 -2
View File
@@ -374,8 +374,15 @@ public:
virtual C4JStorage::EMessageResult RequestAlertMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, WCHAR *pwchFormatString=NULL);
virtual C4JStorage::EMessageResult RequestErrorMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, WCHAR *pwchFormatString=NULL);
#ifndef __ORBIS__
private:
virtual C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString,DWORD dwFocusButton, bool bIsError);
virtual C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,
int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString,DWORD dwFocusButton, bool bIsError);
#else
public:
virtual C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY,
int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, C4JStringTable *pStringTable=NULL, WCHAR *pwchFormatString=NULL,DWORD dwFocusButton=0, bool bIsError = true);
#endif
public:
C4JStorage::EMessageResult RequestUGCMessageBox(UINT title = -1, UINT message = -1, int iPad = -1, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult) = NULL, LPVOID lpParam = NULL);
@@ -394,4 +401,4 @@ public:
void setFontCachingCalculationBuffer(int length);
};
};
Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
+9 -3
View File
@@ -53,7 +53,9 @@ UIScene_DLCMainMenu::UIScene_DLCMainMenu(int iPad, void *initData, UILayer *pare
TelemetryManager->RecordMenuShown(iPad, eUIScene_DLCMainMenu, 0);
#if defined __ORBIS__ || defined __PSVITA__
#ifdef __ORBIS__
sceNpCommerceShowPsStoreIcon(SCE_NP_COMMERCE_PS_STORE_ICON_RIGHT);
#elif __PSVITA__
app.GetCommerce()->ShowPsStoreIcon();
#endif
@@ -96,7 +98,9 @@ void UIScene_DLCMainMenu::handleInput(int iPad, int key, bool repeat, bool press
case ACTION_MENU_CANCEL:
if(pressed)
{
#if defined __ORBIS__ || defined __PSVITA__
#ifdef __ORBIS__
sceNpCommerceHidePsStoreIcon();
#elif defined __PSVITA__
app.GetCommerce()->HidePsStoreIcon();
#endif
navigateBack();
@@ -168,7 +172,9 @@ int UIScene_DLCMainMenu::ExitDLCMainMenu(void *pParam,int iPad,C4JStorage::EMess
{
UIScene_DLCMainMenu* pClass = (UIScene_DLCMainMenu*)pParam;
#if defined __ORBIS__ || defined __PSVITA__
#ifdef __ORBIS__
sceNpCommerceHidePsStoreIcon();
#elif defined __PSVITA__
app.GetCommerce()->HidePsStoreIcon();
#endif
pClass->navigateBack();
Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
+3 -1
View File
@@ -105,7 +105,9 @@ int UIScene_DLCOffersMenu::ExitDLCOffersMenu(void *pParam,int iPad,C4JStorage::E
{
UIScene_DLCOffersMenu* pClass = (UIScene_DLCOffersMenu*)pParam;
#if defined __ORBIS__ || defined __PSVITA__
#if defined __ORBIS__
sceNpCommerceHidePsStoreIcon();
#elif defined __PSVITA__
app.GetCommerce()->HidePsStoreIcon();
#endif
ui.NavigateToHomeMenu();//iPad,eUIScene_MainMenu);
Minecraft.Client/Durango/Sentient/TelemetryEnum.h
+9
View File
@@ -225,5 +225,14 @@ enum ETelemetryChallenges
eTelemetryTutorial_TradingMenu,
eTelemetryTutorial_Enderchest,
eTelemetryTutorial_Horse, // Java 1.6.4
eTelemetryTutorial_HorseMenu,
eTelemetryTutorial_Fireworks,
eTelemetryTutorial_FireworksMenu,
eTelemetryTutorial_Beacon,
eTelemetryTutorial_BeaconMenu,
eTelemetryTutorial_Hopper,
eTelemetryTutorial_HopperMenu,
// Sent over network as a byte
};
Minecraft.Client/Orbis/OrbisExtras/OrbisStubs.cpp
+1 -1
View File
@@ -720,7 +720,7 @@ DWORD XGetLanguage()
case SCE_SYSTEM_PARAM_LANG_FRENCH : return XC_LANGUAGE_FRENCH;
case SCE_SYSTEM_PARAM_LANG_SPANISH : return XC_LANGUAGE_SPANISH;
case SCE_SYSTEM_PARAM_LANG_SPANISH_LA : return XC_LANGUAGE_LATINAMERICANSPANISH;
case SCE_SYSTEM_PARAM_LANG_SPANISH_LA : return XC_LOCALE_LATIN_AMERICA;
case SCE_SYSTEM_PARAM_LANG_GERMAN : return XC_LANGUAGE_GERMAN;
case SCE_SYSTEM_PARAM_LANG_ITALIAN : return XC_LANGUAGE_ITALIAN;
Minecraft.Client/Orbis/Sentient/TelemetryEnum.h
+9
View File
@@ -225,5 +225,14 @@ enum ETelemetryChallenges
eTelemetryTutorial_TradingMenu,
eTelemetryTutorial_Enderchest,
eTelemetryTutorial_Horse, // Java 1.6.4
eTelemetryTutorial_HorseMenu,
eTelemetryTutorial_Fireworks,
eTelemetryTutorial_FireworksMenu,
eTelemetryTutorial_Beacon,
eTelemetryTutorial_BeaconMenu,
eTelemetryTutorial_Hopper,
eTelemetryTutorial_HopperMenu,
// Sent over network as a byte
};
Minecraft.Client/PS3/Sentient/TelemetryEnum.h
+9
View File
@@ -225,5 +225,14 @@ enum ETelemetryChallenges
eTelemetryTutorial_TradingMenu,
eTelemetryTutorial_Enderchest,
eTelemetryTutorial_Horse, // Java 1.6.4
eTelemetryTutorial_HorseMenu,
eTelemetryTutorial_Fireworks,
eTelemetryTutorial_FireworksMenu,
eTelemetryTutorial_Beacon,
eTelemetryTutorial_BeaconMenu,
eTelemetryTutorial_Hopper,
eTelemetryTutorial_HopperMenu,
// Sent over network as a byte
};
Minecraft.Client/Windows64/Sentient/TelemetryEnum.h
+9
View File
@@ -225,5 +225,14 @@ enum ETelemetryChallenges
eTelemetryTutorial_TradingMenu,
eTelemetryTutorial_Enderchest,
eTelemetryTutorial_Horse, // Java 1.6.4
eTelemetryTutorial_HorseMenu,
eTelemetryTutorial_Fireworks,
eTelemetryTutorial_FireworksMenu,
eTelemetryTutorial_Beacon,
eTelemetryTutorial_BeaconMenu,
eTelemetryTutorial_Hopper,
eTelemetryTutorial_HopperMenu,
// Sent over network as a byte
};
Minecraft.Client/Xbox/Sentient/TelemetryEnum.h
+9
View File
@@ -225,5 +225,14 @@ enum ETelemetryChallenges
eTelemetryTutorial_TradingMenu,
eTelemetryTutorial_Enderchest,
eTelemetryTutorial_Horse, // Java 1.6.4
eTelemetryTutorial_HorseMenu,
eTelemetryTutorial_Fireworks,
eTelemetryTutorial_FireworksMenu,
eTelemetryTutorial_Beacon,
eTelemetryTutorial_BeaconMenu,
eTelemetryTutorial_Hopper,
eTelemetryTutorial_HopperMenu,
// Sent over network as a byte
};