fix: skin packs not having the correct icons

Minecraft.Client/Common/UI/UIController.cpp

@@ -2169,10 +2169,10 @@ void UIController::unregisterSubstitutionTexture(const wstring &textureName, boo
 bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUILayer layer, EUIGroup group)
 {
 	static bool bSeenUpdateTextThisSession = false;
-	#if 0 // Disable since we don't use this
+	#if 1 // Disable since we don't use this
 	// If you're navigating to the multigamejoinload, and the player hasn't seen the updates message yet, display it now
 	// display this message the first 3 times
-	if((scene==eUIScene_LoadOrJoinMenu) && (bSeenUpdateTextThisSession==false) && ( app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_DisplayUpdateMessage)!=0))
+	if((scene==eUIScene_LoadCreateJoinMenu) && (bSeenUpdateTextThisSession==false) && ( app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_DisplayUpdateMessage)!=0))
 	{
 		scene=eUIScene_NewUpdateMessage;
 		bSeenUpdateTextThisSession=true;

Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp

@@ -1250,10 +1250,34 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
 		}
 	}
 	// register pack image or whatever texture and set it on the BitmapIcon
-	wstring textureName = L"default";
+	// control type is used to determine which default image to use if the pack image is not available
+	int controlType = app.GetGameSettings(m_iPad, eGameSetting_ControlType);
+	wstring controlTypeTextureName = L"default";
+	
+	switch(controlType)
+	{
+	case 2:	// Xbox 360
+		controlTypeTextureName = L"xbox360";
+		break;
+	case 3:	// PS3
+		controlTypeTextureName = L"playStation";
+		break;
+	case 4:	// PS4
+		controlTypeTextureName = L"playStation";
+		break;
+	case 5:	// WiiU
+		controlTypeTextureName = L"wiiU";
+		break;
+	default:
+		controlTypeTextureName = L"default";
+		break;
+	}
+
+	wstring textureName = L"";
 	if(m_currentPack != nullptr)
 	{
 		DWORD packId = m_currentPack->GetPackId();
+		// printf("Pack name: %ls, packId: %d\n", m_currentPack->getName().c_str(), packId);
 		if(packId >= 1)
 		{
 			wchar_t packIdStr[16];
@@ -1261,9 +1285,9 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
 			textureName = packIdStr;
 		}
 	}
-	if(!registerTexture(textureName))
+	if(textureName.empty() || !registerTexture(textureName))
 	{
-		textureName = L"default";
+		textureName = controlTypeTextureName;
 		registerTexture(textureName);
 	}
 	m_controlTexturePackIcon.setTextureName(textureName);

Minecraft.Client/Windows64Media/loc/stringsGeneric.xml

@@ -626,37 +626,39 @@ so they can easily join you.
 	</data>	
 
 	<data name="IDS_HOW_TO_PLAY_WHATSNEW">
