diff --git a/Minecraft.Client/Common/DLC/DLCAudioFile.cpp b/Minecraft.Client/Common/DLC/DLCAudioFile.cpp index cbf4008c..f8f7e4ce 100644 --- a/Minecraft.Client/Common/DLC/DLCAudioFile.cpp +++ b/Minecraft.Client/Common/DLC/DLCAudioFile.cpp @@ -110,15 +110,38 @@ void DLCAudioFile::addParameter(EAudioType type, EAudioParameterType ptype, cons bool DLCAudioFile::processDLCDataFile(PBYTE pbData, DWORD dwLength) { + if(pbData == nullptr || dwLength < sizeof(unsigned int)) + { + app.DebugPrintf("DLCAudioFile::processDLCDataFile: invalid data\n"); + return false; + } + unordered_map parameterMapping; unsigned int uiCurrentByte=0; // File format defined in the AudioPacker // File format: Version 1 - unsigned int uiVersion=*(unsigned int *)pbData; + unsigned int uiVersion=DLCManager::readUInt32(pbData, false); uiCurrentByte+=sizeof(int); + bool bSwapEndian = false; + unsigned int uiVersionSwapped = DLCManager::SwapInt32(uiVersion); + if(uiVersion >= 0 && uiVersion <= CURRENT_AUDIO_VERSION_NUM) + { + bSwapEndian = false; + } + else if(uiVersionSwapped >= 0 && uiVersionSwapped <= CURRENT_AUDIO_VERSION_NUM) + { + bSwapEndian = true; + } + else + { + if(pbData!=nullptr) delete [] pbData; + app.DebugPrintf("Unknown audio version %d\n", uiVersion); + return false; + } + if(uiVersion < CURRENT_AUDIO_VERSION_NUM) { if(pbData!=nullptr) delete [] pbData; @@ -126,14 +149,21 @@ bool DLCAudioFile::processDLCDataFile(PBYTE pbData, DWORD dwLength) return false; } - unsigned int uiParameterTypeCount=*(unsigned int *)&pbData[uiCurrentByte]; + unsigned int uiParameterTypeCount=DLCManager::readUInt32(&pbData[uiCurrentByte], bSwapEndian); uiCurrentByte+=sizeof(int); C4JStorage::DLC_FILE_PARAM *pParams = (C4JStorage::DLC_FILE_PARAM *)&pbData[uiCurrentByte]; for(unsigned int i=0;idwType = bSwapEndian ? DLCManager::SwapInt32(pParams->dwType) : pParams->dwType; + pParams->dwWchCount = bSwapEndian ? DLCManager::SwapInt32(pParams->dwWchCount) : pParams->dwWchCount; + char16_t* wchData = reinterpret_cast(pParams->wchData); + if (bSwapEndian) { + DLCManager::SwapUTF16Bytes(wchData, pParams->dwWchCount); + } + // Map DLC strings to application strings, then store the DLC index mapping to application index - wstring parameterName(static_cast(pParams->wchData)); + wstring parameterName(reinterpret_cast(pParams->wchData), pParams->dwWchCount); EAudioParameterType type = getParameterType(parameterName); if( type != e_AudioParamType_Invalid ) { @@ -142,13 +172,14 @@ bool DLCAudioFile::processDLCDataFile(PBYTE pbData, DWORD dwLength) uiCurrentByte+= sizeof(C4JStorage::DLC_FILE_PARAM)+(pParams->dwWchCount*sizeof(WCHAR)); pParams = (C4JStorage::DLC_FILE_PARAM *)&pbData[uiCurrentByte]; } - unsigned int uiFileCount=*(unsigned int *)&pbData[uiCurrentByte]; + unsigned int uiFileCount=DLCManager::readUInt32(&pbData[uiCurrentByte], bSwapEndian); uiCurrentByte+=sizeof(int); C4JStorage::DLC_FILE_DETAILS *pFile = (C4JStorage::DLC_FILE_DETAILS *)&pbData[uiCurrentByte]; DWORD dwTemp=uiCurrentByte; for(unsigned int i=0;idwWchCount = bSwapEndian ? DLCManager::SwapInt32(pFile->dwWchCount) : pFile->dwWchCount; dwTemp+=sizeof(C4JStorage::DLC_FILE_DETAILS)+pFile->dwWchCount*sizeof(WCHAR); pFile = (C4JStorage::DLC_FILE_DETAILS *)&pbData[dwTemp]; } @@ -157,6 +188,13 @@ bool DLCAudioFile::processDLCDataFile(PBYTE pbData, DWORD dwLength) for(unsigned int i=0;idwType = bSwapEndian ? DLCManager::SwapInt32(pFile->dwType) : pFile->dwType; + pFile->uiFileSize = bSwapEndian ? DLCManager::SwapInt32(pFile->uiFileSize) : pFile->uiFileSize; + char16_t* wchFile = reinterpret_cast(pFile->wchFile); + if (bSwapEndian) { + DLCManager::SwapUTF16Bytes(wchFile, pFile->dwWchCount); + } + EAudioType type = static_cast(pFile->dwType); //Bounds Checking @@ -167,11 +205,18 @@ bool DLCAudioFile::processDLCDataFile(PBYTE pbData, DWORD dwLength) continue; } // Params - unsigned int uiParameterCount=*(unsigned int *)pbTemp; + unsigned int uiParameterCount=DLCManager::readUInt32(pbTemp, bSwapEndian); pbTemp+=sizeof(int); pParams = (C4JStorage::DLC_FILE_PARAM *)pbTemp; for(unsigned int j=0;jdwType = bSwapEndian ? DLCManager::SwapInt32(pParams->dwType) : pParams->dwType; + pParams->dwWchCount = bSwapEndian ? DLCManager::SwapInt32(pParams->dwWchCount) : pParams->dwWchCount; + char16_t* wchData = reinterpret_cast(pParams->wchData); + if (bSwapEndian) { + DLCManager::SwapUTF16Bytes(wchData, pParams->dwWchCount); + } + //EAudioParameterType paramType = e_AudioParamType_Invalid; auto it = parameterMapping.find(pParams->dwType); diff --git a/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/xbox360.swf b/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/xbox360.swf index 9389645d..eed9a1e2 100644 Binary files a/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/xbox360.swf and b/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/xbox360.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/HelpAndOptionsMenu480.swf b/Minecraft.Client/Common/Media/MediaWindows64/HelpAndOptionsMenu480.swf deleted file mode 100644 index 26df9a49..00000000 Binary files a/Minecraft.Client/Common/Media/MediaWindows64/HelpAndOptionsMenu480.swf and /dev/null differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/HelpAndOptionsMenu720.swf b/Minecraft.Client/Common/Media/MediaWindows64/HelpAndOptionsMenu720.swf deleted file mode 100644 index cdd6849f..00000000 Binary files a/Minecraft.Client/Common/Media/MediaWindows64/HelpAndOptionsMenu720.swf and /dev/null differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/HelpAndOptionsMenuSplit720.swf b/Minecraft.Client/Common/Media/MediaWindows64/HelpAndOptionsMenuSplit720.swf deleted file mode 100644 index be8993c6..00000000 Binary files a/Minecraft.Client/Common/Media/MediaWindows64/HelpAndOptionsMenuSplit720.swf and /dev/null differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/HelpAndOptionsMenuVita.swf b/Minecraft.Client/Common/Media/MediaWindows64/HelpAndOptionsMenuVita.swf deleted file mode 100644 index 6027b19b..00000000 Binary files a/Minecraft.Client/Common/Media/MediaWindows64/HelpAndOptionsMenuVita.swf and /dev/null differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsAudioMenu720.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsAudioMenu720.swf new file mode 100644 index 00000000..7e731522 Binary files /dev/null and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsAudioMenu720.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsAudioMenuSplit720.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsAudioMenuSplit720.swf new file mode 100644 index 00000000..99d2251b Binary files /dev/null and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsAudioMenuSplit720.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsGraphicsMenu720.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsGraphicsMenu720.swf new file mode 100644 index 00000000..39fc0dd4 Binary files /dev/null and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsGraphicsMenu720.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsGraphicsMenuSplit720.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsGraphicsMenuSplit720.swf new file mode 100644 index 00000000..0b3713ae Binary files /dev/null and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsGraphicsMenuSplit720.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsMenu720.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsMenu720.swf new file mode 100644 index 00000000..626b1d0c Binary files /dev/null and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsMenu720.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsMenuSplit720.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsMenuSplit720.swf new file mode 100644 index 00000000..35998343 Binary files /dev/null and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsMenuSplit720.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsOptionsMenu720.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsOptionsMenu720.swf new file mode 100644 index 00000000..dfefaf46 Binary files /dev/null and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsOptionsMenu720.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsOptionsMenuSplit720.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsOptionsMenuSplit720.swf new file mode 100644 index 00000000..cfceefcf Binary files /dev/null and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsOptionsMenuSplit720.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsUIMenu720.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsUIMenu720.swf new file mode 100644 index 00000000..78b8aa2c Binary files /dev/null and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsUIMenu720.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsUIMenuSplit720.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsUIMenuSplit720.swf new file mode 100644 index 00000000..055f36e8 Binary files /dev/null and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsUIMenuSplit720.swf differ diff --git a/Minecraft.Client/Common/UI/IUIScene_StartGame.cpp b/Minecraft.Client/Common/UI/IUIScene_StartGame.cpp index 070030b9..325082cb 100644 --- a/Minecraft.Client/Common/UI/IUIScene_StartGame.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_StartGame.cpp @@ -177,8 +177,17 @@ void IUIScene_StartGame::UpdateTexturePackDescription(int index) } else { - m_labelTexturePackName.setLabel(tp->getName()); - m_labelTexturePackDescription.setLabel(tp->getDesc1()); + + if (tp->getId() != 1034) { + m_labelTexturePackName.setLabel(tp->getName()); + m_labelTexturePackDescription.setLabel(tp->getDesc1()); + } + else + { + // fireblade: temporarily hardcoded until someone figures out how to read big endian dlc string tables + m_labelTexturePackName.setLabel(L"Super Mario"); + m_labelTexturePackDescription.setLabel(L"Super Mario meets Minecraft! This Mash-Up Pack contains a Super Mario style Texture Pack, Skin Pack, and a Super Mario themed world to explore!"); + } DWORD dwImageBytes; PBYTE pbImageData = tp->getPackIcon(dwImageBytes); diff --git a/Minecraft.Client/Common/UI/UIComponent_Logo.cpp b/Minecraft.Client/Common/UI/UIComponent_Logo.cpp index 2f5c82bd..322d1397 100644 --- a/Minecraft.Client/Common/UI/UIComponent_Logo.cpp +++ b/Minecraft.Client/Common/UI/UIComponent_Logo.cpp @@ -2,12 +2,46 @@ #include "UI.h" #include "UIComponent_Logo.h" -UIComponent_Logo::UIComponent_Logo(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) +UIComponent_Logo::UIComponent_Logo(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer), m_bFullscreenProgressLogoRefreshed(false) { // Setup all the Iggy references we need for this scene initialiseMovie(); } +bool UIComponent_Logo::needsReloaded() +{ + if(!hasMovie()) + { + return true; + } + + UIScene *topScene = ui.GetTopScene(m_iPad); + const bool isSettingsMenuActive = topScene && topScene->getSceneType() == eUIScene_SettingsUIMenu; + if(isSettingsMenuActive) + { + return false; + } + + const bool isFullscreenProgressActive = topScene && topScene->getSceneType() == eUIScene_FullscreenProgress; + if(isFullscreenProgressActive && !m_bFullscreenProgressLogoRefreshed) + { + m_bFullscreenProgressLogoRefreshed = true; + return true; + } + if(!isFullscreenProgressActive) + { + m_bFullscreenProgressLogoRefreshed = false; + } + + const bool shouldUse1080 = UIScene::SceneShouldUse1080p(getMoviePath()); + if(shouldUse1080 && m_loadedResolution != eSceneResolution_1080) + return true; + if(!shouldUse1080 && m_loadedResolution == eSceneResolution_1080) + return true; + + return false; +} + wstring UIComponent_Logo::getMoviePath() { switch( m_parentLayer->getViewport() ) diff --git a/Minecraft.Client/Common/UI/UIComponent_Logo.h b/Minecraft.Client/Common/UI/UIComponent_Logo.h index 1a8cf819..bf9b95cf 100644 --- a/Minecraft.Client/Common/UI/UIComponent_Logo.h +++ b/Minecraft.Client/Common/UI/UIComponent_Logo.h @@ -10,6 +10,10 @@ public: protected: // TODO: This should be pure virtual in this class virtual wstring getMoviePath(); + virtual bool needsReloaded(); + +private: + bool m_bFullscreenProgressLogoRefreshed; public: virtual EUIScene getSceneType() { return eUIComponent_Logo;} diff --git a/Minecraft.Client/Common/UI/UIGroup.cpp b/Minecraft.Client/Common/UI/UIGroup.cpp index baccc17f..98f34e30 100644 --- a/Minecraft.Client/Common/UI/UIGroup.cpp +++ b/Minecraft.Client/Common/UI/UIGroup.cpp @@ -56,7 +56,7 @@ void UIGroup::DestroyAll() } } -void UIGroup::ReloadAll() +void UIGroup::ReloadAll(bool force, UIScene *skipScene) { // We only need to reload things when they are likely to be rendered int highestRenderable = 0; @@ -67,7 +67,7 @@ void UIGroup::ReloadAll() if(highestRenderable < eUILayer_Fullscreen) highestRenderable = eUILayer_Fullscreen; for(; highestRenderable >= 0; --highestRenderable) { - if(highestRenderable < eUILayer_COUNT) m_layers[highestRenderable]->ReloadAll(highestRenderable != static_cast(eUILayer_Fullscreen)); + if(highestRenderable < eUILayer_COUNT) m_layers[highestRenderable]->ReloadAll(force && highestRenderable != static_cast(eUILayer_Fullscreen), skipScene); } } diff --git a/Minecraft.Client/Common/UI/UIGroup.h b/Minecraft.Client/Common/UI/UIGroup.h index 403a32ae..6c5aaad2 100644 --- a/Minecraft.Client/Common/UI/UIGroup.h +++ b/Minecraft.Client/Common/UI/UIGroup.h @@ -44,7 +44,7 @@ public: UIComponent_PressStartToPlay *getPressStartToPlay() { return m_pressStartToPlay; } void DestroyAll(); - void ReloadAll(); + void ReloadAll(bool force = false, UIScene *skipScene = nullptr); void tick(); void render(); diff --git a/Minecraft.Client/Common/UI/UILayer.cpp b/Minecraft.Client/Common/UI/UILayer.cpp index 2c10f87c..ac7a9da9 100644 --- a/Minecraft.Client/Common/UI/UILayer.cpp +++ b/Minecraft.Client/Common/UI/UILayer.cpp @@ -178,17 +178,23 @@ void UILayer::DestroyAll() } } -void UILayer::ReloadAll(bool force) +void UILayer::ReloadAll(bool force, UIScene *skipScene) { for(auto& it : m_components) { - it->reloadMovie(force); + if(it != skipScene) + { + it->reloadMovie(force); + } } if(!m_sceneStack.empty()) { for(auto& lowestRenderable : m_sceneStack) { - lowestRenderable->reloadMovie(force); + if(lowestRenderable != skipScene) + { + lowestRenderable->reloadMovie(force); + } } } } diff --git a/Minecraft.Client/Common/UI/UILayer.h b/Minecraft.Client/Common/UI/UILayer.h index 7f1a0bf5..ace5fe9f 100644 --- a/Minecraft.Client/Common/UI/UILayer.h +++ b/Minecraft.Client/Common/UI/UILayer.h @@ -40,7 +40,7 @@ public: void getRenderDimensions(S32 &width, S32 &height); void DestroyAll(); - void ReloadAll(bool force = false); + void ReloadAll(bool force = false, UIScene *skipScene = nullptr); // NAVIGATION bool NavigateToScene(int iPad, EUIScene scene, void *initData); diff --git a/Minecraft.Client/Common/UI/UIScene.cpp b/Minecraft.Client/Common/UI/UIScene.cpp index 49cf9c19..14d4b5f5 100644 --- a/Minecraft.Client/Common/UI/UIScene.cpp +++ b/Minecraft.Client/Common/UI/UIScene.cpp @@ -2,6 +2,8 @@ #include "UI.h" #include "UIScene.h" #include "UISplitScreenHelpers.h" +#include "TexturePackRepository.h" +#include "UILayer.h" #include "../../Lighting.h" #include "../../LocalPlayer.h" @@ -9,6 +11,37 @@ #include "../../../Minecraft.World/net.minecraft.world.item.h" #include "UIScene_BookAndQuillMenu.h" +bool UIScene::SceneShouldUse1080p(const std::wstring &moviePath) +{ +#if defined(_WINDOWS64) + int primaryPad = ProfileManager.GetPrimaryPad(); + if(primaryPad < 0 || primaryPad >= XUSER_MAX_COUNT) + primaryPad = 0; + const int controlType = app.GetGameSettings(primaryPad, eGameSetting_ControlType); + const bool force720ForControlType = (controlType == 3 || controlType == 5); + const bool isTutorialPopupMovie = (moviePath.find(L"TutorialPopup") == 0); + + // dont refresh gui elements when the player + // is in the settings menu [resolution mismatch creates artifacts] + if(moviePath.find(L"SettingsUIMenu") == 0) + { + return (ui.getScreenHeight() > 720.0f) && (!force720ForControlType || isTutorialPopupMovie); + } + + Minecraft *pMinecraft = Minecraft::GetInstance(); + TexturePack *selectedPack = nullptr; + if(pMinecraft && pMinecraft->skins) + { + selectedPack = pMinecraft->skins->getSelected(); + } + const bool isMarioWorld = (selectedPack && selectedPack->getId() == 1034); + return !isMarioWorld && (ui.getScreenHeight() > 720.0f) && (!force720ForControlType || isTutorialPopupMovie); +#else + (void)moviePath; + return true; +#endif +} + UIScene::UIScene(int iPad, UILayer *parentLayer) { m_parentLayer = parentLayer; @@ -35,6 +68,7 @@ UIScene::UIScene(int iPad, UILayer *parentLayer) m_needsCacheRendered = true; m_expectedCachedSlotCount = 0; m_callbackUniqueId = 0; + m_bWasMarioWorld = false; } UIScene::~UIScene() @@ -131,7 +165,26 @@ void UIScene::reloadMovie(bool force) bool UIScene::needsReloaded() { - return !swf && (!stealsFocus() || bHasFocus); + if(!swf) + { + return !stealsFocus() || bHasFocus; + } + + if(!stealsFocus() || bHasFocus) + { + const wstring moviePath = getMoviePath(); + UIScene *topScene = ui.GetTopScene(m_iPad); + const bool isSettingsMenuActive = topScene && topScene->getSceneType() == eUIScene_SettingsUIMenu; + if(isSettingsMenuActive) return false; + + const bool shouldUse1080 = SceneShouldUse1080p(moviePath); + if(shouldUse1080 && m_loadedResolution != eSceneResolution_1080) + return true; + if(!shouldUse1080 && m_loadedResolution == eSceneResolution_1080) + return true; + } + + return false; } bool UIScene::hasMovie() @@ -330,7 +383,16 @@ void UIScene::loadMovie() // tutorial popups + HUD elements have inaccuracies + crashes that we need to fix here const bool isTutorialPopupMovie = (moviePath.find(L"TutorialPopup") == 0); const bool isHUDMovie = (moviePath.find(L"HUD") == 0); - const bool use1080 = (ui.getScreenHeight() > 720.0f) && (!force720ForControlType || isTutorialPopupMovie); + Minecraft *pMinecraft = Minecraft::GetInstance(); + TexturePack *selectedPack = nullptr; + if(pMinecraft && pMinecraft->skins) + { + selectedPack = pMinecraft->skins->getSelected(); + // printf("Selected texture pack: %ls\n", selectedPack ? selectedPack->getName().c_str() : L"None"); + } + const bool isMarioWorld = (selectedPack && selectedPack->getId() == 1034); + bool use1080 = SceneShouldUse1080p(moviePath); + m_bWasMarioWorld = isMarioWorld; if(use1080) { moviePath.append(L"1080.swf"); @@ -514,6 +576,11 @@ void UIScene::PrintTotalMemoryUsage(int64_t &totalStatic, int64_t &totalDynamic) void UIScene::tick() { if(m_bIsReloading) return; + if(needsReloaded()) + { + reloadMovie(); + return; + } if(m_hasTickedOnce) m_bCanHandleInput = true; while(IggyPlayerReadyToTick( swf )) { diff --git a/Minecraft.Client/Common/UI/UIScene.h b/Minecraft.Client/Common/UI/UIScene.h index 59502a5b..4863bbdc 100644 --- a/Minecraft.Client/Common/UI/UIScene.h +++ b/Minecraft.Client/Common/UI/UIScene.h @@ -94,6 +94,7 @@ protected: int m_movieWidth, m_movieHeight; int m_renderWidth, m_renderHeight; vector m_controls; + bool m_bWasMarioWorld; protected: UILayer *m_parentLayer; @@ -110,6 +111,8 @@ public: virtual bool hasMovie(); virtual void updateSafeZone(); + static bool SceneShouldUse1080p(const std::wstring &moviePath); + int getRenderWidth() { return m_renderWidth; } int getRenderHeight() { return m_renderHeight; } diff --git a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp index f8e10a4e..bf04d9e0 100644 --- a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp +++ b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp @@ -108,6 +108,30 @@ void UIScene_FullscreenProgress::handleDestroy() } } +bool UIScene_FullscreenProgress::needsReloaded() +{ + if(!hasMovie()) return true; + + UIScene *topScene = ui.GetTopScene(m_iPad); + const bool isSettingsMenuActive = topScene && topScene->getSceneType() == eUIScene_SettingsUIMenu; + if(isSettingsMenuActive) + { + return false; + } + + // refresh when resolution is updated due to dlc world behavior + const bool shouldUse1080 = UIScene::SceneShouldUse1080p(getMoviePath()); + if(shouldUse1080 && m_loadedResolution != eSceneResolution_1080) + { + return true; + } + if(!shouldUse1080 && m_loadedResolution == eSceneResolution_1080) + { + return true; + } + return false; +} + void UIScene_FullscreenProgress::tick() { UIScene::tick(); diff --git a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.h b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.h index aeb428c3..9d581fe1 100644 --- a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.h +++ b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.h @@ -47,6 +47,7 @@ public: virtual EUIScene getSceneType() { return eUIScene_FullscreenProgress;} virtual void updateTooltips(); virtual void handleDestroy(); + virtual bool needsReloaded(); void tick(); diff --git a/Minecraft.Client/StringTable.cpp b/Minecraft.Client/StringTable.cpp index 14a73c7b..2b4d0071 100644 --- a/Minecraft.Client/StringTable.cpp +++ b/Minecraft.Client/StringTable.cpp @@ -470,8 +470,23 @@ LPCWSTR StringTable::getString(const wstring &id) } else { - m_missingKeyFallback = id; - return m_missingKeyFallback.c_str(); + // fireblade: temporarily hardcoded until someone figures out how to read big endian dlc string tables + if (id == L"IDS_MARIO_NAME") + { + return L"Super Mario World"; + } + else if (id == L"IDS_MARSHRT_NAME") { + return L"Super Mario"; + } + else if (id == L"IDS_MASV_NAME") { + return L"Super Mario Save"; + } + else + { + m_missingKeyFallback = id; + printf("StringTable::getString() - Missing key '%ls'\n", id.c_str()); + return m_missingKeyFallback.c_str(); + } } } diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/GameRules.grf b/Minecraft.Client/Windows64Media/DLC/Mario/Data/GameRules.grf new file mode 100644 index 00000000..baa211fe Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/GameRules.grf differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_Castle.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_Castle.ogg new file mode 100644 index 00000000..44b0c91a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_Castle.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_CaveDungeon.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_CaveDungeon.ogg new file mode 100644 index 00000000..2cc67745 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_CaveDungeon.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_FileSelect.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_FileSelect.ogg new file mode 100644 index 00000000..6b8ec056 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_FileSelect.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_FireBubble.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_FireBubble.ogg new file mode 100644 index 00000000..b24292b4 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_FireBubble.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_HauntedHouse.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_HauntedHouse.ogg new file mode 100644 index 00000000..0f1e83ec Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_HauntedHouse.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_KoopaRoad.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_KoopaRoad.ogg new file mode 100644 index 00000000..85b81e62 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_KoopaRoad.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_KoopaTheme.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_KoopaTheme.ogg new file mode 100644 index 00000000..253ba112 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_KoopaTheme.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_MainTheme.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_MainTheme.ogg new file mode 100644 index 00000000..ac96cac7 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_MainTheme.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_MerryGoRound.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_MerryGoRound.ogg new file mode 100644 index 00000000..bf6f3f53 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_MerryGoRound.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_MetallicMario.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_MetallicMario.ogg new file mode 100644 index 00000000..c42a4e59 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_MetallicMario.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_PakkunFlowersLullaby.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_PakkunFlowersLullaby.ogg new file mode 100644 index 00000000..563d5ec9 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_PakkunFlowersLullaby.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_PowerfulMario.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_PowerfulMario.ogg new file mode 100644 index 00000000..226d6168 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_PowerfulMario.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_Slider.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_Slider.ogg new file mode 100644 index 00000000..28f75b7a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_Slider.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_SnowMountain.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_SnowMountain.ogg new file mode 100644 index 00000000..ea86309b Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_SnowMountain.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_StageBoss.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_StageBoss.ogg new file mode 100644 index 00000000..68977b36 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_StageBoss.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_Title.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_Title.ogg new file mode 100644 index 00000000..05cc8ccd Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_Title.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_UltimateKoopa.ogg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_UltimateKoopa.ogg new file mode 100644 index 00000000..9fdc757c Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/Mario64_UltimateKoopa.ogg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/SuperMario.mcs b/Minecraft.Client/Windows64Media/DLC/Mario/Data/SuperMario.mcs new file mode 100644 index 00000000..7f2a7193 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/SuperMario.mcs differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/Graphics/GameModeGraphics/Alive.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/Graphics/GameModeGraphics/Alive.png new file mode 100644 index 00000000..964ae777 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/Graphics/GameModeGraphics/Alive.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/Graphics/GameModeGraphics/Dead.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/Graphics/GameModeGraphics/Dead.png new file mode 100644 index 00000000..54f24e60 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/Graphics/GameModeGraphics/Dead.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/HTMLColours.col b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/HTMLColours.col new file mode 100644 index 00000000..e1bb357b Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/HTMLColours.col differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinGraphics.swf b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinGraphics.swf new file mode 100644 index 00000000..f122a799 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinGraphics.swf differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinGraphicsHud.swf b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinGraphicsHud.swf new file mode 100644 index 00000000..fac835d3 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinGraphicsHud.swf differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinGraphicsInGame.swf b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinGraphicsInGame.swf new file mode 100644 index 00000000..c0da1f8b Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinGraphicsInGame.swf differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinGraphicsLabels.swf b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinGraphicsLabels.swf new file mode 100644 index 00000000..0c4465c2 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinGraphicsLabels.swf differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinHDGraphics.swf b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinHDGraphics.swf new file mode 100644 index 00000000..3fe28cdb Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinHDGraphics.swf differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinHDGraphicsLabels.swf b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinHDGraphicsLabels.swf new file mode 100644 index 00000000..3c742330 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinHDGraphicsLabels.swf differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinWin.swf b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinWin.swf new file mode 100644 index 00000000..f3e2460a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/skinWin.swf differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/100_SkinSelect_BottomBar_Selected.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/100_SkinSelect_BottomBar_Selected.png new file mode 100644 index 00000000..264b25f5 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/100_SkinSelect_BottomBar_Selected.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/101_SkinSelect_TabBarSmall.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/101_SkinSelect_TabBarSmall.png new file mode 100644 index 00000000..7f00ff2a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/101_SkinSelect_TabBarSmall.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/102_SkinSelect_TabBarSmall_Selected.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/102_SkinSelect_TabBarSmall_Selected.png new file mode 100644 index 00000000..a04c8da4 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/102_SkinSelect_TabBarSmall_Selected.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/103_CharacterBackground.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/103_CharacterBackground.png new file mode 100644 index 00000000..07e9b4b1 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/103_CharacterBackground.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/104_CharacterBackground_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/104_CharacterBackground_Small.png new file mode 100644 index 00000000..6135f157 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/104_CharacterBackground_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/105_SkinSelect_TabOverSmall.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/105_SkinSelect_TabOverSmall.png new file mode 100644 index 00000000..717fd9b7 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/105_SkinSelect_TabOverSmall.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/106_SkinSelect_TabOverSmall_Selected.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/106_SkinSelect_TabOverSmall_Selected.png new file mode 100644 index 00000000..42afd370 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/106_SkinSelect_TabOverSmall_Selected.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/107_SkinSelect_TabNormalSmall.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/107_SkinSelect_TabNormalSmall.png new file mode 100644 index 00000000..2e60e48e Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/107_SkinSelect_TabNormalSmall.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/108_SkinSelect_TabNormalSmall_Selected.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/108_SkinSelect_TabNormalSmall_Selected.png new file mode 100644 index 00000000..787a89ef Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/108_SkinSelect_TabNormalSmall_Selected.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/109_SkinSelect_TabBarSmallPanel.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/109_SkinSelect_TabBarSmallPanel.png new file mode 100644 index 00000000..54a32e18 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/109_SkinSelect_TabBarSmallPanel.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/110_SkinSelect_TabBarSmallPanel_Selected.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/110_SkinSelect_TabBarSmallPanel_Selected.png new file mode 100644 index 00000000..6c6a86b5 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/110_SkinSelect_TabBarSmallPanel_Selected.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/111_SkinSelect_TabOver.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/111_SkinSelect_TabOver.png new file mode 100644 index 00000000..698a4c3a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/111_SkinSelect_TabOver.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/112_SkinSelect_TabOver_Selected.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/112_SkinSelect_TabOver_Selected.png new file mode 100644 index 00000000..5d7dd23f Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/112_SkinSelect_TabOver_Selected.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/113_SkinSelect_TabNormal.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/113_SkinSelect_TabNormal.png new file mode 100644 index 00000000..685b7e2a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/113_SkinSelect_TabNormal.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/114_SkinSelect_TabBar.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/114_SkinSelect_TabBar.png new file mode 100644 index 00000000..6a9a193e Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/114_SkinSelect_TabBar.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/115_SkinSelect_TabBar_Selected.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/115_SkinSelect_TabBar_Selected.png new file mode 100644 index 00000000..188d8ad8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/115_SkinSelect_TabBar_Selected.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/154_GrassBlockRender.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/154_GrassBlockRender.png new file mode 100644 index 00000000..1ce33212 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/154_GrassBlockRender.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/155_MenuBackground720.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/155_MenuBackground720.png new file mode 100644 index 00000000..2dc54c2b Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/155_MenuBackground720.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/156_MenuBackground.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/156_MenuBackground.png new file mode 100644 index 00000000..fdbb033e Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/156_MenuBackground.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/157_Progressbarfiller.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/157_Progressbarfiller.png new file mode 100644 index 00000000..f1fd44eb Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/157_Progressbarfiller.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/158_ProgressBarBG.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/158_ProgressBarBG.png new file mode 100644 index 00000000..f9cea424 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/158_ProgressBarBG.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/159_MinecraftIcon.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/159_MinecraftIcon.png new file mode 100644 index 00000000..f0e09bd5 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/159_MinecraftIcon.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/160_DLCBackground.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/160_DLCBackground.png new file mode 100644 index 00000000..5242473b Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/160_DLCBackground.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/161_Icon_Shank.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/161_Icon_Shank.png new file mode 100644 index 00000000..2ed1fff3 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/161_Icon_Shank.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/162.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/162.png new file mode 100644 index 00000000..e914db91 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/162.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/164.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/164.png new file mode 100644 index 00000000..e0385170 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/164.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/168_Dirt_Tile.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/168_Dirt_Tile.png new file mode 100644 index 00000000..d5939f00 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/168_Dirt_Tile.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/169_LeaderBoard_Icon_ZombiePigman_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/169_LeaderBoard_Icon_ZombiePigman_Small.png new file mode 100644 index 00000000..ce5c3be8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/169_LeaderBoard_Icon_ZombiePigman_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/170_LeaderBoard_Icon_Zombie_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/170_LeaderBoard_Icon_Zombie_Small.png new file mode 100644 index 00000000..35cdd666 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/170_LeaderBoard_Icon_Zombie_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/171_LeaderBoard_Icon_Walked_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/171_LeaderBoard_Icon_Walked_Small.png new file mode 100644 index 00000000..73d9e5b8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/171_LeaderBoard_Icon_Walked_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/172_LeaderBoard_Icon_Swam_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/172_LeaderBoard_Icon_Swam_Small.png new file mode 100644 index 00000000..9589c40c Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/172_LeaderBoard_Icon_Swam_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/173_LeaderBoard_Icon_SpiderJockey_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/173_LeaderBoard_Icon_SpiderJockey_Small.png new file mode 100644 index 00000000..032a3caa Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/173_LeaderBoard_Icon_SpiderJockey_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/174_LeaderBoard_Icon_Spider_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/174_LeaderBoard_Icon_Spider_Small.png new file mode 100644 index 00000000..907121b6 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/174_LeaderBoard_Icon_Spider_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/175_LeaderBoard_Icon_Slime_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/175_LeaderBoard_Icon_Slime_Small.png new file mode 100644 index 00000000..a17a4618 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/175_LeaderBoard_Icon_Slime_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/176_LeaderBoard_Icon_Skeleton_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/176_LeaderBoard_Icon_Skeleton_Small.png new file mode 100644 index 00000000..db63e720 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/176_LeaderBoard_Icon_Skeleton_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/177_LeaderBoard_Icon_Portal_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/177_LeaderBoard_Icon_Portal_Small.png new file mode 100644 index 00000000..49d7c919 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/177_LeaderBoard_Icon_Portal_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/178_LeaderBoard_Icon_Ghast_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/178_LeaderBoard_Icon_Ghast_Small.png new file mode 100644 index 00000000..894eb4cf Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/178_LeaderBoard_Icon_Ghast_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/179_LeaderBoard_Icon_Fallen_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/179_LeaderBoard_Icon_Fallen_Small.png new file mode 100644 index 00000000..d84ae430 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/179_LeaderBoard_Icon_Fallen_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/180_LeaderBoard_Icon_Creeper_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/180_LeaderBoard_Icon_Creeper_Small.png new file mode 100644 index 00000000..e440b74f Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/180_LeaderBoard_Icon_Creeper_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/181_LeaderBoard_Icon_Climbed_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/181_LeaderBoard_Icon_Climbed_Small.png new file mode 100644 index 00000000..54e0fa30 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/181_LeaderBoard_Icon_Climbed_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/183_LeaderBoard_Icon_Fallen.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/183_LeaderBoard_Icon_Fallen.png new file mode 100644 index 00000000..1533d663 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/183_LeaderBoard_Icon_Fallen.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/184_LeaderBoard_Icon_Creeper.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/184_LeaderBoard_Icon_Creeper.png new file mode 100644 index 00000000..cde1dd02 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/184_LeaderBoard_Icon_Creeper.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/185_LeaderBoard_Icon_Climbed.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/185_LeaderBoard_Icon_Climbed.png new file mode 100644 index 00000000..1718bd84 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/185_LeaderBoard_Icon_Climbed.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/186_LeaderBoard_Icon_ZombiePigman.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/186_LeaderBoard_Icon_ZombiePigman.png new file mode 100644 index 00000000..73e48f26 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/186_LeaderBoard_Icon_ZombiePigman.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/187_LeaderBoard_Icon_Zombie.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/187_LeaderBoard_Icon_Zombie.png new file mode 100644 index 00000000..321b280a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/187_LeaderBoard_Icon_Zombie.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/188_LeaderBoard_Icon_Walked.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/188_LeaderBoard_Icon_Walked.png new file mode 100644 index 00000000..f4102e41 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/188_LeaderBoard_Icon_Walked.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/189_LeaderBoard_Icon_Swam.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/189_LeaderBoard_Icon_Swam.png new file mode 100644 index 00000000..9fe0fc5f Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/189_LeaderBoard_Icon_Swam.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/190_LeaderBoard_Icon_SpiderJockey.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/190_LeaderBoard_Icon_SpiderJockey.png new file mode 100644 index 00000000..0e37d106 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/190_LeaderBoard_Icon_SpiderJockey.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/191_LeaderBoard_Icon_Spider.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/191_LeaderBoard_Icon_Spider.png new file mode 100644 index 00000000..7a8789c6 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/191_LeaderBoard_Icon_Spider.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/192_LeaderBoard_Icon_Slime.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/192_LeaderBoard_Icon_Slime.png new file mode 100644 index 00000000..04274226 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/192_LeaderBoard_Icon_Slime.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/193_LeaderBoard_Icon_Skeleton.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/193_LeaderBoard_Icon_Skeleton.png new file mode 100644 index 00000000..2c94d2e8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/193_LeaderBoard_Icon_Skeleton.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/194_LeaderBoard_Icon_Portal.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/194_LeaderBoard_Icon_Portal.png new file mode 100644 index 00000000..3eec4cc5 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/194_LeaderBoard_Icon_Portal.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/195_LeaderBoard_Icon_Ghast.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/195_LeaderBoard_Icon_Ghast.png new file mode 100644 index 00000000..a670de9c Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/195_LeaderBoard_Icon_Ghast.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/197_IconHolderRed_1x1border.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/197_IconHolderRed_1x1border.png new file mode 100644 index 00000000..90a13354 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/197_IconHolderRed_1x1border.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/198_IconHolder_1x1border.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/198_IconHolder_1x1border.png new file mode 100644 index 00000000..0a6d8ccd Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/198_IconHolder_1x1border.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/199_scrollUp.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/199_scrollUp.png new file mode 100644 index 00000000..bb0dc331 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/199_scrollUp.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/1_Padlock_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/1_Padlock_Small.png new file mode 100644 index 00000000..b070bb6d Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/1_Padlock_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/200_scrollRight.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/200_scrollRight.png new file mode 100644 index 00000000..b8d8fe1a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/200_scrollRight.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/201_scrollLeft.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/201_scrollLeft.png new file mode 100644 index 00000000..41ac7fd8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/201_scrollLeft.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/202_scrollDown.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/202_scrollDown.png new file mode 100644 index 00000000..cf7c11c8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/202_scrollDown.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/203_Craft_Scroll_up.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/203_Craft_Scroll_up.png new file mode 100644 index 00000000..3bae0e30 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/203_Craft_Scroll_up.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/204_Craft_Scroll_Down.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/204_Craft_Scroll_Down.png new file mode 100644 index 00000000..6f7b278f Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/204_Craft_Scroll_Down.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/205_voiceSpeaking.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/205_voiceSpeaking.png new file mode 100644 index 00000000..0f490790 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/205_voiceSpeaking.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/206_voiceNotSpeaking.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/206_voiceNotSpeaking.png new file mode 100644 index 00000000..87b0cf30 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/206_voiceNotSpeaking.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/207_voiceMuted.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/207_voiceMuted.png new file mode 100644 index 00000000..b57d9d7f Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/207_voiceMuted.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/208_MapIcon9.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/208_MapIcon9.png new file mode 100644 index 00000000..ea23e988 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/208_MapIcon9.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/209_MapIcon8.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/209_MapIcon8.png new file mode 100644 index 00000000..0f9ebbef Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/209_MapIcon8.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/210_MapIcon7.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/210_MapIcon7.png new file mode 100644 index 00000000..73aa8de4 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/210_MapIcon7.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/211_MapIcon6.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/211_MapIcon6.png new file mode 100644 index 00000000..df990bbb Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/211_MapIcon6.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/212_MapIcon5.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/212_MapIcon5.png new file mode 100644 index 00000000..90366613 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/212_MapIcon5.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/213_MapIcon4.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/213_MapIcon4.png new file mode 100644 index 00000000..7fa5d514 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/213_MapIcon4.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/214_MapIcon3.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/214_MapIcon3.png new file mode 100644 index 00000000..b39ed052 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/214_MapIcon3.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/215_MapIcon2.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/215_MapIcon2.png new file mode 100644 index 00000000..485e9328 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/215_MapIcon2.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/216_MapIcon15.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/216_MapIcon15.png new file mode 100644 index 00000000..73aa8de4 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/216_MapIcon15.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/217_MapIcon14.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/217_MapIcon14.png new file mode 100644 index 00000000..df990bbb Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/217_MapIcon14.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/218_MapIcon13.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/218_MapIcon13.png new file mode 100644 index 00000000..45ee3767 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/218_MapIcon13.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/219_MapIcon12.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/219_MapIcon12.png new file mode 100644 index 00000000..7fa5d514 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/219_MapIcon12.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/220_MapIcon11.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/220_MapIcon11.png new file mode 100644 index 00000000..aa2ec1a5 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/220_MapIcon11.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/221_MapIcon10.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/221_MapIcon10.png new file mode 100644 index 00000000..485e9328 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/221_MapIcon10.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/222_MapIcon1.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/222_MapIcon1.png new file mode 100644 index 00000000..ea23e988 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/222_MapIcon1.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/223_MapIcon0.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/223_MapIcon0.png new file mode 100644 index 00000000..954d6d11 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/223_MapIcon0.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/224_Slider_Track_TintInactive.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/224_Slider_Track_TintInactive.png new file mode 100644 index 00000000..0ec8c900 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/224_Slider_Track_TintInactive.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/225_Slider_Track_TintActive.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/225_Slider_Track_TintActive.png new file mode 100644 index 00000000..0ec8c900 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/225_Slider_Track_TintActive.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/226_SmallTick.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/226_SmallTick.png new file mode 100644 index 00000000..da4c978e Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/226_SmallTick.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/227_DLC_TickSmall.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/227_DLC_TickSmall.png new file mode 100644 index 00000000..5b408ad0 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/227_DLC_TickSmall.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/228_DLC_Tick.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/228_DLC_Tick.png new file mode 100644 index 00000000..61b18ffb Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/228_DLC_Tick.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/229_Tickbox_Over.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/229_Tickbox_Over.png new file mode 100644 index 00000000..1eab7c3c Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/229_Tickbox_Over.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/230_Tick.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/230_Tick.png new file mode 100644 index 00000000..071a14d9 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/230_Tick.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/230_tick.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/230_tick.png new file mode 100644 index 00000000..340a7cea Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/230_tick.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/231_FJ_Tickbox_Background.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/231_FJ_Tickbox_Background.png new file mode 100644 index 00000000..cb2dc7d5 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/231_FJ_Tickbox_Background.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/232_SliderBackgroundHighlight.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/232_SliderBackgroundHighlight.png new file mode 100644 index 00000000..beb31bc2 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/232_SliderBackgroundHighlight.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/233_LeaderboardButton_Over.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/233_LeaderboardButton_Over.png new file mode 100644 index 00000000..4043a9af Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/233_LeaderboardButton_Over.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/234_LeaderboardButton_Norm.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/234_LeaderboardButton_Norm.png new file mode 100644 index 00000000..91753639 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/234_LeaderboardButton_Norm.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/237_TextInputSelectedBorderInactive.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/237_TextInputSelectedBorderInactive.png new file mode 100644 index 00000000..4f7ff3c8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/237_TextInputSelectedBorderInactive.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/238_TextInputSelectedBorder.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/238_TextInputSelectedBorder.png new file mode 100644 index 00000000..9e308dc9 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/238_TextInputSelectedBorder.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/239_Caret.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/239_Caret.png new file mode 100644 index 00000000..ca6b32e2 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/239_Caret.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/240_TextInputBG.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/240_TextInputBG.png new file mode 100644 index 00000000..65e989ee Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/240_TextInputBG.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/241_TextInputBGBorder.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/241_TextInputBGBorder.png new file mode 100644 index 00000000..db1513d8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/241_TextInputBGBorder.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/242_Slider_Graphic.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/242_Slider_Graphic.png new file mode 100644 index 00000000..341a315d Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/242_Slider_Graphic.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/243_FJ_Slider_Background.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/243_FJ_Slider_Background.png new file mode 100644 index 00000000..51054eb2 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/243_FJ_Slider_Background.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/244_ListButton_Over.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/244_ListButton_Over.png new file mode 100644 index 00000000..2337cab6 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/244_ListButton_Over.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/245_ListButton_Outline.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/245_ListButton_Outline.png new file mode 100644 index 00000000..8f8fae3c Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/245_ListButton_Outline.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/246_ListButton_Norm.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/246_ListButton_Norm.png new file mode 100644 index 00000000..299afb1d Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/246_ListButton_Norm.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/247_LayoutButton_Over.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/247_LayoutButton_Over.png new file mode 100644 index 00000000..f4195525 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/247_LayoutButton_Over.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/248_LayoutButton_Outline.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/248_LayoutButton_Outline.png new file mode 100644 index 00000000..e61ffa27 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/248_LayoutButton_Outline.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/249_Layout_Button_Bmp.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/249_Layout_Button_Bmp.png new file mode 100644 index 00000000..2b22cd73 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/249_Layout_Button_Bmp.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/250_MainMenuButton_Over.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/250_MainMenuButton_Over.png new file mode 100644 index 00000000..ce0ea3c6 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/250_MainMenuButton_Over.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/251_MainMenuButton_Outline.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/251_MainMenuButton_Outline.png new file mode 100644 index 00000000..b5a3c359 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/251_MainMenuButton_Outline.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/252_FJ_MainMenuButton_Norm.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/252_FJ_MainMenuButton_Norm.png new file mode 100644 index 00000000..eb7ad31b Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/252_FJ_MainMenuButton_Norm.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/253_BattleModeIcon.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/253_BattleModeIcon.png new file mode 100644 index 00000000..9614e6cd Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/253_BattleModeIcon.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/254.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/254.png new file mode 100644 index 00000000..b7191906 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/254.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/255.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/255.png new file mode 100644 index 00000000..ba583ef4 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/255.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/258.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/258.png new file mode 100644 index 00000000..90453242 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/258.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/261.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/261.png new file mode 100644 index 00000000..4411ee07 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/261.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/263.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/263.png new file mode 100644 index 00000000..fe02d0ff Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/263.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/267_Dead.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/267_Dead.png new file mode 100644 index 00000000..b5220764 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/267_Dead.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/268_AwardIcon.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/268_AwardIcon.png new file mode 100644 index 00000000..34840ef0 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/268_AwardIcon.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/269_Alliance.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/269_Alliance.png new file mode 100644 index 00000000..711c2695 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/269_Alliance.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/270_Alive.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/270_Alive.png new file mode 100644 index 00000000..fd0b27c4 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/270_Alive.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/271_MultiplayerTimerSmall.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/271_MultiplayerTimerSmall.png new file mode 100644 index 00000000..986928f7 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/271_MultiplayerTimerSmall.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/272_MultiplayerTimerbackgroundSmall.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/272_MultiplayerTimerbackgroundSmall.png new file mode 100644 index 00000000..29452af8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/272_MultiplayerTimerbackgroundSmall.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/273_MultiplayerTimer.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/273_MultiplayerTimer.png new file mode 100644 index 00000000..b435dca8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/273_MultiplayerTimer.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/274_MultiplayerTimerbackground.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/274_MultiplayerTimerbackground.png new file mode 100644 index 00000000..6759f010 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/274_MultiplayerTimerbackground.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/275_HowToPlay_InventoryPlayer_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/275_HowToPlay_InventoryPlayer_Small.png new file mode 100644 index 00000000..559a5b38 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/275_HowToPlay_InventoryPlayer_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/276_HowToPlay_InventoryPlayer_Medium.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/276_HowToPlay_InventoryPlayer_Medium.png new file mode 100644 index 00000000..54dac50a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/276_HowToPlay_InventoryPlayer_Medium.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/277_HowToPlay_InventoryPlayer_Large.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/277_HowToPlay_InventoryPlayer_Large.png new file mode 100644 index 00000000..a04c54df Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/277_HowToPlay_InventoryPlayer_Large.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/278_HowToPlay_TheEnd_Portal.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/278_HowToPlay_TheEnd_Portal.jpg new file mode 100644 index 00000000..ea0a40de Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/278_HowToPlay_TheEnd_Portal.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/279_HowToPlay_TheEnd_Dragon.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/279_HowToPlay_TheEnd_Dragon.jpg new file mode 100644 index 00000000..530b73fb Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/279_HowToPlay_TheEnd_Dragon.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/280_HowToPlay_NetherPortal.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/280_HowToPlay_NetherPortal.jpg new file mode 100644 index 00000000..58519858 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/280_HowToPlay_NetherPortal.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/281_HowToPlay_Horses.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/281_HowToPlay_Horses.jpg new file mode 100644 index 00000000..ba5cb554 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/281_HowToPlay_Horses.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/282_HowToPlay_FarmingAnimals.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/282_HowToPlay_FarmingAnimals.jpg new file mode 100644 index 00000000..035eaa90 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/282_HowToPlay_FarmingAnimals.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/283_HowToPlay_Enderchest.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/283_HowToPlay_Enderchest.jpg new file mode 100644 index 00000000..00057369 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/283_HowToPlay_Enderchest.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/284_HowToPlay_Breeding.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/284_HowToPlay_Breeding.jpg new file mode 100644 index 00000000..ac5bf278 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/284_HowToPlay_Breeding.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/2_FavouriteWeaponIcon.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/2_FavouriteWeaponIcon.png new file mode 100644 index 00000000..1488c5d9 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/2_FavouriteWeaponIcon.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/378.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/378.png new file mode 100644 index 00000000..cc940eae Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/378.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/379.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/379.png new file mode 100644 index 00000000..bf752ed2 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/379.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/425.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/425.jpg new file mode 100644 index 00000000..57420095 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/425.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/429.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/429.jpg new file mode 100644 index 00000000..cb64c62f Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/429.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/432.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/432.jpg new file mode 100644 index 00000000..41bdf6fb Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/432.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/433.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/433.jpg new file mode 100644 index 00000000..b6c731d1 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/433.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/439.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/439.jpg new file mode 100644 index 00000000..31cd0666 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/439.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/440.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/440.jpg new file mode 100644 index 00000000..a0767ab6 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/440.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/447.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/447.jpg new file mode 100644 index 00000000..17a6b977 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/447.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/448.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/448.jpg new file mode 100644 index 00000000..a9d61920 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/448.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/449.jpg b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/449.jpg new file mode 100644 index 00000000..760291b2 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/449.jpg differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/47_SkinSelectFrame_Vita.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/47_SkinSelectFrame_Vita.png new file mode 100644 index 00000000..6d473a9f Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/47_SkinSelectFrame_Vita.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/48_SkinSelectFrame_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/48_SkinSelectFrame_Small.png new file mode 100644 index 00000000..de2f4818 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/48_SkinSelectFrame_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/49_Blocked_Icon.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/49_Blocked_Icon.png new file mode 100644 index 00000000..65a72e43 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/49_Blocked_Icon.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/50_Beacon_Button_Tick.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/50_Beacon_Button_Tick.png new file mode 100644 index 00000000..99ac7497 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/50_Beacon_Button_Tick.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/51_Health_Background.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/51_Health_Background.png new file mode 100644 index 00000000..f700b33d Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/51_Health_Background.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/52_Health_Full.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/52_Health_Full.png new file mode 100644 index 00000000..c4727621 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/52_Health_Full.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/53_SkinSelectFrame_720Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/53_SkinSelectFrame_720Small.png new file mode 100644 index 00000000..64ed5747 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/53_SkinSelectFrame_720Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/54_SkinSelect_Frame.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/54_SkinSelect_Frame.png new file mode 100644 index 00000000..61112f16 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/54_SkinSelect_Frame.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/61_AchievementHighlightSmall.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/61_AchievementHighlightSmall.png new file mode 100644 index 00000000..c9e18994 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/61_AchievementHighlightSmall.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/62_AchievementHighlight.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/62_AchievementHighlight.png new file mode 100644 index 00000000..9a1d64dd Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/62_AchievementHighlight.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/63_SkinSelect_TabNormal_Selected.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/63_SkinSelect_TabNormal_Selected.png new file mode 100644 index 00000000..dd29e424 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/63_SkinSelect_TabNormal_Selected.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/66_QuadPanelOverlay.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/66_QuadPanelOverlay.png new file mode 100644 index 00000000..9de1295f Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/66_QuadPanelOverlay.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/67_dolby_graphic.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/67_dolby_graphic.png new file mode 100644 index 00000000..d61981bc Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/67_dolby_graphic.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/68_Logo_Iggy.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/68_Logo_Iggy.png new file mode 100644 index 00000000..86e0692d Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/68_Logo_Iggy.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/69_Logo_Miles.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/69_Logo_Miles.png new file mode 100644 index 00000000..1b250c89 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/69_Logo_Miles.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/70_TexturePackSelectorBorder.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/70_TexturePackSelectorBorder.png new file mode 100644 index 00000000..5d45576b Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/70_TexturePackSelectorBorder.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/73_Panel9Grid.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/73_Panel9Grid.png new file mode 100644 index 00000000..139227d5 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/73_Panel9Grid.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/84_Sqaure_recessed_Panel.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/84_Sqaure_recessed_Panel.png new file mode 100644 index 00000000..05a10def Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/84_Sqaure_recessed_Panel.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/85_Panel_Recess.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/85_Panel_Recess.png new file mode 100644 index 00000000..0ff5c3f1 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/85_Panel_Recess.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/86_PointerTextPanel.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/86_PointerTextPanel.png new file mode 100644 index 00000000..d99bbca6 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/86_PointerTextPanel.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/87_Panel9Grid_16.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/87_Panel9Grid_16.png new file mode 100644 index 00000000..7ef1836c Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/87_Panel9Grid_16.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/88_WorldOptionsTabOn.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/88_WorldOptionsTabOn.png new file mode 100644 index 00000000..84977377 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/88_WorldOptionsTabOn.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/89_WorldOptionsTabOn_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/89_WorldOptionsTabOn_Small.png new file mode 100644 index 00000000..e3ac57dd Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/89_WorldOptionsTabOn_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/90_MoreOptionsTabOff.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/90_MoreOptionsTabOff.png new file mode 100644 index 00000000..a6731bf1 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/90_MoreOptionsTabOff.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/91_MoreOptionsTabOff_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/91_MoreOptionsTabOff_Small.png new file mode 100644 index 00000000..17634d08 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/91_MoreOptionsTabOff_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/92_GameOptionsTabOn.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/92_GameOptionsTabOn.png new file mode 100644 index 00000000..84977377 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/92_GameOptionsTabOn.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/93_GameOptionsTabOn_Small.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/93_GameOptionsTabOn_Small.png new file mode 100644 index 00000000..efe51d7b Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/93_GameOptionsTabOn_Small.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/94.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/94.png new file mode 100644 index 00000000..dcc9127e Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/94.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/97_SkinSelect_BottomBarSmall.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/97_SkinSelect_BottomBarSmall.png new file mode 100644 index 00000000..1e796dff Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/97_SkinSelect_BottomBarSmall.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/98_SkinSelect_BottomBarSmall_Selected.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/98_SkinSelect_BottomBarSmall_Selected.png new file mode 100644 index 00000000..af056c9b Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/98_SkinSelect_BottomBarSmall_Selected.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/99_SkinSelect_BottomBar.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/99_SkinSelect_BottomBar.png new file mode 100644 index 00000000..b979c87a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/99_SkinSelect_BottomBar.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/tb_back.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/tb_back.png new file mode 100644 index 00000000..071a14d9 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/media/sprites/images/tb_back.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/0 b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/0 new file mode 100644 index 00000000..e69de29b diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/colours.col b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/colours.col new file mode 100644 index 00000000..fbab700b Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/colours.col differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/chain_1.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/chain_1.png new file mode 100644 index 00000000..f50a300b Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/chain_1.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/chain_2.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/chain_2.png new file mode 100644 index 00000000..26291b5b Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/chain_2.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/cloth_1.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/cloth_1.png new file mode 100644 index 00000000..a8b08e44 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/cloth_1.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/cloth_1_b.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/cloth_1_b.png new file mode 100644 index 00000000..69c2117c Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/cloth_1_b.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/cloth_2.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/cloth_2.png new file mode 100644 index 00000000..450703d3 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/cloth_2.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/cloth_2_b.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/cloth_2_b.png new file mode 100644 index 00000000..9604bd18 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/cloth_2_b.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/diamond_1.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/diamond_1.png new file mode 100644 index 00000000..1c382b23 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/diamond_1.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/diamond_2.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/diamond_2.png new file mode 100644 index 00000000..04bfdfdd Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/diamond_2.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/gold_1.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/gold_1.png new file mode 100644 index 00000000..a5a775ac Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/gold_1.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/gold_2.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/gold_2.png new file mode 100644 index 00000000..cdd6c025 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/gold_2.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/iron_1.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/iron_1.png new file mode 100644 index 00000000..e33cc586 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/iron_1.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/iron_2.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/iron_2.png new file mode 100644 index 00000000..58fa3645 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/armor/iron_2.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/art/kz.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/art/kz.png new file mode 100644 index 00000000..04fc5158 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/art/kz.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/environment/clouds.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/environment/clouds.png new file mode 100644 index 00000000..4c13eab6 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/environment/clouds.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/environment/rain.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/environment/rain.png new file mode 100644 index 00000000..75a98ff6 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/environment/rain.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/environment/snow.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/environment/snow.png new file mode 100644 index 00000000..f87c8928 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/environment/snow.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/armorstand/wood.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/armorstand/wood.png new file mode 100644 index 00000000..4460fcab Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/armorstand/wood.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/arrows.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/arrows.png new file mode 100644 index 00000000..0c83d1e2 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/arrows.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/boat.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/boat.png new file mode 100644 index 00000000..bb3a8315 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/boat.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/book.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/book.png new file mode 100644 index 00000000..b9a39dc6 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/book.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/cart.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/cart.png new file mode 100644 index 00000000..7cd63531 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/cart.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/chest.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/chest.png new file mode 100644 index 00000000..98bcf9a0 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/chest.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/enderchest.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/enderchest.png new file mode 100644 index 00000000..7acec655 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/enderchest.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/largechest.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/largechest.png new file mode 100644 index 00000000..04382c19 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/largechest.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/lead_knot.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/lead_knot.png new file mode 100644 index 00000000..da3ac927 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/lead_knot.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/sign.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/sign.png new file mode 100644 index 00000000..6c59d724 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/sign.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/trapped.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/trapped.png new file mode 100644 index 00000000..debd83fd Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/trapped.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/trapped_double.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/trapped_double.png new file mode 100644 index 00000000..98beff6a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/item/trapped_double.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/items.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/items.png new file mode 100644 index 00000000..456e752a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/items.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/additionalmapicons.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/additionalmapicons.png new file mode 100644 index 00000000..378fdd30 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/additionalmapicons.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/beacon_beam.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/beacon_beam.png new file mode 100644 index 00000000..df7da407 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/beacon_beam.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/dial.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/dial.png new file mode 100644 index 00000000..140e7e34 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/dial.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/foliagecolor.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/foliagecolor.png new file mode 100644 index 00000000..40a643a1 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/foliagecolor.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/grasscolor.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/grasscolor.png new file mode 100644 index 00000000..d96e52e7 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/grasscolor.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/mapbg.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/mapbg.png new file mode 100644 index 00000000..979d5e43 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/mapbg.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/mapicons.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/mapicons.png new file mode 100644 index 00000000..3486b977 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/mapicons.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/particlefield.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/particlefield.png new file mode 100644 index 00000000..83569a99 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/particlefield.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/pumpkinblur.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/pumpkinblur.png new file mode 100644 index 00000000..3ef0ae18 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/pumpkinblur.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/tunnel.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/tunnel.png new file mode 100644 index 00000000..8bff07a3 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/tunnel.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/water.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/water.png new file mode 100644 index 00000000..f6b3fdc8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/water.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/watercolor.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/watercolor.png new file mode 100644 index 00000000..8537e0d0 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/misc/watercolor.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/bat.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/bat.png new file mode 100644 index 00000000..cad9b1a2 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/bat.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/cat_black.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/cat_black.png new file mode 100644 index 00000000..2067ab06 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/cat_black.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/cat_red.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/cat_red.png new file mode 100644 index 00000000..55f91017 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/cat_red.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/cat_siamese.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/cat_siamese.png new file mode 100644 index 00000000..c6adba38 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/cat_siamese.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/cavespider.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/cavespider.png new file mode 100644 index 00000000..00785e7a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/cavespider.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/chicken.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/chicken.png new file mode 100644 index 00000000..62f95dbc Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/chicken.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/cow.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/cow.png new file mode 100644 index 00000000..84a5ca91 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/cow.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/creeper.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/creeper.png new file mode 100644 index 00000000..84d08a44 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/creeper.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderdragon/beam.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderdragon/beam.png new file mode 100644 index 00000000..fb040981 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderdragon/beam.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderdragon/crystal.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderdragon/crystal.png new file mode 100644 index 00000000..0f801776 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderdragon/crystal.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderdragon/ender.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderdragon/ender.png new file mode 100644 index 00000000..8a5c663a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderdragon/ender.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderdragon/ender_eyes.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderdragon/ender_eyes.png new file mode 100644 index 00000000..284c510f Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderdragon/ender_eyes.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderdragon/shuffle.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderdragon/shuffle.png new file mode 100644 index 00000000..81373ba1 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderdragon/shuffle.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderman.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderman.png new file mode 100644 index 00000000..2a07c426 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderman.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderman_eyes.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderman_eyes.png new file mode 100644 index 00000000..3e46e25d Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/enderman_eyes.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/endermite.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/endermite.png new file mode 100644 index 00000000..cb844249 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/endermite.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/fire.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/fire.png new file mode 100644 index 00000000..e4ba6532 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/fire.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/ghast.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/ghast.png new file mode 100644 index 00000000..f20535ba Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/ghast.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/ghast_fire.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/ghast_fire.png new file mode 100644 index 00000000..03f2908a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/ghast_fire.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/guardian.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/guardian.png new file mode 100644 index 00000000..6d6d100a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/guardian.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/guardian_beam.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/guardian_beam.png new file mode 100644 index 00000000..3e4aedaa Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/guardian_beam.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/guardian_elder.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/guardian_elder.png new file mode 100644 index 00000000..0c94939a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/guardian_elder.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/armor/horse_armor_diamond.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/armor/horse_armor_diamond.png new file mode 100644 index 00000000..84a4ca99 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/armor/horse_armor_diamond.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/armor/horse_armor_gold.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/armor/horse_armor_gold.png new file mode 100644 index 00000000..08848a82 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/armor/horse_armor_gold.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/armor/horse_armor_iron.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/armor/horse_armor_iron.png new file mode 100644 index 00000000..0cde8e23 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/armor/horse_armor_iron.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/donkey.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/donkey.png new file mode 100644 index 00000000..7aa2d792 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/donkey.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_black.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_black.png new file mode 100644 index 00000000..34da0d6d Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_black.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_brown.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_brown.png new file mode 100644 index 00000000..ba95daa6 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_brown.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_chestnut.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_chestnut.png new file mode 100644 index 00000000..f4785da1 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_chestnut.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_creamy.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_creamy.png new file mode 100644 index 00000000..70085da4 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_creamy.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_darkbrown.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_darkbrown.png new file mode 100644 index 00000000..da573a28 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_darkbrown.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_gray.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_gray.png new file mode 100644 index 00000000..08eb5ef8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_gray.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_markings_blackdots.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_markings_blackdots.png new file mode 100644 index 00000000..a6882c65 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_markings_blackdots.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_markings_white.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_markings_white.png new file mode 100644 index 00000000..a6882c65 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_markings_white.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_markings_whitedots.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_markings_whitedots.png new file mode 100644 index 00000000..a6882c65 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_markings_whitedots.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_markings_whitefield.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_markings_whitefield.png new file mode 100644 index 00000000..a6882c65 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_markings_whitefield.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_skeleton.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_skeleton.png new file mode 100644 index 00000000..6454ae43 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_skeleton.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_white.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_white.png new file mode 100644 index 00000000..eb71f568 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_white.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_zombie.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_zombie.png new file mode 100644 index 00000000..ee93fb0a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/horse_zombie.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/mule.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/mule.png new file mode 100644 index 00000000..1e15d128 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/horse/mule.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/lava.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/lava.png new file mode 100644 index 00000000..3a3956c9 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/lava.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/ozelot.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/ozelot.png new file mode 100644 index 00000000..c4b07311 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/ozelot.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/pig.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/pig.png new file mode 100644 index 00000000..8aa2d1e5 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/pig.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/pigzombie.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/pigzombie.png new file mode 100644 index 00000000..052dbe77 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/pigzombie.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/black.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/black.png new file mode 100644 index 00000000..ff6777ed Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/black.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/brown.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/brown.png new file mode 100644 index 00000000..685474c4 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/brown.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/caerbannog.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/caerbannog.png new file mode 100644 index 00000000..d929d19a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/caerbannog.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/gold.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/gold.png new file mode 100644 index 00000000..0820fb35 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/gold.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/salt.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/salt.png new file mode 100644 index 00000000..65622488 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/salt.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/toast.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/toast.png new file mode 100644 index 00000000..fc81a0f1 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/toast.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/white.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/white.png new file mode 100644 index 00000000..1b35c416 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/white.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/white_splotched.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/white_splotched.png new file mode 100644 index 00000000..3b6cf8ca Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/rabbit/white_splotched.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/redcow.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/redcow.png new file mode 100644 index 00000000..0dbe99f2 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/redcow.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/saddle.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/saddle.png new file mode 100644 index 00000000..e3e09305 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/saddle.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/sheep.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/sheep.png new file mode 100644 index 00000000..48675557 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/sheep.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/sheep_fur.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/sheep_fur.png new file mode 100644 index 00000000..ccc542be Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/sheep_fur.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/silverfish.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/silverfish.png new file mode 100644 index 00000000..e1b4b15d Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/silverfish.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/skeleton.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/skeleton.png new file mode 100644 index 00000000..fb78f818 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/skeleton.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/skeleton_wither.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/skeleton_wither.png new file mode 100644 index 00000000..c1531c57 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/skeleton_wither.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/slime.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/slime.png new file mode 100644 index 00000000..6484dd14 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/slime.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/snowman.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/snowman.png new file mode 100644 index 00000000..ac07123e Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/snowman.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/spider.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/spider.png new file mode 100644 index 00000000..250055db Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/spider.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/spider_eyes.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/spider_eyes.png new file mode 100644 index 00000000..8e36f294 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/spider_eyes.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/squid.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/squid.png new file mode 100644 index 00000000..7ca9e5a3 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/squid.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/butcher.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/butcher.png new file mode 100644 index 00000000..180c52e3 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/butcher.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/farmer.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/farmer.png new file mode 100644 index 00000000..3be04eef Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/farmer.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/librarian.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/librarian.png new file mode 100644 index 00000000..c1bab11d Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/librarian.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/priest.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/priest.png new file mode 100644 index 00000000..5d3edd09 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/priest.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/smith.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/smith.png new file mode 100644 index 00000000..eede5e18 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/smith.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/villager.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/villager.png new file mode 100644 index 00000000..f4c4158c Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager/villager.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager_golem.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager_golem.png new file mode 100644 index 00000000..609868db Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/villager_golem.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/witch.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/witch.png new file mode 100644 index 00000000..df7753e8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/witch.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wither/wither.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wither/wither.png new file mode 100644 index 00000000..b61f8735 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wither/wither.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wither/wither_armor.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wither/wither_armor.png new file mode 100644 index 00000000..7f7e58ef Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wither/wither_armor.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wither/wither_invulnerable.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wither/wither_invulnerable.png new file mode 100644 index 00000000..c9274432 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wither/wither_invulnerable.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wolf.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wolf.png new file mode 100644 index 00000000..bb2687b8 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wolf.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wolf_angry.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wolf_angry.png new file mode 100644 index 00000000..d2214434 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wolf_angry.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wolf_collar.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wolf_collar.png new file mode 100644 index 00000000..b942813e Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wolf_collar.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wolf_tame.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wolf_tame.png new file mode 100644 index 00000000..e4ac93da Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/wolf_tame.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/zombie.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/zombie.png new file mode 100644 index 00000000..4af23643 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/zombie.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/zombie_villager.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/zombie_villager.png new file mode 100644 index 00000000..79fdc8d5 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/mob/zombie_villager.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/particles.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/particles.png new file mode 100644 index 00000000..02b30513 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/particles.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrain.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrain.png new file mode 100644 index 00000000..96661300 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrain.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrain/moon.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrain/moon.png new file mode 100644 index 00000000..f634d244 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrain/moon.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrain/moon_phases.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrain/moon_phases.png new file mode 100644 index 00000000..45fa8d41 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrain/moon_phases.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrain/sun.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrain/sun.png new file mode 100644 index 00000000..8ea98ddb Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrain/sun.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrainMipMapLevel2.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrainMipMapLevel2.png new file mode 100644 index 00000000..77ed1c84 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrainMipMapLevel2.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrainMipMapLevel3.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrainMipMapLevel3.png new file mode 100644 index 00000000..fc021e1b Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/terrainMipMapLevel3.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/deadbush.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/deadbush.png new file mode 100644 index 00000000..04b2649a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/deadbush.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/fire_0.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/fire_0.png new file mode 100644 index 00000000..4d7a98cc Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/fire_0.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/fire_1.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/fire_1.png new file mode 100644 index 00000000..a8a29f72 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/fire_1.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/flower_dandelion.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/flower_dandelion.png new file mode 100644 index 00000000..8c4e1d79 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/flower_dandelion.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/flower_rose.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/flower_rose.png new file mode 100644 index 00000000..95c12afb Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/flower_rose.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lava.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lava.png new file mode 100644 index 00000000..435f58ab Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lava.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lavaMipMapLevel2.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lavaMipMapLevel2.png new file mode 100644 index 00000000..eb80768a Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lavaMipMapLevel2.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lavaMipMapLevel3.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lavaMipMapLevel3.png new file mode 100644 index 00000000..3c2afcce Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lavaMipMapLevel3.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lava_flow.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lava_flow.png new file mode 100644 index 00000000..c1f76234 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lava_flow.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lava_flowMipMapLevel2.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lava_flowMipMapLevel2.png new file mode 100644 index 00000000..6056c4bb Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lava_flowMipMapLevel2.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lava_flowMipMapLevel3.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lava_flowMipMapLevel3.png new file mode 100644 index 00000000..cd10ad9b Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/lava_flowMipMapLevel3.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/portal.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/portal.png new file mode 100644 index 00000000..e89e8945 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/portal.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/prismarine_rough.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/prismarine_rough.png new file mode 100644 index 00000000..9dd906ae Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/prismarine_rough.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/sea_lantern.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/sea_lantern.png new file mode 100644 index 00000000..5cdf0342 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/sea_lantern.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/water.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/water.png new file mode 100644 index 00000000..7aea82cc Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/water.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/waterMipMapLevel2.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/waterMipMapLevel2.png new file mode 100644 index 00000000..3ce79bf1 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/waterMipMapLevel2.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/waterMipMapLevel3.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/waterMipMapLevel3.png new file mode 100644 index 00000000..5c881c79 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/waterMipMapLevel3.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/water_flow.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/water_flow.png new file mode 100644 index 00000000..494967b0 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/water_flow.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/water_flowMipMapLevel2.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/water_flowMipMapLevel2.png new file mode 100644 index 00000000..50f5157c Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/water_flowMipMapLevel2.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/water_flowMipMapLevel3.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/water_flowMipMapLevel3.png new file mode 100644 index 00000000..06b6a088 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/blocks/water_flowMipMapLevel3.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/items/clock.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/items/clock.png new file mode 100644 index 00000000..0f352bf9 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/items/clock.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/items/compass.png b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/items/compass.png new file mode 100644 index 00000000..d5ade6c0 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/Data/x16Data/res/textures/items/compass.png differ diff --git a/Minecraft.Client/Windows64Media/DLC/Mario/TexturePack.pck b/Minecraft.Client/Windows64Media/DLC/Mario/TexturePack.pck new file mode 100644 index 00000000..778952c4 Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/Mario/TexturePack.pck differ diff --git a/tools/wiiU2Windows.py b/tools/wiiU2Windows.py new file mode 100644 index 00000000..1534e264 --- /dev/null +++ b/tools/wiiU2Windows.py @@ -0,0 +1,591 @@ +#!/usr/bin/env python3 + +import argparse +import os +import sys +import zlib +from collections import defaultdict + +# good luck processing this +# main arguments: +# --dlc: xbox one split save stuff (meant for our current dlc system) +# --no-split: disable dlc split save system (when --dlc is present) +# otherwise the converter defaults to regular, non-split windows saves + +FILE_ENTRY_SIZE = 144 +SAVE_HEADER_SIZE = 12 +WINDOWS_SAVE_VERSION = 9 +REGION_FORMAT_16_NAME = "region_format_16" +REGION_SECTOR_BYTES = 4096 +REGION_TABLE_COUNT = 1024 +REGION_TABLE_BYTES = REGION_TABLE_COUNT * 4 +REGION_HEADER_BYTES = REGION_TABLE_BYTES * 2 + + +def read_u16(data, offset, endian): + return int.from_bytes(data[offset:offset + 2], endian) + + +def read_u32(data, offset, endian): + return int.from_bytes(data[offset:offset + 4], endian) + + +def read_u64(data, offset, endian): + return int.from_bytes(data[offset:offset + 8], endian) + + +def write_u16(buf, offset, value, endian): + buf[offset:offset + 2] = int(value).to_bytes(2, endian, signed=False) + + +def write_u32(buf, offset, value, endian): + buf[offset:offset + 4] = int(value).to_bytes(4, endian, signed=False) + + +def write_u64(buf, offset, value, endian): + buf[offset:offset + 8] = int(value).to_bytes(8, endian, signed=False) + + +def region_coords_from_name(name): + base_name = os.path.basename(name) + if not base_name.lower().endswith(".mcr"): + return None + + stem = base_name[:-4] + if stem.startswith("r."): + parts = stem.split(".") + if len(parts) == 3: + try: + return "", int(parts[1]), int(parts[2]) + except ValueError: + return None + + if stem.startswith("DIM-1r."): + coords = stem[len("DIM-1r."):].split(".") + if len(coords) == 2: + try: + return "DIM-1", int(coords[0]), int(coords[1]) + except ValueError: + return None + + if stem.startswith("DIM1/r."): + coords = stem[len("DIM1/r."):].split(".") + if len(coords) == 2: + try: + return "DIM1/", int(coords[0]), int(coords[1]) + except ValueError: + return None + + return None + + +def make_region_name(prefix, region_x, region_z): + if prefix == "DIM-1": + return f"DIM-1r.{region_x}.{region_z}.mcr" + if prefix == "DIM1/": + return f"DIM1/r.{region_x}.{region_z}.mcr" + return f"r.{region_x}.{region_z}.mcr" + + +def parse_region_chunks(region_data, endian): + if len(region_data) < REGION_HEADER_BYTES: + return [] + + chunks = [] + for index in range(REGION_TABLE_COUNT): + offset = read_u32(region_data, index * 4, endian) + if offset == 0: + continue + + sector_start = offset >> 8 + sector_count = offset & 0xFF + if sector_start == 0 or sector_count == 0: + continue + + chunk_offset = sector_start * REGION_SECTOR_BYTES + if chunk_offset + 8 > len(region_data): + continue + + stored_length = read_u32(region_data, chunk_offset, endian) + decomp_length = read_u32(region_data, chunk_offset + 4, endian) + use_rle = bool(stored_length & 0x80000000) + payload_length = stored_length & 0x7FFFFFFF + data_start = chunk_offset + 8 + data_end = data_start + payload_length + if data_end > len(region_data): + continue + + local_x = index & 31 + local_z = index >> 5 + chunks.append( + { + "local_x": local_x, + "local_z": local_z, + "stored_length": stored_length, + "decomp_length": decomp_length, + "use_rle": use_rle, + "data": region_data[data_start:data_end], + } + ) + + return chunks + + +def build_region_file(chunks, endian): + sector_free = [True] * 4096 + sector_free[0] = False + sector_free[1] = False + + chunks_by_slot = {} + for chunk in chunks: + slot = chunk["local_x"] + (chunk["local_z"] * 32) + chunks_by_slot[slot] = chunk + + output = bytearray(REGION_SECTOR_BYTES * 2) + header = bytearray(REGION_HEADER_BYTES) + + def allocate_sectors(byte_count): + needed = (byte_count + REGION_SECTOR_BYTES - 1) // REGION_SECTOR_BYTES + run_start = None + run_count = 0 + for i in range(len(sector_free)): + if sector_free[i]: + if run_start is None: + run_start = i + run_count = 1 + else: + run_count += 1 + if run_count >= needed: + for j in range(run_start, run_start + needed): + sector_free[j] = False + return run_start, needed + else: + run_start = None + run_count = 0 + raise ValueError("Not enough free sectors for split region file") + + for slot in sorted(chunks_by_slot.keys()): + chunk = chunks_by_slot[slot] + chunk_bytes = bytearray() + chunk_bytes.extend(int(chunk["stored_length"]).to_bytes(4, endian, signed=False)) + chunk_bytes.extend(int(chunk["decomp_length"]).to_bytes(4, endian, signed=False)) + chunk_bytes.extend(chunk["data"]) + + sector_start, sector_count = allocate_sectors(len(chunk_bytes)) + chunk_offset = sector_start * REGION_SECTOR_BYTES + needed_size = chunk_offset + (sector_count * REGION_SECTOR_BYTES) + if len(output) < needed_size: + output.extend(b"\x00" * (needed_size - len(output))) + output[chunk_offset:chunk_offset + len(chunk_bytes)] = chunk_bytes + + offset_value = (sector_start << 8) | sector_count + write_u32(header, slot * 4, offset_value, endian) + timestamp_offset = REGION_TABLE_BYTES + (slot * 4) + write_u32(header, timestamp_offset, 0, endian) + + if len(output) < REGION_HEADER_BYTES: + output.extend(b"\x00" * (REGION_HEADER_BYTES - len(output))) + output[0:REGION_TABLE_BYTES] = header[0:REGION_TABLE_BYTES] + output[REGION_TABLE_BYTES:REGION_HEADER_BYTES] = header[REGION_TABLE_BYTES:REGION_HEADER_BYTES] + return bytes(output) + + +def build_split_save_entries(parsed, src_payload, src_endian, dst_endian): + entries = [] + region_groups = defaultdict(list) + + for entry in parsed["entries"]: + name = entry["name"] + start = entry["start"] + length = entry["length"] + data = src_payload[start:start + length] + + if name == REGION_FORMAT_16_NAME: + continue + + region_info = region_coords_from_name(name) + if region_info is None or not name.lower().endswith(".mcr"): + entries.append( + { + "name": name, + "data": data, + "last_modified": entry["last_modified"], + } + ) + continue + + prefix, region_x, region_z = region_info + region_chunks = parse_region_chunks(data, src_endian) + for chunk in region_chunks: + # fireblade: if youre reading this pls fix non-dlc worlds + # like if you dont do the --dlc argument then the center chunk + # is always gonna be corrupted for some reason + # (i genuinely have no clue towards why this happens) + chunk_x = region_x * 32 + chunk["local_x"] + chunk_z = region_z * 32 + chunk["local_z"] + + target_region_x = chunk_x // 16 + target_region_z = chunk_z // 16 + + target_local_x = chunk_x % 16 + target_local_z = chunk_z % 16 + region_groups[(prefix, target_region_x, target_region_z)].append( + { + "local_x": target_local_x, + "local_z": target_local_z, + "stored_length": chunk["stored_length"], + "decomp_length": chunk["decomp_length"], + "data": chunk["data"], + } + ) + + entries.append( + { + "name": REGION_FORMAT_16_NAME, + "data": b"", + "last_modified": 0, + } + ) + entries.append( + { + "name": "entities.dat", + "data": b"", + "last_modified": 0, + } + ) + + for prefix, region_x, region_z in sorted(region_groups.keys()): + region_name = make_region_name(prefix, region_x, region_z) + region_blob = build_region_file(region_groups[(prefix, region_x, region_z)], endian=dst_endian) + entries.append( + { + "name": region_name, + "data": region_blob, + "last_modified": 0, + } + ) + + return entries + + +def detect_payload_endian(payload): + for endian in ("little", "big"): + header_offset = read_u32(payload, 0, endian) + header_count = read_u32(payload, 4, endian) + if header_offset < SAVE_HEADER_SIZE: + continue + if header_count == 0 or header_count > 50000: + continue + if header_offset + (header_count * FILE_ENTRY_SIZE) == len(payload): + return endian + return None + + +def serialize_payload_from_entries(entries, original_version, target_version, dst_endian): + data_payload = bytearray(SAVE_HEADER_SIZE) + serialized_entries = [] + + for entry in entries: + start = len(data_payload) + data = entry["data"] + data_payload.extend(data) + serialized_entries.append( + { + "name": entry["name"], + "start": start, + "length": len(data), + "last_modified": entry.get("last_modified", 0), + } + ) + + header_offset = len(data_payload) + dst_payload = bytearray(data_payload) + write_u32(dst_payload, 0, header_offset, dst_endian) + write_u32(dst_payload, 4, len(serialized_entries), dst_endian) + write_u16(dst_payload, 8, original_version, dst_endian) + write_u16(dst_payload, 10, target_version, dst_endian) + + text_encoding = "utf-16-le" if dst_endian == "little" else "utf-16-be" + header_table = bytearray() + for entry in serialized_entries: + record = bytearray(FILE_ENTRY_SIZE) + name_bytes = entry["name"].encode(text_encoding, errors="ignore") + name_bytes = name_bytes[:128] + name_bytes = name_bytes + (b"\x00" * (128 - len(name_bytes))) + record[0:128] = name_bytes + write_u32(record, 128, entry["length"], dst_endian) + write_u32(record, 132, entry["start"], dst_endian) + write_u64(record, 136, entry["last_modified"], dst_endian) + header_table.extend(record) + + dst_payload.extend(header_table) + return bytes(dst_payload) + + +def parse_entries(payload, endian): + header_offset = read_u32(payload, 0, endian) + header_count = read_u32(payload, 4, endian) + original_version = read_u16(payload, 8, endian) + current_version = read_u16(payload, 10, endian) + + if header_offset + (header_count * FILE_ENTRY_SIZE) != len(payload): + raise ValueError("Invalid save header layout") + + entries = [] + text_encoding = "utf-16-le" if endian == "little" else "utf-16-be" + for i in range(header_count): + entry_offset = header_offset + (i * FILE_ENTRY_SIZE) + raw_name = payload[entry_offset:entry_offset + 128] + name = raw_name.decode(text_encoding, errors="ignore").split("\x00", 1)[0] + length = read_u32(payload, entry_offset + 128, endian) + start = read_u32(payload, entry_offset + 132, endian) + last_modified = read_u64(payload, entry_offset + 136, endian) + entries.append( + { + "name": name, + "length": length, + "start": start, + "last_modified": last_modified, + "entry_offset": entry_offset, + } + ) + + return { + "header_offset": header_offset, + "header_count": header_count, + "original_version": original_version, + "current_version": current_version, + "entries": entries, + } + + +def convert_region_file(region_data, src_endian, dst_endian): + if len(region_data) < REGION_HEADER_BYTES: + return region_data + + src = bytearray(region_data) + dst = bytearray(region_data) + + offset_table = [] + for i in range(REGION_TABLE_COUNT): + pos = i * 4 + value = read_u32(src, pos, src_endian) + offset_table.append(value) + write_u32(dst, pos, value, dst_endian) + + for i in range(REGION_TABLE_COUNT): + pos = REGION_TABLE_BYTES + (i * 4) + value = read_u32(src, pos, src_endian) + write_u32(dst, pos, value, dst_endian) + + for offset_value in offset_table: + if offset_value == 0: + continue + + sector_start = offset_value >> 8 + sector_count = offset_value & 0xFF + if sector_start == 0 or sector_count == 0: + continue + + chunk_offset = sector_start * REGION_SECTOR_BYTES + chunk_limit = chunk_offset + (sector_count * REGION_SECTOR_BYTES) + if chunk_limit > len(src): + continue + if chunk_offset + 8 > len(src): + continue + + stored_length = read_u32(src, chunk_offset, src_endian) + decomp_length = read_u32(src, chunk_offset + 4, src_endian) + + rle_flag = stored_length & 0x80000000 + payload_length = stored_length & 0x7FFFFFFF + if chunk_offset + 8 + payload_length > chunk_limit: + continue + + write_u32(dst, chunk_offset, rle_flag | payload_length, dst_endian) + write_u32(dst, chunk_offset + 4, decomp_length, dst_endian) + + return bytes(dst) + + +def serialize_payload(parsed, src_payload, src_endian, dst_endian, target_version): + return serialize_payload_with_mode(parsed, src_payload, src_endian, dst_endian, target_version, "windows") + + +def serialize_payload_with_mode(parsed, src_payload, src_endian, dst_endian, target_version, mode): + if mode == "dlc": + split_entries = build_split_save_entries(parsed, src_payload, src_endian, dst_endian) + return serialize_payload_from_entries(split_entries, parsed["original_version"], target_version, dst_endian) + + header_offset = parsed["header_offset"] + entries = [entry.copy() for entry in parsed["entries"]] + + data_payload = bytearray(src_payload[:header_offset]) + + for entry in entries: + name = entry["name"].lower() + start = entry["start"] + length = entry["length"] + + if start + length > header_offset: + continue + if length == 0: + continue + + if name.endswith(".mcr"): + segment = src_payload[start:start + length] + data_payload[start:start + length] = convert_region_file(segment, src_endian, dst_endian) + + dst_payload = bytearray(data_payload) + write_u32(dst_payload, 0, header_offset, dst_endian) + write_u32(dst_payload, 4, len(entries), dst_endian) + write_u16(dst_payload, 8, parsed["original_version"], dst_endian) + write_u16(dst_payload, 10, target_version, dst_endian) + + text_encoding = "utf-16-le" if dst_endian == "little" else "utf-16-be" + header_table = bytearray() + for entry in entries: + record = bytearray(FILE_ENTRY_SIZE) + name_bytes = entry["name"].encode(text_encoding, errors="ignore") + name_bytes = name_bytes[:128] + name_bytes = name_bytes + (b"\x00" * (128 - len(name_bytes))) + record[0:128] = name_bytes + write_u32(record, 128, entry["length"], dst_endian) + write_u32(record, 132, entry["start"], dst_endian) + write_u64(record, 136, entry["last_modified"], dst_endian) + header_table.extend(record) + + dst_payload.extend(header_table) + return bytes(dst_payload) + + +def convert_mcs( + input_path, + output_path, + source_endian="auto", + target_endian="little", + target_version=WINDOWS_SAVE_VERSION, + mode="windows", + split_saves=False, +): + with open(input_path, "rb") as f: + blob = f.read() + + if len(blob) < 12: + raise ValueError("Input file is too small to be a valid .mcs file") + + compressed_payload = blob[8:] + payload = zlib.decompress(compressed_payload) + + src_endian = source_endian + if source_endian == "auto": + src_endian = detect_payload_endian(payload) + if src_endian is None: + raise ValueError("Could not detect payload endianness!") + + parsed = parse_entries(payload, src_endian) + + out_payload = serialize_payload_with_mode(parsed, payload, src_endian, target_endian, target_version, mode if split_saves else "windows") + + out_blob = bytearray() + out_blob.extend(b"\x00\x00\x00\x00") + out_blob.extend(len(out_payload).to_bytes(4, target_endian, signed=False)) + out_blob.extend(zlib.compress(out_payload, level=9)) + + out_dir = os.path.dirname(output_path) + if out_dir: + os.makedirs(out_dir, exist_ok=True) + + with open(output_path, "wb") as f: + f.write(out_blob) + out_size = len(out_blob) + + return { + "mode": mode, + "split_saves": split_saves, + "source_endian": src_endian, + "target_endian": target_endian, + "entry_count": len(parsed["entries"]), + "original_version": parsed["original_version"], + "current_version": target_version, + "decompressed_size": len(out_payload), + "compressed_size": out_size, + } + + +def default_output_path(input_path): + input_dir = os.path.dirname(input_path) + return os.path.join(input_dir, "saveData.ms") + + +def main(): + parser = argparse.ArgumentParser(description="Converts Wii U .mcs saves to Windows + Xbox One-compatible .mcs files") + parser.add_argument("input", help="Input .mcs path") + parser.add_argument( + "output", + nargs="?", + help="Output path", + ) + parser.add_argument( + "--dlc", + action="store_true", + help="Split-save preset for DLC worlds", + ) + parser.add_argument( + "--no-split", + action="store_true", + help="Disable split-save logic when --dlc is set", + ) + parser.add_argument( + "--source-endian", + choices=["auto", "big", "little"], + default="auto", + help="Override the input source's endianness", + ) + parser.add_argument( + "--target-endian", + choices=["little", "big"], + default="little", + help="Override the output source's endianness", + ) + parser.add_argument( + "--target-version", + type=int, + default=WINDOWS_SAVE_VERSION, + help="Save version to write into the file header", + ) + + args = parser.parse_args() + + try: + mode = "dlc" if args.dlc else "windows" + split_saves = args.dlc and not args.no_split + output_path = args.output or default_output_path(args.input) + result = convert_mcs( + input_path=args.input, + output_path=output_path, + source_endian=args.source_endian, + target_endian=args.target_endian, + target_version=args.target_version, + mode=mode, + split_saves=split_saves, + ) + except Exception as exc: + print(f"Error: {exc}", file=sys.stderr) + return 1 + + print("Converted save successfully!") + print(f" Mode: {result["mode"]}") + print(f" DLC Split Save: {result["split_saves"]}") + print(f" Source Endian: {result["source_endian"]}") + print(f" Target Endian: {result["target_endian"]}") + print(f" Entry Count: {result["entry_count"]}") + print(f" Versions: {result["original_version"]} -> {result["current_version"]}") + print(f" Decompressed Size: {result["decompressed_size"]}") + print(f" Output Size: {result["compressed_size"]}") + print(f" Output Path: {output_path}") + return 0 + + +if __name__ == "__main__": + raise SystemExit(main())