From ed159c98688f19d040536364459ccfa9838cd223 Mon Sep 17 00:00:00 2001 From: NULL511 Date: Sat, 20 Jul 2024 00:44:14 -0400 Subject: [PATCH] floodfill ignore rails, banners --- shaders/block.properties | 4 +++- shaders/dimensions/setup.csh | 4 ++++ shaders/template/block.properties | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/shaders/block.properties b/shaders/block.properties index 197291a..c2b32c7 100644 --- a/shaders/block.properties +++ b/shaders/block.properties @@ -530,7 +530,9 @@ block.321=slime_block ####### ----- LPV shapes ----- ####### -block.401=chain ladder lever tripwire tripwire_hook candle:lit=false black_candle:lit=false blue_candle:lit=false brown_candle:lit=false cyan_candle:lit=false gray_candle:lit=false green_candle:lit=false light_blue_candle:lit=false light_gray_candle:lit=false lime_candle:lit=false magenta_candle:lit=false orange_candle:lit=false pink_candle:lit=false purple_candle:lit=false red_candle:lit=false white_candle:lit=false yellow_candle:lit=false supplementaries:candle_holder:lit=false supplementaries:candle_holder_black:lit=false supplementaries:candle_holder_blue:lit=false supplementaries:candle_holder_brown:lit=false supplementaries:candle_holder_cyan:lit=false supplementaries:candle_holder_gray:lit=false supplementaries:candle_holder_green:lit=false supplementaries:candle_holder_light_blue:lit=false supplementaries:candle_holder_light_gray:lit=false supplementaries:candle_holder_lime:lit=false supplementaries:candle_holder_magenta:lit=false supplementaries:candle_holder_orange:lit=false supplementaries:candle_holder_pink:lit=false supplementaries:candle_holder_purple:lit=false supplementaries:candle_holder_red:lit=false supplementaries:candle_holder_white:lit=false supplementaries:candle_holder_yellow:lit=false acacia_button bamboo_button birch_button cherry_button crimson_button dark_oak_button jungle_button mangrove_button oak_button polished_blackstone_button spruce_button stone_button warped_button scaffolding + # Blocks for FloodFill to ignore +block.401=chain ladder lever tripwire tripwire_hook candle:lit=false black_candle:lit=false blue_candle:lit=false brown_candle:lit=false cyan_candle:lit=false gray_candle:lit=false green_candle:lit=false light_blue_candle:lit=false light_gray_candle:lit=false lime_candle:lit=false magenta_candle:lit=false orange_candle:lit=false pink_candle:lit=false purple_candle:lit=false red_candle:lit=false white_candle:lit=false yellow_candle:lit=false acacia_button bamboo_button birch_button cherry_button crimson_button dark_oak_button jungle_button mangrove_button oak_button polished_blackstone_button spruce_button stone_button warped_button rail activator_rail detector_rail powered_rail:powered=false scaffolding \ + supplementaries:candle_holder:lit=false supplementaries:candle_holder_black:lit=false supplementaries:candle_holder_blue:lit=false supplementaries:candle_holder_brown:lit=false supplementaries:candle_holder_cyan:lit=false supplementaries:candle_holder_gray:lit=false supplementaries:candle_holder_green:lit=false supplementaries:candle_holder_light_blue:lit=false supplementaries:candle_holder_light_gray:lit=false supplementaries:candle_holder_lime:lit=false supplementaries:candle_holder_magenta:lit=false supplementaries:candle_holder_orange:lit=false supplementaries:candle_holder_pink:lit=false supplementaries:candle_holder_purple:lit=false supplementaries:candle_holder_red:lit=false supplementaries:candle_holder_white:lit=false supplementaries:candle_holder_yellow:lit=false block.402=wool_carpets black_carpet blue_carpet brown_carpet cyan_carpet gray_carpet green_carpet light_blue_carpet light_gray_carpet lime_carpet magenta_carpet moss_carpet orange_carpet pink_carpet purple_carpet red_carpet white_carpet yellow_carpet diff --git a/shaders/dimensions/setup.csh b/shaders/dimensions/setup.csh index ce87bdb..a3857c5 100644 --- a/shaders/dimensions/setup.csh +++ b/shaders/dimensions/setup.csh @@ -62,6 +62,10 @@ void main() { uint mixMask = 0xFFFF; vec3 tintColor = vec3(1.0); + if (blockId == BLOCK_SSS_WEAK_3) { + mixWeight = 1.0; + } + switch (blockId) { case BLOCK_WATER: mixWeight = 0.8; diff --git a/shaders/template/block.properties b/shaders/template/block.properties index ee2073b..b7e96af 100644 --- a/shaders/template/block.properties +++ b/shaders/template/block.properties @@ -733,8 +733,10 @@ block.*= minecraft:hanging_roots minecraft:weeping_vines minecraft:cave_vines:be ####### ----- LPV shapes ----- ####### + # Blocks for FloodFill to ignore #= BLOCK_LPV_IGNORE - block.401= chain ladder lever tripwire tripwire_hook [candle]:lit=false [supplementaries_candle]:lit=false acacia_button bamboo_button birch_button cherry_button crimson_button dark_oak_button jungle_button mangrove_button oak_button polished_blackstone_button spruce_button stone_button warped_button scaffolding + block.401= chain ladder lever tripwire tripwire_hook [candle]:lit=false acacia_button bamboo_button birch_button cherry_button crimson_button dark_oak_button jungle_button mangrove_button oak_button polished_blackstone_button spruce_button stone_button warped_button rail activator_rail detector_rail powered_rail:powered=false scaffolding \ + [supplementaries_candle]:lit=false #= BLOCK_CARPET block.*=wool_carpets black_carpet blue_carpet brown_carpet cyan_carpet gray_carpet green_carpet light_blue_carpet light_gray_carpet lime_carpet magenta_carpet moss_carpet orange_carpet pink_carpet purple_carpet red_carpet white_carpet yellow_carpet