From b5f65a2cb30e450ad26d3b1817d07c165be2fba3 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Sat, 25 Mar 2017 17:14:32 -0500 Subject: [PATCH] Extended Vertex Format checker to include Forge Pipeline as well as optifine. --- .../render/chiseledblock/ChiseledBlockSmartModel.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/mod/chiselsandbits/render/chiseledblock/ChiseledBlockSmartModel.java b/src/main/java/mod/chiselsandbits/render/chiseledblock/ChiseledBlockSmartModel.java index 42fed132..ea9f6002 100644 --- a/src/main/java/mod/chiselsandbits/render/chiseledblock/ChiseledBlockSmartModel.java +++ b/src/main/java/mod/chiselsandbits/render/chiseledblock/ChiseledBlockSmartModel.java @@ -27,6 +27,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockRenderLayer; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeModContainer; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.client.FMLClientHandler; @@ -103,12 +104,12 @@ public static ChiseledBlockBaked getCachedModel( private static VertexFormat getModelFormat() { - return hasOptifine() ? DefaultVertexFormats.ITEM : ChiselsAndBitsBakedQuad.VERTEX_FORMAT; + return ForgePipelineDisabled() ? DefaultVertexFormats.ITEM : ChiselsAndBitsBakedQuad.VERTEX_FORMAT; } - private static boolean hasOptifine() + private static boolean ForgePipelineDisabled() { - return FMLClientHandler.instance().hasOptifine(); + return FMLClientHandler.instance().hasOptifine() || !ForgeModContainer.forgeLightPipelineEnabled; } private static ChiseledBlockBaked getCachedModel(