From 3c3928eeb890cf027d5e2d031942bc65b85a82cd Mon Sep 17 00:00:00 2001
From: JFronny <33260128+jfronny@users.noreply.github.com>
Date: Sun, 20 Dec 2020 14:24:48 +0100
Subject: [PATCH] Update included lumilights, fix values being reset on restart

---
 run/resourcepacks/lumi/README.md              |   7 +-
 .../shaders/internal/material_main.frag       | 357 +++---------------
 .../shaders/internal/material_main.vert       |  34 +-
 .../internal/process/emissive_color.frag      |   3 +-
 .../assets/lumi/materials/tasty_liquid.json   |   1 -
 .../assets/lumi/shaders/api/pbr_frag.glsl     |   8 +
 .../lumi/assets/lumi/shaders/api/varying.glsl |   2 -
 .../lumi/shaders/internal/debug_shading.glsl  |  20 +
 .../lumi/shaders/internal/lightsource.glsl    | 226 +++++++++++
 .../lumi/shaders/internal/main_frag.glsl      |  36 ++
 .../lumi/shaders/internal/main_vert.glsl      |  37 ++
 .../lumi/shaders/internal/pbr_shading.glsl    | 138 +++++++
 .../lumi/shaders/internal/phong_shading.glsl  |  74 ++++
 .../lumi/shaders/internal/skybloom.glsl       |   5 +
 .../assets/lumi/shaders/internal/tonemap.glsl |  25 ++
 .../assets/lumi/shaders/internal/varying.glsl |   5 +
 .../lumi/assets/lumi/shaders/lib/bump.glsl    |  48 +++
 .../lumi/assets/lumi/shaders/lib/noise.glsl   |   7 -
 .../lumi/assets/lumi/shaders/lib/pbr.glsl     |  48 +++
 .../lumi/assets/lumi/shaders/lib/water.glsl   |  35 ++
 .../assets/lumi/shaders/material/water.frag   |  65 ++--
 .../assets/lumi/shaders/material/water.vert   |  14 +-
 .../lumi/assets/minecraft/lang/en_us.json     |   9 -
 .../minecraft/lights/item/glowstone.json      |   7 +
 .../minecraft/lights/item/jack_o_lantern.json |   8 +
 .../assets/minecraft/lights/item/lantern.json |   7 +
 .../minecraft/lights/item/shroomlight.json    |   8 +
 .../assets/minecraft/lights/item/torch.json   |   8 +
 .../minecraft/materialmaps/block/ladder.json  |   3 +
 .../lumi/assets/respackopts/conf.json         |  13 +-
 run/resourcepacks/lumi/pack.mcmeta            |   2 +-
 run/resourcepacks/lumi/pack.png               | Bin 24229 -> 1282 bytes
 .../jfronny/respackopts/Respackopts.java      |  52 +--
 .../mixin/ResourcePackManagerMixin.java       |  15 +-
 34 files changed, 925 insertions(+), 402 deletions(-)
 create mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/api/pbr_frag.glsl
 delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/api/varying.glsl
 create mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/debug_shading.glsl
 create mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/lightsource.glsl
 create mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/main_frag.glsl
 create mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/main_vert.glsl
 create mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/pbr_shading.glsl
 create mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/phong_shading.glsl
 create mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/skybloom.glsl
 create mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/tonemap.glsl
 create mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/varying.glsl
 create mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/lib/bump.glsl
 delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/lib/noise.glsl
 create mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/lib/pbr.glsl
 create mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/lib/water.glsl
 delete mode 100644 run/resourcepacks/lumi/assets/minecraft/lang/en_us.json
 create mode 100644 run/resourcepacks/lumi/assets/minecraft/lights/item/glowstone.json
 create mode 100644 run/resourcepacks/lumi/assets/minecraft/lights/item/jack_o_lantern.json
 create mode 100644 run/resourcepacks/lumi/assets/minecraft/lights/item/lantern.json
 create mode 100644 run/resourcepacks/lumi/assets/minecraft/lights/item/shroomlight.json
 create mode 100644 run/resourcepacks/lumi/assets/minecraft/lights/item/torch.json
 create mode 100644 run/resourcepacks/lumi/assets/minecraft/materialmaps/block/ladder.json

