From d311269d3ce9d44d8507bbd9f6881c928dc6c604 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 13 Jul 2018 23:28:46 +0200 Subject: [PATCH] Fixed crash with Optifine. Fixes #1875 --- .../render/model/baked/BakedModelFullbright.java | 4 ++++ .../com/raoulvdberge/refinedstorage/util/RenderUtils.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelFullbright.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelFullbright.java index edcd6ed30..ee8f9ad1b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelFullbright.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelFullbright.java @@ -110,6 +110,10 @@ public class BakedModelFullbright extends BakedModelDelegate { } private static BakedQuad transformQuad(BakedQuad quad, float light) { + if (RenderUtils.isLightMapDisabled()) { + return quad; + } + VertexFormat newFormat = RenderUtils.getFormatWithLightMap(quad.getFormat()); UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(newFormat); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java index cfecca5f6..35d4518a8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java @@ -404,8 +404,12 @@ public final class RenderUtils { return lines; } + public static boolean isLightMapDisabled() { + return FMLClientHandler.instance().hasOptifine() || !ForgeModContainer.forgeLightPipelineEnabled; + } + public static VertexFormat getFormatWithLightMap(VertexFormat format) { - if (FMLClientHandler.instance().hasOptifine() || !ForgeModContainer.forgeLightPipelineEnabled) { + if (isLightMapDisabled()) { return format; }