Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Minecraft.Client/ItemInHandRenderer.cpp
View File

@@ -226,7 +226,7 @@ void ItemInHandRenderer::renderItem(shared_ptr<LivingEntity> mob, shared_ptr<Ite
{
// 4J - code borrowed from render method below, although not factoring in brightness as that should already be being taken into account
// by texture lighting. This is for colourising things held in 3rd person view.
if ( (setColor) && (item != nullptr) )
if ( (setColor) && (item != NULL) )
{
int col = Item::items[item->id]->getColor(item,0);
float red = ((col >> 16) & 0xff) / 255.0f;
@@ -238,7 +238,7 @@ void ItemInHandRenderer::renderItem(shared_ptr<LivingEntity> mob, shared_ptr<Ite
glPushMatrix();
Tile *tile = Tile::tiles[item->id];
if (item->getIconType() == Icon::TYPE_TERRAIN && tile != nullptr && TileRenderer::canRender(tile->getRenderShape()))
if (item->getIconType() == Icon::TYPE_TERRAIN && tile != NULL && TileRenderer::canRender(tile->getRenderShape()))
{
MemSect(31);
minecraft->textures->bindTexture(minecraft->textures->getTextureLocation(Icon::TYPE_TERRAIN));
@@ -249,7 +249,7 @@ void ItemInHandRenderer::renderItem(shared_ptr<LivingEntity> mob, shared_ptr<Ite
{
MemSect(31);
Icon *icon = mob->getItemInHandIcon(item, layer);
if (icon == nullptr)
if (icon == NULL)
{
glPopMatrix();
MemSect(0);
@@ -299,7 +299,7 @@ void ItemInHandRenderer::renderItem(shared_ptr<LivingEntity> mob, shared_ptr<Ite
renderItem3D(t, u0, v0, u1, v1, icon->getSourceWidth(), icon->getSourceHeight(), 1 / 16.0f, false, bIsTerrain);
if (item != nullptr && item->isFoil() && layer == 0)
if (item != NULL && item->isFoil() && layer == 0)
{
glDepthFunc(GL_EQUAL);
glDisable(GL_LIGHTING);
@@ -425,7 +425,7 @@ void ItemInHandRenderer::render(float a)
glMultiTexCoord2f(GL_TEXTURE1, u / 1.0f, v / 1.0f);
glColor4f(1, 1, 1, 1);
}
if (item != nullptr)
if (item != NULL)
{
int col = Item::items[item->id]->getColor(item,0);
float red = ((col >> 16) & 0xff) / 255.0f;
@@ -439,7 +439,7 @@ void ItemInHandRenderer::render(float a)
glColor4f(br, br, br, 1);
}
if (item != nullptr && item->id == Item::map->id)
if (item != NULL && item->id == Item::map->id)
{
glPushMatrix();
float d = 0.8f;
@@ -481,13 +481,13 @@ void ItemInHandRenderer::render(float a)
glPushMatrix();
glTranslatef(-0.0f, -0.6f, 1.1f * flip);
glRotatef(static_cast<float>(-45 * flip), 1, 0, 0);
glRotatef((float)(-45 * flip), 1, 0, 0);
glRotatef(-90, 0, 0, 1);
glRotatef(59, 0, 0, 1);
glRotatef(static_cast<float>(-65 * flip), 0, 1, 0);
glRotatef((float)(-65 * flip), 0, 1, 0);
EntityRenderer *er = EntityRenderDispatcher::instance->getRenderer(minecraft->player);
PlayerRenderer *playerRenderer = static_cast<PlayerRenderer *>(er);
PlayerRenderer *playerRenderer = (PlayerRenderer *) er;
float ss = 1;
glScalef(ss, ss, ss);
@@ -530,20 +530,20 @@ void ItemInHandRenderer::render(float a)
t->begin();
int vo = 7;
t->normal(0,0,-1);
t->vertexUV(static_cast<float>(0 - vo), static_cast<float>(128 + vo), static_cast<float>(0), static_cast<float>(0), static_cast<float>(1));
t->vertexUV(static_cast<float>(128 + vo), static_cast<float>(128 + vo), static_cast<float>(0), static_cast<float>(1), static_cast<float>(1));
t->vertexUV(static_cast<float>(128 + vo), static_cast<float>(0 - vo), static_cast<float>(0), static_cast<float>(1), static_cast<float>(0));
t->vertexUV(static_cast<float>(0 - vo), static_cast<float>(0 - vo), static_cast<float>(0), static_cast<float>(0), static_cast<float>(0));
t->vertexUV((float)(0 - vo), (float)( 128 + vo), (float)( 0), (float)( 0), (float)( 1));
t->vertexUV((float)(128 + vo), (float)( 128 + vo), (float)( 0), (float)( 1), (float)( 1));
t->vertexUV((float)(128 + vo), (float)( 0 - vo), (float)( 0), (float)( 1), (float)( 0));
t->vertexUV((float)(0 - vo), (float)( 0 - vo), (float)( 0), (float)( 0), (float)( 0));
t->end();
shared_ptr<MapItemSavedData> data = Item::map->getSavedData(item, minecraft->level);
PIXBeginNamedEvent(0,"Minimap render");
if(data != nullptr) minimap->render(minecraft->player, minecraft->textures, data, minecraft->player->entityId);
if(data != NULL) minimap->render(minecraft->player, minecraft->textures, data, minecraft->player->entityId);
PIXEndNamedEvent();
glPopMatrix();
}
else if (item != nullptr)
else if (item != NULL)
{
glPushMatrix();
float d = 0.8f;
@@ -617,7 +617,7 @@ void ItemInHandRenderer::render(float a)
glRotatef(-8, 1, 0, 0);
glTranslatef(-0.9f, 0.2f, 0.0f);
float timeHeld = (item->getUseDuration() - (player->getUseItemDuration() - a + 1));
float pow = timeHeld / static_cast<float>(BowItem::MAX_DRAW_DURATION);
float pow = timeHeld / (float) (BowItem::MAX_DRAW_DURATION);
pow = ((pow * pow) + pow * 2) / 3;
if (pow > 1) pow = 1;
if (pow > 0.1f)
@@ -706,7 +706,7 @@ void ItemInHandRenderer::render(float a)
glTranslatef(5.6f, 0, 0);
EntityRenderer *er = EntityRenderDispatcher::instance->getRenderer(minecraft->player);
PlayerRenderer *playerRenderer = static_cast<PlayerRenderer *>(er);
PlayerRenderer *playerRenderer = (PlayerRenderer *) er;
float ss = 1;
glScalef(ss, ss, ss);
MemSect(31);
@@ -762,7 +762,7 @@ void ItemInHandRenderer::renderScreenEffect(float a)
}
}
if (Tile::tiles[tile] != nullptr) renderTex(a, Tile::tiles[tile]->getTexture(2));
if (Tile::tiles[tile] != NULL) renderTex(a, Tile::tiles[tile]->getTexture(2));
}
if (minecraft->player->isUnderLiquid(Material::water))
@@ -905,11 +905,11 @@ void ItemInHandRenderer::tick()
shared_ptr<ItemInstance> nextTile = player->inventory->getSelected();
bool matches = lastSlot == player->inventory->selected && nextTile == selectedItem;
if (selectedItem == nullptr && nextTile == nullptr)
if (selectedItem == NULL && nextTile == NULL)
{
matches = true;
}
if (nextTile != nullptr && selectedItem != nullptr && nextTile != selectedItem && nextTile->id == selectedItem->id && nextTile->getAuxValue() == selectedItem->getAuxValue())
if (nextTile != NULL && selectedItem != NULL && nextTile != selectedItem && nextTile->id == selectedItem->id && nextTile->getAuxValue() == selectedItem->getAuxValue())
{
selectedItem = nextTile;
matches = true;