From af3f0743bed2923a826b9f09ab07a4420e50c21b Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Tue, 14 Jan 2020 00:03:44 +0100 Subject: [PATCH] Fix fullbrightness completely --- .../render/model/FullbrightBakedModel.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/FullbrightBakedModel.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/FullbrightBakedModel.java index 7fd024e2c..b4f855456 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/FullbrightBakedModel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/FullbrightBakedModel.java @@ -32,14 +32,9 @@ public class FullbrightBakedModel extends DelegateBakedModel { this.doCaching = doCaching; } - private boolean canRenderFullbright() { - // return ForgeConfig.CLIENT.forgeLightPipelineEnabled.get(); - return true; - } - @Override public List getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand, IModelData data) { - if (state == null || !canRenderFullbright()) { + if (state == null) { return base.getQuads(state, side, rand, data); } @@ -65,11 +60,21 @@ public class FullbrightBakedModel extends DelegateBakedModel { } private static BakedQuad transformQuad(BakedQuad quad) { - int[] vertexData = quad.getVertexData(); + int[] vertexData = quad.getVertexData().clone(); - vertexData[6] = 0xF000F000; + // Set lighting to fullbright on all vertices + vertexData[6] = 0x00F000F0; + vertexData[6 + 8] = 0x00F000F0; + vertexData[6 + 8 + 8] = 0x00F000F0; + vertexData[6 + 8 + 8 + 8] = 0x00F000F0; - return quad; + return new BakedQuad( + vertexData, + quad.getTintIndex(), + quad.getFace(), + quad.getSprite(), + quad.shouldApplyDiffuseLighting() + ); } private class CacheKey {