diff --git a/shaders/block.properties b/shaders/block.properties index bbb2ff3..4c9d506 100644 --- a/shaders/block.properties +++ b/shaders/block.properties @@ -38,7 +38,7 @@ ####### ----- lightsources ----- ####### - block.10005 = minecraft:candle:lit=true minecraft:sculk_sensor:sculk_sensor_phase=active minecraft:soul_fire minecraft:soul_campfire:lit=true minecraft:cave_vines_plant:berries=true minecraft:soul_lantern minecraft:soul_torch minecraft:soul_wall_torch minecraft:conduit minecraft:beacon minecraft:sea_pickle minecraft:respawn_anchor:charges=4 minecraft:smoker:lit=true minecraft:blast_furnace:lit=true minecraft:furnace:lit=true minecraft:lava_cauldron minecraft:sea_lantern minecraft:cave_vines:berries=true minecraft:glowstone minecraft:torch minecraft:wall_torch minecraft:lava minecraft:fire minecraft:redstone_torch minecraft:redstone_wall_torch minecraft:jack_o_lantern minecraft:magma_block minecraft:redstone_lamp:lit=true minecraft:lantern minecraft:campfire:lit=true minecraft:shroomlight minecraft:end_rod minecraft:end_gateway minecraft:lava minecraft:fire + block.10005 = minecraft:sculk_sensor:sculk_sensor_phase=active minecraft:soul_fire minecraft:soul_campfire:lit=true minecraft:cave_vines_plant:berries=true minecraft:soul_lantern minecraft:soul_torch minecraft:soul_wall_torch minecraft:conduit minecraft:beacon minecraft:sea_pickle minecraft:respawn_anchor:charges=4 minecraft:smoker:lit=true minecraft:blast_furnace:lit=true minecraft:furnace:lit=true minecraft:lava_cauldron minecraft:sea_lantern minecraft:cave_vines:berries=true minecraft:glowstone minecraft:torch minecraft:wall_torch minecraft:lava minecraft:fire minecraft:redstone_torch minecraft:redstone_wall_torch minecraft:jack_o_lantern minecraft:magma_block minecraft:redstone_lamp:lit=true minecraft:lantern minecraft:campfire:lit=true minecraft:shroomlight minecraft:end_rod minecraft:end_gateway minecraft:lava minecraft:fire ####### ----- reflective translucents / glass ----- ####### diff --git a/shaders/composite1.fsh b/shaders/composite1.fsh index 027cb24..8dea77b 100644 --- a/shaders/composite1.fsh +++ b/shaders/composite1.fsh @@ -1202,7 +1202,7 @@ void main() { Emission(FINAL_COLOR, albedo, SpecularTex.a); - if(lightningBolt) FINAL_COLOR.rgb += vec3(Lightning_R,Lightning_G,Lightning_B) * 255.0; + if(lightningBolt) FINAL_COLOR.rgb += vec3(77.0, 153.0, 255.0); gl_FragData[0].rgb = FINAL_COLOR; diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl index 6a5af8a..daba24a 100644 --- a/shaders/lib/settings.glsl +++ b/shaders/lib/settings.glsl @@ -434,8 +434,6 @@ uniform int moonPhase; #define CompSky_G 0.0 // [0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 ] #define CompSky_B 0.0 // [0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 ] -#define Lightning_R 0.3 // [0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 ] -#define Lightning_G 0.6 // [0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 ] -#define Lightning_B 1.0 // [0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 ] +// #define LIGHTNING_FLASH // #define OLD_LIGHTLEAK_FIX \ No newline at end of file diff --git a/shaders/shaders.properties b/shaders/shaders.properties index a1e7be7..5d2af6e 100644 --- a/shaders/shaders.properties +++ b/shaders/shaders.properties @@ -314,8 +314,10 @@ uniform.float.noPuddleAreas = smooth(10, if(in(biome,5,16,17,18,26, 27, 28, 3, 4 # thank you sixthsurge! uniform.float.lightningFlash = smooth(16,if(equals(skyColor.r, skyColor.g, 0.01) && skyColor.r > 0.3, 1.0, 0.0), 0.0, 0.2) + uniform.vec3.lightningEffect = vec3(77.0*lightningFlash, 153.0*lightningFlash, 255.0*lightningFlash) + texture.noise=texture/noises.png texture.composite.colortex6=texture/blueNoise.png separateAo=true diff --git a/shaders/world-1/composite2.fsh b/shaders/world-1/composite2.fsh index b606d44..4c37c84 100644 --- a/shaders/world-1/composite2.fsh +++ b/shaders/world-1/composite2.fsh @@ -469,7 +469,7 @@ void main() { Emission(gl_FragData[0].rgb, albedo, SpecularTex.a); - if(lightningBolt) gl_FragData[0].rgb += vec3(Lightning_R,Lightning_G,Lightning_B) ; + if(lightningBolt) gl_FragData[0].rgb += vec3(77.0, 153.0, 255.0); }