-		<value>{*T3*}Changes and Additions{*ETW*}{*B*}{*B*}
-- Added new items - Hardened Clay, Stained Clay, Block of Coal, Hay Bale, Activator Rail, Block of Redstone, Daylight Sensor, Dropper, Hopper, Minecart with Hopper, Minecart with TNT, Redstone Comparator, Weighted Pressure Plate, Beacon, Trapped Chest, Firework Rocket, Firework Star, Nether Star, Lead, Horse Armor, Name Tag, Horse Spawn Egg{*B*}
-- Added new Mobs - Wither, Wither Skeletons, Witches, Bats, Horses, Donkeys and Mules{*B*}
-- Added new terrain generation features - Witch Huts.{*B*}
-- Added Beacon interface.{*B*}
-- Added Horse interface.{*B*}
-- Added Hopper interface.{*B*}
-- Added Fireworks - Fireworks interface is accessible from the Crafting Table when you have the ingredients to craft a Firework Star or Firework Rocket.{*B*}
-- Added 'Adventure Mode' - You can only break blocks with the correct tools.{*B*}
-- Added lots of new sounds.{*B*}
-- Mobs, items and projectiles can now pass through portals.{*B*}
-- Repeaters can now be locked by powering their sides with another Repeater.{*B*}
-- Zombies and Skeletons can now spawn with different weapons and armor.{*B*}
-- New death messages.{*B*}
-- Name mobs with a Name Tag, and rename containers to change the title when the menu is open.{*B*}
-- Bonemeal no longer instantly grows everything to full size, and instead randomly grows in stages.{*B*}
-- A Redstone signal describing the contents of Chests, Brewing Stands, Dispensers and Jukeboxes can be detected by placing a Redstone Comparator directly against them.{*B*}
-- Dispensers can face in any direction.{*B*}
-- Eating a Golden Apple gives the player extra "absorption" health  for a short period.{*B*}
-- The longer you remain in an area the harder the monsters that spawn in that area will be.{*B*}
-</value>
+		<value>
+			{*T3*}Changes and Additions{*ETW*}{*B*}
+			{*T3*}neoLegacy v1.0.9b{*ETW*}{*B*}{*B*}
+			Additions{*B*}
+			- You can now copy and save various worlds on the LoadCreateJoin menu.{*B*}{*B*}
+			- Controller icons and in-game logos are now modifiable via a slider in 'User Interface' menu Changes{*B*}{*B*}
+			- Skin Select menu has been updated in order to achieve parity with TU36+{*B*}{*B*}
+			- Controls menu has been updated.{*B*}{*B*}
+			- Tutorial world has been updated to version TU31.{*B*}{*B*}
+			- Settings menus are now wider to match the ones from TU31{*B*}{*B*}
+			- In-game music now fades when leaving / joining a world.{*B*}{*B*}
+			- World size is now displayed correctly on the worlds-list menu.{*B*}{*B*}
+			- The LoadCreateJoin menu no longer features an infinite spinner object.{*B*}{*B*}
+		</value>
 	</data>	
 
 	<data name="IDS_TITLEUPDATE">
-		<value>{*ETB*}Welcome back! You may not have noticed but your Minecraft has just been updated.{*B*}{*B*}
-There are lots of new features for you and friends to play with so here’s just a few highlights. Have a read and then go and have fun!{*B*}{*B*}
-{*T1*}New Items{*ETB*} - Hardened Clay, Stained Clay, Block of Coal, Hay Bale, Activator Rail, Block of Redstone, Daylight Sensor, Dropper, Hopper, Minecart with Hopper, Minecart with TNT, Redstone Comparator, Weighted Pressure Plate, Beacon, Trapped Chest, Firework Rocket, Firework Star, Nether Star, Lead, Horse Armor, Name Tag, Horse Spawn Egg{*B*}{*B*}
-{*T1*}New Mobs{*ETB*} - Wither, Wither Skeletons, Witches, Bats, Horses, Donkeys and Mules{*B*}{*B*}
-{*T1*}New Features{*ETB*} -  Tame and ride a horse, craft fireworks and put on a show, name animals and monsters with a Name Tag, create more advanced Redstone circuits, and new Host Options to help control what guests to your world can do!{*B*}{*B*}
-{*T1*}New Tutorial World{*ETB*} – Learn how to use the old and new features in the Tutorial World. See if you can find all the secret Music Discs hidden in the world!{*B*}{*B*}
-    </value>
+		<value>
+			Welcome back! You may not have noticed, but your Minecraft has just been updated.
+			{*T3*}neoLegacy v1.0.9b{*ETW*}
+			Additions
+			- You can now copy and save various worlds on the LoadCreateJoin menu.
+			- Controller icons and in-game logos are now modifiable via a slider in 'User Interface' menu.
+			Changes
+			- Skin Select menu has been updated in order to achieve parity with TU36+
+			- Controls menu has been updated.
+			- Tutorial world has been updated to version TU31.
+			- Settings menus are now wider to match the ones from TU31+
+			Bug Fixes
+			- In-game music now fades when leaving / joining a world.
+			- World size is now displayed correctly on the worlds-list menu.
+			- The LoadCreateJoin menu no longer features an infinite spinner object.
+		</value>
 	</data>	
 
 	<data name="IDS_HOW_TO_PLAY_MENU_HORSES">