LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-01 19:04:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: extract ISkinAssetData so minecraft/ stops including DLCSkinFile.h

Browse Source
This commit is contained in:
MatthewBeshay
2026-04-09 21:11:41 +10:00
parent 80019158da
commit 8b202ba5f1
10 changed files with 89 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
targets/minecraft/client/multiplayer/ClientConnection.cpp
View File

@@ -16,7 +16,7 @@
#include "app/common/ConsoleGameMode.h"
#include "app/common/DLC/DLCManager.h"
#include "app/common/DLC/DLCPack.h"
#include "app/common/DLC/DLCSkinFile.h"
#include "minecraft/client/skins/ISkinAssetData.h"
#include "app/common/Network/Socket.h"
#include "app/common/Tutorial/FullTutorialMode.h"
#include "app/common/Tutorial/Tutorial.h"
@@ -2313,16 +2313,16 @@ void ClientConnection::handleTextureAndGeometry(
unsigned int dwBytes = 0;
gameServices().getMemFileDetails(packet->textureName, &pbData,
&dwBytes);
DLCSkinFile* pDLCSkinFile =
gameServices().getDLCSkinFile(packet->textureName);
ISkinAssetData* pSkinAsset =
gameServices().getSkinAssetData(packet->textureName);
if (dwBytes != 0) {
if (pDLCSkinFile) {
if (pDLCSkinFile->getAdditionalBoxesCount() != 0) {
if (pSkinAsset) {
if (pSkinAsset->getAdditionalBoxesCount() != 0) {
send(std::shared_ptr<TextureAndGeometryPacket>(
new TextureAndGeometryPacket(packet->textureName,
pbData, dwBytes,
pDLCSkinFile)));
pSkinAsset)));
} else {
send(std::shared_ptr<TextureAndGeometryPacket>(
new TextureAndGeometryPacket(packet->textureName,