diff --git a/Minecraft.Client/Common/Media/MediaWindows64.arc b/Minecraft.Client/Common/Media/MediaWindows64.arc index bef6c943..e8701343 100644 Binary files a/Minecraft.Client/Common/Media/MediaWindows64.arc and b/Minecraft.Client/Common/Media/MediaWindows64.arc differ diff --git a/Minecraft.Client/Common/UI/UIScene.cpp b/Minecraft.Client/Common/UI/UIScene.cpp index a5ca2f1e..927dac7a 100644 --- a/Minecraft.Client/Common/UI/UIScene.cpp +++ b/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)) { diff --git a/Minecraft.Client/DLCTexturePack.cpp b/Minecraft.Client/DLCTexturePack.cpp index 2e77ab08..83cd856b 100644 --- a/Minecraft.Client/DLCTexturePack.cpp +++ b/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 diff --git a/Minecraft.Client/DefaultTexturePack.cpp b/Minecraft.Client/DefaultTexturePack.cpp index 78f94172..e9b8661a 100644 --- a/Minecraft.Client/DefaultTexturePack.cpp +++ b/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"; diff --git a/Minecraft.Client/TexturePack.cpp b/Minecraft.Client/TexturePack.cpp index d96f5982..0ea13f50 100644 --- a/Minecraft.Client/TexturePack.cpp +++ b/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 diff --git a/Minecraft.Client/Windows64Media/DLC/Festive/Data/Festive.mcs b/Minecraft.Client/Windows64Media/DLC/Festive/Data/Festive.mcs new file mode 100644 index 00000000..d7d3dc53 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Festive/Data/Festive.mcs differ diff --git a/Minecraft.Client/Windows64Media/DLC/Festive/Data/GameRules.grf b/Minecraft.Client/Windows64Media/DLC/Festive/Data/GameRules.grf new file mode 100644 index 00000000..1a49ac17 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Festive/Data/GameRules.grf differ diff --git a/Minecraft.Client/Windows64Media/DLC/Festive/Data/flake.binka b/Minecraft.Client/Windows64Media/DLC/Festive/Data/flake.binka new file mode 100644 index 00000000..51380837 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Festive/Data/flake.binka differ diff --git a/Minecraft.Client/Windows64Media/DLC/Festive/Data/kyoto.binka b/Minecraft.Client/Windows64Media/DLC/Festive/Data/kyoto.binka new file mode 100644 index 00000000..f08f03db Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Festive/Data/kyoto.binka differ diff --git a/Minecraft.Client/Windows64Media/DLC/Festive/Data/media.arc b/Minecraft.Client/Windows64Media/DLC/Festive/Data/media.arc new file mode 100644 index 00000000..6a3d0334 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Festive/Data/media.arc differ diff --git a/Minecraft.Client/Windows64Media/DLC/Festive/Data/nether3xmas.binka b/Minecraft.Client/Windows64Media/DLC/Festive/Data/nether3xmas.binka new file mode 100644 index 00000000..de29fcfe Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Festive/Data/nether3xmas.binka differ diff --git a/Minecraft.Client/Windows64Media/DLC/Festive/Data/nether4xmas.binka b/Minecraft.Client/Windows64Media/DLC/Festive/Data/nether4xmas.binka new file mode 100644 index 00000000..14b7fa3e Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Festive/Data/nether4xmas.binka differ diff --git a/Minecraft.Client/Windows64Media/DLC/Festive/Data/x16Data.pck b/Minecraft.Client/Windows64Media/DLC/Festive/Data/x16Data.pck new file mode 100644 index 00000000..df5b8c5f Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Festive/Data/x16Data.pck differ diff --git a/Minecraft.Client/Windows64Media/DLC/Festive/Data/xmas_the end.binka b/Minecraft.Client/Windows64Media/DLC/Festive/Data/xmas_the end.binka new file mode 100644 index 00000000..224e9a1f Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Festive/Data/xmas_the end.binka differ diff --git a/Minecraft.Client/Windows64Media/DLC/Festive/TexturePack.pck b/Minecraft.Client/Windows64Media/DLC/Festive/TexturePack.pck new file mode 100644 index 00000000..5f1aebc3 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Festive/TexturePack.pck differ diff --git a/Minecraft.Client/Windows64Media/Media/Logo/Cafeberry1080p.png b/Minecraft.Client/Windows64Media/Media/Logo/Cafeberry1080p.png new file mode 100644 index 00000000..51786ecf Binary files /dev/null and b/Minecraft.Client/Windows64Media/Media/Logo/Cafeberry1080p.png differ diff --git a/Minecraft.Client/Windows64Media/Media/Logo/Cafeberry480p.png b/Minecraft.Client/Windows64Media/Media/Logo/Cafeberry480p.png new file mode 100644 index 00000000..3cf59ce8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/Media/Logo/Cafeberry480p.png differ diff --git a/Minecraft.Client/Windows64Media/Media/Logo/Cafeberry544p.png b/Minecraft.Client/Windows64Media/Media/Logo/Cafeberry544p.png new file mode 100644 index 00000000..3cf59ce8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/Media/Logo/Cafeberry544p.png differ diff --git a/Minecraft.Client/Windows64Media/Media/Logo/Cafeberry720p.png b/Minecraft.Client/Windows64Media/Media/Logo/Cafeberry720p.png new file mode 100644 index 00000000..707083ef Binary files /dev/null and b/Minecraft.Client/Windows64Media/Media/Logo/Cafeberry720p.png differ diff --git a/Minecraft.Client/Windows64Media/Media/Logo/Festive/Festive1080p.png b/Minecraft.Client/Windows64Media/Media/Logo/Festive/Festive1080p.png new file mode 100644 index 00000000..a01a6677 Binary files /dev/null and b/Minecraft.Client/Windows64Media/Media/Logo/Festive/Festive1080p.png differ diff --git a/Minecraft.Client/Windows64Media/Media/Logo/Festive/Festive480p.png b/Minecraft.Client/Windows64Media/Media/Logo/Festive/Festive480p.png new file mode 100644 index 00000000..1da4c88b Binary files /dev/null and b/Minecraft.Client/Windows64Media/Media/Logo/Festive/Festive480p.png differ diff --git a/Minecraft.Client/Windows64Media/Media/Logo/Festive/Festive544p.png b/Minecraft.Client/Windows64Media/Media/Logo/Festive/Festive544p.png new file mode 100644 index 00000000..1da4c88b Binary files /dev/null and b/Minecraft.Client/Windows64Media/Media/Logo/Festive/Festive544p.png differ diff --git a/Minecraft.Client/Windows64Media/Media/Logo/Festive/Festive720p.png b/Minecraft.Client/Windows64Media/Media/Logo/Festive/Festive720p.png new file mode 100644 index 00000000..91da0192 Binary files /dev/null and b/Minecraft.Client/Windows64Media/Media/Logo/Festive/Festive720p.png differ