Reimagined r1.3.1

Author: EminGT

shaders/block.properties

@@ -50,8 +50,8 @@ block.10108=deepslate cobbled_deepslate infested_deepslate cobbled_deepslate_wal
 block.10112=polished_deepslate deepslate_bricks cracked_deepslate_bricks deepslate_tiles cracked_deepslate_tiles chiseled_deepslate polished_deepslate_wall deepslate_brick_wall deepslate_tile_wall polished_deepslate_stairs deepslate_brick_stairs deepslate_tile_stairs polished_deepslate_slab deepslate_brick_slab deepslate_tile_slab mud muddy_mangrove_roots mangrove_roots
 block.10116=calcite
 block.10120=dripstone_block pointed_dripstone daylight_detector
-block.10124=grass_block:snowy=true
-block.10128=dirt coarse_dirt rooted_dirt podzol mycelium dirt_path farmland:moisture=0 farmland:moisture=1 farmland:moisture=2 farmland:moisture=3 farmland:moisture=4 farmland:moisture=5 farmland:moisture=6
+block.10124=grass_block:snowy=true podzol:snowy=true mycelium:snowy=true
+block.10128=dirt coarse_dirt rooted_dirt podzol:snowy=false mycelium:snowy=false dirt_path farmland:moisture=0 farmland:moisture=1 farmland:moisture=2 farmland:moisture=3 farmland:moisture=4 farmland:moisture=5 farmland:moisture=6
 block.10132=grass_block:snowy=false
 block.10136=farmland:moisture=7
 block.10140=netherrack

shaders/program/gbuffers_block.glsl

@@ -225,6 +225,8 @@ void main() {
 	northVec = normalize(gbufferModelView[2].xyz);
 	sunVec = GetSunVector();
 
+	if (normal != normal) normal = -upVec; // Mod Fix: Fixes Better Nether Fireflies
+
 	#if defined GENERATED_NORMALS || defined COATED_TEXTURES
 		if (blockEntityId == 60008) { // Chest
 			float fractWorldPosY = fract((gbufferModelViewInverse * gl_ModelViewMatrix * gl_Vertex).y + cameraPosition.y);

shaders/program/gbuffers_skytextured.glsl

@@ -57,23 +57,22 @@ void main() {
 		float VdotS = dot(nViewPos, sunVec);
 		float VdotU = dot(nViewPos, upVec);
 
-
 		if (abs(tSize.y - 48.0) < 16.5) {
-			if (VdotS > 0.0) {
-				color.rgb *= float(color.b > 0.1775); // 0.065 to 0.290
-
-				if (color.b > 0.48) { // 0.295 to 0.665
-					color.rgb *= 12.0;
-				} else {
-					color.rgb *= 8.0;
-				}
-
-				color.rgb *= normalize(lightColor);
-
-				#ifdef SUN_MOON_HORIZON
-					color.rgb *= 0.2 + 0.8 * sunVisibility2;
-				#endif
-			} else {
+			if (VdotS > 0.0) { // Sun
+				if (color.b > 0.1775) { // 0.065 to 0.290
+					if (color.b > 0.48) { // 0.295 to 0.665
+						color.rgb *= 12.0;
+					} else {
+						color.rgb *= 8.0;
+					}
+
+					color.rgb *= normalize(lightColor);
+
+					#ifdef SUN_MOON_HORIZON
+						color.rgb *= 0.2 + 0.8 * sunVisibility2;
+					#endif
+				} else discard;
+			} else { // Moon
 				color.rgb *= sqrt2(max0(color.r - 0.115)); // 0.065 to 0.165
 				color.rgb *= 1.5;
 			}
@@ -83,7 +82,7 @@ void main() {
 			#else
 				color.rgb *= pow2(pow2(pow2(min1(VdotU + 1.0))));
 			#endif
-		} else {
+		} else { // Custom Sky
 			color.rgb *= color.rgb * smoothstep1(sqrt1(max0(VdotU)));
 		}
 

shaders/program/gbuffers_textured.glsl

@@ -83,10 +83,6 @@ void main() {
 	vec4 colorP = color;
 	color *= glColor;
 
-	#if defined OVERWORLD && CLOUD_QUALITY > 0
-		float cloudLinearDepth = texelFetch(gaux1, texelCoord, 0).r;
-	#endif
-
 	vec3 screenPos = vec3(gl_FragCoord.xy / vec2(viewWidth, viewHeight), gl_FragCoord.z);
 	vec3 viewPos = ScreenToView(screenPos);
 	float lViewPos = length(viewPos);
@@ -98,8 +94,10 @@ void main() {
 	#endif
 
 	#if defined OVERWORLD && CLOUD_QUALITY > 0
+		float cloudLinearDepth = texelFetch(gaux1, texelCoord, 0).r;
+
 		if (cloudLinearDepth > 0.0) // Because Iris changes the pipeline position of opaque particles
-		if (pow2(cloudLinearDepth + OSIEBCA * dither) * far < lViewPos) discard;
+		if (pow2(cloudLinearDepth + OSIEBCA * dither) * far < min(lViewPos, far)) discard;
 	#endif
 
 	vec3 shadowMult = vec3(1.0);

shaders/program/gbuffers_water.glsl

@@ -158,10 +158,6 @@ void main() {
 	vec4 colorP = texture2D(texture, texCoord);
 	vec4 color = colorP * vec4(glColor.rgb, 1.0);
 
-	#if defined OVERWORLD && CLOUD_QUALITY > 0
-		float cloudLinearDepth = texelFetch(gaux1, texelCoord, 0).r;
-	#endif
-
 	vec2 screenCoord = gl_FragCoord.xy / vec2(viewWidth, viewHeight);
 	vec3 screenPos = vec3(screenCoord, gl_FragCoord.z);
 	#ifdef TAA
@@ -177,7 +173,9 @@ void main() {
 	#endif
 
 	#if defined OVERWORLD && CLOUD_QUALITY > 0
-		if (pow2(cloudLinearDepth + OSIEBCA * dither) * far < lViewPos) discard;
+		float cloudLinearDepth = texelFetch(gaux1, texelCoord, 0).r;
+
+		if (pow2(cloudLinearDepth + OSIEBCA * dither) * far < min(lViewPos, far)) discard;
 	#endif
 
 	vec3 nViewPos = normalize(viewPos);

shaders/program/shadow.glsl

@@ -157,7 +157,7 @@ void main() {
 	#ifdef PERPENDICULAR_TWEAKS
 		vec3 normal = gl_NormalMatrix * gl_Normal;
 
-		if (abs(dot(normal, gl_ModelViewMatrix[2].xyz)) > 0.99) {
+		if (abs(dot(normal, gl_ModelViewMatrix[2].xyz)) > 0.99 && abs(mat - 20000) < 19999) {
 			gl_Position = vec4(-1.0);
 		} else
 	#endif