Merge remote-tracking branch 'upstream/main' into TU31

This commit is contained in:
Fireblade
2026-07-05 18:32:31 -04:00
85 changed files with 2061 additions and 899 deletions

View File

@@ -19,9 +19,8 @@ ResourceLocation EntityRenderer::SHADOW_LOCATION = ResourceLocation(TN__CLAMP__M
EntityRenderer::EntityRenderer()
{
model = nullptr;
modelWide = nullptr;
modelSlim = nullptr;
newModel = nullptr;
newModelSlim = nullptr;
tileRenderer = new TileRenderer();
shadowRadius = 0;
shadowStrength = 1.0f;
@@ -409,6 +408,13 @@ void EntityRenderer::registerTerrainTextures(IconRegister *iconRegister)
{
}
Model *EntityRenderer::getModel(int modelType)
{
if (modelType == 2) return modelSlim;
else if (modelType == 1) return modelWide;
else return model;
}
ResourceLocation *EntityRenderer::getTextureLocation(shared_ptr<Entity> mob)
{