diff --git a/run/resourcepacks/lumi/README.md b/run/resourcepacks/lumi/README.md
index 7994d1c..fc265f0 100644
--- a/run/resourcepacks/lumi/README.md
+++ b/run/resourcepacks/lumi/README.md
@@ -1,8 +1,3 @@
 # Lumi Lights
 [Lumi Lights](https://github.com/spiralhalo/LumiLights) by [spiralhalo](https://github.com/spiralhalo/LumiLights) is a shader for canvas.\
-I used it here as the fact it provides sevaral versions with only slight changes makes it an easy example for this library.\
-Modified/added files:
-- [minecraft/lang/en_us.json](https://gitlab.com/JFronny/respackopts/-/blob/master/run/resourcepacks/lumi/assets/minecraft/lang/en_us.json)
-- [respackopts/conf.json](https://gitlab.com/JFronny/respackopts/-/blob/master/run/resourcepacks/lumi/assets/respackopts/conf.json)
-- [lumi/shaders/material/water.frag](https://gitlab.com/JFronny/respackopts/-/blob/master/run/resourcepacks/lumi/assets/lumi/shaders/material/water.frag)
-- [canvas/shaders/internal/material_main.frag](https://gitlab.com/JFronny/respackopts/-/blob/master/run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.frag)
\ No newline at end of file
+This modified version uses respackopts for configuration instead of forcing the user to edit glsl
\ No newline at end of file
diff --git a/run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.frag b/run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.frag
index 8b9231a..c49a71a 100644
--- a/run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.frag
+++ b/run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.frag
@@ -1,283 +1,57 @@
-/*
- *  Lumi Lights - A shader pack for Canvas
- *  Copyright (c) 2020 spiralhalo and Contributors
- *
- *  See `README.md` for license notice.
- */
+/*******************************************************
+ *  Lumi Lights - Shader pack for Canvas               *
+ *******************************************************
+ *  Copyright (c) 2020 spiralhalo and Contributors.    *
+ *  Released WITHOUT WARRANTY under the terms of the   *
+ *  GNU Lesser General Public License version 3 as     *
+ *  published by the Free Software Foundation, Inc.    *
+ *******************************************************/
 
 #include canvas:shaders/internal/header.glsl
 #include canvas:shaders/internal/varying.glsl
 #include canvas:shaders/internal/diffuse.glsl
 #include canvas:shaders/internal/flags.glsl
 #include canvas:shaders/internal/fog.glsl
+#include canvas:shaders/internal/program.glsl
 #include frex:shaders/api/world.glsl
+#include frex:shaders/api/camera.glsl
 #include frex:shaders/api/player.glsl
 #include frex:shaders/api/material.glsl
 #include frex:shaders/api/fragment.glsl
 #include frex:shaders/api/sampler.glsl
 #include frex:shaders/lib/math.glsl
 #include frex:shaders/lib/color.glsl
-#include canvas:shaders/internal/program.glsl
-#include lumi:shaders/api/varying.glsl
+#include respackopts:config_supplier
+#include lumi:shaders/api/pbr_frag.glsl
+#include lumi:shaders/api/context_bump.glsl
+#include lumi:shaders/lib/pbr.glsl
+#include lumi:shaders/internal/varying.glsl
+#include lumi:shaders/internal/main_frag.glsl
+#include lumi:shaders/internal/lightsource.glsl
+#include lumi:shaders/internal/tonemap.glsl
+#include lumi:shaders/internal/pbr_shading.glsl
+#include lumi:shaders/internal/phong_shading.glsl
+#include lumi:shaders/internal/skybloom.glsl
+#include lumi:shaders/internal/debug_shading.glsl
 
 #include canvas:apitarget
-#include respackopts:config_supplier
 
 /******************************************************
   canvas:shaders/internal/material_main.frag
 ******************************************************/
 
-#define M_PI 3.1415926535897932384626433832795
-
-const float hdr_sunStr = 3;
-const float hdr_moonStr = 0.4;
-const float hdr_blockStr = 1.5;
-const float hdr_handHeldStr = 0.9;
-const float hdr_skylessStr = 0.2;
-const float hdr_baseMinStr = 0.0;
-const float hdr_baseMaxStr = 0.25;
-const float hdr_emissiveStr = 1;
-const float hdr_relAmbient = 0.09;
-const float hdr_relSunHorizon = 0.5;
-const float hdr_zWobbleDefault = 0.1;
-const float hdr_finalMult = 1;
-const float hdr_gamma = 2.2;
-
-float hdr_gammaAdjust(float x){
-	return pow(x, hdr_gamma);
-}
-
-vec3 hdr_gammaAdjust(vec3 x){
-	return pow(x, vec3(hdr_gamma));
-}
-
-vec3 hdr_reinhardJodieTonemap(in vec3 v) {
-    float l = frx_luminance(v);
-    vec3 tv = v / (1.0f + v);
-    return mix(v / (1.0f + l), tv, tv);
-}
-
-vec3 hdr_vibrantTonemap(in vec3 v){
-	return v / (frx_luminance(v) + vec3(1.0));
-}
-
 void _cv_startFragment(inout frx_FragmentData data) {
 	int cv_programId = _cv_fragmentProgramId();
 #include canvas:startfragment
 }
 
-float l2_clampScale(float e0, float e1, float v){
-    return clamp((v-e0)/(e1-e0), 0.0, 1.0);
-}
-
-float l2_max3(vec3 vec){
-	return max(vec.x, max(vec.y, vec.z));
-}
-
-// vec3 l2_what(vec3 rgb){
-// 	return vec3(0.4123910 * rgb.r + 0.3575840 * rgb.g + 0.1804810 * rgb.b,
-// 				0.2126390 * rgb.r + 0.7151690 * rgb.g + 0.0721923 * rgb.b,
-// 				0.0193308 * rgb.r + 0.1191950 * rgb.g + 0.9505320 * rgb.b);
-// }
-
-vec3 l2_blockLight(float blockLight){
-	float bl = l2_clampScale(0.03125, 1.0, blockLight);
-	bl *= bl * hdr_blockStr;
-	vec3 block = hdr_gammaAdjust(vec3(bl, bl*0.875, bl*0.75));
-	
-#if HANDHELD_LIGHT_RADIUS != 0
-	vec4 held = frx_heldLight();
-	if (held.w > 0.0) {
-		float hl = l2_clampScale(held.w * HANDHELD_LIGHT_RADIUS, 0.0, gl_FogFragCoord);
-		hl *= hl * hdr_handHeldStr;
-
-		return block + hdr_gammaAdjust(held.rgb * hl);
+void main() {
+#ifndef PROGRAM_BY_UNIFORM
+	if (_cv_programDiscard()) {
+		discard;
 	}
 #endif
 
-	return block;
-}
-
-vec3 l2_emissiveLight(float emissivity){
-	return vec3(hdr_gammaAdjust(emissivity) * hdr_emissiveStr);
-}
-
-float l2_skyLight(float skyLight, float intensity)
-{
-	float sl = l2_clampScale(0.03125, 1.0, skyLight);
-	return hdr_gammaAdjust(sl) * intensity;
-}
-
-vec3 l2_ambientColor(float time){
-	vec3 ambientColor = hdr_gammaAdjust(vec3(0.6, 0.9, 1.0)) * hdr_sunStr * hdr_relAmbient;
-	vec3 sunriseAmbient = hdr_gammaAdjust(vec3(1.0, 0.8, 0.4)) * hdr_sunStr * hdr_relAmbient * hdr_relSunHorizon;
-	vec3 sunsetAmbient = hdr_gammaAdjust(vec3(1.0, 0.6, 0.2)) * hdr_sunStr * hdr_relAmbient * hdr_relSunHorizon;
-	vec3 nightAmbient = hdr_gammaAdjust(vec3(1.0, 1.0, 2.0)) * hdr_moonStr * hdr_relAmbient;
-	if(time > 0.94){
-		ambientColor = mix(nightAmbient, sunriseAmbient, l2_clampScale(0.94, 0.98, time));
-	} else if(time > 0.52){
-		ambientColor = mix(sunsetAmbient, nightAmbient, l2_clampScale(0.52, 0.56, time));
-	} else if(time > 0.48){
-		ambientColor = mix(ambientColor, sunsetAmbient, l2_clampScale(0.48, 0.5, time));
-	} else if(time < 0.02){
-		ambientColor = mix(ambientColor, sunriseAmbient, l2_clampScale(0.02, 0, time));
-	}
-	return ambientColor;
-}
-
-vec3 l2_skyAmbient(float skyLight, float time, float intensity){
-	float sa = l2_skyLight(skyLight, intensity) * 2.5;
-	return sa * l2_ambientColor(time);
-}
-
-float l2_userBrightness(){
-	float base = texture2D(frxs_lightmap, vec2(0.03125, 0.03125)).r;
-	// if(frx_isWorldTheNether()){
-	// 	return smoothstep(0.15/*0.207 no true darkness in nether*/, 0.577, base);
-	// } else if (frx_isWorldTheEnd(){
-	// 	return smoothstep(0.18/*0.271 no true darkness in the end*/, 0.685, base);
-	// } else {
-	// 	return smoothstep(0.053, 0.135, base);
-	// }
-
-	// Simplify nether/the end check
-	if(frx_worldHasSkylight()){
-		return smoothstep(0.053, 0.135, base);
-	} else {
-		return smoothstep(0.15, 0.63, base);
-	}
-}
-
-vec3 l2_skylessLightColor(){
-	return hdr_gammaAdjust(vec3(1.0));
-}
-
-vec3 l2_dimensionColor(){
-	if (frx_isWorldTheNether()) {
-		float min_col = min(min(gl_Fog.color.rgb.x, gl_Fog.color.rgb.y), gl_Fog.color.rgb.z);
-		float max_col = max(max(gl_Fog.color.rgb.x, gl_Fog.color.rgb.y), gl_Fog.color.rgb.z);
-		float sat = 0.0;
-		if (max_col != 0.0) {
-			sat = (max_col-min_col)/max_col;
-		}
-	
-		return hdr_gammaAdjust(clamp((gl_Fog.color.rgb*(1/max_col))+pow(sat,2)/2, 0.0, 1.0));
-	}
-	else {
-		return hdr_gammaAdjust(vec3(0.8, 0.7, 1.0));
-	}
-}
-
-vec3 l2_skylessLight(vec3 normal){
-	if(frx_worldHasSkylight()){
-		return vec3(0);
-	} else {
-		float yalign = dot(normal,vec3(0, 0.977358, 0.211593)); // a bit towards z for more interesting effect
-		yalign = frx_isSkyDarkened()?abs(yalign):max(0,yalign);
-		return yalign * hdr_skylessStr * l2_skylessLightColor() * l2_userBrightness();
-	}
-}
-
-vec3 l2_baseAmbient(){
-	if(frx_worldHasSkylight()){
-		return vec3(0.1) * mix(hdr_baseMinStr, hdr_baseMaxStr, l2_userBrightness());
-	} else {
-		return l2_dimensionColor() * mix(hdr_baseMinStr, hdr_baseMaxStr, l2_userBrightness());
-	}
-}
-
-vec3 l2_sunColor(float time){
-	vec3 sunColor = hdr_gammaAdjust(vec3(1.0, 1.0, lumi_sunColorFactor)) * hdr_sunStr;
-	vec3 sunriseColor = hdr_gammaAdjust(vec3(1.0, 0.8, 0.4)) * hdr_sunStr * hdr_relSunHorizon;
-	vec3 sunsetColor = hdr_gammaAdjust(vec3(1.0, 0.6, 0.4)) * hdr_sunStr * hdr_relSunHorizon;
-	if(time > 0.94){
-		sunColor = sunriseColor;
-	} else if(time > 0.56){
-		sunColor = vec3(0); // pitch black at night
-	} else if(time > 0.54){
-		sunColor = mix(sunsetColor, vec3(0), l2_clampScale(0.54, 0.56, time));
-	} else if(time > 0.5){
-		sunColor = sunsetColor;
-	} else if(time > 0.48){
-		sunColor = mix(sunColor, sunsetColor, l2_clampScale(0.48, 0.5, time));
-	} else if(time < 0.02){
-		sunColor = mix(sunColor, sunriseColor, l2_clampScale(0.02, 0, time));
-	}
-	return sunColor;
-}
-
-vec3 l2_vanillaSunDir(in float time, float zWobble){
-
-	// wrap time to account for sunrise
-	time -= (time >= 0.75) ? 1.0 : 0.0;
-
-	// supposed offset of sunset/sunrise from 0/12000 daytime. might get better result with datamining?
-	float sunHorizonDur = 0.04;
-
-	// angle of sun in radians
-	float angleRad = l2_clampScale(-sunHorizonDur, 0.5+sunHorizonDur, time) * M_PI;
-
-	return normalize(vec3(cos(angleRad), sin(angleRad), zWobble));
-}
-
-vec3 l2_sunLight(float skyLight, in float time, float intensity, float rainGradient, vec3 diffuseNormal){
-
-	// wrap time to account for sunrise
-	float customTime = (time >= 0.75) ? (time - 1.0) : time;
-
-    float customIntensity = l2_clampScale(-0.08, 0.00, customTime);
-
-    if(customTime >= 0.25){
-		customIntensity = l2_clampScale(0.58, 0.5, customTime);
-    }
-
-	customIntensity *= mix(1.0, 0.0, rainGradient);
-
-	float sl = l2_skyLight(skyLight, max(customIntensity, intensity));
-
-	// direct sun light doesn't reach into dark spot as much as sky ambient
-	sl = frx_smootherstep(0.5,1.0,sl);
-
-	// zWobble is added to make more interesting looking diffuse light
-	// TODO: might be fun to use frx_worldDay() with sine wave for the zWobble to simulate annual sun position change
-	sl *= max(0.0, dot(l2_vanillaSunDir(time, hdr_zWobbleDefault), diffuseNormal));
-	return sl * l2_sunColor(time);
-}
-
-vec3 l2_moonLight(float skyLight, float time, float intensity, vec3 diffuseNormal){
-	float ml = l2_skyLight(skyLight, intensity) * frx_moonSize() * hdr_moonStr;
-    float aRad = l2_clampScale(0.56, 0.94, time) * M_PI;
-	ml *= max(0.0, dot(vec3(cos(aRad), sin(aRad), 0), diffuseNormal));
-	if(time < 0.58){
-		ml *= l2_clampScale(0.54, 0.58, time);
-	} else if(time > 0.92){
-		ml *= l2_clampScale(0.96, 0.92, time);
-	}
-	return vec3(ml);
-}
-
-float l2_specular(float time, vec3 aNormal, vec3 aPos, vec3 cameraPos, float power)
-{
-    // calculate sun position (0 zWobble to make it look accurate with vanilla sun visuals)
-    vec3 sunDir = l2_vanillaSunDir(time, 0);
-
-    // obtain the direction of the camera
-    vec3 viewDir = normalize(cameraPos - aPos);
-
-    // calculate the specular light
-    return pow(max(0.0, dot(reflect(-sunDir, aNormal), viewDir)),power);
-}
-
-float l2_ao(frx_FragmentData fragData) {
-#if AO_SHADING_MODE != AO_MODE_NONE
-	float ao = fragData.ao ? _cvv_ao : 1.0;
-	return hdr_gammaAdjust(min(1.0, ao + fragData.emissivity));
-#else
-	return 1.0;
-#endif 
-}
-
-void main() {
 	frx_FragmentData fragData = frx_FragmentData (
 	texture2D(frxs_spriteAltas, _cvv_texcoord, _cv_getFlag(_CV_FLAG_UNMIPPED) * -4.0),
 	_cvv_color,
@@ -288,10 +62,19 @@ void main() {
 	_cvv_lightcoord
 	);
 
+#ifdef lumi_pbr
+	pbr_roughness = 1.0;
+	pbr_metallic = 0.0;
+	pbr_f0 = vec3(-1.0);
+#else
+	ww_specular = 0.0;
+#endif
+
 	_cv_startFragment(fragData);
 
-	vec4 a = fragData.spriteColor * fragData.vertexColor;
+	vec4 a = clamp(fragData.spriteColor * fragData.vertexColor, 0.0, 1.0);
 	float bloom = fragData.emissivity; // separate bloom from emissivity
+	bool translucent = _cv_getFlag(_CV_FLAG_CUTOUT) == 0.0 && a.a < 0.99;
 
 	if(frx_isGui()){
 #if DIFFUSE_SHADING_MODE != DIFFUSE_MODE_NONE
@@ -302,52 +85,27 @@ void main() {
 		}
 #endif
 	} else {
-		a.rgb = hdr_gammaAdjust(a.rgb);
-
-		// If diffuse is disabled (e.g. grass) then the normal points up by default
-		float ao = l2_ao(fragData);
-		vec3 diffuseNormal = fragData.diffuse?fragData.vertexNormal * frx_normalModelMatrix():vec3(0,1,0);
-		vec3 block = l2_blockLight(fragData.light.x);
-		vec3 sun = l2_sunLight(fragData.light.y, frx_worldTime(), frx_ambientIntensity(), frx_rainGradient(), diffuseNormal);
-		vec3 moon = l2_moonLight(fragData.light.y, frx_worldTime(), frx_ambientIntensity(), diffuseNormal);
-		vec3 skyAmbient = l2_skyAmbient(fragData.light.y, frx_worldTime(), frx_ambientIntensity());
-		vec3 emissive = l2_emissiveLight(fragData.emissivity);
-		vec3 nether = l2_skylessLight(diffuseNormal);
-
-		vec3 light = block + moon + l2_baseAmbient() + skyAmbient + sun + nether;
-		light *= ao; // AO is supposed to be applied to ambient only, but things look better with AO on everything except for emissive light
-		light += emissive;
-		
-		vec3 specular = vec3(0.0);
-		if (wwv_specPower > 0.01) {
-			vec3 specularNormal = fragData.vertexNormal * frx_normalModelMatrix();
-
-			float skyAccess = smoothstep(0.89, 1.0, fragData.light.y);
-
-			vec3 fragPos = frx_var0.xyz;
-			vec3 cameraPos = frx_var1.xyz;
-			vec3 sunDir = l2_vanillaSunDir(frx_worldTime(), 0);
-			vec3 sun = l2_sunLight(fragData.light.y, frx_worldTime(), frx_ambientIntensity(), frx_rainGradient(), sunDir);
-
-			float specularAmount = l2_specular(frx_worldTime(), specularNormal, fragPos, cameraPos, wwv_specPower);
-
-			specular = sun * specularAmount * skyAccess;
-		}
-
-		a.rgb *= light;
-		a.rgb += specular;
-
-		float specularLuminance = frx_luminance(specular);
-		a.a += specularLuminance;
-		bloom += specularLuminance;
-
-		a.rgb *= hdr_finalMult;
-#if lumi_tonemap == lumi_tonemap_vibrant
-		a.rgb = pow(hdr_vibrantTonemap(a.rgb), vec3(1.0 / hdr_gamma));
-#elif lumi_tonemap == reinhardJodie
-		a.rgb = pow(hdr_reinhardJodieTonemap(a.rgb), vec3(1.0 / hdr_gamma));
+#if lumi_debugMode != lumi_debugMode_none
+		debug_shading(a);
 #else
-        a.rgb = pow(frx_toneMap(a.rgb), vec3(1.0 / hdr_gamma));
+		float userBrightness;
+		float brightnessBase = texture2D(frxs_lightmap, vec2(0.03125, 0.03125)).r;
+		if(frx_worldHasSkylight()){
+			userBrightness = smoothstep(0.053, 0.135, brightnessBase);
+		} else {
+			// simplified for both nether and the end
+			userBrightness = smoothstep(0.15, 0.63, brightnessBase);
+			// if(frx_isWorldTheNether()){
+			// 	userBrightness = smoothstep(0.15/*0.207 no true darkness in nether*/, 0.577, brightnessBase);
+			// } else if (frx_isWorldTheEnd(){
+			// 	userBrightness = smoothstep(0.18/*0.271 no true darkness in the end*/, 0.685, brightnessBase);
+			// }
+		}
+	#ifdef lumi_pbr
+		pbr_shading(fragData, a, bloom, userBrightness, translucent);
+	#else
+		phong_shading(fragData, a, bloom, userBrightness, translucent);
+	#endif
 #endif
 	}
 
@@ -372,6 +130,7 @@ void main() {
 	gl_FragDepth = gl_FragCoord.z;
 
 #if TARGET_EMISSIVE > 0
-	gl_FragData[TARGET_EMISSIVE] = vec4(bloom * a.a, 1.0, 0.0, 1.0);
+	translucent = translucent && a.a < 0.99;
+	gl_FragData[TARGET_EMISSIVE] = vec4(bloom * a.a, 1.0, 0.0, translucent ? step(hdr_skyBloom, bloom) : 1.0);
 #endif
 }
diff --git a/run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.vert b/run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.vert
index 354c409..d5b5338 100644
--- a/run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.vert
+++ b/run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.vert
@@ -1,13 +1,22 @@
+/******************************************************************************************************
+ * Derived from Canvas (https://github.com/grondag/canvas) material_main shader, Apache 2.0 license.  *
+ * Modified to add PBR varyings and support for texture-based bump map generation.                    *
+ * The modifications are licensed under the GNU Lesser General Public License version 3.              *
+ ******************************************************************************************************/
+
 #include canvas:shaders/internal/header.glsl
-#include frex:shaders/api/context.glsl
 #include canvas:shaders/internal/varying.glsl
 #include canvas:shaders/internal/vertex.glsl
 #include canvas:shaders/internal/flags.glsl
-#include frex:shaders/api/vertex.glsl
-#include frex:shaders/api/sampler.glsl
 #include canvas:shaders/internal/diffuse.glsl
 #include canvas:shaders/internal/program.glsl
-#include lumi:shaders/api/varying.glsl
+#include frex:shaders/api/context.glsl
+#include frex:shaders/api/vertex.glsl
+#include frex:shaders/api/sampler.glsl
+#include respackopts:config_supplier
+#include lumi:shaders/api/context_bump.glsl
+#include lumi:shaders/internal/varying.glsl
+#include lumi:shaders/internal/main_vert.glsl
 
 #include canvas:apitarget
 
@@ -36,13 +45,22 @@ void main() {
 	// due to FP error on some cards/drivers.  Also made varying attribute invariant (rolls eyes at OpenGL)
 	_cvv_flags = uint(in_normal_flags.w + 0.5);
 
-    wwv_specPower = 0.0;
+    // pbrv_roughness = 1.0;
+	// pbrv_metallic = 0.0;
 
 	_cv_setupProgram();
 
+#ifdef LUMI_BUMP
+	startBump();
+#endif
+
 	int cv_programId = _cv_vertexProgramId();
 	_cv_startVertex(data, cv_programId);
 
+#ifdef LUMI_BUMP
+	setupBump(data);
+#endif
+
 	if (_cvu_atlas[_CV_SPRITE_INFO_TEXTURE_SIZE] != 0.0) {
 		float spriteIndex = in_material.x;
 		// for sprite atlas textures, convert from normalized (0-1) to interpolated coordinates
@@ -58,6 +76,10 @@ void main() {
 		spriteBounds /= vec4(atlasWidth, atlasHeight, atlasWidth, atlasHeight);
 
 		data.spriteUV = spriteBounds.xy + data.spriteUV * spriteBounds.zw;
+
+	#ifdef LUMI_BUMP
+		endBump(spriteBounds);
+	#endif
 	}
 
 	data.spriteUV = _cv_textureCoord(data.spriteUV, 0);
@@ -66,6 +88,8 @@ void main() {
 	gl_ClipVertex = viewCoord;
 	gl_FogFragCoord = length(viewCoord.xyz);
 
+	setVaryings(viewCoord);
+
 	//data.normal *= gl_NormalMatrix;
 	data.vertex = gl_ModelViewProjectionMatrix * data.vertex;
 
diff --git a/run/resourcepacks/lumi/assets/canvas/shaders/internal/process/emissive_color.frag b/run/resourcepacks/lumi/assets/canvas/shaders/internal/process/emissive_color.frag
index 510acb2..cac8772 100644
--- a/run/resourcepacks/lumi/assets/canvas/shaders/internal/process/emissive_color.frag
+++ b/run/resourcepacks/lumi/assets/canvas/shaders/internal/process/emissive_color.frag
@@ -8,6 +8,7 @@
 #include frex:shaders/lib/color.glsl
 #include frex:shaders/lib/sample.glsl
 #include frex:shaders/lib/math.glsl
+#include lumi:shaders/internal/skybloom.glsl
 
 /******************************************************
   canvas:shaders/internal/process/emissive_color.frag
@@ -22,7 +23,7 @@ void main() {
 	vec4 e = texture2D(_cvu_emissive, _cvv_texcoord);
 
 	bool sky = e.g == 0.0;
-	float bloom = sky ? 0.25 : e.r;
+	float bloom = sky ? hdr_skyBloom : e.r;
 
 	vec4 c = frx_fromGamma(texture2D(_cvu_base, _cvv_texcoord));
 	
diff --git a/run/resourcepacks/lumi/assets/lumi/materials/tasty_liquid.json b/run/resourcepacks/lumi/assets/lumi/materials/tasty_liquid.json
index 3032be1..f2f96e8 100644
--- a/run/resourcepacks/lumi/assets/lumi/materials/tasty_liquid.json
+++ b/run/resourcepacks/lumi/assets/lumi/materials/tasty_liquid.json
@@ -1,7 +1,6 @@
 {
     "blendMode": "translucent",
     "disableAo": true,
-    "disableDiffuse": true,
     "vertexSource": "lumi:shaders/material/water.vert",
     "fragmentSource": "lumi:shaders/material/water.frag"
 }
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/api/pbr_frag.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/api/pbr_frag.glsl
new file mode 100644
index 0000000..7d9bf25
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/lumi/shaders/api/pbr_frag.glsl
@@ -0,0 +1,8 @@
+#define LUMI_PBR_API 1
+
+// API 0
+float pbr_roughness;
+float pbr_metallic;
+
+// API 1
+vec3 pbr_f0;
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/api/varying.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/api/varying.glsl
deleted file mode 100644
index 62ec007..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/api/varying.glsl
+++ /dev/null
@@ -1,2 +0,0 @@
-// If wwv_specPower is used, frx_var0 must be reserved for fragPos and frx_var1 must be reserved for cameraPos
-varying float wwv_specPower;
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/debug_shading.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/debug_shading.glsl
new file mode 100644
index 0000000..07daee6
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/lumi/shaders/internal/debug_shading.glsl
@@ -0,0 +1,20 @@
+/*******************************************************
+ *  lumi:shaders/internal/debug_shading.glsl           *
+ *******************************************************
+ *  Copyright (c) 2020 spiralhalo and Contributors.    *
+ *  Released WITHOUT WARRANTY under the terms of the   *
+ *  GNU Lesser General Public License version 3 as     *
+ *  published by the Free Software Foundation, Inc.    *
+ *******************************************************/
+
+#if lumi_debugMode != lumi_debugMode_none
+void debug_shading(inout vec4 a) {
+#if lumi_debugMode == lumi_debugMode_viewDir
+    vec3 viewDir = normalize(-pbrv_viewPos) * frx_normalModelMatrix() * gl_NormalMatrix;
+    a.rgb = viewDir * 0.5 + 0.5;
+#else
+    vec3 normal = fragData.vertexNormal * frx_normalModelMatrix();
+    a.rgb = normal * 0.5 + 0.5;
+#endif
+}
+#endif
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/lightsource.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/lightsource.glsl
new file mode 100644
index 0000000..13fb586
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/lumi/shaders/internal/lightsource.glsl
@@ -0,0 +1,226 @@
+/*******************************************************
+ *  lumi:shaders/internal/lightsource.glsl             *
+ *******************************************************
+ *  Copyright (c) 2020 spiralhalo and Contributors.    *
+ *  Released WITHOUT WARRANTY under the terms of the   *
+ *  GNU Lesser General Public License version 3 as     *
+ *  published by the Free Software Foundation, Inc.    *
+ *******************************************************/
+
+#ifdef lumi_pbr
+const float hdr_sunStr = 5;
+const float hdr_moonStr = 0.4;
+const float hdr_blockMinStr = 2;
+const float hdr_blockMaxStr = 3;
+const float hdr_handHeldStr = 1.5;
+const float hdr_skylessStr = 0.2;
+const float hdr_baseMinStr = 0.01;
+const float hdr_baseMaxStr = 0.8;
+const float hdr_emissiveStr = 1;
+const float hdr_relAmbient = 0.2;
+#else
+const float hdr_sunStr = 2;
+const float hdr_moonStr = 0.4;
+const float hdr_blockMinStr = 1.0;
+const float hdr_blockMaxStr = 1.4;
+const float hdr_handHeldStr = 0.9;
+const float hdr_skylessStr = 0.2;
+const float hdr_baseMinStr = 0.0;
+const float hdr_baseMaxStr = 0.25;
+const float hdr_emissiveStr = 1;
+const float hdr_relAmbient = 0.09;
+#endif
+const float hdr_zWobbleDefault = 0.1;
+const vec3 blockColor = vec3(1.0, 0.875, 0.75);
+#if lumi_tonemap == lumi_tonemap_vibrant
+const vec3 sunColor = vec3(1.0, 1.0, 1.0);
+#else
+const vec3 sunColor = vec3(1.0, 1.0, 0.8);
+#endif
+
+/*  BLOCK LIGHT
+ *******************************************************/
+
+vec3 l2_blockRadiance(float blockLight, float userBrightness) {
+	float bl = l2_clampScale(0.03125, 1.0, blockLight);
+	bl *= bl * mix(hdr_blockMinStr, hdr_blockMaxStr, userBrightness);
+	return hdr_gammaAdjust(bl * blockColor);
+}
+
+/*  HELD LIGHT
+ *******************************************************/
+
+#if HANDHELD_LIGHT_RADIUS != 0
+vec3 l2_handHeldRadiance() {
+	vec4 held = frx_heldLight();
+	float hl = l2_clampScale(held.w * HANDHELD_LIGHT_RADIUS, 0.0, gl_FogFragCoord);
+	hl *= hl * hdr_handHeldStr;
+	return hdr_gammaAdjust(held.rgb * hl);
+}
+#endif
+
+/*  EMISSIVE LIGHT
+ *******************************************************/
+
+vec3 l2_emissiveRadiance(float emissivity) {
+	return vec3(hdr_gammaAdjust(emissivity) * hdr_emissiveStr);
+}
+
+/*  SKY AMBIENT LIGHT
+ *******************************************************/
+
+float l2_skyLight(float skyLight, float intensity) {
+	float sl = l2_clampScale(0.03125, 1.0, skyLight);
+	return hdr_gammaAdjust(sl) * intensity;
+}
+
+vec3 l2_ambientColor(float time) {
+	vec3 ambientColor = hdr_gammaAdjust(vec3(0.6, 0.9, 1.0)) * hdr_sunStr * hdr_relAmbient;
+	vec3 sunriseAmbient = hdr_gammaAdjust(vec3(1.0, 0.8, 0.4)) * hdr_sunStr * hdr_relAmbient;
+	vec3 sunsetAmbient = hdr_gammaAdjust(vec3(1.0, 0.6, 0.2)) * hdr_sunStr * hdr_relAmbient;
+	vec3 nightAmbient = hdr_gammaAdjust(vec3(1.0, 1.0, 2.0)) * hdr_moonStr * hdr_relAmbient;
+	if(time > 0.94){
+		ambientColor = mix(nightAmbient, sunriseAmbient, l2_clampScale(0.94, 0.98, time));
+	} else if(time > 0.52){
+		ambientColor = mix(sunsetAmbient, nightAmbient, l2_clampScale(0.52, 0.56, time));
+	} else if(time > 0.48){
+		ambientColor = mix(ambientColor, sunsetAmbient, l2_clampScale(0.48, 0.5, time));
+	} else if(time < 0.02){
+		ambientColor = mix(ambientColor, sunriseAmbient, l2_clampScale(0.02, 0, time));
+	}
+	return ambientColor;
+}
+
+vec3 l2_skyAmbient(float skyLight, float time, float intensity) {
+	float sa = l2_skyLight(skyLight, intensity) * 2.5;
+	return sa * l2_ambientColor(time);
+}
+
+/*  SKYLESS LIGHT
+ *******************************************************/
+
+vec3 l2_skylessLightColor() {
+	return hdr_gammaAdjust(vec3(1.0));
+}
+
+vec3 l2_dimensionColor() {
+	if (frx_isWorldTheNether()) {
+		float min_col = min(min(gl_Fog.color.rgb.x, gl_Fog.color.rgb.y), gl_Fog.color.rgb.z);
+		float max_col = max(max(gl_Fog.color.rgb.x, gl_Fog.color.rgb.y), gl_Fog.color.rgb.z);
+		float sat = 0.0;
+		if (max_col != 0.0) {
+			sat = (max_col-min_col)/max_col;
+		}
+	
+		return hdr_gammaAdjust(clamp((gl_Fog.color.rgb*(1/max_col))+pow(sat,2)/2, 0.0, 1.0));
+	}
+	else {
+		return hdr_gammaAdjust(vec3(0.8, 0.7, 1.0));
+	}
+}
+
+vec3 l2_skylessDarkenedDir() {
+	return vec3(0, -0.977358, 0.211593);
+}
+
+vec3 l2_skylessDir() {
+	return vec3(0, 0.977358, 0.211593);
+}
+
+vec3 l2_skylessRadiance(float userBrightness) {
+	if (frx_worldHasSkylight()) {
+		return vec3(0);
+	} else {
+		return ( frx_isSkyDarkened() ? 0.5 : 1.0 )
+			* hdr_skylessStr
+			* l2_skylessLightColor()
+			* userBrightness;
+	}
+}
+
+/*  BASE AMBIENT LIGHT
+ *******************************************************/
+
+vec3 l2_baseAmbient(float userBrightness){
+	if(frx_worldHasSkylight()){
+		return vec3(0.1) * mix(hdr_baseMinStr, hdr_baseMaxStr, userBrightness);
+	} else {
+		return l2_dimensionColor() * mix(hdr_baseMinStr, hdr_baseMaxStr, userBrightness);
+	}
+}
+
+/*  SUN LIGHT
+ *******************************************************/
+
+vec3 l2_sunColor(float time){
+	vec3 sunColor = hdr_gammaAdjust(sunColor) * hdr_sunStr;
+	vec3 sunriseColor = hdr_gammaAdjust(vec3(1.0, 0.8, 0.4)) * hdr_sunStr;
+	vec3 sunsetColor = hdr_gammaAdjust(vec3(1.0, 0.6, 0.4)) * hdr_sunStr;
+	if(time > 0.94){
+		sunColor = sunriseColor;
+	} else if(time > 0.56){
+		sunColor = vec3(0); // pitch black at night
+	} else if(time > 0.54){
+		sunColor = mix(sunsetColor, vec3(0), l2_clampScale(0.54, 0.56, time));
+	} else if(time > 0.5){
+		sunColor = sunsetColor;
+	} else if(time > 0.48){
+		sunColor = mix(sunColor, sunsetColor, l2_clampScale(0.48, 0.5, time));
+	} else if(time < 0.02){
+		sunColor = mix(sunColor, sunriseColor, l2_clampScale(0.02, 0, time));
+	}
+	return sunColor;
+}
+
+vec3 l2_vanillaSunDir(in float time, float zWobble){
+
+	// wrap time to account for sunrise
+	time -= (time >= 0.75) ? 1.0 : 0.0;
+
+	// supposed offset of sunset/sunrise from 0/12000 daytime. might get better result with datamining?
+	float sunHorizonDur = 0.04;
+
+	// angle of sun in radians
+	float angleRad = l2_clampScale(-sunHorizonDur, 0.5+sunHorizonDur, time) * PI;
+
+	return normalize(vec3(cos(angleRad), sin(angleRad), zWobble));
+}
+
+vec3 l2_sunRadiance(float skyLight, in float time, float intensity, float rainGradient){
+
+	// wrap time to account for sunrise
+	float customTime = (time >= 0.75) ? (time - 1.0) : time;
+
+    float customIntensity = l2_clampScale(-0.08, 0.00, customTime);
+
+    if(customTime >= 0.25){
+		customIntensity = l2_clampScale(0.58, 0.5, customTime);
+    }
+
+	customIntensity *= mix(1.0, 0.0, rainGradient);
+
+	float sl = l2_skyLight(skyLight, max(customIntensity, intensity));
+
+	// direct sun light doesn't reach into dark spot as much as sky ambient
+	sl = frx_smootherstep(0.5,1.0,sl);
+
+	return sl * l2_sunColor(time);
+}
+
+/*  MOON LIGHT
+ *******************************************************/
+
+vec3 l2_moonDir(float time){
+    float aRad = l2_clampScale(0.56, 0.94, time) * PI;
+	return normalize(vec3(cos(aRad), sin(aRad), 0));
+}
+
+vec3 l2_moonRadiance(float skyLight, float time, float intensity){
+	float ml = l2_skyLight(skyLight, intensity) * frx_moonSize() * hdr_moonStr;
+	if(time < 0.58){
+		ml *= l2_clampScale(0.54, 0.58, time);
+	} else if(time > 0.92){
+		ml *= l2_clampScale(0.96, 0.92, time);
+	}
+	return vec3(ml);
+}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/main_frag.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/main_frag.glsl
new file mode 100644
index 0000000..913e5fc
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/lumi/shaders/internal/main_frag.glsl
@@ -0,0 +1,36 @@
+/*******************************************************
+ *  lumi:shaders/internal/main_frag.glsl               *
+ *******************************************************
+ *  Copyright (c) 2020 spiralhalo and Contributors.    *
+ *  Released WITHOUT WARRANTY under the terms of the   *
+ *  GNU Lesser General Public License version 3 as     *
+ *  published by the Free Software Foundation, Inc.    *
+ *******************************************************/
+
+const float hdr_finalMult = 1;
+const float hdr_gamma = 2.2;
+
+float hdr_gammaAdjust(float x){
+	return pow(x, hdr_gamma);
+}
+
+vec3 hdr_gammaAdjust(vec3 x){
+	return pow(x, vec3(hdr_gamma));
+}
+
+float l2_clampScale(float e0, float e1, float v){
+    return clamp((v-e0)/(e1-e0), 0.0, 1.0);
+}
+
+float l2_max3(vec3 vec){
+	return max(vec.x, max(vec.y, vec.z));
+}
+
+float l2_ao(frx_FragmentData fragData) {
+#if AO_SHADING_MODE != AO_MODE_NONE
+	float ao = fragData.ao ? _cvv_ao : 1.0;
+	return hdr_gammaAdjust(min(1.0, ao + fragData.emissivity));
+#else
+	return 1.0;
+#endif 
+}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/main_vert.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/main_vert.glsl
new file mode 100644
index 0000000..1df8b39
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/lumi/shaders/internal/main_vert.glsl
@@ -0,0 +1,37 @@
+/*******************************************************
+ *  lumi:shaders/internal/main_vert.glsl               *
+ *******************************************************
+ *  Copyright (c) 2020 spiralhalo and Contributors.    *
+ *  Released WITHOUT WARRANTY under the terms of the   *
+ *  GNU Lesser General Public License version 3 as     *
+ *  published by the Free Software Foundation, Inc.    *
+ *******************************************************/
+
+#ifdef LUMI_BUMP
+float bump_resolution;
+vec2 uvN;
+vec2 uvT;
+vec2 uvB;
+
+void startBump() {
+	bump_resolution = 1.0;
+}
+
+void setupBump(frx_VertexData data) {
+	float bumpSample = 0.015625 * bump_resolution;
+
+	uvN = clamp(data.spriteUV + vec2(-bumpSample, bumpSample), 0.0, 1.0);
+	uvT = clamp(data.spriteUV + vec2(bumpSample, 0), 0.0, 1.0);
+	uvB = clamp(data.spriteUV - vec2(0, bumpSample), 0.0, 1.0);
+}
+
+void endBump(vec4 spriteBounds) {
+    uvN = spriteBounds.xy + uvN * spriteBounds.zw;
+    uvT = spriteBounds.xy + uvT * spriteBounds.zw;
+    uvB = spriteBounds.xy + uvB * spriteBounds.zw;
+}
+#endif
+
+void setVaryings(vec4 viewCoord) {
+    l2_viewPos = viewCoord.xyz;
+}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/pbr_shading.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/pbr_shading.glsl
new file mode 100644
index 0000000..e1640fe
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/lumi/shaders/internal/pbr_shading.glsl
@@ -0,0 +1,138 @@
+/*******************************************************
+ *  lumi:shaders/internal/pbr_shading.glsl             *
+ *******************************************************
+ *  Copyright (c) 2020 spiralhalo and Contributors.    *
+ *  Released WITHOUT WARRANTY under the terms of the   *
+ *  GNU Lesser General Public License version 3 as     *
+ *  published by the Free Software Foundation, Inc.    *
+ *******************************************************/
+ 
+const float pbr_specularBloomStr = 0.01;
+const float pbr_specularAlphaStr = 0.1;
+
+vec3 pbr_specularBRDF(float roughness, vec3 radiance, vec3 halfway, vec3 lightDir, vec3 viewDir, vec3 normal, vec3 fresnel, float NdotL) {
+	// cook-torrance brdf
+	float distribution = pbr_distributionGGX(normal, halfway, roughness);
+	float geometry     = pbr_geometrySmith(normal, viewDir, lightDir, roughness);
+
+	vec3  num   = distribution * geometry * fresnel;
+	float denom = 4.0 * pbr_dot(normal, viewDir) * NdotL;
+
+	vec3  specular = num / max(denom, 0.001);
+	return specular * radiance * NdotL;
+}
+
+vec3 pbr_lightCalc(vec3 albedo, vec3 radiance, vec3 lightDir, vec3 viewDir, vec3 normal, bool diffuseOn, bool isAmbiance, float haloBlur, inout vec3 specularAccu) {
+	
+	vec3 halfway = normalize(viewDir + lightDir);
+	float roughness = pbr_roughness;
+
+	// ambiance hack
+	if (isAmbiance) {
+		roughness = min(1.0, roughness + 0.5 * (1 - pbr_metallic));
+	}
+	
+	// disableDiffuse hack
+	if (!diffuseOn) {
+		return albedo / PI * radiance * pbr_dot(lightDir, vec3(.0, 1.0, .0));
+	}
+
+	vec3 specularRadiance;
+	vec3 fresnel = pbr_fresnelSchlick(pbr_dot(viewDir, halfway), pbr_f0);
+	float NdotL = pbr_dot(normal, lightDir);
+
+	if (haloBlur > roughness) {
+		// sun halo hack
+		specularRadiance = pbr_specularBRDF(roughness, radiance * 0.75, halfway, lightDir, viewDir, normal, fresnel, NdotL);
+		specularRadiance += pbr_specularBRDF(haloBlur, radiance * 0.25, halfway, lightDir, viewDir, normal, fresnel, NdotL);
+	} else {
+		specularRadiance = pbr_specularBRDF(roughness, radiance, halfway, lightDir, viewDir, normal, fresnel, NdotL);
+	}
+
+	vec3 diffuse = (1.0 - fresnel) * (1.0 - pbr_metallic);
+	vec3 diffuseRadiance = albedo * diffuse / PI * radiance * NdotL;
+	specularAccu += specularRadiance;
+
+	return specularRadiance + diffuseRadiance;
+}
+
+void pbr_shading(in frx_FragmentData fragData, inout vec4 a, inout float bloom, in float userBrightness, in bool translucent) {
+
+	vec3 albedo = hdr_gammaAdjust(a.rgb);
+	vec3 dielectricF0 = vec3(0.1) * frx_luminance(albedo);
+	pbr_roughness = clamp(pbr_roughness, 0.0, 1.0);
+	pbr_metallic = clamp(pbr_metallic, 0.0, 1.0);
+	pbr_f0 = pbr_f0.r < 0 ? mix(dielectricF0, albedo, pbr_metallic) : clamp(pbr_f0, 0.0, 1.0);
+
+    a.rgb = albedo;
+
+    float ao = l2_ao(fragData);
+    vec3 emissive = l2_emissiveRadiance(fragData.emissivity);
+    a.rgb *= emissive;
+    
+    vec3 viewDir = normalize(-l2_viewPos) * frx_normalModelMatrix() * gl_NormalMatrix;
+
+    vec3 normal = fragData.vertexNormal * frx_normalModelMatrix();
+
+    vec3 specularAccu = vec3(0.0);  
+
+#if HANDHELD_LIGHT_RADIUS != 0
+    if (frx_heldLight().w > 0) {
+        vec3 handHeldDir = viewDir;
+        vec3 handHeldRadiance = l2_handHeldRadiance();
+        if(handHeldRadiance.x * handHeldRadiance.y * handHeldRadiance.z > 0) {
+            vec3 adjustedNormal = fragData.diffuse ? normal : viewDir;
+            a.rgb += pbr_lightCalc(albedo, handHeldRadiance, handHeldDir, viewDir, adjustedNormal, true, false, 0.0, specularAccu);
+        }
+    }
+#endif
+
+    vec3 blockRadiance = l2_blockRadiance(fragData.light.x, userBrightness);
+    vec3 baseAmbientRadiance = l2_baseAmbient(userBrightness);
+    vec3 ambientDir = normalize(vec3(0.1, 0.9, 0.1) + normal);
+
+    a.rgb += pbr_lightCalc(albedo, blockRadiance * ao, ambientDir, viewDir, normal, fragData.diffuse, true, 0.0, specularAccu);
+    a.rgb += pbr_lightCalc(albedo, baseAmbientRadiance * ao, ambientDir, viewDir, normal, fragData.diffuse, true, 0.0, specularAccu);
+
+    if (frx_worldHasSkylight()) {
+        if (fragData.light.y > 0.03125) {
+
+            vec3 moonRadiance = l2_moonRadiance(fragData.light.y, frx_worldTime(), frx_ambientIntensity());
+            vec3 moonDir = l2_moonDir(frx_worldTime());
+            vec3 sunRadiance = l2_sunRadiance(fragData.light.y, frx_worldTime(), frx_ambientIntensity(), frx_rainGradient());
+            vec3 sunDir = l2_vanillaSunDir(frx_worldTime(), 0.0);
+            vec3 skyRadiance = l2_skyAmbient(fragData.light.y, frx_worldTime(), frx_ambientIntensity());
+
+            a.rgb += pbr_lightCalc(albedo, moonRadiance * ao, moonDir, viewDir, normal, fragData.diffuse, false, 0.15, specularAccu);
+            a.rgb += pbr_lightCalc(albedo, sunRadiance * ao, sunDir, viewDir, normal, fragData.diffuse, false, 0.15, specularAccu);
+            a.rgb += pbr_lightCalc(albedo, skyRadiance * ao, ambientDir, viewDir, normal, fragData.diffuse, true, 0.0, specularAccu);
+
+        }
+
+    } else {
+
+        vec3 skylessRadiance = l2_skylessRadiance(userBrightness);
+        vec3 skylessDir = l2_skylessDir();
+
+        a.rgb += pbr_lightCalc(albedo, skylessRadiance * ao, skylessDir, viewDir, normal, fragData.diffuse, false, 0.0, specularAccu);
+
+        if (frx_isSkyDarkened()) {
+
+            vec3 skylessDarkenedDir = l2_skylessDarkenedDir();
+            a.rgb += pbr_lightCalc(albedo, skylessRadiance * ao, skylessDarkenedDir, viewDir, normal, fragData.diffuse, false, 0.0, specularAccu);
+        }
+
+    }
+
+    // float skyAccess = smoothstep(0.89, 1.0, fragData.light.y);
+
+    float specularLuminance = frx_luminance(specularAccu);
+    float smoothness = (1-pbr_roughness);
+    bloom += specularLuminance * pbr_specularBloomStr * smoothness * smoothness;
+    if (translucent) {
+        a.a += specularLuminance * pbr_specularBloomStr;
+    }
+
+    a.rgb *= hdr_finalMult;
+    tonemap(a);
+}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/phong_shading.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/phong_shading.glsl
new file mode 100644
index 0000000..5a82f2c
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/lumi/shaders/internal/phong_shading.glsl
@@ -0,0 +1,74 @@
+/*******************************************************
+ *  lumi:shaders/internal/phong_shading.glsl           *
+ *******************************************************
+ *  Copyright (c) 2020 spiralhalo and Contributors.    *
+ *  Released WITHOUT WARRANTY under the terms of the   *
+ *  GNU Lesser General Public License version 3 as     *
+ *  published by the Free Software Foundation, Inc.    *
+ *******************************************************/
+
+float ww_specular;
+
+float l2_specular(float time, vec3 aNormal, vec3 viewDir, float power)
+{
+    // calculate sun position (0 zWobble to make it look accurate with vanilla sun visuals)
+    vec3 sunDir = l2_vanillaSunDir(time, 0);
+
+    // calculate the specular light
+    return pow(max(0.0, dot(reflect(-sunDir, aNormal), viewDir)), power);
+}
+
+void phong_shading(in frx_FragmentData fragData, inout vec4 a, inout float bloom, in float userBrightness, in bool translucent) {
+    a.rgb = hdr_gammaAdjust(a.rgb);
+
+    float ao = l2_ao(fragData);
+    // If diffuse is disabled (e.g. grass) then the normal points up by default
+    vec3 diffuseNormal = fragData.diffuse?fragData.vertexNormal * frx_normalModelMatrix():vec3(0,1,0);
+    float sunDot = max(0.0, dot(l2_vanillaSunDir(frx_worldTime(), hdr_zWobbleDefault), diffuseNormal));
+    float moonDot = max(0.0, dot(l2_moonDir(frx_worldTime()), diffuseNormal));
+    float skyLessDot = max(0.0, dot(l2_skylessDir(), diffuseNormal));
+    float skyLessDarkenedDot = max(0.0, dot(l2_skylessDarkenedDir(), diffuseNormal));
+#if HANDHELD_LIGHT_RADIUS == 0
+    vec3 held = vec3(0);
+#else
+    vec3 held = l2_handHeldRadiance();
+#endif
+    vec3 block = l2_blockRadiance(fragData.light.x, userBrightness);
+    vec3 sun = l2_sunRadiance(fragData.light.y, frx_worldTime(), frx_ambientIntensity(), frx_rainGradient()) * sunDot;
+    vec3 moon = l2_moonRadiance(fragData.light.y, frx_worldTime(), frx_ambientIntensity()) * moonDot;
+    vec3 skyAmbient = l2_skyAmbient(fragData.light.y, frx_worldTime(), frx_ambientIntensity());
+    vec3 emissive = l2_emissiveRadiance(fragData.emissivity);
+    vec3 skylessRadiance = l2_skylessRadiance(userBrightness);
+    vec3 skyless = skylessRadiance * skyLessDot + (frx_isSkyDarkened() ? skylessRadiance * skyLessDarkenedDot : vec3(0.0));
+    vec3 baseAmbient = l2_baseAmbient(userBrightness);
+
+    vec3 light = baseAmbient + held + block + moon + skyAmbient + sun + skyless;
+    light *= ao; // AO is supposed to be applied to ambient only, but things look better with AO on everything except for emissive light
+    light += emissive;
+    
+    vec3 specular = vec3(0.0);
+    if (ww_specular > 0) {
+        vec3 specularNormal = fragData.vertexNormal * frx_normalModelMatrix();
+
+        float skyAccess = smoothstep(0.89, 1.0, fragData.light.y);
+
+        vec3 sunDir = l2_vanillaSunDir(frx_worldTime(), 0);
+        float specSunDot = max(0.0, dot(l2_vanillaSunDir(frx_worldTime(), hdr_zWobbleDefault), specularNormal));
+        vec3 viewDir = normalize(-l2_viewPos) * frx_normalModelMatrix() * gl_NormalMatrix;
+        vec3 sun = l2_sunRadiance(fragData.light.y, frx_worldTime(), frx_ambientIntensity(), frx_rainGradient()) * specSunDot;
+
+        float specularAmount = l2_specular(frx_worldTime(), specularNormal, viewDir, ww_specular);
+
+        specular = sun * specularAmount * skyAccess;
+
+        float specularLuminance = frx_luminance(specular);
+        a.a += specularLuminance;
+        bloom += specularLuminance;
+    }
+
+    a.rgb *= light;
+    a.rgb += specular;
+
+    a.rgb *= hdr_finalMult;
+    tonemap(a);
+}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/skybloom.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/skybloom.glsl
new file mode 100644
index 0000000..33cb611
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/lumi/shaders/internal/skybloom.glsl
@@ -0,0 +1,5 @@
+/***********************************************************
+ *  lumi:shaders/internal/skybloom.glsl                    *
+ ***********************************************************/
+
+const float hdr_skyBloom = 0.25;
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/tonemap.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/tonemap.glsl
new file mode 100644
index 0000000..5f65734
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/lumi/shaders/internal/tonemap.glsl
@@ -0,0 +1,25 @@
+/***********************************************************
+ *  lumi:shaders/internal/tonemap.glsl                     *
+ ***********************************************************/
+
+vec3 hdr_reinhardJodieTonemap(in vec3 v) {
+    float l = frx_luminance(v);
+    vec3 tv = v / (1.0f + v);
+    return mix(v / (1.0f + l), tv, tv);
+}
+
+#if lumi_tonemap == lumi_tonemap_vibrant
+vec3 hdr_vibrantTonemap(in vec3 hdrColor){
+	return hdrColor / (frx_luminance(hdrColor) + vec3(1.0));
+}
+#endif
+
+void tonemap(inout vec4 a) {
+#if lumi_tonemap == lumi_tonemap_film
+    a.rgb = frx_toGamma(frx_toneMap(a.rgb));
+#elif lumi_tonemap == lumi_tonemap_vibrant
+    a.rgb = pow(hdr_vibrantTonemap(a.rgb), vec3(1.0 / hdr_gamma));
+#else
+    a.rgb = pow(hdr_reinhardJodieTonemap(a.rgb), vec3(1.0 / hdr_gamma));
+#endif
+}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/varying.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/varying.glsl
new file mode 100644
index 0000000..9cc8a54
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/lumi/shaders/internal/varying.glsl
@@ -0,0 +1,5 @@
+/***********************************************************
+ *  lumi:shaders/internal/varying.glsl                     *
+ ***********************************************************/
+
+varying vec3 l2_viewPos;
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/lib/bump.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/lib/bump.glsl
new file mode 100644
index 0000000..6b9ba83
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/lumi/shaders/lib/bump.glsl
@@ -0,0 +1,48 @@
+/*******************************************************
+ *  lumi:shaders/lib/bump.glsl                         *
+ *******************************************************
+ *  Copyright (c) 2020 spiralhalo and Contributors.    *
+ *  Released WITHOUT WARRANTY under the terms of the   *
+ *  GNU Lesser General Public License version 3 as     *
+ *  published by the Free Software Foundation, Inc.    *
+ *******************************************************/
+
+const mat4 _bump_tRotm = mat4(
+0,  0, -1,  0,
+0,  1,  0,  0,
+1,  0,  0,  0,
+0,  0,  0,  1 );
+
+vec3 _bump_tangentMove(vec3 normal)
+{
+    vec3 aaNormal = vec3(normal.x + 0.01, 0, normal.z + 0.01);
+        aaNormal = normalize(aaNormal);
+    return (_bump_tRotm * vec4(aaNormal, 0.0)).xyz;
+}
+
+vec3 _bump_bitangentMove(vec3 normal, vec3 tangent)
+{
+    return cross(normal, tangent);
+}
+
+float _bump_height(float raw)
+{
+    return frx_smootherstep(0, 1, pow(raw, 1 + raw * raw));
+}
+
+vec3 bump_normal(sampler2D tex, vec3 normal, vec2 uvn, vec2 uvt, vec2 uvb)
+{
+    vec3 tangentMove = _bump_tangentMove(normal);
+    vec3 bitangentMove = _bump_bitangentMove(normal, tangentMove);
+
+    vec4 texel     = texture2D(tex, uvn, _cv_getFlag(_CV_FLAG_UNMIPPED) * -4.0);
+    vec3 origin    = _bump_height(frx_luminance(texel.rgb)) * normal;
+
+         texel     = texture2D(tex, uvt, _cv_getFlag(_CV_FLAG_UNMIPPED) * -4.0);
+    vec3 tangent   = tangentMove + _bump_height(frx_luminance(texel.rgb)) * normal - origin;
+    
+         texel     = texture2D(tex, uvb, _cv_getFlag(_CV_FLAG_UNMIPPED) * -4.0);
+    vec3 bitangent = bitangentMove + _bump_height(frx_luminance(texel.rgb)) * normal - origin;
+
+    return normalize(cross(tangent, bitangent));
+}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/lib/noise.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/lib/noise.glsl
deleted file mode 100644
index e0a6833..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/lib/noise.glsl
+++ /dev/null
@@ -1,7 +0,0 @@
-#include frex:shaders/lib/noise/noise3d.glsl
-
-float l2_noise(vec3 aPos, float renderTime, float scale, float amplitude)
-{
-	float invScale = 1/scale;
-    return (snoise(vec3(aPos.x*invScale, aPos.z*invScale, renderTime)) * 0.5+0.5) * amplitude;
-}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/lib/pbr.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/lib/pbr.glsl
new file mode 100644
index 0000000..8a45a69
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/lumi/shaders/lib/pbr.glsl
@@ -0,0 +1,48 @@
+/*******************************************************
+ *  lumi:shaders/lib/pbr.glsl                          *
+ *******************************************************/
+
+float pbr_dot(vec3 a, vec3 b)
+{
+    return clamp(dot(a, b), 0.0, 1.0);
+}
+
+float pbr_distributionGGX(vec3 N, vec3 H, float roughness)
+{
+    float a      = roughness*roughness;
+    float a2     = a*a;
+    float NdotH  = pbr_dot(N, H);
+    float NdotH2 = NdotH*NdotH;
+	
+    float num   = a2;
+    float denom = (NdotH2 * (a2 - 1.0) + 1.0);
+    denom = PI * denom * denom;
+	
+    return num / denom;
+}
+
+float pbr_geometrySchlickGGX(float NdotV, float roughness)
+{
+    float r = (roughness + 1.0);
+    float k = (r*r) / 8.0;
+
+    float num   = NdotV;
+    float denom = NdotV * (1.0 - k) + k;
+	
+    return num / denom;
+}
+
+float pbr_geometrySmith(vec3 N, vec3 V, vec3 L, float roughness)
+{
+    float NdotV = pbr_dot(N, V);
+    float NdotL = pbr_dot(N, L);
+    float ggx2  = pbr_geometrySchlickGGX(NdotV, roughness);
+    float ggx1  = pbr_geometrySchlickGGX(NdotL, roughness);
+	
+    return ggx1 * ggx2;
+}
+
+vec3 pbr_fresnelSchlick(float cosTheta, vec3 F0)
+{
+    return F0 + (1.0 - F0) * pow(1.0 - cosTheta, 5.0);
+}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/lib/water.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/lib/water.glsl
new file mode 100644
index 0000000..d3a58d4
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/lumi/shaders/lib/water.glsl
@@ -0,0 +1,35 @@
+#include lumi:shaders/lib/bump.glsl
+
+/*******************************************************
+ *  lumi:shaders/lib/water.glsl                        *
+ *******************************************************
+ *  Copyright (c) 2020 spiralhalo and Contributors.    *
+ *  Released WITHOUT WARRANTY under the terms of the   *
+ *  GNU Lesser General Public License version 3 as     *
+ *  published by the Free Software Foundation, Inc.    *
+ *******************************************************/
+
+float ww_noise(vec3 pos, vec3 move, float invScale, float amplitude, float stretch)
+{
+	vec3 noisePos = vec3(pos.x * invScale * stretch, pos.y * invScale, pos.z * invScale) + move;
+    return (snoise(noisePos) * 0.5 + 0.5) * amplitude;
+}
+
+vec3 ww_normals(vec3 up, vec3 samplePos, float waveSpeed, float scale, float amplitude, float stretch, vec3 moveSpeed)
+{
+	float microSample = 0.01 * scale;
+	float invScale = 1 / scale;
+	vec3  waveMove = moveSpeed * frx_renderSeconds() * waveSpeed;
+		  waveMove.xz *= abs(up.y);
+
+	vec3 tmove = _bump_tangentMove(up);
+	vec3 bmove = _bump_bitangentMove(up, tmove) * microSample;
+		 tmove *= microSample;
+	
+	vec3 origin = ww_noise(samplePos, waveMove, invScale, amplitude, stretch) * up;
+	vec3 tangent = tmove + ww_noise(samplePos + tmove, waveMove, invScale, amplitude, stretch) * up - origin;
+	vec3 bitangent = bmove + ww_noise(samplePos + bmove, waveMove, invScale, amplitude, stretch) * up - origin;
+
+	vec3 noisyNormal = normalize(cross(tangent, bitangent));
+	return noisyNormal;
+}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/material/water.frag b/run/resourcepacks/lumi/assets/lumi/shaders/material/water.frag
index c168b28..4ce3107 100644
--- a/run/resourcepacks/lumi/assets/lumi/shaders/material/water.frag
+++ b/run/resourcepacks/lumi/assets/lumi/shaders/material/water.frag
@@ -1,38 +1,43 @@
-#include lumi:shaders/api/varying.glsl
-#include lumi:shaders/lib/noise.glsl
 #include frex:shaders/api/fragment.glsl
 #include frex:shaders/api/world.glsl
-#include respackopts:config_supplier
+#include frex:shaders/lib/noise/noise3d.glsl
+#include frex:shaders/lib/color.glsl
+#include lumi:shaders/lib/water.glsl
 
 void frx_startFragment(inout frx_FragmentData fragData) {
-    fragData.spriteColor.rgb *= fragData.spriteColor.rgb * lumi_waterColorFactor;
+#ifdef lumi_pbr
+	/* PBR PARAMS */
+	pbr_f0 = vec3(0.02);
+    pbr_roughness = 0.05;
+#else
+	/* HACK */
+	fragData.light.y += 0.077 * smoothstep(1.0, 0.99, fragData.vertexNormal.y);
+	fragData.light.y = min(0.96875, fragData.light.y);
 
-    if(fragData.vertexNormal.y > 0.01) {
-		
-		// hack
-    	fragData.light.y += 0.077 * smoothstep(1.0, 0.99, fragData.vertexNormal.y);
-    	fragData.light.y = min(0.96875, fragData.light.y);
-		
-		vec3 worldPos = frx_modelOriginWorldPos() + frx_var0.xyz;
-		// water wavyness parameter
-		float timeScale = 2; 		// speed
-		float noiseScale = 2; 		// wavelength
-		float noiseAmp = 0.03125 * noiseScale;// * timeScale; // amplitude
+	/* LUMI PARAMS */
+	ww_specular = 500.0;
+#endif
+	
+	/* WATER RECOLOR */
+	vec3 desat = vec3(frx_luminance(fragData.vertexColor.rgb));
+	fragData.vertexColor.rgb = mix(fragData.vertexColor.rgb, desat, 0.7);
 
-		// inferred parameter
-		float renderTime = frx_renderSeconds() * 0.5 * timeScale;
-		float microSample = 0.01 * noiseScale;
+	float maxc = max(fragData.spriteColor.r, max(fragData.spriteColor.g, fragData.spriteColor.b)); 
+	fragData.spriteColor.rgb *= fragData.spriteColor.rgb * fragData.spriteColor.rgb * 2.0;
 
-		// base noise
-		float noise = l2_noise(worldPos, renderTime, noiseScale, noiseAmp);
-
-		// normal recalculation
-		vec3 noiseOrigin = vec3(0, noise, 0);
-		vec3 noiseTangent = vec3(microSample, l2_noise(worldPos + vec3(microSample,0,0), renderTime, noiseScale, noiseAmp), 0) - noiseOrigin;
-		vec3 noiseBitangent = vec3(0, l2_noise(worldPos + vec3(0,0,microSample), renderTime, noiseScale, noiseAmp), microSample) - noiseOrigin;
-
-		// noisy normal
-		vec3 noisyNormal = normalize(cross(noiseBitangent, noiseTangent));
-		fragData.vertexNormal = noisyNormal;
-	}
+	float l = frx_luminance(fragData.spriteColor.rgb);
+	pbr_f0 = mix(pbr_f0, vec3(0.2), l * l);
+	
+	/* WAVY NORMALS */
+	float waveSpeed = 1;
+	float scale = 1.5;
+	float amplitude = 0.01;
+	float stretch = 2;
+	// wave movement doesn't necessarily follow flow direction for the time being
+	vec3 moveSpeed = vec3(0.5, 1.5, -0.5);
+	// const float texAmplitude = 0.005;
+    vec3 up = fragData.vertexNormal.xyz;// * (1.0 + texAmplitude);
+	vec3 samplePos = frx_var0.xyz;
+	// samplePos = floor(samplePos) + floor(fract(samplePos) * 16) / 16;
+	fragData.vertexNormal = ww_normals(up, samplePos, waveSpeed, scale, amplitude, stretch, moveSpeed);
 }
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/material/water.vert b/run/resourcepacks/lumi/assets/lumi/shaders/material/water.vert
index 6332634..92a8585 100644
--- a/run/resourcepacks/lumi/assets/lumi/shaders/material/water.vert
+++ b/run/resourcepacks/lumi/assets/lumi/shaders/material/water.vert
@@ -1,8 +1,14 @@
 #include frex:shaders/api/vertex.glsl
-#include lumi:shaders/api/varying.glsl
+#include frex:shaders/api/world.glsl
+#include frex:shaders/lib/noise/noise3d.glsl
+#include lumi:shaders/api/water_param.glsl
+
+// #define WATER_VERTEX_WAVY
 
 void frx_startVertex(inout frx_VertexData data) {
-	frx_var0.xyz = data.vertex.xyz;
-	frx_var1.xyz = (gl_ModelViewMatrixInverse * vec4(0.0, 0.0, 0.0, 1.0)).xyz;
-    wwv_specPower = 100.0;
+    frx_var0.xyz = data.vertex.xyz + frx_modelOriginWorldPos();
+    #ifdef WATER_VERTEX_WAVY
+    float amplitude = 0.03;
+    data.vertex.y += snoise(vec3(frx_var0.x, frx_renderSeconds(), frx_var0.z)) * amplitude;
+    #endif
 }
diff --git a/run/resourcepacks/lumi/assets/minecraft/lang/en_us.json b/run/resourcepacks/lumi/assets/minecraft/lang/en_us.json
deleted file mode 100644
index 33960b3..0000000
--- a/run/resourcepacks/lumi/assets/minecraft/lang/en_us.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "respackopts.title.lumi": "Lumi Lights",
-  "respackopts.field.lumi.waterColorFactor": "Water Color Factor",
-  "respackopts.field.lumi.sunColorFactor": "Sun Color Factor",
-  "respackopts.field.lumi.tonemap": "Tonemap",
-  "respackopts.field.lumi.tonemap.reinhardJodie": "Reinhard Jodie",
-  "respackopts.field.lumi.tonemap.vibrant": "Vibrant",
-  "respackopts.field.lumi.tonemap.fxr": "Fxr"
-}
\ No newline at end of file
diff --git a/run/resourcepacks/lumi/assets/minecraft/lights/item/glowstone.json b/run/resourcepacks/lumi/assets/minecraft/lights/item/glowstone.json
new file mode 100644
index 0000000..44ed7db
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/minecraft/lights/item/glowstone.json
@@ -0,0 +1,7 @@
+{
+  "intensity": 1.0,
+  "red": 1.0,
+  "green": 0.875,
+  "blue": 0.75,
+  "worksInFluid": true
+}
diff --git a/run/resourcepacks/lumi/assets/minecraft/lights/item/jack_o_lantern.json b/run/resourcepacks/lumi/assets/minecraft/lights/item/jack_o_lantern.json
new file mode 100644
index 0000000..0631f34
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/minecraft/lights/item/jack_o_lantern.json
@@ -0,0 +1,8 @@
+{
+  "intensity": 0.93,
+  "red": 1.0,
+  "green": 0.875,
+  "blue": 0.75,
+  "worksInFluid": false
+}
+
diff --git a/run/resourcepacks/lumi/assets/minecraft/lights/item/lantern.json b/run/resourcepacks/lumi/assets/minecraft/lights/item/lantern.json
new file mode 100644
index 0000000..f12840c
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/minecraft/lights/item/lantern.json
@@ -0,0 +1,7 @@
+{
+  "intensity": 0.93,
+  "red": 1.0,
+  "green": 0.875,
+  "blue": 0.75,
+  "worksInFluid": false
+}
diff --git a/run/resourcepacks/lumi/assets/minecraft/lights/item/shroomlight.json b/run/resourcepacks/lumi/assets/minecraft/lights/item/shroomlight.json
new file mode 100644
index 0000000..4f908b7
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/minecraft/lights/item/shroomlight.json
@@ -0,0 +1,8 @@
+{
+  "intensity": 1.0,
+  "red": 1.0,
+  "green": 0.875,
+  "blue": 0.75,
+  "worksInFluid": true
+}
+
diff --git a/run/resourcepacks/lumi/assets/minecraft/lights/item/torch.json b/run/resourcepacks/lumi/assets/minecraft/lights/item/torch.json
new file mode 100644
index 0000000..0631f34
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/minecraft/lights/item/torch.json
@@ -0,0 +1,8 @@
+{
+  "intensity": 0.93,
+  "red": 1.0,
+  "green": 0.875,
+  "blue": 0.75,
+  "worksInFluid": false
+}
+
diff --git a/run/resourcepacks/lumi/assets/minecraft/materialmaps/block/ladder.json b/run/resourcepacks/lumi/assets/minecraft/materialmaps/block/ladder.json
new file mode 100644
index 0000000..f67c61a
--- /dev/null
+++ b/run/resourcepacks/lumi/assets/minecraft/materialmaps/block/ladder.json
@@ -0,0 +1,3 @@
+{
+    "defaultMaterial": "fabric:standard"
+}
diff --git a/run/resourcepacks/lumi/assets/respackopts/conf.json b/run/resourcepacks/lumi/assets/respackopts/conf.json
index c047af4..b075cdb 100644
--- a/run/resourcepacks/lumi/assets/respackopts/conf.json
+++ b/run/resourcepacks/lumi/assets/respackopts/conf.json
@@ -3,11 +3,16 @@
   "version": 1,
   "conf": {
     "tonemap": [
-      "reinhardJodie",
+      "default",
       "vibrant",
-      "fxr"
+      "film"
     ],
-    "sunColorFactor": 0.8,
-    "waterColorFactor": 1
+    "pbr": true,
+    "debugMode": [
+      "none",
+      "normal",
+      "viewDir"
+    ],
+    "waterVertexWavy": false
   }
 }
diff --git a/run/resourcepacks/lumi/pack.mcmeta b/run/resourcepacks/lumi/pack.mcmeta
index 779bb20..837bbfa 100644
--- a/run/resourcepacks/lumi/pack.mcmeta
+++ b/run/resourcepacks/lumi/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "pack_format": 6,
-    "description": "§3Aesthetic shader pack\n§8by awoo [v1.0-wip]"
+    "description": "§3Aesthetic shader pack\n§8by spiralhalo [v0.4]"
   }
 }
diff --git a/run/resourcepacks/lumi/pack.png b/run/resourcepacks/lumi/pack.png
index e48cdab60329ac7814e4b198e65bf1caaa9d575a..e5d7bb225b60df30d555c8297c06ff48c579b086 100644
GIT binary patch
delta 1243
zcmZwFeNd8j00;2j!;1oC2`6Z6DKaY+os`vOzJ!Qi*;Le_^DUfOWMywErX~0YWlNJf
zH*7=Fe77FWhMB1;-drzU@z8w9G%IICa~7$IEo*E0ue*Kk^Y{1ed-tvGgkX|#qZFsz
z!u5~LQctOULq@}F6dnR6n-Z8Jpc`s#l9V-Howd4@mtLN1`GO%hgHOi32s&9pttt;Z
zUtlc9R5S3`ZqH2Iy`MXi`%?ebbz)hLkNVXL{r!C%83!cOT)LY__A6jqgd;5Z)ZM-@
zZ!}-hzH?kU?O?7gGFNS`z(rFRrhh-p-S5#IZA_ZXQt1%jrE3~F6-ACChPlo*@69=*
zQ-JmP+s)bbTo#i(iQbsgH7tIHL#;dH145RgY!F>}u?0?r-0&WW71VyB$TyvM2Px-)
zVqLI!x1tflCB}1tndxNuK@-I{w&E-xNRO)Rk+67xJIB8utYZL<2Y*WF><Zwf;3DDu
zXdoZcoI#ZC03OoSAgo{@Z&Zy6OP#uP8{pPo-aOpNU~Ka9sXb@z8uF6}v2ng1-o3kX
z;jOpDAFtp1<sX-;Z4c#Y!{vYKfg6@<>}z<eN+cH?Tf1k$9U!QtzM@IW*sD1I970JM
z!|Uc#PGy=W)kH3{q%z&u7uiLV32!E)nYz+6#gqG%&ha%~Rl@^pZO=xp%CdZYb>9)7
z?NN>z65vKpn9<59HhfvJBScgpG<rQ)*-z-s+JkqmjOUaAm%&*75wXhX+WmBDX0y1t
z_2;?6Kg9UYh*e=y1BeKu-y0#(c<pi$WJk-p$zw);HbrT`1sO(3LVmkE2C{QU9w%yp
z>ul-OeC9+#VY9X0=`~R410?JnNxf<tNf~~b%E0SOZDqIiD$+X(u69J3o=yeKi)zPf
zAg5<qPGsB$87{_uRUugHWJd`BEF1=B`5)<x@4?B=6-OTabb<-l6|hzet%k#irZ=I#
zreK50smVQrZZ_=r1P21>?EP_4g7&VeS90KOZJ)U}0gG`?{@T=6tg?nM&WUcb%^3$%
zWT5O8G52BS^>}G%i#^WBu1A9bv^<<S-&W~|$3)gV6F+jw;vwM1@#o{ylzq}`_~jor
zZi0mPu7#^q@>ap*`vz;#zhxb_(ea}hRQl@qjFGm(3(?6rox5Dpqo9O{;qH5n7OFS@
zeVN@vJCt*dJ*LSdXFFVvJYqp_kf@dxA*lDP&3X(=6YC#gD%=ExYsbiYmMjkl6}W@S
zC#OV*4E8=rX*_hGQX@@jv)r~$ChrxZ1#K2eHgh8B3gm>6W)2ttMXcC$H5CxGJ=vp+
zlrV4Jq4hXmSrM#1|CD;mb13bDnnE_{=DryygHlR8hcgFH&}n&uwc;-%$1>*5vbFG%
z4P`N1uj@rxPR`c%8o18X0<@fX=~fGUWSgB_=*%xdBO10_ahVeW@2r~Pr=pKPLpY%?
z);a)$RmC@L8zMTMj;+{fbV=QT3*3cw*LkMmL_SyGD`-SNQTc5rb)BWYjwWmFC($^e
zYaH3%4GJ&Oe3C){FMt_s<=cA^xFE5*08`;2sPsqVvCFJY6s9VoBo*JJ^Gw5w4#wzm
zj4m(nLCbb4f^?p-wvyGMof6C}_P3sVECm0r8C!uAHK#dSb%2lA5*Wg5<cQ#Z0P!v#
A5&!@I

literal 24229
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
M07*qoM6N<$f=$NINB{r;

diff --git a/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java b/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java
index 3eb1286..a28f2f0 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java
@@ -32,19 +32,12 @@ public class Respackopts implements ClientModInitializer {
     public static final HashSet<Runnable> saveActions = new HashSet<>();
     @Override
     public void onInitializeClient() {
-        load();
-        Respackopts.save();
+        deNull();
         if (FabricLoader.getInstance().isDevelopmentEnvironment())
             saveActions.add(() -> System.out.println("Save"));
     }
 
     public static void save() {
-        deNull();
-        try {
-            Files.createDirectories(p);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
         for (String s : resPackMetas.keySet()) {
             s = resPackMetas.get(s).id;
             Config cfg = new Config();
@@ -72,31 +65,38 @@ public class Respackopts implements ClientModInitializer {
     public static void load() {
         try {
             for (String s : resPackMetas.keySet()) {
-                s = resPackMetas.get(s).id;
-                Path q = p.resolve(s + ".json");
-                if (Files.exists(q)) {
-                    try {
-                        Reader reader = Files.newBufferedReader(q);
-                        Config c = g.fromJson(reader, Config.class);
-                        reader.close();
-                        if (c.bools != null)
-                            boolVals.put(s, c.bools);
-                        if (c.doubles != null)
-                            numVals.put(s, c.doubles);
-                        if (c.strings != null)
-                            strVals.put(s, c.strings);
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
+                load(resPackMetas.get(s).id);
             }
         } catch (Throwable e) {
             e.printStackTrace();
         }
-        deNull();
+    }
+
+    public static void load(String id) {
+        Path q = p.resolve(id + ".json");
+        if (Files.exists(q)) {
+            try {
+                Reader reader = Files.newBufferedReader(q);
+                Config c = g.fromJson(reader, Config.class);
+                reader.close();
+                if (c.bools != null)
+                    boolVals.put(id, c.bools);
+                if (c.doubles != null)
+                    numVals.put(id, c.doubles);
+                if (c.strings != null)
+                    strVals.put(id, c.strings);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
     }
 
     private static void deNull() {
+        try {
+            Files.createDirectories(p);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
         if (boolVals == null)
             boolVals = new HashMap<>();
         if (numVals == null)
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackManagerMixin.java b/src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackManagerMixin.java
index 99bdab8..87fef11 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackManagerMixin.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackManagerMixin.java
@@ -17,7 +17,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.TreeSet;
 
@@ -39,6 +38,14 @@ public class ResourcePackManagerMixin {
                         Respackopts.strVals.put(conf.id, new HashMap<>());
                     if (!Respackopts.enumKeys.containsKey(conf.id))
                         Respackopts.enumKeys.put(conf.id, new HashMap<>());
+                    if (Respackopts.metaVersion.equals(conf.version)) {
+                        Respackopts.resPackMetas.put(v.getDisplayName().asString(), conf);
+                        Respackopts.load(conf.id);
+                    }
+                    else {
+                        System.err.println(s + " was not loaded as it specifies a different respackopts version than is installed");
+                        return;
+                    }
                     for (Map.Entry<String, JsonElement> entry : conf.conf.entrySet()) {
                         String n = entry.getKey();
                         if (n.contains(":") || n.contains(".") || n.contains("_")) {
@@ -91,12 +98,6 @@ public class ResourcePackManagerMixin {
                             System.err.println("[respackopts] Unsupported non-primitive datatype");
                         }
                     }
-                    if (Respackopts.metaVersion.equals(conf.version)) {
-                        Respackopts.resPackMetas.put(v.getDisplayName().asString(), conf);
-                    }
-                    else {
-                        System.err.println(s + " was not loaded as it specifies a different respackopts version than is installed");
-                    }
                 } catch (Throwable e) {
                     e.printStackTrace();
                 }