From 6fbe0a9e72494d0e77f8bf0a4fb60cdfdf220768 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 15 Feb 2025 11:06:43 -0600 Subject: [PATCH] Add missing cave blocks for cave culling --- .../distanthorizons/core/config/Config.java | 16 +++++++++++----- .../FullDataToRenderDataTransformer.java | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java index 4b6a5393b..bf37f6e57 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java @@ -761,20 +761,26 @@ public class Config + "Disable this if shadows render incorrectly.") .build(); - public static ConfigEntry ignoredRenderBlockCsv = new ConfigEntry.Builder() + public static ConfigEntry ignoredRenderBlockCsv = new ConfigEntry.Builder() // TODO accept wildcards .set("minecraft:barrier,minecraft:structure_void,minecraft:light,minecraft:tripwire,minecraft:brown_mushroom") + .setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // only shown in file since the UI has a character limit .comment("" + "A comma separated list of block resource locations that won't be rendered by DH. \n" - + "Note: air is always included in this list. \n" + + "Air is always included in this list. \n" + + "Requires a restart to change. \n" + "") .build(); - public static ConfigEntry ignoredRenderCaveBlockCsv = new ConfigEntry.Builder() - .set("minecraft:glow_lichen,minecraft:rail,minecraft:water,minecraft:lava,minecraft:bubble_column") + public static ConfigEntry ignoredRenderCaveBlockCsv = new ConfigEntry.Builder() // TODO accept wildcards + .set("minecraft:glow_lichen,minecraft:rail,minecraft:water,minecraft:lava,minecraft:bubble_column," + + "minecraft:cave_vines_plant,minecraft:vine,minecraft:cave_vines,minecraft:short_grass,minecraft:tall_grass," + + "minecraft:small_dripleaf,minecraft:big_dripleaf,minecraft:big_dripleaf_stem,minecraft:sculk_vein") + .setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // only shown in file since the UI has a character limit .comment("" + "A comma separated list of block resource locations that shouldn't be rendered \n" + "if they are in a 0 sky light underground area. \n" - + "Note: air is always included in this list. \n" + + "Air is always included in this list. \n" + + "Requires a restart to change. \n" + "") .build(); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java index fa2be0adf..d9a901faf 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java @@ -270,7 +270,7 @@ public class FullDataToRenderDataTransformer //====================// boolean ignoreBlock = blockStatesToIgnore.contains(block); - boolean caveBlock = caveBlockStatesToIgnore.contains(block); + boolean caveBlock = caveBlockStatesToIgnore.contains(block); // TODO caves should also ignore transparent/non-solid blocks (IE grass and plants) wthout each being defined if (caveBlock) { if (caveCullingEnabled