Reimagined r1.2

Author: EminGT

License.txt

@@ -1,4 +1,4 @@
-Complementary Agreement 1.0
+Complementary Agreement 1.2
 ===========================
 
 0. Terminology
@@ -42,17 +42,19 @@ Complementary Agreement 1.0
             the Modified Pack.
          b. This agreement file must still be left inside the Modified Pack
             without any changes being made to it.
-         c. The Modified Pack must not share the same name as This Pack, and
-            there must be at least 5 character difference between the name of
-            the Modified Pack and This Pack.
+         c. The Modified Pack must not have the word "Complementary" in it's
+            name, and there should be at least 3 character difference between
+            the name of the Modified Pack and This Pack. Adding or removing
+            invisible characters or the removal of "Complementary" does not
+            count as a character difference.
        This section (1.3) covers any forks of The Pack as long as the intent
        is modification.
 
 2. Denied Cases
 ---------------
-  1.1. The Pack is NOT allowed to be redistributed unless the case falls under
+  2.1. The Pack is NOT allowed to be redistributed unless the case falls under
        the sections 1.2 or 1.3 in this agreement.
 
-  1.2. This agreement only applies to the version of This Pack that this exact
+  2.2. This agreement only applies to the version of This Pack that this exact
        file can be found in. This agreement is not valid for future or past
        versions of The Pack unless they contain the exact same agreement.

shaders/block.properties

@@ -221,7 +221,7 @@ block.60000=end_portal end_gateway
 block.60004=oak_sign spruce_sign birch_sign jungle_sign acacia_sign dark_oak_sign oak_wall_sign spruce_wall_sign birch_wall_sign jungle_wall_sign acacia_wall_sign dark_oak_wall_sign crimson_sign crimson_wall_sign warped_sign warped_wall_sign
 block.60008=chest trapped_chest
 block.60012=ender_chest
-block.60016=shulker_box white_shulker_box orange_shulker_box magenta_shulker_box light_blue_shulker_box yellow_shulker_box lime_shulker_box pink_shulker_box gray_shulker_box light_gray_shulker_box cyan_shulker_box purple_shulker_box blue_shulker_box brown_shulker_box green_shulker_box red_shulker_box black_shulker_box skeleton_skull wither_skeleton_skull player_head zombie_head creeper_head dragon_head white_banner orange_banner magenta_banner light_blue_banner yellow_banner lime_banner pink_banner gray_banner light_gray_banner cyan_banner purple_banner blue_banner brown_banner green_banner red_banner black_banner white_bed orange_bed magenta_bed light_blue_bed yellow_bed lime_bed pink_bed gray_bed light_gray_bed cyan_bed purple_bed blue_bed brown_bed green_bed red_bed black_bed
+block.60016=shulker_box white_shulker_box orange_shulker_box magenta_shulker_box light_blue_shulker_box yellow_shulker_box lime_shulker_box pink_shulker_box gray_shulker_box light_gray_shulker_box cyan_shulker_box purple_shulker_box blue_shulker_box brown_shulker_box green_shulker_box red_shulker_box black_shulker_box skeleton_skull wither_skeleton_skull player_head zombie_head creeper_head dragon_head white_banner orange_banner magenta_banner light_blue_banner yellow_banner lime_banner pink_banner gray_banner light_gray_banner cyan_banner purple_banner blue_banner brown_banner green_banner red_banner black_banner white_wall_banner orange_wall_banner magenta_wall_banner light_blue_wall_banner yellow_wall_banner lime_wall_banner pink_wall_banner gray_wall_banner light_gray_wall_banner cyan_wall_banner purple_wall_banner blue_wall_banner brown_wall_banner green_wall_banner red_wall_banner black_wall_banner white_bed orange_bed magenta_bed light_blue_bed yellow_bed lime_bed pink_bed gray_bed light_gray_bed cyan_bed purple_bed blue_bed brown_bed green_bed red_bed black_bed
 block.60020=conduit
 block.60024=
 

shaders/entity.properties

@@ -26,6 +26,7 @@ entity.50068=wither wither_skull
 entity.50072=experience_orb
 entity.50076=boat chest_boat
 entity.50080=allay
