Add emissive ore override for labPBR emission

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

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
 

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

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土豆 (极低配置)

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
 

shaders/shaders.properties

@@ -287,7 +287,7 @@ SHADER_VERSION_LABEL <profile>     \
         screen.Subsurface_Scattering = SSS_TYPE sss_density_multiplier sss_absorbance_multiplier LabSSS_Curve <empty> MISC_BLOCK_SSS MOB_SSS <empty> 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 <empty> 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