phaneron/MinecraftConsoles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge with upstream

Browse source
This commit is contained in:
Soggy_Pancake 2026-03-14 14:51:06 -07:00
commit ad1a4ecc68
2031 changed files with 40476 additions and 27116 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Minecraft.Client/PreStitchedTextureMap.cpp
View file

@ -27,11 +27,11 @@ PreStitchedTextureMap::PreStitchedTextureMap(int type, const wstring &name, cons
this->missingTexture = missingTexture;
// 4J Initialisers
missingPosition = NULL;
stitchResult = NULL;
missingPosition = nullptr;
stitchResult = nullptr;
m_mipMap = mipmap;
missingPosition = (StitchedTexture *)(new SimpleIcon(NAME_MISSING_TEXTURE,NAME_MISSING_TEXTURE,0,0,1,1));
missingPosition = static_cast<StitchedTexture *>(new SimpleIcon(NAME_MISSING_TEXTURE, NAME_MISSING_TEXTURE, 0, 0, 1, 1));
}
void PreStitchedTextureMap::stitch()
@ -49,7 +49,7 @@ void PreStitchedTextureMap::stitch()
//for (Tile tile : Tile.tiles)
for(unsigned int i = 0; i < Tile::TILE_NUM_COUNT; ++i)
{
if (Tile::tiles[i] != NULL)
if (Tile::tiles[i] != nullptr)
{
Tile::tiles[i]->registerIcons(this);
}
@ -63,7 +63,7 @@ void PreStitchedTextureMap::stitch()
for(unsigned int i = 0; i < Item::ITEM_NUM_COUNT; ++i)
{
Item *item = Item::items[i];
if (item != NULL && item->getIconType() == iconType)
if (item != nullptr && item->getIconType() == iconType)
{
item->registerIcons(this);
}
@ -124,7 +124,7 @@ void PreStitchedTextureMap::stitch()
int height = image->getHeight();
int width = image->getWidth();
if(stitchResult != NULL)
if(stitchResult != nullptr)
{
TextureManager::getInstance()->unregisterTexture(name, stitchResult);
delete stitchResult;
@ -219,7 +219,7 @@ void PreStitchedTextureMap::makeTextureAnimated(TexturePack *texturePack, Stitch
// TODO: [EB] Put the frames into a proper object, not this inside out hack
vector<Texture *> *frames = TextureManager::getInstance()->createTextures(filename, m_mipMap);
if (frames == NULL || frames->empty())
if (frames == nullptr || frames->empty())
{
return; // Couldn't load a texture, skip it
}
@ -251,10 +251,10 @@ StitchedTexture *PreStitchedTextureMap::getTexture(const wstring &name)
app.DebugPrintf("Not implemented!\n");
__debugbreak();
#endif
return NULL;
return nullptr;
#if 0
StitchedTexture *result = texturesByName.find(name)->second;
if (result == NULL) result = missingPosition;
if (result == nullptr) result = missingPosition;
return result;
#endif
}
@ -275,10 +275,10 @@ Texture *PreStitchedTextureMap::getStitchedTexture()
// 4J Stu - register is a reserved keyword in C++
Icon *PreStitchedTextureMap::registerIcon(const wstring &name)
{
Icon *result = NULL;
Icon *result = nullptr;
if (name.empty())
{
app.DebugPrintf("Don't register NULL\n");
app.DebugPrintf("Don't register nullptr\n");
#ifndef _CONTENT_PACKAGE
__debugbreak();
#endif