+entity.50084=slime
 
 #else
 #1.12 And Below Mapping:

shaders/lang/en_US.lang

@@ -24,8 +24,10 @@ screen.PERFORMANCE_SETTINGS.comment=Settings that directly relate to the perform
 
 screen.PREFERENCE_SETTINGS=Preference Settings
 screen.PREFERENCE_SETTINGS.comment=Settings that are optional, and not changed by the different shader profiles.
-    screen.CLOUD_SETTINGS=Clouds
-    screen.CLOUD_SETTINGS.comment=Settings that relate to the clouds.
+    screen.SKY_SETTINGS=Sky
+    screen.SKY_SETTINGS.comment=Settings that relate to the sky.
+        screen.CLOUD_SETTINGS=Clouds
+        screen.CLOUD_SETTINGS.comment=Settings that relate to the clouds.
     screen.CAMERA_SETTINGS=Camera
     screen.CAMERA_SETTINGS.comment=Settings that determine how the final image is tweaked.
     screen.IPBR_SETTINGS=IntegratedPBR
@@ -163,6 +165,18 @@ option.NIGHT_STAR_AMOUNT.comment=Determines the amount of stars in the night sky
 value.NIGHT_STAR_AMOUNT.2=§aMedium
 value.NIGHT_STAR_AMOUNT.3=§aHigh
 
+option.AURORA_BOREALIS=Aurora Borealis
+option.AURORA_BOREALIS.comment=Enables northern lights to appear in the night sky.
+value.AURORA_BOREALIS.true=§dON
+value.AURORA_BOREALIS.false=§aOFF
+
+option.AURORA_CONDITION=Aurora
+option.AURORA_CONDITION.comment=Determines the condition(s) for the Aurora Borealis to appear.
+value.AURORA_CONDITION.0=§aNo Condition
+value.AURORA_CONDITION.1=§aFull Moon
+value.AURORA_CONDITION.2=§aSnowy Biome
+value.AURORA_CONDITION.3=§aFull Moon in Snowy Biome
+
 option.PIXEL_SHADOW=Pixelated Shadows
 option.PIXEL_SHADOW.comment=Modifies the world coordinates on a grid to make shadows pixelated. §e[*]§r This does not affect performance.
 value.PIXEL_SHADOW.0=§aOFF
@@ -174,19 +188,19 @@ value.PIXEL_SHADOW.128=§a128x128
 
 option.BLOOM_STRENGTH=Bloom Strength
 option.BLOOM_STRENGTH.comment=Determines the intensity of glow on bright things, and the bloom from rain/cave humidity.
-value.BLOOM_STRENGTH.0.027=§a15%
-value.BLOOM_STRENGTH.0.036=§a20%
-value.BLOOM_STRENGTH.0.045=§a25%
-value.BLOOM_STRENGTH.0.054=§a30%
-value.BLOOM_STRENGTH.0.063=§a35%
-value.BLOOM_STRENGTH.0.072=§a40%
-value.BLOOM_STRENGTH.0.081=§a45%
-value.BLOOM_STRENGTH.0.09=§a50%
-value.BLOOM_STRENGTH.0.10=§a55%
-value.BLOOM_STRENGTH.0.11=§a60%
-value.BLOOM_STRENGTH.0.12=§a65%
-value.BLOOM_STRENGTH.0.13=§a70%
-value.BLOOM_STRENGTH.0.14=§a75%
+value.BLOOM_STRENGTH.0.027=15%
+value.BLOOM_STRENGTH.0.036=20%
+value.BLOOM_STRENGTH.0.045=25%
+value.BLOOM_STRENGTH.0.054=30%
+value.BLOOM_STRENGTH.0.063=35%
+value.BLOOM_STRENGTH.0.072=40%
+value.BLOOM_STRENGTH.0.081=45%
+value.BLOOM_STRENGTH.0.09=50%
+value.BLOOM_STRENGTH.0.10=55%
+value.BLOOM_STRENGTH.0.11=60%
+value.BLOOM_STRENGTH.0.12=65%
+value.BLOOM_STRENGTH.0.13=70%
+value.BLOOM_STRENGTH.0.14=75%
 
 option.FXAA=FXAA
 option.FXAA.comment=Enables Fast Approximate Anti-Aliasing, which is basically an effect that produces smoother image.
