Merge branch 'ps4' of https://git.neolegacy.dev/pieeebot/cafeberry into ps4

# Conflicts:
#	Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp
#	Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
#	Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp
#	Minecraft.Client/OrbisMedia/strings.h
#	MinecraftConsoles.sln

Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp

@@ -154,7 +154,7 @@ void SonyLeaderboardManager::scoreboardThreadInternal()
 		// The following NP call should be reserved for asynchronous multiplayer modes that require PS Plus to be accessed. 
 		//
 		//	Note 2: 
-		// The message is not displayed with a user without PlayStation®Plus subscription and they are able to access the Leaderboards.
+		// The message is not displayed with a user without PlayStation�Plus subscription and they are able to access the Leaderboards.
 
 		// NotifyAsyncPlusFeature();
 

Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1

@@ -6,13 +6,13 @@ param(
 Write-Host "Orbis Postbuild script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
 
 $directories = @(
-    "music",
-	"Orbis",
-	"Common",
-    "Common\Media",
-	"Common\Tutorial",
-    "Common\res",
-    "Sound"
+    "PS4_GAME\music",
+	"PS4_GAME\Orbis",
+	"PS4_GAME\Common",
+    "PS4_GAME\Common\Media",
+	"PS4_GAME\Common\Tutorial",
+    "PS4_GAME\Common\res",
+    "PS4_GAME\Orbis\Sound"
 )
 
 foreach ($dir in $directories) {
@@ -27,7 +27,7 @@ $folderCopies = @(
 	@{ Source = "PS3\Sound";       Dest = "PS4_GAME\Sound" },
     @{ Source = "Common\Postbuilds\Contents\Orbis\sce_module"; Dest = "PS4_GAME\sce_module" },
     @{ Source = "Common\Postbuilds\Contents\Orbis\sce_gls";	   Dest = "PS4_GAME\sce_gls" },
-    @{ Source = "Common\Postbuilds\Contents\Orbis\sce_sys";    Dest = "PS4_GAME\sce_sys" },
+    @{ Source = "Common\Postbuilds\Contents\Orbis\sce_sys";    Dest = "PS4_GAME\sce_sys" }
 )
 
 foreach ($copy in $folderCopies) {
@@ -41,7 +41,7 @@ foreach ($copy in $folderCopies) {
 
 $fileCopies = @(
     @{ Source = "Orbis\PS4ProductCodes.bin"; Dest = "PS4_GAME\Orbis\PS4ProductCodes.bin" },
-	@{ Source = "Orbis\session_image.jpg"; Dest = "PS4_GAME\Orbis\session_image.jpg" },
+	@{ Source = "Orbis\session_image.jpg"; Dest = "PS4_GAME\Orbis\session_image.jpg" }
 )
 
 foreach ($copy in $fileCopies) {

Minecraft.Client/Minecraft.Client.vcxproj

@@ -3068,6 +3068,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
+    <PostBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"</Command>
+    </PostBuildEvent>
+    <PostAnalyzeEvent>
+      <Message>Run Orbis postbuild script</Message>
+    </PostAnalyzeEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">
     <ClCompile>
@@ -3185,6 +3191,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
+    <PostBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"</Command>
+    </PostBuildEvent>
+    <PostAnalyzeEvent>
+      <Message>Run Orbis postbuild script</Message>
+    </PostAnalyzeEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <None Include="ClassDiagram.cd" />

Minecraft.Client/Orbis/Network/SonyVoiceChat_Orbis.cpp

@@ -41,14 +41,14 @@ static void CreatePort(uint32_t *portId, const SceVoicePortParam *pArg)
 
 	int err = sceVoiceCreatePort( portId, pArg );
 	assert(err == SCE_OK);
-	assert(*portId != SCE_VOICE_INVALID_PORT_ID);
+	assert(*portId != VOICE_INVALID_PORT_ID);
 	C4JThread::PopAffinity();	// PS4 only
 }
 
 static void DeletePort(uint32_t& port)
 {
 	int32_t result;
-	if (port != SCE_VOICE_INVALID_PORT_ID)
+	if (port != VOICE_INVALID_PORT_ID)
 	{
 		result = sceVoiceDeletePort( port );
 		if (result != SCE_OK)
@@ -56,7 +56,7 @@ static void DeletePort(uint32_t& port)
 			app.DebugPrintf("sceVoiceDeletePort failed %0x\n", result);
 			assert(0);
 		}
-		port = SCE_VOICE_INVALID_PORT_ID;
+		port = VOICE_INVALID_PORT_ID;
 	}
 }
 

Minecraft.Client/Orbis/Network/SonyVoiceChat_Orbis.h

@@ -8,6 +8,7 @@
 
 static const int sc_maxVoiceDataSize = 2048;
 
+#define VOICE_INVALID_PORT_ID 0xff // str1k3r - use of SCE_VOICE_INVALID_PORT_ID causes a crash when loading / making worlds.
 
 class VoicePacket
 {
@@ -87,9 +88,9 @@ public:
 
 public:
 	SQRLocalVoiceDevice() 
-		: m_headsetPort(SCE_VOICE_INVALID_PORT_ID)
-		, m_microphonePort(SCE_VOICE_INVALID_PORT_ID)
 		, m_localUserID(SCE_USER_SERVICE_USER_ID_INVALID)
+		: m_headsetPort(VOICE_INVALID_PORT_ID)
+		, m_microphonePort(VOICE_INVALID_PORT_ID)
 	{
 		for(int i=0;i<4;i++)
 			m_localConnections[i] = 0;

Minecraft.Client/OrbisMedia/loc/stringsGeneric.xml

@@ -1675,9 +1675,69 @@ Can also be used for low-level lighting.</value>
 
 	<data name="IDS_DESC_SKULL">
 		<value>Mob Heads can be placed as a decoration, or worn as a mask in the helmet slot.</value>
-	</data>	
+	</data>
 
-	<data name="IDS_SQUID">
+  <data name="IDS_DESC_COMMAND_BLOCK">
+    <value>Used to execute commands.</value>
+  </data>
+
+  <data name="IDS_DESC_BEACON">
+    <value>Projects a beam of light into the sky and can provide Status Effects to nearby players.</value>
+  </data>
+
+  <data name="IDS_DESC_CHEST_TRAP">
+    <value>Stores blocks and items inside. Place two chest side by side to create a larger chest with double capacity. The trapped chest also creates a Redstone charge when opened.</value>
+  </data>
+
+  <data name="IDS_DESC_WEIGHTED_PLATE_LIGHT">
+    <value>Provides a Redstone charge. The charge will be stronger if more items are on the plate.</value>
+  </data>
+
+  <data name="IDS_DESC_WEIGHTED_PLATE_HEAVY">
+    <value>Provides a Redstone charge. The charge will be stronger if more items are on the plate. Requires more weight than the light plate.</value>
+  </data>
+
+  <data name="IDS_DESC_REDSTONE_BLOCK">
+    <value>Used as a redstone power source. Can be crafted back into Redstone.</value>
+  </data>
+
+  <data name="IDS_DESC_HOPPER">
+    <value>Used to catch items or to transfer items into and out of containers.</value>
+  </data>
+
+  <data name="IDS_DESC_ACTIVATOR_RAIL">
+    <value>A type of rail that can enable or disable Minecarts with Hoppers and trigger Minecarts with TNT.</value>
+  </data>
+
+  <data name="IDS_DESC_DROPPER">
+    <value>Used to hold and drop items, or push items into another container, when given a Redstone charge.</value>
+  </data>
+
+  <data name="IDS_DESC_STAINED_CLAY">
+    <value>Colorful blocks crafted by dyeing Hardened clay.</value>
+  </data>
+
+  <data name="IDS_DESC_HAY">
+    <value>Can be fed to Horses, Donkeys or Mules to heal up to 10 Hearts. Speeds up the growth of foals.</value>
+  </data>
+
+  <data name="IDS_DESC_HARDENED_CLAY">
+    <value>Created by smelting Clay in a furnace.</value>
+  </data>
+
+  <data name="IDS_DESC_STAINED_GLASS">
+    <value>Crafted from glass and a dye.</value>
+  </data>
+
+  <data name="IDS_DESC_STAINED_GLASS_PANE">
+    <value>Crafted from Stained Glass</value>
+  </data>
+
+  <data name="IDS_DESC_COAL_BLOCK">
+    <value>A compact way of storing Coal. Can be used as fuel in a Furnace.</value>
+  </data>
+
+  <data name="IDS_SQUID">
 		<value>Squid</value>
 	</data>	
 
@@ -2895,9 +2955,13 @@ Can also be used for low-level lighting.</value>
 
 	<data name="IDS_TILE_JUNGLE_PLANKS">
 		<value>Jungle Wood Planks</value>
-	</data>	
+	</data>
 
-	<data name="IDS_TILE_SAPLING">
+  <data name="IDS_TILE_PLANKS">
+    <value>Wood Planks (any type)</value>
+  </data>
+
+  <data name="IDS_TILE_SAPLING">
 		<value>Sapling</value>
 	</data>	
 
@@ -5688,9 +5752,41 @@ Can also be used for low-level lighting.</value>
 
 	<data name="IDS_TOOLTIPS_CLEARSLOTS">
 		<value>Clear All Slots</value>
-	</data>	
+	</data>
 
-	<data name="IDS_CONFIRM_OK">
+  <data name="IDS_TOOLTIPS_MOUNT">
+    <value>Mount</value>
+  </data>
+
+  <data name="IDS_TOOLTIPS_DISMOUNT">
+    <value>Dismount</value>
+  </data>
+
+  <data name="IDS_TOOLTIPS_SADDLEBAGS">
+    <value>Attach Chest</value>
+  </data>
+
+  <data name="IDS_TOOLTIPS_FIREWORK_LAUNCH">
+    <value>Launch</value>
+  </data>
+
+  <data name="IDS_TOOLTIPS_LEASH">
+    <value>Leash</value>
+  </data>
+
+  <data name="IDS_TOOLTIPS_UNLEASH">
+    <value>Release</value>
+  </data>
+
+  <data name="IDS_TOOLTIPS_ATTACH">
+    <value>Attach</value>
+  </data>
+
+  <data name="IDS_TOOLTIPS_NAME">
+    <value>Name</value>
+  </data>
+
+  <data name="IDS_CONFIRM_OK">
 		<value>OK</value>
 	</data>	
 
@@ -5700,9 +5796,13 @@ Can also be used for low-level lighting.</value>
 
 	<data name="IDS_DOWNLOADABLECONTENT">
 		<value>Minecraft Store</value>
-	</data>	
+	</data>
 
-	<data name="IDS_EXIT_GAME">
+  <data name="IDS_CONFIRM_LEAVE_VIA_INVITE">
+    <value>Are you sure you want to leave your current game and join the new one? Any unsaved progress will be lost.</value>
+  </data>
+
+  <data name="IDS_EXIT_GAME">
 		<value>Exit Game</value>
 	</data>	
 
@@ -5732,9 +5832,17 @@ Can also be used for low-level lighting.</value>
 
 	<data name="IDS_CORRUPT_OR_DAMAGED_SAVE_TEXT">
 		<value>This save is corrupt or damaged. Would you like to delete it?</value>
-	</data>	
+	</data>
 
-	<data name="IDS_CONFIRM_EXIT_GAME_CONFIRM_DISCONNECT_SAVE">
+  <data name="IDS_CORRUPT_OPTIONS_RETRY">
+    <value>Str1k3r: Placeholder</value>
+  </data>
+
+  <data name="IDS_CORRUPT_OPTIONS_DELETE">
+    <value>Str1k3r: Placeholder</value>
+  </data>
+
+  <data name="IDS_CONFIRM_EXIT_GAME_CONFIRM_DISCONNECT_SAVE">
 		<value>Are you sure you want to exit to the main menu and disconnect all players from the game? Any unsaved progress will be lost.</value>
 	</data>	
 
@@ -5744,9 +5852,13 @@ Can also be used for low-level lighting.</value>
 
 	<data name="IDS_EXIT_GAME_NO_SAVE">
 		<value>Exit without saving</value>
-	</data>	
+	</data>
 
-	<data name="IDS_CONFIRM_EXIT_GAME_PROGRESS_LOST">
+  <data name="IDS_CONFIRM_EXIT_GAME">
+    <value>Are you sure you want to exit to the main menu? Any unsaved progress will be lost.</value>
+  </data>
+
+  <data name="IDS_CONFIRM_EXIT_GAME_PROGRESS_LOST">
 		<value>Are you sure you want to exit to the main menu? Your progress will be lost!</value>
 	</data>	
 
@@ -6503,9 +6615,13 @@ Would you like to install the mash-up pack or texture pack now?</value>
 
 	<data name="IDS_GAMEMODE_CREATIVE">
 		<value>Game Mode: Creative</value>
-	</data>	
+	</data>
 
-	<data name="IDS_SURVIVAL">
+  <data name="IDS_GAMEMODE_ADVENTURE">
+    <value>Game Mode: Adventure</value>
+  </data>
+
+  <data name="IDS_SURVIVAL">
 		<value>Survival</value>
 	</data>	
 
@@ -6517,6 +6633,10 @@ Would you like to install the mash-up pack or texture pack now?</value>
     <value>Adventure</value>
   </data>
 
+  <data name="IDS_ADVENTURE">
+    <value>Adventure</value>
+  </data>
+
   <data name="IDS_CREATED_IN_SURVIVAL">
 		<value>Created in Survival Mode</value>
 	</data>	
@@ -6555,9 +6675,13 @@ Would you like to install the mash-up pack or texture pack now?</value>
 
 	<data name="IDS_LEVELTYPE_SUPERFLAT">
 		<value>Superflat</value>
-	</data>	
+	</data>
 
-	<data name="IDS_GAMEOPTION_ONLINE">
+  <data name="IDS_GAMEOPTION_SEED">
+    <value>Enter a seed to generate the same terrain again. Leave blank for a random world.</value>
+  </data>
+
+  <data name="IDS_GAMEOPTION_ONLINE">
 		<value>When enabled, the game will be an online game.</value>
 	</data>	
 
@@ -6575,13 +6699,29 @@ Would you like to install the mash-up pack or texture pack now?</value>
 
 	<data name="IDS_GAMEOPTION_TRUST">
 		<value>When disabled, players joining the game cannot build or mine until authorised.</value>
-	</data>	
+	</data>
 
-	<data name="IDS_GAMEOPTION_FIRE_SPREADS">
+  <data name="IDS_INCREASE_WORLD_SIZE">
+    <value>Increase World Size</value>
+  </data>
+
+  <data name="IDS_INCREASE_WORLD_SIZE_OVERWRITE_EDGES">
+    <value>Overwrite World Edges</value>
+  </data>
+
+  <data name="IDS_GAMEOPTION_FIRE_SPREADS">
 		<value>When enabled, fire may spread to nearby flammable blocks.</value>
-	</data>	
+	</data>
 
-	<data name="IDS_GAMEOPTION_TNT_EXPLODES">
+  <data name="IDS_GAMEOPTION_INCREASE_WORLD_SIZE">
+    <value>Select a larger world size to increase the amount of the world that you can explore. Larger worlds cannot be made smaller again.</value>
+  </data>
+
+  <data name="IDS_GAMEOPTION_INCREASE_WORLD_SIZE_OVERWRITE_EDGES">
+    <value>When enabled, the outer 32 tiles around the world edge will be overwritten by newly generated tiles to make the world size increase seamless. When disabled, the world size increase will leave all original tiles intact.</value>
+  </data>
+
+  <data name="IDS_GAMEOPTION_TNT_EXPLODES">
 		<value>When enabled, TNT will explode when activated.</value>
 	</data>	
 
@@ -7110,9 +7250,13 @@ Would you like to install the mash-up pack or texture pack now?</value>
 
 	<data name="IDS_MAX_CHICKENS_BRED">
 		<value>This animal can't enter Love Mode. The maximum number of breeding Chickens has been reached.</value>
-	</data>	
+	</data>
 
-	<data name="IDS_MAX_MUSHROOMCOWS_BRED">
+  <data name="IDS_MAX_HORSES_BRED">
+    <value>This animal can't enter Love Mode. The maximum number of breeding horses has been reached.</value>
+  </data>
+
+  <data name="IDS_MAX_MUSHROOMCOWS_BRED">
 		<value>This animal can't enter Love Mode. The maximum number of breeding Mooshrooms has been reached.</value>
 	</data>	
 
@@ -7162,7 +7306,11 @@ Would you like to install the mash-up pack or texture pack now?</value>
 
 	<data name="IDS_CREDITS">
 		<value>Credits</value>
-	</data>	
+	</data>
+
+  <data name="IDS_LANGUAGE_SELECTOR">
+    <value>Languages</value>
+  </data>
 
 	<data name="IDS_REINSTALL_CONTENT">
 		<value>Reinstall Content</value>
@@ -7566,9 +7714,25 @@ Would you like to install the mash-up pack or texture pack now?</value>
 
 	<data name="IDS_POTION_POISON">
 		<value>Poison</value>
-	</data>	
+	</data>
 
-	<data name="IDS_POTION_MOVESPEED_POSTFIX">
+  <data name="IDS_POTION_WITHER">
+    <value>Wither</value>
+  </data>
+
+  <data name="IDS_POTION_HEALTHBOOST">
+    <value>Health Boost</value>
+  </data>
+
+  <data name="IDS_POTION_ABSORPTION">
+    <value>Absorption</value>
+  </data>
+
+  <data name="IDS_POTION_SATURATION">
+    <value>Saturation</value>
+  </data>
+
+  <data name="IDS_POTION_MOVESPEED_POSTFIX">
 		<value>of Swiftness</value>
 	</data>	
 
@@ -7642,9 +7806,25 @@ Would you like to install the mash-up pack or texture pack now?</value>
 
 	<data name="IDS_POTION_POISON_POSTFIX">
 		<value>of Poison</value>
-	</data>	
+	</data>
 
-	<data name="IDS_POTION_POTENCY_0">
+  <data name="IDS_POTION_WITHER_POSTFIX">
+    <value>of Decay</value>
+  </data>
+
+  <data name="IDS_POTION_HEALTHBOOST_POSTFIX">
+    <value>of Health Boost</value>
+  </data>
+
+  <data name="IDS_POTION_ABSORPTION_POSTFIX">
+    <value>of Absorption</value>
+  </data>
+
+  <data name="IDS_POTION_SATURATION_POSTFIX">
+    <value>of Saturation</value>
+  </data>
+
+  <data name="IDS_POTION_POTENCY_0">
 		<value/>
 
 	</data>	
@@ -7837,6 +8017,10 @@ Would you like to install the mash-up pack or texture pack now?</value>
 		<value>Reduces health of the affected players, animals and monsters over time.</value>
 	</data>
 
+  <data name="IDS_POTION_EFFECTS_WHENDRANK">
+    <value>When Applied:</value>
+  </data>
+
   <data name="IDS_ATTRIBUTE_NAME_HORSE_JUMPSTRENGTH">
     <value>Horse Jump Strength</value>
   </data>

Minecraft.Client/OrbisMedia/loc/stringsLanguages.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <data name="IDS_LANG_SYSTEM">
+    <value>System Language</value>
+  </data>
+  <data name="IDS_LANG_ENGLISH">
+    <value>English</value>
+  </data>
+
+  <data name="IDS_LANG_GERMAN">
+    <value>German</value>
+  </data>
+
+  <data name="IDS_LANG_SPANISH">
+    <value>Spanish</value>
+  </data>
+  <data name="IDS_LANG_SPANISH_SPAIN">
+    <value>Spanish (Spain)</value>
+  </data>
+  <data name="IDS_LANG_SPANISH_LATIN_AMERICA">
+    <value>Spanish (Latin America)</value>
+  </data>
+
+  <data name="IDS_LANG_FRENCH">
+    <value>French</value>
+  </data>
+
+  <data name="IDS_LANG_ITALIAN">
+    <value>Italian</value>
+  </data>
+
+  <data name="IDS_LANG_PORTUGUESE">
+    <value>Portuguese</value>
+  </data>
+  <data name="IDS_LANG_PORTUGUESE_PORTUGAL">
+    <value>Portuguese (Portugal)</value>
+  </data>
+  <data name="IDS_LANG_PORTUGUESE_BRAZIL">
+    <value>Portuguese (Brazil)</value>
+  </data>
+
+  <data name="IDS_LANG_JAPANESE">
+    <value>Japanese</value>
+  </data>
+
+  <data name="IDS_LANG_KOREAN">
+    <value>Korean</value>
+  </data>
+
+  <data name="IDS_LANG_CHINESE_TRADITIONAL">
+    <value>Chinese (Traditional)</value>
+  </data>
+  <data name="IDS_LANG_CHINESE_SIMPLIFIED">
+    <value>Chinese (Simplified)</value>
+  </data>
+
+  <data name="IDS_LANG_DANISH">
+    <value>Danish</value>
+  </data>
+  <data name="IDS_LANG_FINISH">
+    <value>Finnish</value>
+  </data>
+
+  <data name="IDS_LANG_DUTCH">
+    <value>Dutch</value>
+  </data>
+
+  <data name="IDS_LANG_POLISH">
+    <value>Polish</value>
+  </data>
+  <data name="IDS_LANG_RUSSIAN">
+    <value>Russian</value>
+  </data>
+  <data name="IDS_LANG_SWEDISH">
+    <value>Swedish</value>
+  </data>
+  <data name="IDS_LANG_NORWEGIAN">
+    <value>Norwegian</value>
+  </data>
+
+  <data name="IDS_LANG_GREEK">
+    <value>Greek</value>
+  </data>
+
+  <data name="IDS_LANG_TURKISH">
+    <value>Turkish</value>
+  </data>
+</root>

Minecraft.Client/OrbisMedia/loc/stringsPlatformSpecific.xml

@@ -270,6 +270,10 @@ If you try to save while using the trial version, you will be given the option t
     <value>Download Failed. Please try again later.</value>
   </data>
 
+  <data name="IDS_SAVE_TRANSFER_WRONG_VERSION">
+    <value>The saved file in the download area has a version number that Minecraft: PlayStation®4 Edition does not yet support.</value>
+  </data>
+
   <data name="IDS_DISCONNECTED_NAT_TYPE_MISMATCH">
     <value>Failed to join the game due to a restrictive NAT type. Please check your network settings.</value>
   </data>