Remove redundant rendering options (#10140)

This commit is contained in:
Paint_Ninja authored and GitHub committed 2024-10-26 20:24:18 +01:00
1 parent de587eb50a
commit b8f5e4553b
4 files changed
+4 -51

No files matched your search

@@ -447,7 +447,7 @@ public class ForgeHooksClient {
// TODO Do we need this?
public static void fillNormal(int[] faceData, Direction facing, boolean calculateNormals) {
Vector3f v2;
if (calculateNormals || ForgeConfig.CLIENT.calculateAllNormals()) {
if (calculateNormals) {
Vector3f v1 = getVertexPos(faceData, 3);
Vector3f t1 = getVertexPos(faceData, 1);
v2 = getVertexPos(faceData, 2);
@@ -94,27 +94,14 @@ public class ForgeConfig {
* Client specific configuration - only loaded clientside from forge-client.toml
*/
public static class Client {
public final BooleanValue alwaysSetupTerrainOffThread;
public final BooleanValue experimentalForgeLightPipelineEnabled;
public final BooleanValue showLoadWarnings;
public final BooleanValue useCombinedDepthStencilAttachment;
public final BooleanValue calculateAllNormals;
Client(ForgeConfigSpec.Builder builder) {
builder.comment("Client only settings, mostly things related to rendering")
.push("client");
alwaysSetupTerrainOffThread = builder
.comment("Enable Forge to queue all chunk updates to the Chunk Update thread.",
"May increase FPS significantly, but may also cause weird rendering lag.",
"Not recommended for computers without a significant number of cores available.")
.translation("forge.configgui.alwaysSetupTerrainOffThread")
.define("alwaysSetupTerrainOffThread", false);
experimentalForgeLightPipelineEnabled = builder
.comment("EXPERIMENTAL: Enable the Forge block rendering pipeline - fixes the lighting of custom models.")
.translation("forge.configgui.forgeLightPipelineEnabled")
@@ -125,29 +112,11 @@ public class ForgeConfig {
.translation("forge.configgui.showLoadWarnings")
.define("showLoadWarnings", true);
useCombinedDepthStencilAttachment = builder
.comment("Set to true to use a combined DEPTH_STENCIL attachment instead of two separate ones.")
.translation("forge.configgui.useCombinedDepthStencilAttachment")
.define("useCombinedDepthStencilAttachment", false);
calculateAllNormals = builder
.comment("During block model baking, manually calculates the normal for all faces.",
"This was the default behavior of forge between versions 31.0 and 47.1.",
"May result in differences between vanilla rendering and forge rendering.",
"Will only produce differences for blocks that contain non-axis aligned faces.",
"You will need to reload your resources to see results.")
.translation("forge.configgui.calculateAllNormals")
.define("calculateAllNormals", false);
builder.pop();
}
// Allow these to be called before the config is loaded because its used before loading the error screens.
// Prevents a ton of spam when an error screen is displayed.
public final boolean calculateAllNormals() {
return clientSpec.isLoaded() ? calculateAllNormals.get() : calculateAllNormals.getDefault();
}
public final boolean showLoadWarnings() {
return clientSpec.isLoaded() ? showLoadWarnings.get() : showLoadWarnings.getDefault();
}