Backups/Bliss-Shader
1
0
Fork 0
mirror of https://github.com/X0nk/Bliss-Shader.git synced 2024-12-23 01:59:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

add maccaws lights

Browse Source
This commit is contained in:
NULL511 2024-06-13 19:23:07 -04:00
parent 52594451f0
commit a40843f2ae
7 changed files with 284 additions and 919 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1018
shaders/block.properties
View File

File diff suppressed because one or more lines are too long

66
shaders/dimensions/setup.csh
View File

@ -827,11 +827,67 @@ void main() {
} }
if (blockId == BLOCK_TORCH || blockId == ITEM_TORCH) { if (blockId == BLOCK_TORCH || blockId == ITEM_TORCH) {
lightColor = vec3(1.0, 0.6, 0.1); lightColor = vec3(TORCH_R, TORCH_G, TORCH_B);
lightRange = 14.0; lightRange = 14.0;
mixWeight = 0.8; mixWeight = 0.8;
} }
if (blockId >= BLOCK_LAMP_LIT_BLACK && blockId <= BLOCK_LAMP_LIT_YELLOW) {
lightRange = 15.0;
mixWeight = 0.25;
switch (blockId) {
case BLOCK_LAMP_LIT_BLACK:
lightColor = LightColor_Candles_Black;
break;
case BLOCK_LAMP_LIT_BLUE:
lightColor = LightColor_Candles_Blue;
break;
case BLOCK_LAMP_LIT_BROWN:
lightColor = LightColor_Candles_Brown;
break;
case BLOCK_LAMP_LIT_CYAN:
lightColor = LightColor_Candles_Cyan;
break;
case BLOCK_LAMP_LIT_GRAY:
lightColor = LightColor_Candles_Gray;
break;
case BLOCK_LAMP_LIT_GREEN:
lightColor = LightColor_Candles_Green;
break;
case BLOCK_LAMP_LIT_LIGHT_BLUE:
lightColor = LightColor_Candles_LightBlue;
break;
case BLOCK_LAMP_LIT_LIGHT_GRAY:
lightColor = LightColor_Candles_LightGray;
break;
case BLOCK_LAMP_LIT_LIME:
lightColor = LightColor_Candles_Lime;
break;
case BLOCK_LAMP_LIT_MAGENTA:
lightColor = LightColor_Candles_Magenta;
break;
case BLOCK_LAMP_LIT_ORANGE:
lightColor = LightColor_Candles_Orange;
break;
case BLOCK_LAMP_LIT_PINK:
lightColor = LightColor_Candles_Pink;
break;
case BLOCK_LAMP_LIT_PURPLE:
lightColor = LightColor_Candles_Purple;
break;
case BLOCK_LAMP_LIT_RED:
lightColor = LightColor_Candles_Red;
break;
case BLOCK_LAMP_LIT_WHITE:
lightColor = LightColor_Candles_White;
break;
case BLOCK_LAMP_LIT_YELLOW:
lightColor = LightColor_Candles_Yellow;
break;
}
}
// reflective translucents / glass // reflective translucents / glass
switch (blockId) { switch (blockId) {
@ -1063,11 +1119,15 @@ void main() {
// hack to increase light (if set) // hack to increase light (if set)
if (lightRange > 0.0) lightRange += 1.0; if (lightRange > 0.0) lightRange += 1.0;
// apply saturation changes to light and tint colors // apply saturation changes to light color
const float saturationF = LPV_SATURATION / 100.0; const float saturationF = LPV_SATURATION / 100.0;
mat4 matSaturation = GetSaturationMatrix(saturationF); mat4 matSaturation = GetSaturationMatrix(saturationF);
lightColor = (matSaturation * vec4(lightColor, 1.0)).rgb; lightColor = (matSaturation * vec4(lightColor, 1.0)).rgb;
tintColor = (matSaturation * vec4(tintColor, 1.0)).rgb;
// apply saturation changes to tint color
const float tintSaturationF = LPV_TINT_SATURATION / 100.0;
mat4 matTintSaturation = GetSaturationMatrix(tintSaturationF);
tintColor = (matTintSaturation * vec4(tintColor, 1.0)).rgb;
// lazy fix for migrating from mixWeight to tintColor // lazy fix for migrating from mixWeight to tintColor
tintColor *= mixWeight; tintColor *= mixWeight;

5
shaders/lang/en_us.lang
View File

@ -98,8 +98,10 @@ screen.Direct_Light = Direct Light
value.LPV_SIZE.6 = Small [64] value.LPV_SIZE.6 = Small [64]
value.LPV_SIZE.7 = Medium [128] value.LPV_SIZE.7 = Medium [128]
value.LPV_SIZE.8 = Large [256] value.LPV_SIZE.8 = Large [256]
option.LPV_SATURATION = Saturation option.LPV_SATURATION = Light Saturation
suffix.LPV_SATURATION=% suffix.LPV_SATURATION=%
option.LPV_TINT_SATURATION = Tint Saturation
suffix.LPV_TINT_SATURATION=%
option.LPV_NORMAL_STRENGTH = Normal Strength option.LPV_NORMAL_STRENGTH = Normal Strength
suffix.LPV_NORMAL_STRENGTH = % suffix.LPV_NORMAL_STRENGTH = %
value.LPV_NORMAL_STRENGTH.0 = OFF value.LPV_NORMAL_STRENGTH.0 = OFF
@ -544,6 +546,7 @@ screen.Ambient_light.comment = Configure settings related to the lighting in sha
option.LPV_SIZE.comment = Configures the size (in blocks) of the volume for colored lighting. option.LPV_SIZE.comment = Configures the size (in blocks) of the volume for colored lighting.
option.LPV_SATURATION.comment = Configures the intensity of colored lighting. option.LPV_SATURATION.comment = Configures the intensity of colored lighting.
option.LPV_TINT_SATURATION.comment = Configures the intensity of tinting by translucent blocks on colored lighting.
option.LPV_NORMAL_STRENGTH.comment = Configure the amount surface normals will affect lighting direction. option.LPV_NORMAL_STRENGTH.comment = Configure the amount surface normals will affect lighting direction.
option.LPV_ENTITY_LIGHTS.comment = Allows entities to contribute to colored lighting. option.LPV_ENTITY_LIGHTS.comment = Allows entities to contribute to colored lighting.
option.LPV_REDSTONE_LIGHTS.comment = Allows redstone blocks to contribute to colored lighting. option.LPV_REDSTONE_LIGHTS.comment = Allows redstone blocks to contribute to colored lighting.

16
shaders/lib/blocks.glsl
View File

@ -161,6 +161,22 @@
#define BLOCK_SOUL_LANTERN 244 #define BLOCK_SOUL_LANTERN 244
#define BLOCK_SOUL_TORCH 245 #define BLOCK_SOUL_TORCH 245
#define BLOCK_TORCH 246 #define BLOCK_TORCH 246
#define BLOCK_LAMP_LIT_BLACK 249
#define BLOCK_LAMP_LIT_BLUE 250
#define BLOCK_LAMP_LIT_BROWN 251
#define BLOCK_LAMP_LIT_CYAN 252
#define BLOCK_LAMP_LIT_GRAY 253
#define BLOCK_LAMP_LIT_GREEN 254
#define BLOCK_LAMP_LIT_LIGHT_BLUE 255
#define BLOCK_LAMP_LIT_LIGHT_GRAY 256
#define BLOCK_LAMP_LIT_LIME 257
#define BLOCK_LAMP_LIT_MAGENTA 258
#define BLOCK_LAMP_LIT_ORANGE 259
#define BLOCK_LAMP_LIT_PINK 260
#define BLOCK_LAMP_LIT_PURPLE 261
#define BLOCK_LAMP_LIT_RED 262
#define BLOCK_LAMP_LIT_WHITE 263
#define BLOCK_LAMP_LIT_YELLOW 264
#define BLOCK_GLASS 301 #define BLOCK_GLASS 301
#define BLOCK_HONEY 302 #define BLOCK_HONEY 302
#define BLOCK_ICE 303 #define BLOCK_ICE 303

3
shaders/lib/settings.glsl
View File

@ -718,6 +718,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_ENABLED
#define LPV_SIZE 7 // [6 7 8] #define LPV_SIZE 7 // [6 7 8]
#define LPV_SATURATION 100 // [0 5 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100 105 110 115 120 125 130 135 140 145 150 155 160 165 170 175 180 185 190 195 200] #define LPV_SATURATION 100 // [0 5 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100 105 110 115 120 125 130 135 140 145 150 155 160 165 170 175 180 185 190 195 200]
#define LPV_TINT_SATURATION 100 // [0 5 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100 105 110 115 120 125 130 135 140 145 150 155 160 165 170 175 180 185 190 195 200]
#define LPV_NORMAL_STRENGTH 50 // [0 5 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100] #define LPV_NORMAL_STRENGTH 50 // [0 5 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100]
#define LPV_NORMAL_OFFSET #define LPV_NORMAL_OFFSET
#define LPV_ENTITY_LIGHTS #define LPV_ENTITY_LIGHTS
@ -725,7 +726,7 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631)
//#define LPV_COLORED_CANDLES //#define LPV_COLORED_CANDLES
// Fix for making nether/end work until next Iris release to fix shadow matrices // Fix for making nether/end work until next Iris release to fix shadow matrices
#define LPV_NOSHADOW_HACK //#define LPV_NOSHADOW_HACK
#ifdef LPV_ENABLED #ifdef LPV_ENABLED
#ifdef IRIS_FEATURE_CUSTOM_IMAGES #ifdef IRIS_FEATURE_CUSTOM_IMAGES

4
shaders/shaders.properties
View File

@ -111,7 +111,7 @@ alphaTest.gbuffers_water = false
alphaTest.gbuffers_skybasic = false alphaTest.gbuffers_skybasic = false
alphaTest.gbuffers_skytextured = false alphaTest.gbuffers_skytextured = false
sliders = maxRayMarchSteps MOTION_BLUR_STRENGTH OVERDRAW_MAX_DISTANCE 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 DAY3_l0_coverage DAY3_l1_coverage DAY3_l2_coverage DAY3_ufog_density DAY3_l0_density DAY3_l1_density DAY3_l2_density DAY3_cfog_density DAY4_l0_coverage DAY4_l1_coverage DAY4_l2_coverage DAY4_ufog_density DAY4_l0_density DAY4_l1_density DAY4_l2_density DAY4_cfog_density DAY5_l0_coverage DAY5_l1_coverage DAY5_l2_coverage DAY5_ufog_density DAY5_l0_density DAY5_l1_density DAY5_l2_density DAY5_cfog_density DAY6_l0_coverage DAY6_l1_coverage DAY6_l2_coverage DAY6_ufog_density DAY6_l0_density DAY6_l1_density DAY6_l2_density DAY6_cfog_density DAY7_l0_coverage DAY7_l1_coverage DAY7_l2_coverage DAY7_ufog_density DAY7_l0_density DAY7_l1_density DAY7_l2_density DAY7_cfog_density DAY8_l0_coverage DAY8_l1_coverage DAY8_l2_coverage DAY8_ufog_density DAY8_l0_density DAY8_l1_density DAY8_l2_density DAY8_cfog_density DAY9_l0_coverage DAY9_l1_coverage DAY9_l2_coverage DAY9_ufog_density DAY9_l0_density DAY9_l1_density DAY9_l2_density DAY9_cfog_density sss_density_multiplier sss_absorbance_multiplier MOTION_AMOUNT TONEMAP WATER_WAVE_SPEED WATER_CAUSTICS_BRIGHTNESS 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_SATURATION LPV_NORMAL_STRENGTH sliders = maxRayMarchSteps MOTION_BLUR_STRENGTH OVERDRAW_MAX_DISTANCE 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 DAY3_l0_coverage DAY3_l1_coverage DAY3_l2_coverage DAY3_ufog_density DAY3_l0_density DAY3_l1_density DAY3_l2_density DAY3_cfog_density DAY4_l0_coverage DAY4_l1_coverage DAY4_l2_coverage DAY4_ufog_density DAY4_l0_density DAY4_l1_density DAY4_l2_density DAY4_cfog_density DAY5_l0_coverage DAY5_l1_coverage DAY5_l2_coverage DAY5_ufog_density DAY5_l0_density DAY5_l1_density DAY5_l2_density DAY5_cfog_density DAY6_l0_coverage DAY6_l1_coverage DAY6_l2_coverage DAY6_ufog_density DAY6_l0_density DAY6_l1_density DAY6_l2_density DAY6_cfog_density DAY7_l0_coverage DAY7_l1_coverage DAY7_l2_coverage DAY7_ufog_density DAY7_l0_density DAY7_l1_density DAY7_l2_density DAY7_cfog_density DAY8_l0_coverage DAY8_l1_coverage DAY8_l2_coverage DAY8_ufog_density DAY8_l0_density DAY8_l1_density DAY8_l2_density DAY8_cfog_density DAY9_l0_coverage DAY9_l1_coverage DAY9_l2_coverage DAY9_ufog_density DAY9_l0_density DAY9_l1_density DAY9_l2_density DAY9_cfog_density sss_density_multiplier sss_absorbance_multiplier MOTION_AMOUNT TONEMAP WATER_WAVE_SPEED WATER_CAUSTICS_BRIGHTNESS 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_SATURATION LPV_TINT_SATURATION LPV_NORMAL_STRENGTH
screen.columns=2 screen.columns=2
screen = \ screen = \
@ -185,7 +185,7 @@ BLISS_SHADERS <empty> \
### FloodFill ### FloodFill
screen.LPV.columns = 1 screen.LPV.columns = 1
screen.LPV = LPV_ENABLED LPV_SIZE LPV_SATURATION LPV_NORMAL_STRENGTH LPV_ENTITY_LIGHTS LPV_REDSTONE_LIGHTS LPV_COLORED_CANDLES LPV_NOSHADOW_HACK screen.LPV = LPV_ENABLED LPV_SIZE LPV_SATURATION LPV_TINT_SATURATION LPV_NORMAL_STRENGTH LPV_ENTITY_LIGHTS LPV_REDSTONE_LIGHTS LPV_COLORED_CANDLES LPV_NOSHADOW_HACK
######## WORLD ######## WORLD
screen.World.columns=1 screen.World.columns=1

91
shaders/template/block.properties
View File

@ -37,7 +37,7 @@ block.*= minecraft:hanging_roots minecraft:weeping_vines minecraft:cave_vines:be
## 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. ## 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_GROUND_WAVING_VERTICAL
block.*= minecraft:fern \ 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 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: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 ## air waving
## add a newline to organize for modded blocks ## add a newline to organize for modded blocks
@ -346,7 +346,8 @@ block.*= minecraft:hanging_roots minecraft:weeping_vines minecraft:cave_vines:be
block.*= end_gateway block.*= end_gateway
#= BLOCK_END_ROD #= BLOCK_END_ROD
block.*= end_rod block.*= end_rod \
mcwlights:garden_light:lit=true
#= BLOCK_FIRE #= BLOCK_FIRE
block.*= fire campfire:lit=true block.*= fire campfire:lit=true
@ -367,16 +368,20 @@ block.*= minecraft:hanging_roots minecraft:weeping_vines minecraft:cave_vines:be
block.*= glow_lichen block.*= glow_lichen
#= BLOCK_GLOWSTONE #= BLOCK_GLOWSTONE
block.*= glowstone block.*= glowstone \
mcwlights:glowstone_slab
#= BLOCK_JACK_O_LANTERN #= BLOCK_JACK_O_LANTERN
block.*= jack_o_lantern block.*= jack_o_lantern
#= BLOCK_LANTERN #= BLOCK_LANTERN
block.*= lantern amendments:wall_lantern:light_level=15 block.*= lantern \
amendments:wall_lantern:light_level=15 \
mcwlights:striped_lantern mcwlights:covered_lantern mcwlights:chain_lantern mcwlights:tavern_lantern mcwlights:festive_lantern mcwlights:cross_lantern mcwlights:bell_lantern mcwlights:wall_lantern mcwlights:striped_wall_lantern mcwlights:covered_wall_lantern mcwlights:chain_wall_lantern mcwlights:tavern_wall_lantern mcwlights:festive_wall_lantern mcwlights:cross_wall_lantern mcwlights:bell_wall_lantern mcwlights:classic_street_lamp:lit=true:part=top mcwlights:classic_street_lamp:lit=true:part=base mcwlights:double_street_lamp:lit=true:part=top mcwlights:double_street_lamp:lit=true:part=base
#= BLOCK_LAVA #= BLOCK_LAVA
block.*= lava block.*= lava \
mcwlights:lava_lamp:lit=true
#= BLOCK_LIGHT_1 #= BLOCK_LIGHT_1
block.*= light:level=1 block.*= light:level=1
@ -430,7 +435,8 @@ block.*= minecraft:hanging_roots minecraft:weeping_vines minecraft:cave_vines:be
block.*= powered_rail:powered=true block.*= powered_rail:powered=true
#= BLOCK_REDSTONE_LAMP_LIT #= BLOCK_REDSTONE_LAMP_LIT
block.*= redstone_lamp:lit=true block.*= redstone_lamp:lit=true \
mcwlights:redstone_lamp_slab
#= BLOCK_REDSTONE_ORE_LIT #= BLOCK_REDSTONE_ORE_LIT
block.*= redstone_ore:lit=true block.*= redstone_ore:lit=true
@ -505,26 +511,82 @@ block.*= minecraft:hanging_roots minecraft:weeping_vines minecraft:cave_vines:be
block.*= sea_pickle:waterlogged=true:pickles=4 block.*= sea_pickle:waterlogged=true:pickles=4
#= BLOCK_SEA_LANTERN #= BLOCK_SEA_LANTERN
block.*= sea_lantern block.*= sea_lantern \
mcwlights:sea_lantern_slab
#= BLOCK_SHROOMLIGHT #= BLOCK_SHROOMLIGHT
block.*= shroomlight block.*= shroomlight \
mcwlights:shroomlight_slab
#= BLOCK_SOUL_FIRE #= BLOCK_SOUL_FIRE
block.*= soul_fire soul_campfire:lit=true block.*= soul_fire soul_campfire:lit=true
#= BLOCK_SOUL_LANTERN #= BLOCK_SOUL_LANTERN
block.*= soul_lantern amendments:wall_lantern:light_level=10 block.*= soul_lantern \
amendments:wall_lantern:light_level=10 \
mcwlights:soul_classic_street_lamp:lit=true:part=top mcwlights:soul_classic_street_lamp:lit=true:part=base mcwlights:soul_double_street_lamp:lit=true:part=top mcwlights:soul_double_street_lamp:lit=true:part=base
#= BLOCK_SOUL_TORCH #= BLOCK_SOUL_TORCH
block.*= soul_torch soul_wall_torch supplementaries:sconce_soul supplementaries:sconce_wall_soul block.*= soul_torch soul_wall_torch \
supplementaries:sconce_soul supplementaries:sconce_wall_soul \
mcwlights:soul_acacia_tiki_torch mcwlights:soul_bamboo_tiki_torch mcwlights:soul_birch_tiki_torch mcwlights:soul_cherry_tiki_torch mcwlights:soul_crimson_tiki_torch mcwlights:soul_dark_oak_tiki_torch mcwlights:soul_jungle_tiki_torch mcwlights:soul_mangrove_tiki_torch mcwlights:soul_oak_tiki_torch mcwlights:soul_spruce_tiki_torch mcwlights:soul_warped_tiki_torch
#= BLOCK_TORCH #= BLOCK_TORCH
block.*= torch wall_torch supplementaries:sconce supplementaries:sconce_wall supplementaries:sconce_lever block.*= torch wall_torch \
supplementaries:sconce supplementaries:sconce_wall supplementaries:sconce_lever \
mcwlights:framed_torch mcwlights:iron_framed_torch mcwlights:reinforced_torch mcwlights:rustic_torch mcwlights:upgraded_torch mcwlights:acacia_tiki_torch mcwlights:bamboo_tiki_torch mcwlights:birch_tiki_torch mcwlights:cherry_tiki_torch mcwlights:crimson_tiki_torch mcwlights:dark_oak_tiki_torch mcwlights:jungle_tiki_torch mcwlights:mangrove_tiki_torch mcwlights:oak_tiki_torch mcwlights:spruce_tiki_torch mcwlights:warped_tiki_torch
block.* = westerosblocks:safe_fire 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 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
#= BLOCK_LAMP_LIT_BLACK
block.*= mcwlights:black_lamp:lit=true mcwlights:black_paper_lamp:lit=true mcwlights:black_ceiling_light:lit=true
#= BLOCK_LAMP_LIT_BLUE
block.*= mcwlights:blue_lamp:lit=true mcwlights:blue_paper_lamp:lit=true mcwlights:blue_ceiling_light:lit=true
#= BLOCK_LAMP_LIT_BROWN
block.*= mcwlights:brown_lamp:lit=true mcwlights:brown_paper_lamp:lit=true mcwlights:brown_ceiling_light:lit=true
#= BLOCK_LAMP_LIT_CYAN
block.*= mcwlights:cyan_lamp:lit=true mcwlights:cyan_paper_lamp:lit=true mcwlights:cyan_ceiling_light:lit=true
#= BLOCK_LAMP_LIT_GRAY
block.*= mcwlights:gray_lamp:lit=true mcwlights:gray_paper_lamp:lit=true mcwlights:gray_ceiling_light:lit=true
#= BLOCK_LAMP_LIT_GREEN
block.*= mcwlights:green_lamp:lit=true mcwlights:green_paper_lamp:lit=true mcwlights:green_ceiling_light:lit=true
#= BLOCK_LAMP_LIT_LIGHT_BLUE
block.*= mcwlights:light_blue_lamp:lit=true mcwlights:light_blue_paper_lamp:lit=true mcwlights:light_blue_ceiling_light:lit=true
#= BLOCK_LAMP_LIT_LIGHT_GRAY
block.*= mcwlights:light_gray_lamp:lit=true mcwlights:light_gray_paper_lamp:lit=true mcwlights:light_gray_ceiling_light:lit=true
#= BLOCK_LAMP_LIT_LIME
block.*= mcwlights:lime_lamp:lit=true mcwlights:lime_paper_lamp:lit=true mcwlights:lime_ceiling_light:lit=true
#= BLOCK_LAMP_LIT_MAGENTA
block.*= mcwlights:magenta_lamp:lit=true mcwlights:magenta_paper_lamp:lit=true mcwlights:magenta_ceiling_light:lit=true
#= BLOCK_LAMP_LIT_ORANGE
block.*= mcwlights:orange_lamp:lit=true mcwlights:orange_paper_lamp:lit=true mcwlights:orange_ceiling_light:lit=true
#= BLOCK_LAMP_LIT_PINK
block.*= mcwlights:pink_lamp:lit=true mcwlights:pink_paper_lamp:lit=true mcwlights:pink_ceiling_light:lit=true
#= BLOCK_LAMP_LIT_PURPLE
block.*= mcwlights:purple_lamp:lit=true mcwlights:purple_paper_lamp:lit=true mcwlights:purple_ceiling_light:lit=true
#= BLOCK_LAMP_LIT_RED
block.*= mcwlights:red_lamp:lit=true mcwlights:red_paper_lamp:lit=true mcwlights:red_ceiling_light:lit=true
#= BLOCK_LAMP_LIT_WHITE
block.*= mcwlights:white_lamp:lit=true mcwlights:white_paper_lamp:lit=true mcwlights:white_ceiling_light:lit=true
#= BLOCK_LAMP_LIT_YELLOW
block.*= mcwlights:yellow_lamp:lit=true mcwlights:yellow_paper_lamp:lit=true mcwlights:yellow_ceiling_light:lit=true
####### ----- reflective translucents / glass ----- ####### ####### ----- reflective translucents / glass ----- #######
@ -596,8 +658,7 @@ block.*= minecraft:hanging_roots minecraft:weeping_vines minecraft:cave_vines:be
####### ----- LPV shapes ----- ####### ####### ----- LPV shapes ----- #######
#= BLOCK_LPV_IGNORE #= BLOCK_LPV_IGNORE
block.401= chain ladder lever tripwire tripwire_hook snow:layers=1 [candle]:lit=false \ block.401= chain ladder lever tripwire tripwire_hook snow:layers=1 [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
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_CARPET #= 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 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