tilera
/
Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

Fixes a crash bug when trying to break a block because the damage texture couldn't be generated. (#69) 

Fixes another crash bug where during UVLModelLoader loading, it tried to apply tint but couldn't, because no block was available.
Also fixes a bug where the quad tint wasn't propagated and tinting didn't work.
This commit is contained in:
shartte 2016-08-19 09:23:51 +02:00 committed by Elix_x
parent 25a5108944
commit 153b38b74c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/appeng/client/render/model/CachingRotatingBakedModel.java
View File

@ -216,7 +216,7 @@ public class CachingRotatingBakedModel implements IBakedModel
public void setQuadTint( int tint )
{
parent.setQuadTint( tint );
}
@Override
@ -228,13 +228,13 @@ public class CachingRotatingBakedModel implements IBakedModel
@Override
public void setApplyDiffuseLighting( boolean diffuse )
{
parent.setApplyDiffuseLighting( diffuse );
}
@Override
public void setTexture( TextureAtlasSprite texture )
{
parent.setTexture( texture );
}
}

6
src/main/java/appeng/client/render/model/UVLModelLoader.java
View File

@ -315,9 +315,15 @@ public enum UVLModelLoader implements ICustomModelLoader
lightmap[1] = brightness.getLeft();
}
@Override
public void setQuadTint( int tint )
{
// Tint requires a block state which we don't have at this point
}
};
trans.setParent( builder );
quad.pipe( trans );
builder.setQuadTint( quad.getTintIndex() );
builder.setQuadOrientation( quad.getFace() );
return builder.build();
}