From 68f029d8c35be664e5507ccf9127384695cc96a0 Mon Sep 17 00:00:00 2001 From: NULL511 Date: Sat, 4 May 2024 23:55:14 -0400 Subject: [PATCH] variable normal offset strength; misc fixes --- shaders/dimensions/all_translucent.fsh | 11 +- shaders/dimensions/composite1.fsh | 11 +- shaders/entity.properties | 3 +- shaders/lang/en_us.lang | 4 +- shaders/lib/settings.glsl | 1 + shaders/shaders.properties | 4 +- shaders/template/block.properties | 690 +++++++++++++++++++++++++ shaders/world0/shadow.vsh | 4 +- 8 files changed, 713 insertions(+), 15 deletions(-) create mode 100644 shaders/template/block.properties diff --git a/shaders/dimensions/all_translucent.fsh b/shaders/dimensions/all_translucent.fsh index c1087fd..03145fb 100644 --- a/shaders/dimensions/all_translucent.fsh +++ b/shaders/dimensions/all_translucent.fsh @@ -619,13 +619,14 @@ if (gl_FragCoord.x * texelSize.x < 1.0 && gl_FragCoord.y * texelSize.y < 1.0 ) #endif #ifdef IS_LPV_ENABLED - vec3 lpvPos = GetLpvPosition(feetPlayerPos); + vec3 normalOffset = 0.5*worldSpaceNormal; - #ifdef LPV_NORMAL_OFFSET - lpvPos += -0.5*worldSpaceNormal + viewToWorld(normal); - #else - lpvPos += 0.5*worldSpaceNormal; + #if LPV_NORMAL_STRENGTH > 0 + vec3 texNormalOffset = -normalOffset + viewToWorld(normal); + normalOffset = mix(normalOffset, texNormalOffset, (LPV_NORMAL_STRENGTH*0.01)); #endif + + vec3 lpvPos = GetLpvPosition(feetPlayerPos) + normalOffset; #else const vec3 lpvPos = vec3(0.0); #endif diff --git a/shaders/dimensions/composite1.fsh b/shaders/dimensions/composite1.fsh index 40b037d..056ab96 100644 --- a/shaders/dimensions/composite1.fsh +++ b/shaders/dimensions/composite1.fsh @@ -1175,13 +1175,14 @@ void main() { #endif #ifdef IS_LPV_ENABLED - vec3 lpvPos = GetLpvPosition(feetPlayerPos); + vec3 normalOffset = 0.5*viewToWorld(FlatNormals); - #ifdef LPV_NORMAL_OFFSET - lpvPos += -0.5*viewToWorld(FlatNormals) + slopednormal; - #else - lpvPos += 0.5*viewToWorld(FlatNormals); + #if LPV_NORMAL_STRENGTH > 0 + vec3 texNormalOffset = -normalOffset + slopednormal; + normalOffset = mix(normalOffset, texNormalOffset, (LPV_NORMAL_STRENGTH*0.01)); #endif + + vec3 lpvPos = GetLpvPosition(feetPlayerPos) + normalOffset; #else const vec3 lpvPos = vec3(0.0); #endif diff --git a/shaders/entity.properties b/shaders/entity.properties index 79d75b1..23b7965 100644 --- a/shaders/entity.properties +++ b/shaders/entity.properties @@ -17,7 +17,8 @@ entity.1303= tnt firework_rocket entity.1401 = giant ghast elder_guardian ## weak sss (same as weak sss for blocks) -entity.1402 = furnace_minecart player sheep frog chicken iron_golem snow_golem polar_bear zombie_horse armor_stand arrow squid bat cat cod cow donkey fox horse mooshroom mule ocelot parrot pig piglin polar_bear pufferfish rabbit salmon strider tropical_fish turtle villager wandering_trader bee cave_spider dolphin enderman llama panda spider wolf zombified_piglin blaze creeper drowned endermite evoker guardian hoglin husk magma_cube phantom piglin_brute pillager ravager silverfish stray vex vindicator witch zoglin zombie zombie_villager trader_llama +entity.1402 = furnace_minecart sheep frog chicken iron_golem snow_golem polar_bear zombie_horse armor_stand arrow squid bat cat cod cow donkey fox horse mooshroom mule ocelot parrot pig piglin polar_bear pufferfish rabbit salmon strider tropical_fish turtle villager wandering_trader bee cave_spider dolphin enderman llama panda spider wolf zombified_piglin blaze creeper drowned endermite evoker guardian hoglin husk magma_cube phantom piglin_brute pillager ravager silverfish stray vex vindicator witch zoglin zombie zombie_villager trader_llama +#removed: player ################################################ ###### REFLECTIVE TRANSLUCENTS diff --git a/shaders/lang/en_us.lang b/shaders/lang/en_us.lang index bc98f7d..6e9647f 100644 --- a/shaders/lang/en_us.lang +++ b/shaders/lang/en_us.lang @@ -97,7 +97,9 @@ screen.Direct_Light = Direct Light value.LPV_SIZE.6 = Small [64] value.LPV_SIZE.7 = Medium [128] value.LPV_SIZE.8 = Large [256] - option.LPV_NORMAL_OFFSET = Normal-Offset + option.LPV_NORMAL_STRENGTH = Normal Strength + suffix.LPV_NORMAL_STRENGTH = % + value.LPV_NORMAL_STRENGTH.0 = OFF option.LPV_ENTITY_LIGHTS = Entity Lights option.LPV_REDSTONE_LIGHTS = Redstone Lights option.LPV_COLORED_CANDLES = Colored Candles diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl index 4d68378..2f9716a 100644 --- a/shaders/lib/settings.glsl +++ b/shaders/lib/settings.glsl @@ -681,6 +681,7 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631) //#define LPV_ENABLED #define LPV_SIZE 7 // [6 7 8] +#define LPV_NORMAL_STRENGTH 50 // [0 10 20 30 40 50 60 70 80 90 100] #define LPV_NORMAL_OFFSET #define LPV_ENTITY_LIGHTS #define LPV_REDSTONE_LIGHTS diff --git a/shaders/shaders.properties b/shaders/shaders.properties index 7a852c1..946cf5c 100644 --- a/shaders/shaders.properties +++ b/shaders/shaders.properties @@ -110,7 +110,7 @@ alphaTest.gbuffers_skybasic = false alphaTest.gbuffers_skytextured = false -sliders = sss_density_multiplier sss_absorbance_multiplier MOTION_AMOUNT TONEMAP WATER_WAVE_SPEED WATER_CAUSTICS_BRIGHTNESS DAY3_l0_coverage DAY3_l0_density DAY3_l1_coverage DAY3_l1_density DAY3_l2_coverage DAY3_l2_density DAY3_ufog_density DAY3_cfog_density DAY0_l0_coverage DAY0_l1_coverage DAY0_l2_coverage DAY0_ufog_density DAY0_l0_density DAY0_l1_density DAY0_l2_density DAY0_cfog_density DAY1_l0_coverage DAY1_l1_coverage DAY1_l2_coverage DAY1_ufog_density DAY1_l0_density DAY1_l1_density DAY1_l2_density DAY1_cfog_density DAY2_l0_coverage DAY2_l1_coverage DAY2_l2_coverage DAY2_ufog_density DAY2_l0_density DAY2_l1_density DAY2_l2_density DAY2_cfog_density DEBUG_VIEW entityShadowDistanceMul HANDHELD_LIGHT_RANGE CLOUD_SHADOW_STRENGTH CloudLayer0_coverage CloudLayer0_density CloudLayer0_height CloudLayer1_coverage CloudLayer1_density CloudLayer1_height CloudLayer2_coverage CloudLayer2_density CloudLayer2_height PLANET_GROUND_BRIGHTNESS FOG_START_HEIGHT WATER_WAVE_STRENGTH SWAMP_UNIFORM_DENSITY SWAMP_CLOUDY_DENSITY SWAMP_R SWAMP_G SWAMP_B JUNGLE_UNIFORM_DENSITY JUNGLE_CLOUDY_DENSITY JUNGLE_R JUNGLE_G JUNGLE_B DARKFOREST_UNIFORM_DENSITY DARKFOREST_CLOUDY_DENSITY DARKFOREST_R DARKFOREST_G DARKFOREST_B NETHER_PLUME_DENSITY END_STORM_DENSTIY LIT_PARTICLE_BRIGHTNESS UPPER_CURVE LOWER_CURVE CONTRAST EMISSIVE_TYPE SCALE_FACTOR ambientsss_brightness SSS_TYPE Cloud_Speed ORB_ColMult ORB_X ORB_Y ORB_Z ORB_R ORB_G ORB_B TOD_Fog_mult Morning_Uniform_Fog Noon_Uniform_Fog Evening_Uniform_Fog Night_Uniform_Fog Morning_Cloudy_Fog Noon_Cloudy_Fog Evening_Cloudy_Fog Night_Cloudy_Fog Summer_Leaf_R Summer_Leaf_G Summer_Leaf_B Fall_Leaf_R Fall_Leaf_G Fall_Leaf_B Winter_Leaf_R Winter_Leaf_G Winter_Leaf_B Spring_Leaf_R Spring_Leaf_G Spring_Leaf_B Summer_R Summer_G Summer_B Fall_R Fall_G Fall_B Winter_R Winter_G Winter_B Spring_R Spring_G Spring_B Season_Length CaveFogFallOff CaveFogColor_R CaveFogColor_G CaveFogColor_B indirect_effect GI_Strength ambient_brightness AmbientLight_R AmbientLight_G AmbientLight_B Rain_coverage Moon_temp Haze_amount RainFog_amount Sun_temp Puddle_Size LabSSS_Curve Emissive_Curve Emissive_Brightness AO_Strength BLOOMY_FOG WAVY_SPEED WAVY_STRENGTH BLOOM_STRENGTH shadowDistance Sky_Brightness fog_coefficientMieR fog_coefficientMieG fog_coefficientMieB sun_illuminance sunColorG sunColorB sunColorR sky_mieg sky_coefficientMieB sky_coefficientMieG sky_coefficientMieR sky_coefficientRayleighB sky_coefficientRayleighG sky_coefficientRayleighR CLOUDS_QUALITY EXPOSURE_MULTIPLIER MIN_LIGHT_AMOUNT TORCH_R TORCH_G TORCH_B TORCH_AMOUNT shadowMapResolution sunPathRotation BLEND_FACTOR VL_SAMPLES Exposure_Speed POM_DEPTH MAX_ITERATIONS MAX_DIST SSR_STEPS ambientOcclusionLevel SEA_LEVEL moon_illuminance moonColorR moonColorG moonColorB fog_coefficientRayleighR fog_coefficientRayleighG SATURATION Manual_exposure_value focal aperture MANUAL_FOCUS SHADOW_FILTER_SAMPLE_COUNT Max_Filter_Depth VPS_Search_Samples Min_Shadow_Filter_Radius Max_Shadow_Filter_Radius Water_Top_Layer fog_coefficientRayleighB SHARPENING rayMarchSampleCount Dirt_Amount Dirt_Scatter_R Dirt_Scatter_G Dirt_Scatter_B Dirt_Absorb_R Dirt_Absorb_G Dirt_Absorb_B Water_Absorb_R Water_Absorb_G Water_Absorb_B Purkinje_strength Purkinje_strength Purkinje_R Purkinje_G Purkinje_B Texture_MipMap_Bias DoF_Adaptation_Speed Purkinje_Multiplier CROSSTALK VL_RENDER_RESOLUTION BLOOM_QUALITY VL_RENDER_RESOLUTION RAY_COUNT STEPS STEP_LENGTH cloud_LevelOfDetail cloud_ShadowLevelOfDetail cloud_LevelOfDetailLQ cloud_ShadowLevelOfDetailLQ minRayMarchSteps maxRayMarchSteps minRayMarchStepsLQ maxRayMarchStepsLQ fbmAmount fbmPower1 fbmPower2 Roughness_Threshold Sun_specular_Strength reflection_quality DOF_QUALITY DOF_ANAMORPHIC_RATIO AEROCHROME_PINKNESS DOF_JITTER_FOCUS JITTER_STRENGTH SHADOWS_GRADE_R MIDS_GRADE_R HIGHLIGHTS_GRADE_R SHADOWS_GRADE_G MIDS_GRADE_G HIGHLIGHTS_GRADE_G SHADOWS_GRADE_B MIDS_GRADE_B HIGHLIGHTS_GRADE_B SHADOWS_GRADE_MUL MIDS_GRADE_MUL HIGHLIGHTS_GRADE_MUL +sliders = sss_density_multiplier sss_absorbance_multiplier MOTION_AMOUNT TONEMAP WATER_WAVE_SPEED WATER_CAUSTICS_BRIGHTNESS DAY3_l0_coverage DAY3_l0_density DAY3_l1_coverage DAY3_l1_density DAY3_l2_coverage DAY3_l2_density DAY3_ufog_density DAY3_cfog_density DAY0_l0_coverage DAY0_l1_coverage DAY0_l2_coverage DAY0_ufog_density DAY0_l0_density DAY0_l1_density DAY0_l2_density DAY0_cfog_density DAY1_l0_coverage DAY1_l1_coverage DAY1_l2_coverage DAY1_ufog_density DAY1_l0_density DAY1_l1_density DAY1_l2_density DAY1_cfog_density DAY2_l0_coverage DAY2_l1_coverage DAY2_l2_coverage DAY2_ufog_density DAY2_l0_density DAY2_l1_density DAY2_l2_density DAY2_cfog_density DEBUG_VIEW entityShadowDistanceMul HANDHELD_LIGHT_RANGE CLOUD_SHADOW_STRENGTH CloudLayer0_coverage CloudLayer0_density CloudLayer0_height CloudLayer1_coverage CloudLayer1_density CloudLayer1_height CloudLayer2_coverage CloudLayer2_density CloudLayer2_height PLANET_GROUND_BRIGHTNESS FOG_START_HEIGHT WATER_WAVE_STRENGTH SWAMP_UNIFORM_DENSITY SWAMP_CLOUDY_DENSITY SWAMP_R SWAMP_G SWAMP_B JUNGLE_UNIFORM_DENSITY JUNGLE_CLOUDY_DENSITY JUNGLE_R JUNGLE_G JUNGLE_B DARKFOREST_UNIFORM_DENSITY DARKFOREST_CLOUDY_DENSITY DARKFOREST_R DARKFOREST_G DARKFOREST_B NETHER_PLUME_DENSITY END_STORM_DENSTIY LIT_PARTICLE_BRIGHTNESS UPPER_CURVE LOWER_CURVE CONTRAST EMISSIVE_TYPE SCALE_FACTOR ambientsss_brightness SSS_TYPE Cloud_Speed ORB_ColMult ORB_X ORB_Y ORB_Z ORB_R ORB_G ORB_B TOD_Fog_mult Morning_Uniform_Fog Noon_Uniform_Fog Evening_Uniform_Fog Night_Uniform_Fog Morning_Cloudy_Fog Noon_Cloudy_Fog Evening_Cloudy_Fog Night_Cloudy_Fog Summer_Leaf_R Summer_Leaf_G Summer_Leaf_B Fall_Leaf_R Fall_Leaf_G Fall_Leaf_B Winter_Leaf_R Winter_Leaf_G Winter_Leaf_B Spring_Leaf_R Spring_Leaf_G Spring_Leaf_B Summer_R Summer_G Summer_B Fall_R Fall_G Fall_B Winter_R Winter_G Winter_B Spring_R Spring_G Spring_B Season_Length CaveFogFallOff CaveFogColor_R CaveFogColor_G CaveFogColor_B indirect_effect GI_Strength ambient_brightness AmbientLight_R AmbientLight_G AmbientLight_B Rain_coverage Moon_temp Haze_amount RainFog_amount Sun_temp Puddle_Size LabSSS_Curve Emissive_Curve Emissive_Brightness AO_Strength BLOOMY_FOG WAVY_SPEED WAVY_STRENGTH BLOOM_STRENGTH shadowDistance Sky_Brightness fog_coefficientMieR fog_coefficientMieG fog_coefficientMieB sun_illuminance sunColorG sunColorB sunColorR sky_mieg sky_coefficientMieB sky_coefficientMieG sky_coefficientMieR sky_coefficientRayleighB sky_coefficientRayleighG sky_coefficientRayleighR CLOUDS_QUALITY EXPOSURE_MULTIPLIER MIN_LIGHT_AMOUNT TORCH_R TORCH_G TORCH_B TORCH_AMOUNT shadowMapResolution sunPathRotation BLEND_FACTOR VL_SAMPLES Exposure_Speed POM_DEPTH MAX_ITERATIONS MAX_DIST SSR_STEPS ambientOcclusionLevel SEA_LEVEL moon_illuminance moonColorR moonColorG moonColorB fog_coefficientRayleighR fog_coefficientRayleighG SATURATION Manual_exposure_value focal aperture MANUAL_FOCUS SHADOW_FILTER_SAMPLE_COUNT Max_Filter_Depth VPS_Search_Samples Min_Shadow_Filter_Radius Max_Shadow_Filter_Radius Water_Top_Layer fog_coefficientRayleighB SHARPENING rayMarchSampleCount Dirt_Amount Dirt_Scatter_R Dirt_Scatter_G Dirt_Scatter_B Dirt_Absorb_R Dirt_Absorb_G Dirt_Absorb_B Water_Absorb_R Water_Absorb_G Water_Absorb_B Purkinje_strength Purkinje_strength Purkinje_R Purkinje_G Purkinje_B Texture_MipMap_Bias DoF_Adaptation_Speed Purkinje_Multiplier CROSSTALK VL_RENDER_RESOLUTION BLOOM_QUALITY VL_RENDER_RESOLUTION RAY_COUNT STEPS STEP_LENGTH cloud_LevelOfDetail cloud_ShadowLevelOfDetail cloud_LevelOfDetailLQ cloud_ShadowLevelOfDetailLQ minRayMarchSteps maxRayMarchSteps minRayMarchStepsLQ maxRayMarchStepsLQ fbmAmount fbmPower1 fbmPower2 Roughness_Threshold Sun_specular_Strength reflection_quality DOF_QUALITY DOF_ANAMORPHIC_RATIO AEROCHROME_PINKNESS DOF_JITTER_FOCUS JITTER_STRENGTH SHADOWS_GRADE_R MIDS_GRADE_R HIGHLIGHTS_GRADE_R SHADOWS_GRADE_G MIDS_GRADE_G HIGHLIGHTS_GRADE_G SHADOWS_GRADE_B MIDS_GRADE_B HIGHLIGHTS_GRADE_B SHADOWS_GRADE_MUL MIDS_GRADE_MUL HIGHLIGHTS_GRADE_MUL LPV_NORMAL_STRENGTH screen.columns=2 screen = \ @@ -174,7 +174,7 @@ BLISS_SHADERS \ ### FloodFill screen.LPV.columns = 1 - screen.LPV = LPV_ENABLED LPV_SIZE LPV_NORMAL_OFFSET LPV_ENTITY_LIGHTS LPV_REDSTONE_LIGHTS LPV_COLORED_CANDLES + screen.LPV = LPV_ENABLED LPV_SIZE LPV_NORMAL_STRENGTH LPV_ENTITY_LIGHTS LPV_REDSTONE_LIGHTS LPV_COLORED_CANDLES ######## WORLD screen.World.columns=1 screen.World = [Water] [Waving_Stuff] [LabPBR] SKY_GROUND RESOURCEPACK_SKY AEROCHROME_MODE AEROCHROME_PINKNESS AEROCHROME_WOOL_ENABLED diff --git a/shaders/template/block.properties b/shaders/template/block.properties new file mode 100644 index 0000000..5347087 --- /dev/null +++ b/shaders/template/block.properties @@ -0,0 +1,690 @@ +layer.translucent = minecraft:glass minecraft:glass_pane + +#= BLOCK_WATER +block.8= minecraft:water minecraft:flowing_water + +#= BLOCK_BAMBOO +block.11= bamboo bamboo_sapling + +#= BLOCK_GRASS_SHORT +block.*= minecraft:short_grass minecraft:grass + +#= BLOCK_GRASS_TALL_LOWER +block.*= minecraft:tall_grass:half=lower + +#= BLOCK_GRASS_TALL_UPPER +block.*= minecraft:tall_grass:half=upper + +#= BLOCK_SAPLING +block.*= minecraft:oak_sapling minecraft:spruce_sapling minecraft:birch_sapling minecraft:jungle_sapling minecraft:acacia_sapling minecraft:dark_oak_sapling + +#= BLOCK_VINE +block.*= vine + + +####### ----- waving blocks with SSS ----- ####### + + ## ground waving + ## add a newline to organize for modded blocks + #= BLOCK_GROUND_WAVING + block.60= minecraft:sunflower:half=upper minecraft:beetroots minecraft:potatoes minecraft:carrots minecraft:wheat minecraft:nether_wart minecraft:kelp minecraft:large_fern:half=upper minecraft:peony:half=upper minecraft:rose_bush:half=upper minecraft:lilac:half=upper minecraft:crimson_roots minecraft:nether_sprouts minecraft:warped_roots minecraft:seagrass minecraft:tall_seagrass:half=upper minecraft:wither_rose minecraft:lily_of_the_valley minecraft:cornflower minecraft:sweet_berry_bush minecraft:oxeye_daisy minecraft:pink_tulip minecraft:white_tulip minecraft:orange_tulip minecraft:red_tulip minecraft:azure_bluet minecraft:allium minecraft:blue_orchid minecraft:poppy minecraft:dandelion minecraft:dead_bush + # removed: sapling(s) + + ## ground waving vertical models. this exists to brighten up the sides of grass and stuff in shaded places they blend in better with the world. + #= BLOCK_GROUND_WAVING_VERTICAL + block.*= minecraft:fern conquest:acacia_sapling conquest:alder_tree_sapling conquest:apple_tree_sapling conquest:aspen_tree_sapling conquest:birch_sapling conquest:cherry_tree_sapling conquest:dark_oak_sapling conquest:downy_willow_tree_sapling conquest:gorse_tree_sapling conquest:grape_vine_sapling conquest:horse_chestnut_tree_sapling conquest:jungle_sapling conquest:larch_tree_sapling conquest:mallorn_tree_sapling conquest:oak_sapling conquest:orange_tree_sapling conquest:pear_tree_sapling conquest:pine_tree_sapling conquest:plum_tree_sapling conquest:rowan_tree_sapling conquest:spruce_sapling conquest:willow_tree_sapling conquest:angelica conquest:black_knapweed conquest:buttercups conquest:cornflower conquest:dandelion conquest:elanor conquest:goldenrod conquest:harebell conquest:lily_of_the_valley conquest:lobelia_flowers conquest:marsh_ragwort conquest:meadow_saffron conquest:mediterranean_wild_tulip conquest:moorland_spotted_orchid conquest:niphredil conquest:orange_tulip conquest:orpine conquest:oxeye_daisy conquest:pasque_flower conquest:pink_tulip conquest:poppy conquest:red_tulip conquest:rock_rose conquest:sea_lavender conquest:simbelmyne conquest:white_clematis conquest:white_tulip conquest:wild_dagga conquest:allium conquest:barley conquest:bean_pole conquest:beetroots conquest:cabbage conquest:carrots conquest:common_beans conquest:corn conquest:flax conquest:heirloom_wheat_crops conquest:hemp conquest:lavender conquest:peas conquest:potatoes conquest:rice conquest:thyme conquest:tobacco conquest:turnips conquest:water_mint conquest:wheat conquest:wild_basil conquest:wild_parsley conquest:wild_wheat conquest:common_meadow_grass conquest:cotton_grass conquest:dead_grass conquest:deergrass conquest:grass conquest:kentucky_bluegrass conquest:lush_grass conquest:purple_moor_grass conquest:sea_arrowgrass conquest:seagrass conquest:sweet_grass conquest:timothy_grass conquest:wavy_hair_grass conquest:pine_cones conquest:spruce_cones conquest:beautyberry_bush conquest:bilberry_bush conquest:blackberry_bush conquest:bog_blueberry_bush conquest:broom_bush conquest:dead_bush conquest:hawthorn_bush conquest:lingonberry_bush conquest:raspberry_bush conquest:alpine_sow_thristle conquest:athelas conquest:autumnal_dwarf_birch conquest:birdsfoot_trefoil conquest:bog_asphodel conquest:bottle_sedge conquest:cattails conquest:common_cow_wheat conquest:cow_parsley conquest:cross leaved heath conquest:dead_reeds conquest:dead_shrubs conquest:desert_shrub conquest:dogs_mercury conquest:dooryard_dock conquest:dry_reeds conquest:greater_fen_sedge conquest:greater_wood_rush conquest:green_meadow_fescue conquest:green_spurge conquest:heather conquest:meadow_fescue conquest:melancholy_thristle conquest:nettles conquest:nightshade conquest:papyrus conquest:purple_wolfs_bane conquest:red_common_cow_wheat conquest:rosebay_willowherb conquest:rushes conquest:wild_shrub conquest:sedge conquest:small_fescue conquest:small_scabious conquest:sweet_woodruff conquest:wild_overgrown_nettles conquest:wild_shrub conquest:wood_horsetail conquest:woodland_sedge conquest:wormwood conquest:yellow_wolfs_bane conquest:autumnal_bracken conquest:bracken conquest:dark_autumnal_bracken conquest:dead_bracken conquest:fern conquest:fern_1 conquest:fern_2 conquest:harts_tongue_fern conquest:large_fern_1 conquest:large_fern_2 conquest:large_fern_3 conquest:thick_fern conquest:tall_grass conquest:large_fern conquest:sunflower conquest:tall_lilac conquest:peony conquest:rose_bush conquest:tall_seagrass conquest:cypress conquest:young_tree conquest:young_frozen_tree conquest:cross_leaved_heath conquest:jungle_ground_cover conquest:alpine_sow_thistle conquest:duckweed conquest:red_mushroom conquest:brown_mushroom + + ## air waving + ## add a newline to organize for modded blocks + #= BLOCK_AIR_WAVING + block.*= minecraft:azalea_leaves minecraft:flowering_azalea_leaves minecraft:cherry_leaves minecraft:mangrove_leaves minecraft:vine minecraft:oak_leaves minecraft:spruce_leaves minecraft:birch_leaves minecraft:jungle_leaves minecraft:acacia_leaves minecraft:dark_oak_leaves westerosblocks:vine_jasmine westerosblocks:apple_fruit_leaves westerosblocks:apricot_fruit_leaves westerosblocks:cherry_fruit_leaves westerosblocks:purple_grape_fruit_leaves westerosblocks:lemon_fruit_leaves westerosblocks:lime_fruit_leaves westerosblocks:orange_fruit_leaves westerosblocks:peach_fruit_leaves westerosblocks:plum_fruit_leaves westerosblocks:pomegranate_fruit_leaves westerosblocks:weirwood_leaves westerosblocks:hop_fruit_leaves westerosblocks:olive_fruit_leaves westerosblocks:palm_leaves westerosblocks:white_grape_fruit_leaves conquest:apple_tree_leaves conquest:ash_tree_leaves conquest:aspen_leaves conquest:autumnal_aspen_leaves conquest:dark_deciduous_leaves conquest:autumnal_beech_tree_leaves conquest:autumnal_birch_leaves conquest:autumnal_horse_chestnut_leaves conquest:autumnal_maple_leaves conquest:autumnal_oak_leaves conquest:autumnal_weeping_willow_leaves conquest:banana_tree_leaves conquest:beech_tree_leaves conquest:bright_autumnal_beech_tree_leaves conquest:bright_autumnal_weeping_willow_leaves conquest:bushy_joshua_tree_leaves conquest:caribbean_royal_palm_leaves conquest:caribbean_royal_palm_leaves_corner conquest:cherry_tree_leaves conquest:dark_beech_tree_leaves conquest:date_palm_leaves conquest:diseased_horse_chestnut_leaves conquest:downy_willow_leaves conquest:downy_willow_leaves_tip conquest:faded_autumnal_beech_tree_leaves conquest:dead_norway_spruce_needles conquest:orange_larch_leaf_top conquest:yellow_larch_leaf_top conquest:larch_leaf_top conquest:larch_spruce_leaf_top conquest:larch_leaf_slab conquest:larch_leaf_long_branch conquest:larch_leaf_branch conquest:larch_spruce_leaf_top conquest:yellow_larch_spruce_leaf_top conquest:yellow_larch_leaf_slab conquest:yellow_larch_leaf_long_branch conquest:yellow_larch_leaf_branch conquest:orange_larch_spruce_leaf_top conquest:orange_larch_leaf_slab conquest:oranch_larch_leaf_long_branch conquest:orange_larch_leaf_branch conquest:dead_spruce_leaf_top conquest:dead_spruce_leaf_slab conquest:dead_spruce_leaf_long_branch conquest:dead_spruce_leaf_branch conquest:light_spruce_leaf_top conquest:light_spruce_leaf_slab conquest:light_spruce_leaf_long_branch conquest:light_spruce_leaf_branch conquest:goat_willow_leaves conquest:gorse_leaves conquest:grape_vine_leaves conquest:holly_leaves conquest:horse_chestnut_leaves conquest:joshua_tree_leaves conquest:lemon_tree_leaves conquest:old_caribbean_royal_palm_leaves conquest:old_caribbean_royal_palm_leaves_corner conquest:olive_tree_leaves conquest:orange_tree_leaves conquest:pear_tree_leaves conquest:plum_tree_leaves conquest:rowan_leaves conquest:weeping_willow_leaves conquest:wisteria_leaves conquest:yellow_autumnal_weeping_willow_leaves conquest:dark_spruce_needles conquest:dead_pine_needles conquest:dead_spruce_needles conquest:larch_needles conquest:light_spruce_needles conquest:orange_autumnal_larch_needles conquest:pine_needles conquest:yellow_autumnal_larch_needles conquest:dead_deciduous_branches conquest:mistletoe_garland conquest:lilac conquest:pink_cherry_blossoms conquest:purple_cherry_blossoms conquest:red_cherry_blossoms conquest:white_cherry_blossoms conquest:wisteria_blossoms conquest:hanging_moss conquest:lianas conquest:moss_vines conquest:spruce_leaf_top conquest:spruce_leaf_branch conquest:spruce_leaf_slab conquest:spruce_leaf_long_branch conquest:thick_hanging_ivy conquest:thick_ivy conquest:hanging_roots conquest:acacia_branch_tip conquest:acacia_branch_tip_45 conquest:acacia_branch_tip_2 conquest:acacia_branch_tip_2_45 conquest:beech_branch_tip conquest:beech_branch_tip_45 conquest:beech_branch_tip_2 conquest:beech _branch_tip_2_45 conquest:birch_branch_tip conquest:birch_branch_tip_45 conquest:birch_branch_tip_2 conquest:birch_branch_tip_2_45 conquest:oak_branch_tip conquest:oak_branch_tip_45 conquest:oak_branch_tip_2 conquest:oak_branch_tip_2_45 conquest:spruce_branch_tip conquest:spruce_branch_tip_45 conquest:spruce_branch_tip_2 conquest:spruce_branch_tip_2_45 conquest:orange_pine_branch_tip conquest:orange_pine_branch_tip_45 conquest:orange_pine_branch_tip_2 conquest:orange_pine_branch_tip_2_45 + + +####### ----- blocks with SSS ----- ####### + + ## strong sss + #= BLOCK_SSS_STRONG + block.80= minecraft:flowering_azalea minecraft:tall_seagrass minecraft:seagrass minecraft:kelp minecraft:large_fern:half=lower minecraft:tall_seagrass minecraft:kelp_plant minecraft:peony minecraft:rose_bush minecraft:lilac minecraft:sunflower:half=lower minecraft:packed_ice minecraft:blue_ice minecraft:melon_stem minecraft:pumpkin_stem minecraft:attached_melon_stem minecraft:attached_pumpkin_stem minecraft:lily_pad westerosblocks:blackberry_bush westerosblocks:blueberry_bush westerosblocks:raspberry_bush westerosblocks:juniper_bush westerosblocks:red_rose_bush westerosblocks:pink_rose_bush westerosblocks:white_rose_bush westerosblocks:yellow_rose_bush westerosblocks:yellow_wildflowers westerosblocks:green_spiny_herb westerosblocks:green_leafy_herb westerosblocks:orange_marigolds westerosblocks:orange_trollius westerosblocks:blue_forgetmenots westerosblocks:pink_wildflowers westerosblocks:yellow_tansy westerosblocks:blue_flax westerosblocks:white_daisies westerosblocks:yellow_daisies westerosblocks:green_scrub_grass westerosblocks:dead_scrub_grass westerosblocks:yellow_bedstraw westerosblocks:orange_bells westerosblocks:blue_bells westerosblocks:blue_swamp_bells westerosblocks:yellow_buttercups westerosblocks:orange_bog_asphodel westerosblocks:yellow_lupine westerosblocks:blue_hyacinth westerosblocks:pink_thistle westerosblocks:yellow_dandelions westerosblocks:yellow_daffodils westerosblocks:yellow_roses westerosblocks:strawberry_bush westerosblocks:white_lilyofthevalley westerosblocks:yellow_bells westerosblocks:yellow_sunflower westerosblocks:white_roses westerosblocks:red_dark_roses westerosblocks:yellow_hellebore westerosblocks:meadow_fescue westerosblocks:red_poppies westerosblocks:red_roses westerosblocks:purple_pansies westerosblocks:purple_roses westerosblocks:orange_sun_star westerosblocks:pink_primrose westerosblocks:red_aster westerosblocks:blue_chicory westerosblocks:red_flowering_spiny_herb westerosblocks:purple_foxglove westerosblocks:pink_allium westerosblocks:purple_violets westerosblocks:white_chamomile westerosblocks:red_tulips westerosblocks:white_peony westerosblocks:purple_alpine_sowthistle westerosblocks:red_carnations westerosblocks:magenta_roses westerosblocks:red_chrysanthemum westerosblocks:blue_orchid westerosblocks:yellow_rudbeckia westerosblocks:pink_tulips westerosblocks:cranberry_bush westerosblocks:purple_lavender westerosblocks:red_sourleaf_bush westerosblocks:pink_sweet_peas westerosblocks:red_sorrel westerosblocks:pink_roses westerosblocks:unshaded_grass westerosblocks:cow_parsely westerosblocks:bracken westerosblocks:lady_fern westerosblocks:nettle westerosblocks:dead_bracken westerosblocks:fireweed westerosblocks:heather westerosblocks:red_fern westerosblocks:dock_leaf westerosblocks:jasmine_vines westerosblocks:dappled_moss westerosblocks:cushion_moss_wall westerosblocks:hemp_short westerosblocks:hemp_tall westerosblocks:hemp_dense westerosblocks:crop_carrots westerosblocks:crop_wheat westerosblocks:crop_turnips westerosblocks:crop_peas westerosblocks:cattails westerosblocks:jungle_tall_fern westerosblocks:jungle_tall_grass westerosblocks:savanna_tall_grass + + ## weak sss + #= BLOCK_SSS_WEAK + block.*= minecraft:amethyst_block minecraft:budding_amethyst minecraft:small_amethyst_bud minecraft:pitcher_plant minecraft:small_dripleaf minecraft:grass_block:snowy=true minecraft:snow_block minecraft:snow powder_snow cobweb red_mushroom_block brown_mushroom_block weeping_vines weeping_vines_plant twisting_vines twisting_vines_plant tube_coral tube_coral_block tube_coral_fan tube_coral_wall_fan horn_coral horn_coral_block horn_coral_fan horn_coral_wall_fan fire_coral fire_coral_block fire_coral_fan fire_coral_wall_fan dead_brain_coral dead_brain_coral_block dead_brain_coral_fan dead_brain_coral_wall_fan dead_bubble_coral dead_bubble_coral_block dead_bubble_coral_fan dead_bubble_coral_wall_fan dead_bush dead_fire_coral dead_fire_coral_block dead_fire_coral_fan dead_fire_coral_wall_fan dead_horn_coral dead_horn_coral_block dead_horn_coral_fan dead_horn_coral_wall_fan dead_tube_coral dead_tube_coral_block dead_tube_coral_fan dead_tube_coral_wall_fan bubble_coral bubble_coral_block bubble_coral_fan bubble_coral_wall_fan brain_coral brain_coral_block brain_coral_fan brain_coral_wall_fan minecraft:spore_blossom minecraft:cave_vines:berries=false minecraft:cave_vines_plant:berries=false minecraft:glow_lichen minecraft:melon minecraft:pumpkin minecraft:big_dripleaf minecraft:big_dripleaf_stem minecraft:cactus minecraft:hay_block minecraft:brown_mushroom minecraft:mushroom_stem minecraft:sugar_cane minecraft:crimson_fungus minecraft:warped_fungus minecraft:sea_pickle:waterlogged=false minecraft:honeycomb_block + + ## weak sss + #= BLOCK_SSS_WEAK_2 + block.*= minecraft:white_wool minecraft:orange_wool minecraft:magenta_wool minecraft:light_blue_wool minecraft:yellow_wool minecraft:lime_wool minecraft:pink_wool minecraft:gray_wool minecraft:light_gray_wool minecraft:cyan_wool minecraft:purple_wool minecraft:blue_wool minecraft:brown_wool minecraft:green_wool minecraft:red_wool minecraft:black_wool minecraft:orange_carpet minecraft:magenta_carpet minecraft:light_blue_carpet minecraft:yellow_carpet minecraft:lime_carpet minecraft:pink_carpet minecraft:gray_carpet minecraft:light_gray_carpet minecraft:cyan_carpet minecraft:purple_carpet minecraft:blue_carpet minecraft:brown_carpet minecraft:green_carpet minecraft:red_carpet minecraft:black_carpet westerosblocks:clothesline westerosblocks:smoke westerosblocks:brown_mushroom_1 westerosblocks:brown_mushroom_2 westerosblocks:brown_mushroom_3 westerosblocks:brown_mushroom_4 westerosblocks:brown_mushroom_5 westerosblocks:brown_mushroom_6 westerosblocks:brown_mushroom_7 westerosblocks:brown_mushroom_8 westerosblocks:brown_mushroom_9 westerosblocks:brown_mushroom_10 westerosblocks:brown_mushroom_11 westerosblocks:brown_mushroom_12 westerosblocks:brown_mushroom_13 westerosblocks:red_mushroom_1 westerosblocks:red_mushroom_2 westerosblocks:red_mushroom_3 westerosblocks:red_mushroom_4 westerosblocks:red_mushroom_5 westerosblocks:red_mushroom_6 westerosblocks:red_mushroom_7 westerosblocks:red_mushroom_8 westerosblocks:red_mushroom_9 westerosblocks:white_wool_slab westerosblocks:orange_wool_slab westerosblocks:light_brown_wool_slab westerosblocks:light_blue_wool_slab westerosblocks:yellow_wool_slab westerosblocks:dirty_white_wool_slab westerosblocks:pink_wool_slab westerosblocks:grey_wool_slab westerosblocks:light_grey_wool_slab westerosblocks:cyan_wool_slab westerosblocks:purple_wool_slab westerosblocks:blue_wool_slab westerosblocks:brown_wool_slab westerosblocks:green_wool_slab westerosblocks:red_wool_slab westerosblocks:black_wool_slab westerosblocks:white_wool_carpet westerosblocks:orange_wool_carpet westerosblocks:light_brown_wool_carpet westerosblocks:light_blue_wool_carpet westerosblocks:yellow_wool_carpet westerosblocks:dirty_white_wool_carpet westerosblocks:pink_wool_carpet westerosblocks:grey_wool_carpet westerosblocks:light_grey_wool_carpet westerosblocks:cyan_wool_carpet westerosblocks:purple_wool_carpet westerosblocks:blue_wool_carpet westerosblocks:brown_wool_carpet westerosblocks:green_wool_carpet westerosblocks:red_wool_carpet westerosblocks:black_wool_carpet westerosblocks:thatch_light_fur_carpet westerosblocks:thatch_dark_fur_carpet + + ## weak sss + #= BLOCK_SSS_WEAK_3 + block.*= minecraft:white_wall_banner minecraft:orange_wall_banner minecraft:magenta_wall_banner minecraft:light_blue_wall_banner minecraft:yellow_wall_banner minecraft:lime_wall_banner minecraft:pink_wall_banner minecraft:gray_wall_banner minecraft:light_gray_wall_banner minecraft:cyan_wall_banner minecraft:purple_wall_banner minecraft:blue_wall_banner minecraft:brown_wall_banner minecraft:green_wall_banner minecraft:red_wall_banner minecraft:black_wall_banner minecraft:white_banner minecraft:orange_banner minecraft:magenta_banner minecraft:light_blue_banner minecraft:yellow_banner minecraft:lime_banner minecraft:pink_banner minecraft:gray_banner minecraft:light_gray_banner minecraft:cyan_banner minecraft:purple_banner minecraft:blue_banner minecraft:brown_banner minecraft:green_banner minecraft:red_banner minecraft:black_banner westerosblocks:renly_banner westerosblocks:redwyne_banner westerosblocks:grafton_banner westerosblocks:grey_banner westerosblocks:red_banner westerosblocks:black_banner westerosblocks:the_faith_of_the_seven_banner westerosblocks:cream_banner westerosblocks:blue_banner westerosblocks:brown_banner westerosblocks:cyan_banner westerosblocks:green_banner westerosblocks:orange_banner westerosblocks:pink_banner westerosblocks:purple_banner westerosblocks:lord_of_light_rhllor_banner westerosblocks:yellow_banner westerosblocks:arryn_banner westerosblocks:baratheon_banner westerosblocks:bolton_banner westerosblocks:dayne_banner westerosblocks:frey_banner westerosblocks:greyjoy_banner westerosblocks:hightower_banner westerosblocks:lannister_banner westerosblocks:manderly_banner westerosblocks:martell_banner westerosblocks:stannis_banner westerosblocks:stark_banner westerosblocks:targaryen_banner westerosblocks:tarly_banner westerosblocks:tully_banner westerosblocks:tyrell_banner + + ## weird blocks + #= BLOCK_SSS_WEIRD + block.*= minecraft:sand minecraft:red_sand + + ## grass uwu + #= BLOCK_GRASS + block.*= minecraft:grass_block:snowy=false + + +####### ----- lightsources ----- ####### + + #= BLOCK_AMETHYST_BUD_LARGE + block.101= large_amethyst_bud + + #= BLOCK_AMETHYST_BUD_MEDIUM + block.*= medium_amethyst_bud + + #= BLOCK_AMETHYST_CLUSTER + block.*= amethyst_cluster + + #= BLOCK_BEACON + block.*= beacon + + #= BLOCK_BREWING_STAND + block.*= brewing_stand + + group.candle= candle black_candle blue_candle brown_candle cyan_candle gray_candle \ + green_candle light_blue_candle light_gray_candle lime_candle magenta_candle \ + orange_candle pink_candle purple_candle red_candle white_candle yellow_candle + + #ifdef LPV_COLORED_CANDLES + #= BLOCK_CANDLES_PLAIN_LIT_1 + block.*= candle:candles=1:lit=true + + #= BLOCK_CANDLES_PLAIN_LIT_2 + block.*= candle:candles=2:lit=true + + #= BLOCK_CANDLES_PLAIN_LIT_3 + block.*= candle:candles=3:lit=true + + #= BLOCK_CANDLES_PLAIN_LIT_4 + block.*= candle:candles=4:lit=true + + #= BLOCK_CANDLES_BLACK_LIT_1 + block.*= black_candle:candles=1:lit=true + + #= BLOCK_CANDLES_BLACK_LIT_2 + block.*= black_candle:candles=2:lit=true + + #= BLOCK_CANDLES_BLACK_LIT_3 + block.*= black_candle:candles=3:lit=true + + #= BLOCK_CANDLES_BLACK_LIT_4 + block.*= black_candle:candles=4:lit=true + + #= BLOCK_CANDLES_BLUE_LIT_1 + block.*= blue_candle:candles=1:lit=true + + #= BLOCK_CANDLES_BLUE_LIT_2 + block.*= blue_candle:candles=2:lit=true + + #= BLOCK_CANDLES_BLUE_LIT_3 + block.*= blue_candle:candles=3:lit=true + + #= BLOCK_CANDLES_BLUE_LIT_4 + block.*= blue_candle:candles=4:lit=true + + #= BLOCK_CANDLES_BROWN_LIT_1 + block.*= brown_candle:candles=1:lit=true + + #= BLOCK_CANDLES_BROWN_LIT_2 + block.*= brown_candle:candles=2:lit=true + + #= BLOCK_CANDLES_BROWN_LIT_3 + block.*= brown_candle:candles=3:lit=true + + #= BLOCK_CANDLES_BROWN_LIT_4 + block.*= brown_candle:candles=4:lit=true + + #= BLOCK_CANDLES_CYAN_LIT_1 + block.*= cyan_candle:candles=1:lit=true + + #= BLOCK_CANDLES_CYAN_LIT_2 + block.*= cyan_candle:candles=2:lit=true + + #= BLOCK_CANDLES_CYAN_LIT_3 + block.*= cyan_candle:candles=3:lit=true + + #= BLOCK_CANDLES_CYAN_LIT_4 + block.*= cyan_candle:candles=4:lit=true + + #= BLOCK_CANDLES_GRAY_LIT_1 + block.*= gray_candle:candles=1:lit=true + + #= BLOCK_CANDLES_GRAY_LIT_2 + block.*= gray_candle:candles=2:lit=true + + #= BLOCK_CANDLES_GRAY_LIT_3 + block.*= gray_candle:candles=2:lit=true + + #= BLOCK_CANDLES_GRAY_LIT_4 + block.*= gray_candle:candles=4:lit=true + + #= BLOCK_CANDLES_GREEN_LIT_1 + block.*= green_candle:candles=1:lit=true + + #= BLOCK_CANDLES_GREEN_LIT_2 + block.*= green_candle:candles=2:lit=true + + #= BLOCK_CANDLES_GREEN_LIT_3 + block.*= green_candle:candles=3:lit=true + + #= BLOCK_CANDLES_GREEN_LIT_4 + block.*= green_candle:candles=4:lit=true + + #= BLOCK_CANDLES_LIGHT_BLUE_LIT_1 + block.*= light_blue_candle:candles=1:lit=true + + #= BLOCK_CANDLES_LIGHT_BLUE_LIT_2 + block.*= light_blue_candle:candles=2:lit=true + + #= BLOCK_CANDLES_LIGHT_BLUE_LIT_3 + block.*= light_blue_candle:candles=3:lit=true + + #= BLOCK_CANDLES_LIGHT_BLUE_LIT_4 + block.*= light_blue_candle:candles=4:lit=true + + #= BLOCK_CANDLES_LIGHT_GRAY_LIT_1 + block.*= light_gray_candle:candles=1:lit=true + + #= BLOCK_CANDLES_LIGHT_GRAY_LIT_2 + block.*= light_gray_candle:candles=2:lit=true + + #= BLOCK_CANDLES_LIGHT_GRAY_LIT_3 + block.*= light_gray_candle:candles=3:lit=true + + #= BLOCK_CANDLES_LIGHT_GRAY_LIT_4 + block.*= light_gray_candle:candles=4:lit=true + + #= BLOCK_CANDLES_LIME_LIT_1 + block.*= lime_candle:candles=1:lit=true + + #= BLOCK_CANDLES_LIME_LIT_2 + block.*= lime_candle:candles=2:lit=true + + #= BLOCK_CANDLES_LIME_LIT_3 + block.*= lime_candle:candles=3:lit=true + + #= BLOCK_CANDLES_LIME_LIT_4 + block.*= lime_candle:candles=4:lit=true + + #= BLOCK_CANDLES_MAGENTA_LIT_1 + block.*= magenta_candle:candles=1:lit=true + + #= BLOCK_CANDLES_MAGENTA_LIT_2 + block.*= magenta_candle:candles=2:lit=true + + #= BLOCK_CANDLES_MAGENTA_LIT_3 + block.*= magenta_candle:candles=3:lit=true + + #= BLOCK_CANDLES_MAGENTA_LIT_4 + block.*= magenta_candle:candles=4:lit=true + + #= BLOCK_CANDLES_ORANGE_LIT_1 + block.*= orange_candle:candles=1:lit=true + + #= BLOCK_CANDLES_ORANGE_LIT_2 + block.*= orange_candle:candles=2:lit=true + + #= BLOCK_CANDLES_ORANGE_LIT_3 + block.*= orange_candle:candles=3:lit=true + + #= BLOCK_CANDLES_ORANGE_LIT_4 + block.*= orange_candle:candles=4:lit=true + + #= BLOCK_CANDLES_PINK_LIT_1 + block.*= pink_candle:candles=1:lit=true + + #= BLOCK_CANDLES_PINK_LIT_2 + block.*= pink_candle:candles=2:lit=true + + #= BLOCK_CANDLES_PINK_LIT_3 + block.*= pink_candle:candles=3:lit=true + + #= BLOCK_CANDLES_PINK_LIT_4 + block.*= pink_candle:candles=4:lit=true + + #= BLOCK_CANDLES_PURPLE_LIT_1 + block.*= purple_candle:candles=1:lit=true + + #= BLOCK_CANDLES_PURPLE_LIT_2 + block.*= purple_candle:candles=2:lit=true + + #= BLOCK_CANDLES_PURPLE_LIT_3 + block.*= purple_candle:candles=3:lit=true + + #= BLOCK_CANDLES_PURPLE_LIT_4 + block.*= purple_candle:candles=4:lit=true + + #= BLOCK_CANDLES_RED_LIT_1 + block.*= red_candle:candles=1:lit=true + + #= BLOCK_CANDLES_RED_LIT_2 + block.*= red_candle:candles=2:lit=true + + #= BLOCK_CANDLES_RED_LIT_3 + block.*= red_candle:candles=3:lit=true + + #= BLOCK_CANDLES_RED_LIT_4 + block.*= red_candle:candles=4:lit=true + + #= BLOCK_CANDLES_WHITE_LIT_1 + block.*= white_candle:candles=1:lit=true + + #= BLOCK_CANDLES_WHITE_LIT_2 + block.*= white_candle:candles=2:lit=true + + #= BLOCK_CANDLES_WHITE_LIT_3 + block.*= white_candle:candles=3:lit=true + + #= BLOCK_CANDLES_WHITE_LIT_4 + block.*= white_candle:candles=4:lit=true + + #= BLOCK_CANDLES_YELLOW_LIT_1 + block.*= yellow_candle:candles=1:lit=true + + #= BLOCK_CANDLES_YELLOW_LIT_2 + block.*= yellow_candle:candles=2:lit=true + + #= BLOCK_CANDLES_YELLOW_LIT_3 + block.*= yellow_candle:candles=3:lit=true + + #= BLOCK_CANDLES_YELLOW_LIT_4 + block.*= yellow_candle:candles=4:lit=true + #else + #= BLOCK_CANDLES_LIT_1 + block.*= [candle]:candles=1:lit=true + + #= BLOCK_CANDLES_LIT_2 + block.*= [candle]:candles=2:lit=true + + #= BLOCK_CANDLES_LIT_3 + block.*= [candle]:candles=3:lit=true + + #= BLOCK_CANDLES_LIT_4 + block.*= [candle]:candles=4:lit=true + #endif + + #= BLOCK_CAVE_VINE_BERRIES + block.*= cave_vines_plant:berries=true cave_vines:berries=true + + #= BLOCK_COMPARATOR_LIT + block.*= comparator:powered=true + + #= BLOCK_COPPER_BULB_LIT + block.*= copper_bulb:lit=true waxed_copper_bulb:lit=true + + #= BLOCK_COPPER_BULB_EXPOSED_LIT + block.*= exposed_copper_bulb:lit=true waxed_exposed_copper_bulb:lit=true + + #= BLOCK_COPPER_BULB_OXIDIZED_LIT + block.*= oxidized_copper_bulb:lit=true waxed_oxidized_copper_bulb:lit=true + + #= BLOCK_COPPER_BULB_WEATHERED_LIT + block.*= weathered_copper_bulb:lit=true waxed_weathered_copper_bulb:lit=true + + #= BLOCK_CONDUIT + block.*= conduit + + #= BLOCK_CRYING_OBSIDIAN + block.*= crying_obsidian + + #= BLOCK_END_GATEWAY + block.*= end_gateway + + #= BLOCK_END_ROD + block.*= end_rod + + #= BLOCK_FIRE + block.*= fire campfire:lit=true + + #= BLOCK_FROGLIGHT_OCHRE + block.*= ochre_froglight + + #= BLOCK_FROGLIGHT_PEARLESCENT + block.*= pearlescent_froglight + + #= BLOCK_FROGLIGHT_VERDANT + block.*= verdant_froglight + + #= BLOCK_GLOW_LICHEN + block.*= glow_lichen + + #= BLOCK_GLOWSTONE + block.*= glowstone + + #= BLOCK_JACK_O_LANTERN + block.*= jack_o_lantern + + #= BLOCK_LANTERN + block.*= lantern + + #= BLOCK_LAVA + block.*= lava + + #= BLOCK_LIGHT_1 + block.*= light:level=1 + + #= BLOCK_LIGHT_2 + block.*= light:level=2 + + #= BLOCK_LIGHT_3 + block.*= light:level=3 + + #= BLOCK_LIGHT_4 + block.*= light:level=4 + + #= BLOCK_LIGHT_5 + block.*= light:level=5 + + #= BLOCK_LIGHT_6 + block.*= light:level=6 + + #= BLOCK_LIGHT_7 + block.*= light:level=7 + + #= BLOCK_LIGHT_8 + block.*= light:level=8 + + #= BLOCK_LIGHT_9 + block.*= light:level=9 + + #= BLOCK_LIGHT_10 + block.*= light:level=10 + + #= BLOCK_LIGHT_11 + block.*= light:level=11 + + #= BLOCK_LIGHT_12 + block.*= light:level=12 + + #= BLOCK_LIGHT_13 + block.*= light:level=13 + + #= BLOCK_LIGHT_14 + block.*= light:level=14 + + #= BLOCK_LIGHT_15 + block.*= light:level=15 + + #= BLOCK_MAGMA + block.*= magma_block + + #= BLOCK_REDSTONE_LAMP_LIT + block.*= redstone_lamp:lit=true + + #= BLOCK_REDSTONE_TORCH_LIT + block.*= redstone_torch:lit=true redstone_wall_torch:lit=true + + #= BLOCK_REDSTONE_WIRE_1 + block.*= redstone_wire:power=1 + + #= BLOCK_REDSTONE_WIRE_2 + block.*= redstone_wire:power=2 + + #= BLOCK_REDSTONE_WIRE_3 + block.*= redstone_wire:power=3 + + #= BLOCK_REDSTONE_WIRE_4 + block.*= redstone_wire:power=4 + + #= BLOCK_REDSTONE_WIRE_5 + block.*= redstone_wire:power=5 + + #= BLOCK_REDSTONE_WIRE_6 + block.*= redstone_wire:power=6 + + #= BLOCK_REDSTONE_WIRE_7 + block.*= redstone_wire:power=7 + + #= BLOCK_REDSTONE_WIRE_8 + block.*= redstone_wire:power=8 + + #= BLOCK_REDSTONE_WIRE_9 + block.*= redstone_wire:power=9 + + #= BLOCK_REDSTONE_WIRE_10 + block.*= redstone_wire:power=10 + + #= BLOCK_REDSTONE_WIRE_11 + block.*= redstone_wire:power=11 + + #= BLOCK_REDSTONE_WIRE_12 + block.*= redstone_wire:power=12 + + #= BLOCK_REDSTONE_WIRE_13 + block.*= redstone_wire:power=13 + + #= BLOCK_REDSTONE_WIRE_14 + block.*= redstone_wire:power=14 + + #= BLOCK_REDSTONE_WIRE_15 + block.*= redstone_wire:power=15 + + #= BLOCK_REPEATER_LIT + block.*= repeater:powered=true + + #= BLOCK_RESPAWN_ANCHOR_4 + block.*= respawn_anchor:charges=4 + + #= BLOCK_SCULK_SENSOR_ACTIVE + block.*= sculk_sensor:sculk_sensor_phase=active + + #= BLOCK_SEA_PICKLE_WET_1 + block.*= sea_pickle:waterlogged=true:pickles=1 + + #= BLOCK_SEA_PICKLE_WET_2 + block.*= sea_pickle:waterlogged=true:pickles=2 + + #= BLOCK_SEA_PICKLE_WET_3 + block.*= sea_pickle:waterlogged=true:pickles=3 + + #= BLOCK_SEA_PICKLE_WET_4 + block.*= sea_pickle:waterlogged=true:pickles=4 + + #= BLOCK_SEA_LANTERN + block.*= sea_lantern + + #= BLOCK_SHROOMLIGHT + block.*= shroomlight + + #= BLOCK_SMOKER_LIT + block.*= smoker:lit=true + + #= BLOCK_SOUL_FIRE + block.*= soul_fire soul_campfire:lit=true + + #= BLOCK_SOUL_LANTERN + block.*= soul_lantern + + #= BLOCK_SOUL_TORCH + block.*= soul_torch soul_wall_torch + + #= BLOCK_TORCH + block.*= torch wall_torch + + block.* = westerosblocks:safe_fire + block.* = conquest:white_paper_lantern conquest:yellow_paper_lantern conquest:small_red_paper_lantern conquest:chinese_palace_lantern conquest:campfire conquest:brazier conquest:hanging_brazier conquest:chandelier conquest:candelabra conquest:cross_chandelier conquest:iron_candelabrum_1 conquest:golden_candelabrum_1 conquest:candle conquest:hanging_candle_holder conquest:candle_in_a_lantern conquest:candles conquest:hand_candle conquest:torch_with_grille conquest:elven_hand_light conquest:ship_lantern conquest:victorian_lantern conquest:small_lantern conquest:big_lantern conquest:hanging_oil_lamp conquest:oil_lamp conquest:terracotta_oil_lamp conquest:invisible_light_low conquest:invisible_light_medium conquest:invisible_light + + +####### ----- reflective translucents / glass ----- ####### + + #= BLOCK_GLASS + block.301= glass glass_pane + + #= BLOCK_HONEY + block.*= honey_block + + #= BLOCK_ICE + block.*= ice frosted_ice + + #= BLOCK_NETHER_PORTAL + block.*= nether_portal + + #= BLOCK_SLIME + block.*= slime_block + + #= BLOCK_GLASS_BLACK + block.*= black_stained_glass black_stained_glass_pane + + #= BLOCK_GLASS_BLUE + block.*= blue_stained_glass blue_stained_glass_pane + + #= BLOCK_GLASS_BROWN + block.*= brown_stained_glass brown_stained_glass_pane + + #= BLOCK_GLASS_CYAN + block.*= cyan_stained_glass cyan_stained_glass_pane + + #= BLOCK_GLASS_GRAY + block.*= gray_stained_glass gray_stained_glass_pane + + #= BLOCK_GLASS_GREEN + block.*= green_stained_glass green_stained_glass_pane + + #= BLOCK_GLASS_LIGHT_BLUE + block.*= light_blue_stained_glass light_blue_stained_glass_pane + + #= BLOCK_GLASS_LIGHT_GRAY + block.*= light_gray_stained_glass light_gray_stained_glass_pane + + #= BLOCK_GLASS_LIME + block.*= lime_stained_glass lime_stained_glass_pane + + #= BLOCK_GLASS_MAGENTA + block.*= magenta_stained_glass magenta_stained_glass_pane + + #= BLOCK_GLASS_ORANGE + block.*= orange_stained_glass orange_stained_glass_pane + + #= BLOCK_GLASS_PINK + block.*= pink_stained_glass pink_stained_glass_pane + + #= BLOCK_GLASS_PURPLE + block.*= purple_stained_glass purple_stained_glass_pane + + #= BLOCK_GLASS_RED + block.*= red_stained_glass red_stained_glass_pane + + #= BLOCK_GLASS_WHITE + block.*= white_stained_glass white_stained_glass_pane + + #= BLOCK_GLASS_YELLOW + block.*= yellow_stained_glass yellow_stained_glass_pane + + +####### ----- LPV shapes ----- ####### + + #= BLOCK_BUTTON + block.401= 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 + + #= BLOCK_CANDLE + block.*=[candle]:lit=false + + #= BLOCK_CARPET + block.*=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 + + #= BLOCK_CHAIN + block.*= chain + + group.door= acacia_door bamboo_door birch_door cherry_door crimson_door dark_oak_door \ + iron_door jungle_door mangrove_door oak_door spruce_door warped_door \ + copper_door exposed_copper_door weathered_copper_door oxidized_copper_door \ + waxed_copper_door waxed_exposed_copper_door waxed_weathered_copper_door waxed_oxidized_copper_door + + #= BLOCK_DOOR_N + block.*= [door]:facing=north:open=false [door]:facing=west:hinge=left:open=true [door]:facing=east:hinge=right:open=true + + #= BLOCK_DOOR_E + block.*= [door]:facing=east:open=false [door]:facing=north:hinge=left:open=true [door]:facing=south:hinge=right:open=true + + #= BLOCK_DOOR_S + block.*= [door]:facing=south:open=false [door]:facing=east:hinge=left:open=true [door]:facing=west:hinge=right:open=true + + #= BLOCK_DOOR_W + block.*= [door]:facing=west:open=false [door]:facing=south:hinge=left:open=true [door]:facing=north:hinge=right:open=true + + #= BLOCK_FENCE + block.*= acacia_fence bamboo_fence birch_fence cherry_fence crimson_fence dark_oak_fence jungle_fence mangrove_fence nether_brick_fence oak_fence spruce_fence warped_fence + + #= BLOCK_FENCE_GATE + block.*= acacia_fence_gate bamboo_fence_gate birch_fence_gate cherry_fence_gate crimson_fence_gate dark_oak_fence_gate jungle_fence_gate mangrove_fence_gate oak_fence_gate spruce_fence_gate warped_fence_gate + + #= BLOCK_FLOWER_POT + block.*= flower_pot potted_acacia_sapling potted_allium potted_azalea_bush potted_bamboo potted_azure_bluet potted_birch_sapling \ + potted_blue_orchid potted_brown_mushroom potted_cactus potted_cornflower potted_crimson_fungus potted_crimson_roots \ + potted_dandelion potted_dark_oak_sapling potted_dead_bush potted_fern potted_flowering_azalea_bush potted_jungle_sapling \ + potted_lily_of_the_valley potted_mangrove_propagule potted_oak_sapling potted_orange_tulip potted_oxeye_daisy \ + potted_pink_tulip potted_poppy potted_red_mushroom potted_red_tulip potted_spruce_sapling potted_torchflower \ + potted_warped_fungus potted_warped_roots potted_white_tulip potted_wither_rose + + #= BLOCK_IRON_BARS + block.*= iron_bars + + #= BLOCK_LADDER + block.*= ladder + + #= BLOCK_LEVER + block.*= lever + + #= BLOCK_PRESSURE_PLATE + block.*= acacia_pressure_plate bamboo_pressure_plate birch_pressure_plate cherry_pressure_plate crimson_pressure_plate \ + dark_oak_pressure_plate heavy_weighted_pressure_plate jungle_pressure_plate light_weighted_pressure_plate mangrove_pressure_plate \ + oak_pressure_plate polished_blackstone_pressure_plate spruce_pressure_plate stone_pressure_plate warped_pressure_plate + + group.slab= acacia_slab bamboo_slab bamboo_mosaic_slab birch_slab cherry_slab crimson_slab dark_oak_slab jungle_slab mangrove_slab \ + oak_slab spruce_slab warped_slab andesite_slab blackstone_slab brick_slab cobbled_deepslate_slab cobblestone_slab \ + cut_copper_slab cut_red_sandstone_slab cut_sandstone_slab dark_prismarine_slab deepslate_brick_slab deepslate_tile_slab \ + diorite_slab end_stone_brick_slab exposed_cut_copper_slab granite_slab mossy_cobblestone_slab mossy_stone_brick_slab \ + mud_brick_slab nether_brick_slab oxidized_cut_copper_slab petrified_oak_slab polished_andesite_slab \ + polished_blackstone_brick_slab polished_blackstone_slab polished_deepslate_slab polished_diorite_slab \ + polished_granite_slab prismarine_brick_slab prismarine_slab purpur_slab quartz_slab red_nether_brick_slab \ + red_sandstone_slab sandstone_slab smooth_quartz_slab smooth_red_sandstone_slab smooth_sandstone_slab smooth_stone_slab \ + stone_brick_slab stone_slab waxed_cut_copper_slab waxed_exposed_cut_copper_slab waxed_oxidized_cut_copper_slab \ + waxed_weathered_cut_copper_slab weathered_cut_copper_slab + + #= BLOCK_SLAB_TOP + block.*= [slab]:type=top + + #= BLOCK_SLAB_BOTTOM + block.*= [slab]:type=bottom daylight_detector + + group.trapdoor= acacia_trapdoor bamboo_trapdoor birch_trapdoor cherry_trapdoor crimson_trapdoor dark_oak_trapdoor \ + iron_trapdoor jungle_trapdoor mangrove_trapdoor oak_trapdoor spruce_trapdoor warped_trapdoor \ + copper_trapdoor exposed_copper_trapdoor weathered_copper_trapdoor oxidized_copper_trapdoor \ + waxed_copper_trapdoor waxed_exposed_copper_trapdoor waxed_weathered_copper_trapdoor waxed_oxidized_copper_trapdoor + + #= BLOCK_TRAPDOOR_BOTTOM + block.*= [trapdoor]:half=bottom:open=false + + #= BLOCK_TRAPDOOR_TOP + block.*= [trapdoor]:half=top:open=false + + #= BLOCK_TRAPDOOR_N + block.*= [trapdoor]:facing=north:open=true + + #= BLOCK_TRAPDOOR_E + block.*= [trapdoor]:facing=east:open=true + + #= BLOCK_TRAPDOOR_S + block.*= [trapdoor]:facing=south:open=true + + #= BLOCK_TRAPDOOR_W + block.*= [trapdoor]:facing=west:open=true + + +####### ----- misc ----- ####### + + ## stuff + #= BLOCK_END_PORTAL + block.500= minecraft:end_portal + + ## all blocks here get exluded from POM. + #= BLOCK_SIGN + block.*= minecraft:oak_sign minecraft:spruce_sign minecraft:birch_sign minecraft:jungle_sign minecraft:acacia_sign minecraft:dark_oak_sign minecraft:mangrove_sign minecraft:crimson_sign minecraft:warped_sign minecraft:oak_wall_sign minecraft:spruce_wall_sign minecraft:birch_wall_sign minecraft:jungle_wall_sign minecraft:acacia_wall_sign minecraft:dark_oak_wall_sign minecraft:mangrove_wall_sign minecraft:crimson_wall_sign minecraft:warped_wall_sign + + ## workaround mixed render stages + ##= BLOCK_REDSTONE_WIRE + ##block.*= minecraft:redstone_wire diff --git a/shaders/world0/shadow.vsh b/shaders/world0/shadow.vsh index fb171c0..c1cb0bf 100644 --- a/shaders/world0/shadow.vsh +++ b/shaders/world0/shadow.vsh @@ -210,9 +210,11 @@ void main() { (currentRenderedItemId > 0 || entityId > 0) && (renderStage == MC_RENDER_STAGE_BLOCK_ENTITIES || renderStage == MC_RENDER_STAGE_ENTITIES) ) { - uint voxelId = uint(BLOCK_EMPTY); + uint voxelId = 0u; if (currentRenderedItemId > 0) { + // TODO: once hand-light is added, switch to this condition + // if (entityId != ENTITY_ITEM_FRAME && entityId != ENTITY_PLAYER) if (entityId != ENTITY_ITEM_FRAME) voxelId = uint(currentRenderedItemId); }