From 13feffe3175e02071865fb1f3a47472b8fca9101 Mon Sep 17 00:00:00 2001
From: MikiP98 <79966387+MikiP98@users.noreply.github.com>
Date: Sat, 16 Nov 2024 21:39:26 +0100
Subject: [PATCH] Revert "make new specular settings functional"

This reverts commit 9b80b3ba97046ab4f456a811695ef3cbbdb3baab.
---
 shaders/dimensions/all_translucent.fsh |  9 ---------
 shaders/dimensions/composite1.fsh      |  9 ---------
 shaders/shaders.properties             | 10 ++--------
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/shaders/dimensions/all_translucent.fsh b/shaders/dimensions/all_translucent.fsh
index d3bd525..b987a77 100644
--- a/shaders/dimensions/all_translucent.fsh
+++ b/shaders/dimensions/all_translucent.fsh
@@ -371,15 +371,6 @@ uniform vec3 eyePosition;
 #define FORWARD_BACKGROUND_REFLECTION
 #define FORWARD_ROUGH_REFLECTION
 
-#ifdef FORWARD_SPECULAR
-#endif
-#ifdef FORWARD_ENVIORNMENT_REFLECTION
-#endif
-#ifdef FORWARD_BACKGROUND_REFLECTION
-#endif
-#ifdef FORWARD_ROUGH_REFLECTION
-#endif
-
 #include "/lib/specular.glsl"
 
 //////////////////////////////VOID MAIN//////////////////////////////
diff --git a/shaders/dimensions/composite1.fsh b/shaders/dimensions/composite1.fsh
index ede4faa..e87d11b 100644
--- a/shaders/dimensions/composite1.fsh
+++ b/shaders/dimensions/composite1.fsh
@@ -220,15 +220,6 @@ vec2 decodeVec2(float a){
 #define DEFERRED_BACKGROUND_REFLECTION
 #define DEFERRED_ROUGH_REFLECTION
 
-#ifdef DEFERRED_SPECULAR
-#endif
-#ifdef DEFERRED_ENVIORNMENT_REFLECTION
-#endif
-#ifdef DEFERRED_BACKGROUND_REFLECTION
-#endif
-#ifdef DEFERRED_ROUGH_REFLECTION
-#endif
-
 #include "/lib/specular.glsl"
 
 
diff --git a/shaders/shaders.properties b/shaders/shaders.properties
index 7a7356c..1f3a52d 100644
--- a/shaders/shaders.properties
+++ b/shaders/shaders.properties
@@ -192,14 +192,8 @@ SHADER_VERSION_LABEL <empty>     \
         screen.Resource_Pack_Support = [Reflections] [Emissives] [Subsurface_Scattering] [POM] [Porosity] MATERIAL_AO RESOURCEPACK_SKY
 
         screen.Reflections.columns=2
-        # screen.Reflections = Specular_Reflections Sun_specular_Strength Screen_Space_Reflections reflection_quality Rough_reflections Roughness_Threshold  Sky_reflection Dynamic_SSR_quality
-        screen.Reflections = \
-        DEFERRED_SPECULAR FORWARD_SPECULAR \
-        DEFERRED_ENVIORNMENT_REFLECTION FORWARD_ENVIORNMENT_REFLECTION \
-        DEFERRED_BACKGROUND_REFLECTION FORWARD_BACKGROUND_REFLECTION \
-        DEFERRED_ROUGH_REFLECTION FORWARD_ROUGH_REFLECTION \
-        Sun_specular_Strength Roughness_Threshold
-
+        screen.Reflections =  Specular_Reflections Sun_specular_Strength Screen_Space_Reflections reflection_quality Rough_reflections Roughness_Threshold  Sky_reflection Dynamic_SSR_quality
+    
         screen.Subsurface_Scattering.columns=1
         screen.Subsurface_Scattering = SSS_TYPE sss_density_multiplier sss_absorbance_multiplier LabSSS_Curve  <empty> MISC_BLOCK_SSS MOB_SSS <empty> Ambient_SSS ambientsss_brightness