From 6cdcd8ccc92b4b9650eb3b1c48f32e8cefe0083b Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Tue, 18 Oct 2016 23:06:54 +0200 Subject: [PATCH] Trying to fix #2489: Always use the BLOCK VertexFormat for fullbright quads, and try to disable diffuse lighting for them. --- .../java/appeng/client/render/model/UVLModelLoader.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/appeng/client/render/model/UVLModelLoader.java b/src/main/java/appeng/client/render/model/UVLModelLoader.java index 237e81c4f..131c53f94 100644 --- a/src/main/java/appeng/client/render/model/UVLModelLoader.java +++ b/src/main/java/appeng/client/render/model/UVLModelLoader.java @@ -32,7 +32,6 @@ import java.lang.reflect.Type; import java.util.Collection; import java.util.HashMap; import java.util.Map; - import javax.annotation.Nullable; import com.google.common.base.Charsets; @@ -336,12 +335,7 @@ public enum UVLModelLoader implements ICustomModelLoader Pair brightness = uvlightmap.get( face ); if( brightness != null ) { - VertexFormat format = new VertexFormat( quad.getFormat() ); - if( !format.getElements().contains( DefaultVertexFormats.TEX_2S ) ) - { - format.addElement( DefaultVertexFormats.TEX_2S ); - } - UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( format ); + UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( DefaultVertexFormats.BLOCK ); VertexLighterFlat trans = new VertexLighterFlat( Minecraft.getMinecraft().getBlockColors() ){ @Override @@ -362,6 +356,7 @@ public enum UVLModelLoader implements ICustomModelLoader builder.setQuadTint( quad.getTintIndex() ); builder.setQuadOrientation( quad.getFace() ); builder.setTexture( quad.getSprite() ); + builder.setApplyDiffuseLighting( false ); return builder.build(); } else