From e7a724d832f1e3b6cc7c85b38704592117c44300 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Wed, 27 Dec 2017 21:02:20 -0600 Subject: [PATCH] Add setting disableCustomVertexFormats --- src/main/java/mod/chiselsandbits/config/ModConfig.java | 4 ++++ .../render/chiseledblock/ChiseledBlockSmartModel.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/mod/chiselsandbits/config/ModConfig.java b/src/main/java/mod/chiselsandbits/config/ModConfig.java index e3c5262d..1e5fab64 100644 --- a/src/main/java/mod/chiselsandbits/config/ModConfig.java +++ b/src/main/java/mod/chiselsandbits/config/ModConfig.java @@ -153,6 +153,9 @@ public class ModConfig extends Configuration @Configured( category = "Client Performance Settings" ) public static UseVBO useVBO; + @Configured( category = "Client Performance Settings" ) + public boolean disableCustomVertexFormats; + @Configured( category = "Client Performance Settings" ) public int maxMillisecondsPerBlock = 10; @@ -361,6 +364,7 @@ private void setDefaults() defaultToDynamicRenderer = false; dynamicRenderFullChunksOnly = true; useVBO = UseVBO.AUTOMATIC; + disableCustomVertexFormats = false; showUsage = true; invertBitBagFullness = false; diff --git a/src/main/java/mod/chiselsandbits/render/chiseledblock/ChiseledBlockSmartModel.java b/src/main/java/mod/chiselsandbits/render/chiseledblock/ChiseledBlockSmartModel.java index f862a971..67bca8fe 100644 --- a/src/main/java/mod/chiselsandbits/render/chiseledblock/ChiseledBlockSmartModel.java +++ b/src/main/java/mod/chiselsandbits/render/chiseledblock/ChiseledBlockSmartModel.java @@ -14,6 +14,7 @@ import mod.chiselsandbits.chiseledblock.data.VoxelBlobStateInstance; import mod.chiselsandbits.chiseledblock.data.VoxelBlobStateReference; import mod.chiselsandbits.chiseledblock.data.VoxelNeighborRenderTracker; +import mod.chiselsandbits.core.ChiselsAndBits; import mod.chiselsandbits.helpers.ModUtil; import mod.chiselsandbits.interfaces.ICacheClearable; import mod.chiselsandbits.render.BaseSmartModel; @@ -112,7 +113,7 @@ private static VertexFormat getModelFormat() private static boolean ForgePipelineDisabled() { - return FMLClientHandler.instance().hasOptifine() || !ForgeModContainer.forgeLightPipelineEnabled; + return FMLClientHandler.instance().hasOptifine() || !ForgeModContainer.forgeLightPipelineEnabled || ChiselsAndBits.getConfig().disableCustomVertexFormats; } private static ChiseledBlockBaked getCachedModel(