@@ -245,4 +259,9 @@ option.WAVING_BLOCKS=Waving Blocks
 option.WAVING_BLOCKS.comment=Adds movement to some blocks to simulate wind.
 value.WAVING_BLOCKS.0=§aOFF
 value.WAVING_BLOCKS.1=§aFoliage
-value.WAVING_BLOCKS.2=§bFoliage + Leaves
+value.WAVING_BLOCKS.2=§bFoliage + Leaves
+
+option.WORLD_OUTLINE=Outlined World
+option.WORLD_OUTLINE.comment=Adds outlines around blocks.
+value.WORLD_OUTLINE.true=§bON
+value.WORLD_OUTLINE.false=§aOFF

shaders/lib/antialiasing/taa.glsl

@@ -1,21 +1,22 @@
 #include "/lib/util/reprojection.glsl"
 
 ivec2 neighbourhoodOffsets[8] = ivec2[8](
-								ivec2(-1, -1),
-								ivec2( 0, -1),
-								ivec2( 1, -1),
-								ivec2(-1,  0),
-								ivec2( 1,  0),
-								ivec2(-1,  1),
-								ivec2( 0,  1),
-								ivec2( 1,  1));
+	ivec2(-1, -1),
+	ivec2( 0, -1),
+	ivec2( 1, -1),
+	ivec2(-1,  0),
+	ivec2( 1,  0),
+	ivec2(-1,  1),
+	ivec2( 0,  1),
+	ivec2( 1,  1)
+);
 
 void NeighbourhoodClamping(vec3 color, inout vec3 tempColor, float depth, inout float edge) {
 	vec3 minclr = color, maxclr = color;
 
 	for (int i = 0; i < 8; i++) {
 		float depthCheck = texelFetch(depthtex1, texelCoord + neighbourhoodOffsets[i], 0).r;
-		if (abs(GetLinearDepth(depthCheck) - GetLinearDepth(depth)) > 0.09) edge = 20.0;
+		if (abs(GetLinearDepth(depthCheck) - GetLinearDepth(depth)) > 0.09) edge = 0.25;
 		vec3 clr = texelFetch(colortex3, texelCoord + neighbourhoodOffsets[i], 0).rgb;
 		minclr = min(minclr, clr); maxclr = max(maxclr, clr);
 	}

shaders/lib/atmospherics/auroraBorealis.glsl

@@ -0,0 +1,42 @@
+vec3 GetAuroraBorealis(vec3 viewPos, float VdotU, float dither) {
+    float visibility = sqrt1(clamp01(VdotU * 1.5 - 0.225)) - sunVisibility - rainFactor;
+    visibility *= 1.0 - VdotU * 0.75;
+
+    #if AURORA_CONDITION == 1 || AURORA_CONDITION == 3
+        visibility -= moonPhase;
+    #endif
+    #if AURORA_CONDITION == 2 || AURORA_CONDITION == 3
+        visibility *= isSnowy;
+    #endif
+
+    if (visibility > 0.0) {
+        vec3 aurora = vec3(0.0);
+
+        vec3 wpos = (gbufferModelViewInverse * vec4(viewPos, 1.0)).xyz;
+             wpos.xz /= wpos.y;
+        vec2 cameraPositionM = cameraPosition.xz * 0.0075;
+             cameraPositionM.x += syncedTime * 0.04;
+        
+        int sampleCount = 25;
+        int sampleCountP = sampleCount + 5;
+        float ditherM = dither + 5.0;
+        float auroraAnimate = frameTimeCounter * 0.0015;
+        for (int i = 0; i < sampleCount; i++) {
+            float current = pow2((i + ditherM) / sampleCountP);
+
+            vec2 planePos = wpos.xz * (0.8 + current);
+            planePos = floor(planePos * 11.0 + cameraPositionM) * 0.0007;
+
+            float noise = texture2D(noisetex, planePos).b;
+            noise = pow2(pow2(pow2(pow2(1.0 - 2.0 * abs(noise - 0.5)))));
+            noise *= pow1_5(texture2D(noisetex, planePos * 100.0 + auroraAnimate).b);
+
+            float currentM = 1.0 - current;
+            aurora += noise * currentM * mix(vec3(7.0, 2.2, 12.0), vec3(6.0, 16.0, 12.0), pow2(pow2(currentM)));
+        }
+        
+        return aurora * 1.3 * visibility / sampleCount;
+    }
+
+    return vec3(0.0);
+}

shaders/lib/atmospherics/volumetricClouds.glsl

@@ -25,23 +25,22 @@ vec3 cloudLightColor   = mix(lightColor * 0.9, cloudRainColor, rainFactor);
 #endif
 
 #if CLOUD_QUALITY >= 2
-    vec3 GetCloudShadowPosition(vec3 tracePos) {
+    vec3 GetShadowOnCloudPosition(vec3 tracePos) {
         vec3 wpos = PlayerToShadow(tracePos - cameraPosition);
         float distb = sqrt(wpos.x * wpos.x + wpos.y * wpos.y);
         float distortFactor = 1.0 - shadowMapBias + distb * shadowMapBias;
         vec3 shadowPosition = vec3(vec2(wpos.xy / distortFactor), wpos.z * 0.2);
         return shadowPosition * 0.5 + 0.5;
     }
 
-    bool GetCloudShadow(vec3 tracePos, float cloudAltitude, float lowerPlaneAltitude, float higherPlaneAltitude) {
+    bool GetShadowOnCloud(vec3 tracePos, float cloudAltitude, float lowerPlaneAltitude, float higherPlaneAltitude) {
         const float cloudShadowOffset = 0.5;
 
-        vec3 shadowPosition0 = GetCloudShadowPosition(tracePos);
+        vec3 shadowPosition0 = GetShadowOnCloudPosition(tracePos);
         if (length(shadowPosition0.xy * 2.0 - 1.0) < 1.0) {
             float shadowsample0 = shadow2D(shadowtex0, shadowPosition0).z;
-            float sampleR = texelFetch(shadowcolor0, ivec2(shadowPosition0.xy * shadowMapResolution), 0).r;
 
-            if (shadowsample0 == 0.0 && sampleR > 0.0) return true;
+            if (shadowsample0 == 0.0) return true;
         }
 
         return false;
@@ -95,22 +94,28 @@ vec4 GetVolumetricClouds(float cloudAltitude, float distanceThreshold, inout flo
         if (lTracePos > lViewPos - 1.0) continue;
 
         if (GetCloudNoise(tracePos.xyz, cloudAltitude)) {
+            float lightMult = 1.0;
             #if CLOUD_QUALITY >= 2
-                if (GetCloudShadow(tracePos, cloudAltitude, lowerPlaneAltitude, higherPlaneAltitude)) continue;
+                if (GetShadowOnCloud(tracePos, cloudAltitude, lowerPlaneAltitude, higherPlaneAltitude)) {
+                    if (eyeBrightness.y != 240) continue;
+                    else {
+                        lightMult = 0.25;
+                    }
+                }
             #endif
 
             float cloudShading = 1.0 - (higherPlaneAltitude - tracePos.y) / cloudHeight;
 
             #if CLOUD_QUALITY >= 3
                 float cloudShadingM = 1.0 - pow2(cloudShading);
 
-                float light = 2.0;
                 float gradientNoise = InterleavedGradientNoise();
 
                 vec3 cLightPos = ModifyTracePos(tracePos.xyz, cloudAltitude);
                 vec3 cLightPosAdd = normalize(ViewToPlayer(lightVec * 1000000000.0)) * vec3(0.08);
                 cLightPosAdd *= shadowTime;
 
+                float light = 2.0;
                 cLightPos += (1.0 + gradientNoise) * cLightPosAdd;
                 light -= texture2D(colortex3, GetRoundedCloudCoord(cLightPos.xz)).r * cloudShadingM;
                 cLightPos += gradientNoise * cLightPosAdd;
@@ -119,7 +124,7 @@ vec4 GetVolumetricClouds(float cloudAltitude, float distanceThreshold, inout flo
                 float VdotSM = VdotS;
                       if (sunVisibility < 0.5) VdotSM = -VdotSM;
                       VdotSM = max0(VdotSM) * shadowTime * 0.25 + 0.5 * cloudShading + 0.08;
-                cloudShading = VdotSM * light;
+                cloudShading = VdotSM * light * lightMult;
             #endif
 
             vec3 colorSample = cloudAmbientColor + cloudLightColor * (0.07 + cloudShading);

shaders/lib/atmospherics/volumetricLight.glsl

@@ -18,7 +18,7 @@ vec4 DistortShadow(vec4 shadowpos, float distortFactor) {
 	return shadowpos;
 }
 
-vec4 GetVolumetricLight(inout float vlFactor, vec3 translucentMult, float lViewPos, float VdotL, float VdotU, vec2 texCoord, float z0, float z1, float dither) {
+vec4 GetVolumetricLight(inout float vlFactor, vec3 translucentMult, float lViewPos, vec3 nViewPos, float VdotL, float VdotU, vec2 texCoord, float z0, float z1, float dither) {
 	if (max(blindness, darknessFactor) > 0.1) return vec4(0.0);
 	vec4 volumetricLight = vec4(0.0);
 
@@ -57,7 +57,7 @@ vec4 GetVolumetricLight(inout float vlFactor, vec3 translucentMult, float lViewP
 		int sampleCount = 16;
 	#endif
 	float addition = 1.0;
-	float maxDist = mix(max(far, 96.0) * 0.6, 80.0, vlSceneIntensity);
+	float maxDist = mix(max(far, 96.0) * 0.55, 80.0, vlSceneIntensity);
 	float distMult = maxDist / (sampleCount + addition);
 	float sampleMultIntense = isEyeInWater != 1 ? 1.0 : 0.85;
 
@@ -69,33 +69,29 @@ vec4 GetVolumetricLight(inout float vlFactor, vec3 translucentMult, float lViewP
 	#endif
 
 	// Fast but inaccurate perspective distortion approximation
-	float fovFactor = gbufferProjection[1][1] / 1.37;
-	float x = abs(texCoord.x - 0.5);
-	x = 1.0 - x*x;
-	x = pow(x, max(3.0 - fovFactor, 0.0));
-	maxDist *= x;
-	distMult *= x;
+	float viewFactor = 1.0 - 0.7 * pow2(dot(nViewPos.xy, nViewPos.xy));
+	maxDist *= viewFactor;
+	distMult *= viewFactor;
+	
+	#ifdef OVERWORLD
+		float maxCurrentDist = min(depth1, maxDist);
+	#else
+		float maxCurrentDist = min(depth1, far);
+	#endif
 
 	for (int i = 0; i < sampleCount; i++) {
 		float currentDist = (i + dither) * distMult + addition;
 
-		if (currentDist > depth1) break;
-		#ifdef OVERWORLD
-			if (currentDist > maxDist) break;
-			//if (volumetricLight.a >= 1.0) break;
-		#else
-			if (currentDist > far) break;
-		#endif
+		if (currentDist > maxCurrentDist) break;
+		//if (volumetricLight.a >= 1.0) break;
 
 		vec4 viewPos = gbufferProjectionInverse * (vec4(texCoord, GetDistX(currentDist), 1.0) * 2.0 - 1.0);
 		viewPos /= viewPos.w;
 		vec4 wpos = gbufferModelViewInverse * viewPos;
-
 		#ifdef END
 			vec3 playerPos = wpos.xyz / wpos.w;
 			vec4 enderBeamSample = vec4(DrawEnderBeams(VdotU, playerPos), 1.0) / sampleCount;
 		#endif
-
 		wpos = shadowModelView * wpos;
 		wpos = shadowProjection * wpos;
 		wpos /= wpos.w;
@@ -145,8 +141,8 @@ vec4 GetVolumetricLight(inout float vlFactor, vec3 translucentMult, float lViewP
 				vec4 shadowPosition = DistortShadow(wpos, 1.0 - shadowMapBias);
 				shadowPosition.z -= 0.0005;
 				float shadowSample = shadow2D(shadowtex0, shadowPosition.xyz).z;
-				if (shadowSample > 0.5 || eyeBrightness.y > 180) vlFactor = max(vlFactor - OSIEBB*3, 0.0);
-				else                                             vlFactor = min(vlFactor + OSIEBB*2, 1.0);
+				if (shadowSample > 0.5 || eyeBrightness.y > 180) vlFactor = max(vlFactor - OSIEBCA*3, 0.0);
+				else                                             vlFactor = min(vlFactor + OSIEBCA*2, 1.0);
 			}
 		} else vlFactor = 0.0;
 	#endif

shaders/lib/colors/lightAndAmbientColors.glsl

@@ -2,7 +2,11 @@
 #define INCLUDE_LIGHT_AND_AMBIENT_COLORS
 
 #if defined OVERWORLD
-    vec3 noonClearLightColor   = vec3(0.7, 0.55, 0.5) * 1.5;
+    #ifndef COMPOSITE
+        vec3 noonClearLightColor = vec3(0.7, 0.55, 0.5) * 1.5; //ground and cloud color
+    #else
+        vec3 noonClearLightColor = vec3(0.5, 0.55, 0.7) * 1.5; //light shaft color
+    #endif
     vec3 noonClearAmbientColor = pow(skyColor, vec3(0.6)) * 0.85;
 
     #ifndef COMPOSITE
@@ -15,17 +19,17 @@
     #if !defined COMPOSITE && !defined DEFERRED1
         vec3 nightClearLightColor = vec3(0.15, 0.14, 0.20) * (0.4 + vsBrightness * 0.4); //ground color
     #elif defined DEFERRED1
-        vec3 nightClearLightColor = vec3(0.11, 0.14, 0.20) * 1.0; //cloud color
+        vec3 nightClearLightColor = vec3(0.11, 0.14, 0.20); //cloud color
     #else
         vec3 nightClearLightColor = vec3(0.07, 0.12, 0.27) * (0.25 + vsBrightness * 0.25); //light shaft color
     #endif
     vec3 nightClearAmbientColor   = vec3(0.09, 0.12, 0.17) * (1.55 + vsBrightness * 0.77);
 
-    vec3 dayRainLightColor   = vec3(0.11, 0.13, 0.2) * (0.75 + vsBrightness * 0.25);
-    vec3 dayRainAmbientColor = dayRainLightColor * 3.5;
+    vec3 dayRainLightColor   = vec3(0.1, 0.12, 0.24) * (0.75 + vsBrightness * 0.25);
+    vec3 dayRainAmbientColor = vec3(0.17, 0.21, 0.3) * (1.5 + vsBrightness);
 
-    vec3 nightRainLightColor   = vec3(0.005, 0.0055, 0.0095);
-    vec3 nightRainAmbientColor = vec3(0.1, 0.11, 0.19) * (1.5 + vsBrightness * 0.5);
+    vec3 nightRainLightColor   = vec3(0.008, 0.009, 0.024) * (0.5 + vsBrightness);
+    vec3 nightRainAmbientColor = vec3(0.16, 0.20, 0.3) * (0.75 + vsBrightness * 0.6);
 
     vec3 dayLightColor   = mix(noonClearLightColor, sunsetClearLightColor, invNoonFactor);
     vec3 dayAmbientColor = mix(noonClearAmbientColor, sunsetClearAmbientColor, invNoonFactor);

shaders/lib/colors/skyColors.glsl

@@ -4,11 +4,11 @@
 #ifdef OVERWORLD
     vec3 skyColorSqrt = sqrt(skyColor);
 
-    vec3 noonUpSkyColor     = pow(skyColor, vec3(1.32)) * 0.7;
+    vec3 noonUpSkyColor     = pow(skyColor, vec3(1.32)) * 0.8;
     vec3 noonMiddleSkyColor = skyColorSqrt * 1.2;
     vec3 noonDownSkyColor   = noonUpSkyColor;
 
-    vec3 sunsetUpSkyColor     = pow(skyColor, vec3(1.12)) * vec3(0.65, 0.45, 0.5);
+    vec3 sunsetUpSkyColor     = pow(skyColor, vec3(1.12)) * vec3(0.78, 0.54, 0.6);
     vec3 sunsetMiddleSkyColor = skyColorSqrt * 1.1;
     vec3 sunsetDownSkyColor   = vec3(0.92, 0.56, 0.44);