feat: more accurate logo, festive logo & festive DLC

Minecraft.Client/Common/UI/UIScene.cpp

@@ -335,20 +335,20 @@ void UIScene::loadMovie()
 #endif
 			app.FatalLoadError();
 #else
-			app.DebugPrintf("WARNING: Could not find iggy movie %ls, falling back on 480\n", moviePath.c_str());
+			app.DebugPrintf("WARNING: Could not find iggy movie %ls, falling back on Vita\n", moviePath.c_str());
 
 			moviePath = getMoviePath();
-			moviePath.append(L"480.swf");
-			m_loadedResolution = eSceneResolution_480;
+			moviePath.append(L"Vita.swf");
+			m_loadedResolution = eSceneResolution_544;
 
 			//str1k3r - while 480 & Vita share basically all the same skins its just a extra fallback :D
 			if(!app.hasArchiveFile(moviePath))
 			{
-				app.DebugPrintf("WARNING: Could not find iggy movie %ls, falling back on Vita\n", moviePath.c_str());
+				app.DebugPrintf("WARNING: Could not find iggy movie %ls, falling back on 480\n", moviePath.c_str());
 
 				moviePath = getMoviePath();
-				moviePath.append(L"Vita.swf");
-				m_loadedResolution = eSceneResolution_544;
+				moviePath.append(L"480.swf");
+				m_loadedResolution = eSceneResolution_480;
 
 				if(!app.hasArchiveFile(moviePath))
 				{

Minecraft.Client/DLCTexturePack.cpp

@@ -535,18 +535,18 @@ void DLCTexturePack::loadUI()
 			//CXuiSceneBase::GetInstance()->SkinChanged(CXuiSceneBase::GetInstance()->m_hObj);
 		}
 	}
+	else
+	{
+		loadDefaultUI();
+		bUILoaded = true;
+	}
 #else
-	if(m_archiveFile && m_archiveFile->hasFile(L"skin.swf"))
+	if(m_archiveFile)
 	{
 		ui.ReloadSkins();
 		bUILoaded = true;
 	}
 #endif
-	else
-	{		
-		loadDefaultUI();
-		bUILoaded = true;
-	}
 
 	AbstractTexturePack::loadUI();
 #ifndef _XBOX

Minecraft.Client/DefaultTexturePack.cpp

@@ -87,7 +87,7 @@ InputStream *DefaultTexturePack::getResourceImplementation(const wstring &name)/
 	wstring wstr (pchUsrDir, pchUsrDir+strlen(pchUsrDir));
 
 	wDrive = wstr + L"\\Common\\res\\TitleUpdate\\res";
-#elif __PSVITA__
+//#elif __PSVITA__
 
 	/*
 	char *pchUsrDir=getUsrDirPath();
@@ -95,7 +95,7 @@ InputStream *DefaultTexturePack::getResourceImplementation(const wstring &name)/
 	
 	wDrive = wstr + L"Common\\res\\TitleUpdate\\res";
 	*/
-	wDrive = L"Common\\res\\TitleUpdate\\res";
+	//wDrive = L"Common\\res\\TitleUpdate\\res";
 #else
 	wDrive = L"Common\\res\\TitleUpdate\\res";
 

Minecraft.Client/TexturePack.cpp

@@ -57,23 +57,21 @@ wstring TexturePack::getPath(bool bTitleUpdateTexture /*= false*/,const char *pc
 		}			
 	}
 
-#elif __PSVITA__
+/*#elif __PSVITA__
 	char *pchUsrDir="";//getUsrDirPath();
 	wstring wstr (pchUsrDir, pchUsrDir+strlen(pchUsrDir));
 
 	if(bTitleUpdateTexture)
 	{
-		// Make the content package point to to the UPDATE: drive is needed
 		wDrive= wstr + L"Common\\res\\TitleUpdate\\";
 	}
 	else
 	{
 		wDrive= wstr + L"Common\\";
-	}
+	}*/
 #else
 	if(bTitleUpdateTexture)
 	{
-		// Make the content package point to to the UPDATE: drive is needed
 		wDrive=L"Common\\res\\TitleUpdate\\";
 	}
 	else