From 153b38b74c878206e0dd53fda4b13e9ac3ce9bed Mon Sep 17 00:00:00 2001 From: shartte Date: Fri, 19 Aug 2016 09:23:51 +0200 Subject: [PATCH] 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. --- .../client/render/model/CachingRotatingBakedModel.java | 6 +++--- .../java/appeng/client/render/model/UVLModelLoader.java | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/appeng/client/render/model/CachingRotatingBakedModel.java b/src/main/java/appeng/client/render/model/CachingRotatingBakedModel.java index c3c91a3e..1d96b194 100644 --- a/src/main/java/appeng/client/render/model/CachingRotatingBakedModel.java +++ b/src/main/java/appeng/client/render/model/CachingRotatingBakedModel.java @@ -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 ); } } diff --git a/src/main/java/appeng/client/render/model/UVLModelLoader.java b/src/main/java/appeng/client/render/model/UVLModelLoader.java index e1b63a04..265e909a 100644 --- a/src/main/java/appeng/client/render/model/UVLModelLoader.java +++ b/src/main/java/appeng/client/render/model/UVLModelLoader.java @@ -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(); }