From 25e53c2052db531e5b97f87345931d88bfaea0b6 Mon Sep 17 00:00:00 2001 From: Merlin1809 <88194861+Merlin1809@users.noreply.github.com> Date: Sun, 30 Nov 2025 19:13:23 +0100 Subject: [PATCH] Add emissive ore override for labPBR emission --- shaders/dimensions/all_solid.fsh | 18 ++++++++++++++++-- shaders/dimensions/voxy_solid.glsl | 2 +- shaders/lang/en_us.lang | 5 ++++- shaders/lang/zh_cn.lang | 2 +- shaders/lib/settings.glsl | 4 +--- shaders/shaders.properties | 2 +- 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/shaders/dimensions/all_solid.fsh b/shaders/dimensions/all_solid.fsh index a0dd27b..63df856 100644 --- a/shaders/dimensions/all_solid.fsh +++ b/shaders/dimensions/all_solid.fsh @@ -806,8 +806,14 @@ void main() { if(data_in.blockID == 244) EMISSIVE = 1.5; // soul fire - #ifdef EMISSIVE_ORES - if(data_in.blockID == 502) EMISSIVE = EMISSIVE_ORES_STRENGTH; + #if EMISSIVE_ORES > 0 + if(data_in.blockID == 502) { + EMISSIVE = EMISSIVE_ORES_STRENGTH; + + #ifndef HARDCODED_EMISSIVES_APPROX + EMISSIVE *= getEmission(Albedo.rgb); + #endif + } #endif #endif @@ -828,6 +834,14 @@ void main() { gl_FragData[1] = vec4(0.0,0.0,0.0,0.0); gl_FragData[1].rg = SpecularTex.rg; + #if EMISSIVE_ORES > 1 + if(data_in.blockID == 502) { + SpecularTex.a = EMISSIVE_ORES_STRENGTH; + + SpecularTex.a *= getEmission(Albedo.rgb); + } + #endif + #if EMISSIVE_TYPE == 2 bool emissionCheck = SpecularTex.a <= 0.0; #endif diff --git a/shaders/dimensions/voxy_solid.glsl b/shaders/dimensions/voxy_solid.glsl index 0cc4ab7..2b3b398 100644 --- a/shaders/dimensions/voxy_solid.glsl +++ b/shaders/dimensions/voxy_solid.glsl @@ -107,7 +107,7 @@ void voxy_emitFragment(VoxyFragmentParameters parameters) { if(blockID == 244) EMISSIVE = 1.5; // soul fire - #ifdef EMISSIVE_ORES + #if EMISSIVE_ORES > 0 if(blockID == 502) EMISSIVE = EMISSIVE_ORES_STRENGTH; #endif diff --git a/shaders/lang/en_us.lang b/shaders/lang/en_us.lang index 9cb341a..3b46c66 100644 --- a/shaders/lang/en_us.lang +++ b/shaders/lang/en_us.lang @@ -1,6 +1,6 @@ option.SHADER_VERSION_LABEL = §d§lECLIPSE§r - A Bliss Edit prefix.SHADER_VERSION_LABEL = V - value.SHADER_VERSION_LABEL.482 = 5.4.3 + value.SHADER_VERSION_LABEL.482 = 5.4.4 # if you're here to translate, this is not a joke, these do what they say profile.POTATO=§4Potato @@ -922,6 +922,9 @@ option.AEROCHROME_PINKNESS.comment = Higher = Pink. Lower = Red option.AEROCHROME_WOOL_ENABLED.comment = Technically wool things should be affected but it ruins a lot of builds. Enable to be more technically correct. option.EMISSIVE_ORES = Emissive Ores + value.EMISSIVE_ORES.0 = Off + value.EMISSIVE_ORES.1 = On (Don't override labPBR emission) + value.EMISSIVE_ORES.2 = On (Override labPBR emission) option.EMISSIVE_ORES_STRENGTH = Emissive Ores Brightness option.PLANET_CURVATURE = Planet Curvature §c(VOXY NOT SUPPORTED!) option.CURVATURE_AMOUNT = Curvature Amount diff --git a/shaders/lang/zh_cn.lang b/shaders/lang/zh_cn.lang index 91e759a..3c1e763 100644 --- a/shaders/lang/zh_cn.lang +++ b/shaders/lang/zh_cn.lang @@ -1,6 +1,6 @@ option.SHADER_VERSION_LABEL = §d§lECLIPSE§r - Bliss 编辑版 prefix.SHADER_VERSION_LABEL = 版本 - value.SHADER_VERSION_LABEL.482 = 5.4.3 + value.SHADER_VERSION_LABEL.482 = 5.4.4 # 如果你是来翻译的，这不是玩笑，这些选项的功能正如其名 profile.POTATO=§4土豆 (极低配置) diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl index 68d1e1b..57610f6 100644 --- a/shaders/lib/settings.glsl +++ b/shaders/lib/settings.glsl @@ -757,7 +757,7 @@ const vec3 HIGHLIGHTS_TARGET = length(vec3(HIGHLIGHTS_GRADE_R, HIGHLIGHTS_GRADE_ #define AEROCHROME_PINKNESS 0.3 // How pink it is from red [0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0] const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631), AEROCHROME_PINKNESS); // #define CAMERA_GRIDLINES -// #define EMISSIVE_ORES +#define EMISSIVE_ORES 0 // [0 1 2] #define EMISSIVE_ORES_STRENGTH 0.9 // [0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0] // #define INCLUDE_UNLISTED_ENTITIES @@ -1174,8 +1174,6 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631) #endif #ifdef USE_CUSTOM_SKY_GROUND_LIGHTING_COLORS #endif -#ifdef EMISSIVE_ORES -#endif #ifdef CUMULONIMBUS_LIGHTNING #endif diff --git a/shaders/shaders.properties b/shaders/shaders.properties index 548e2cb..b24e520 100644 --- a/shaders/shaders.properties +++ b/shaders/shaders.properties @@ -287,7 +287,7 @@ SHADER_VERSION_LABEL \ screen.Subsurface_Scattering = SSS_TYPE sss_density_multiplier sss_absorbance_multiplier LabSSS_Curve MISC_BLOCK_SSS MOB_SSS Ambient_SSS ambientsss_brightness SCREENSPACE_DIRECT_SSS_BLENDING screen.Emissives.columns = 1 - screen.Emissives = EMISSIVE_TYPE Emissive_Brightness Emissive_Curve + screen.Emissives = EMISSIVE_TYPE Emissive_Brightness Emissive_Curve EMISSIVE_ORES EMISSIVE_ORES_STRENGTH screen.POM.columns=1 screen.POM = POM Adaptive_Step_length MAX_ITERATIONS POM_DEPTH MAX_DIST Horrible_slope_normals POM_OFFSET_SHADOW_BIAS DEPTH_WRITE_POM