update for 1.21.3

Author: Godlander

.gitignore

@@ -0,0 +1 @@
+*.zip

assets/minecraft/shaders/core/render/armor.fsh

@@ -1,6 +1,6 @@
 #version 150
 
-#moj_import <fog.glsl>
+#moj_import <minecraft:fog.glsl>
 
 uniform sampler2D Sampler0;
 
@@ -13,17 +13,14 @@ in float vertexDistance;
 in vec4 vertexColor;
 in vec4 tintColor;
 in vec4 lightColor;
-in vec4 overlayColor;
 in vec2 uv;
-in vec4 normal;
 
 out vec4 fragColor;
 
 void main() {
     vec4 color = texture(Sampler0, uv);
     if (color.a < 0.1) discard;
     color *= tintColor * ColorModulator;
-    color.rgb = mix(overlayColor.rgb, color.rgb, overlayColor.a);
     color *= vertexColor * lightColor; //shading
     fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
 }

assets/minecraft/shaders/core/render/armor.vsh

@@ -1,7 +1,7 @@
 #version 150
 
-#moj_import <light.glsl>
-#moj_import <fog.glsl>
+#moj_import <minecraft:light.glsl>
+#moj_import <minecraft:fog.glsl>
 
 in vec3 Position;
 in vec4 Color;
@@ -11,11 +11,11 @@ in ivec2 UV2;
 in vec3 Normal;
 
 uniform sampler2D Sampler0;
-uniform sampler2D Sampler1;
 uniform sampler2D Sampler2;
 
 uniform mat4 ModelViewMat;
 uniform mat4 ProjMat;
+uniform mat4 TextureMat;
 uniform int FogShape;
 
 uniform vec3 Light0_Direction;
@@ -27,7 +27,6 @@ out vec4 tintColor;
 out vec4 lightColor;
 out vec4 overlayColor;
 out vec2 uv;
-out vec4 normal;
 
 int toint(vec3 c) {
     ivec3 v = ivec3(c*255);
@@ -40,10 +39,8 @@ void main() {
     vertexDistance = fog_distance(Position, FogShape);
     tintColor = Color;
     vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, vec4(1));
-    lightColor = minecraft_sample_lightmap(Sampler2, UV2);
-    overlayColor = texelFetch(Sampler1, UV1, 0);
+    lightColor = texelFetch(Sampler2, UV2 / 16, 0);
     uv = UV0;
-    normal = ProjMat * ModelViewMat * vec4(Normal, 0.0);
 
     //number of armors from texture size
     vec2 size = textureSize(Sampler0, 0);

assets/minecraft/shaders/core/render/glowing.vsh

@@ -21,6 +21,6 @@ void main() {
     //cannot pass tint color here so it's the only option
     vec2 size = textureSize(Sampler0, 0);
     if (size.y >= 2*size.x && size.x < 256) {
-        uv.y /= 2.*size.y/size.x;
+        uv.y /= 2*size.y/size.x;
     }
 }

assets/minecraft/shaders/core/rendertype_armor_cutout_no_cull.json

@@ -1,22 +1,8 @@
 {
-    "blend": {
-        "func": "add",
-        "srcrgb": "srcalpha",
-        "dstrgb": "1-srcalpha"
-    },
-    "vertex": "render/armor",
-    "fragment": "render/armor",
-    "attributes": [
-        "Position",
-        "Color",
-        "UV0",
-        "UV1",
-        "UV2",
-        "Normal"
-    ],
+    "vertex": "minecraft:core/render/armor",
+    "fragment": "minecraft:core/render/armor",
     "samplers": [
         { "name": "Sampler0" },
-        { "name": "Sampler1" },
         { "name": "Sampler2" }
     ],
     "uniforms": [

assets/minecraft/shaders/core/rendertype_outline.json

@@ -1,16 +1,6 @@
 {
-    "blend": {
-        "func": "add",
-        "srcrgb": "srcalpha",
-        "dstrgb": "1-srcalpha"
-    },
-    "vertex": "render/glowing",
-    "fragment": "render/glowing",
-    "attributes": [
-        "Position",
-        "Color",
-        "UV0"
-    ],
+    "vertex": "minecraft:core/render/glowing",
+    "fragment": "minecraft:core/render/glowing",
     "samplers": [
         { "name": "Sampler0" }
     ],
@@ -19,4 +9,4 @@
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] }
     ]
-}
+}