diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer.java b/src/main/java/net/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer.java index b9b0dc5ff7..61846a94c1 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer.java @@ -39,7 +39,7 @@ public class ForgeBlockModelRenderer extends ModelBlockRenderer @Override public boolean tesselateWithoutAO(BlockAndTintGetter level, BakedModel model, BlockState state, BlockPos pos, PoseStack poseStack, VertexConsumer buffer, boolean checkSides, Random rand, long seed, int packedOverlay, IModelData modelData) { - if(ForgeConfig.CLIENT.experimentalForgeLightPipelineEnabled.get()) + if(ForgeConfig.CLIENT.forgeLightPipelineEnabled.get()) { VertexBufferConsumer consumer = consumerFlat.get(); consumer.setBuffer(buffer); @@ -59,7 +59,7 @@ public class ForgeBlockModelRenderer extends ModelBlockRenderer @Override public boolean tesselateWithAO(BlockAndTintGetter level, BakedModel model, BlockState state, BlockPos pos, PoseStack poseStack, VertexConsumer buffer, boolean checkSides, Random rand, long seed, int packedOverlay, IModelData modelData) { - if(ForgeConfig.CLIENT.experimentalForgeLightPipelineEnabled.get()) + if(ForgeConfig.CLIENT.forgeLightPipelineEnabled.get()) { VertexBufferConsumer consumer = consumerSmooth.get(); consumer.setBuffer(buffer); diff --git a/src/main/java/net/minecraftforge/common/ForgeConfig.java b/src/main/java/net/minecraftforge/common/ForgeConfig.java index fc9663d6dd..ea7bdd496d 100644 --- a/src/main/java/net/minecraftforge/common/ForgeConfig.java +++ b/src/main/java/net/minecraftforge/common/ForgeConfig.java @@ -120,6 +120,9 @@ public class ForgeConfig { public static class Client { public final BooleanValue alwaysSetupTerrainOffThread; + public final BooleanValue forgeLightPipelineEnabled; + + @Deprecated(forRemoval = true, since = "1.18.2") public final BooleanValue experimentalForgeLightPipelineEnabled; public final BooleanValue showLoadWarnings; @@ -139,6 +142,11 @@ public class ForgeConfig { .translation("forge.configgui.alwaysSetupTerrainOffThread") .define("alwaysSetupTerrainOffThread", false); + forgeLightPipelineEnabled = builder + .comment("Enable the Forge block rendering pipeline - fixes the lighting of custom models.") + .translation("forge.configgui.forgeLightPipelineEnabled") + .define("forgeLightPipelineEnabled", true); + experimentalForgeLightPipelineEnabled = builder .comment("EXPERIMENTAL: Enable the Forge block rendering pipeline - fixes the lighting of custom models.") .translation("forge.configgui.forgeLightPipelineEnabled")