From 12347b13b0fe7b1f613e541b8f52b01ef36dc1ae Mon Sep 17 00:00:00 2001 From: Sestain Date: Wed, 18 Mar 2026 20:41:31 +0200 Subject: [PATCH] Remove the things made for other PR --- Minecraft.Client/Common/DLC/DLCManager.cpp | 41 ---------------------- Minecraft.Client/Common/DLC/DLCManager.h | 1 - 2 files changed, 42 deletions(-) diff --git a/Minecraft.Client/Common/DLC/DLCManager.cpp b/Minecraft.Client/Common/DLC/DLCManager.cpp index 9d4d37731..88a7756e5 100644 --- a/Minecraft.Client/Common/DLC/DLCManager.cpp +++ b/Minecraft.Client/Common/DLC/DLCManager.cpp @@ -453,16 +453,11 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD DLCFile *dlcFile = nullptr; DLCPack *dlcTexturePack = nullptr; - DLCPack *dlcSkinPack = nullptr; if(type == e_DLCType_TexturePack) { dlcTexturePack = new DLCPack(pack->getName(), pack->getLicenseMask()); } - else if(type == e_DLCType_SkinData) - { - dlcSkinPack = new DLCPack(pack->getName(), pack->getLicenseMask()); - } else if(type != e_DLCType_PackConfig) { dlcFile = pack->addFile(type,(WCHAR *)pFile->wchFile); @@ -522,42 +517,6 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD } ++dwFilesProcessed; } - else if(dlcSkinPack != nullptr) - { - DWORD skinFilesProcessed = 0; - bool validPack = processDLCDataFile(skinFilesProcessed, pbTemp, pFile->uiFileSize, dlcSkinPack); - if(!validPack || skinFilesProcessed == 0) - { - delete dlcSkinPack; - dlcSkinPack = nullptr; - } - else - { - for(DWORD i = 0; i < dlcSkinPack->getSkinCount(); ++i) - { - DLCSkinFile* skinFile = dlcSkinPack->getSkinFile(i); - if(skinFile) - { - DLCFile* newFile = pack->addFile(DLCManager::e_DLCType_Skin, skinFile->getPath()); - - for(int param = 0; param < DLCManager::e_DLCParamType_Max; ++param) - { - auto value = skinFile->getParameterAsString(static_cast(param)); - if(!value.empty()) - { - newFile->addParameter(static_cast(param), value); - } - } - - app.vSkinNames.push_back(skinFile->getPath()); - } - } - - pack->addChildPack(dlcSkinPack); - } - - ++dwFilesProcessed; - } else if(dlcFile != nullptr) { // Data diff --git a/Minecraft.Client/Common/DLC/DLCManager.h b/Minecraft.Client/Common/DLC/DLCManager.h index 596fc66a4..7191ab0b6 100644 --- a/Minecraft.Client/Common/DLC/DLCManager.h +++ b/Minecraft.Client/Common/DLC/DLCManager.h @@ -20,7 +20,6 @@ public: e_DLCType_Audio, e_DLCType_ColourTable, e_DLCType_GameRulesHeader, - e_DLCType_SkinData, e_DLCType_Max, e_DLCType_All,