Merge branch 'main' of https://github.com/hugovdev/thankmas-resource-…

…pack

assets/minecraft/models/item/props/vending_mashine.json → assets/minecraft/models/item/props/vending_machine.json

@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [64, 64],
 	"textures": {
-		"0": "item/props/vending_mashine",
-		"particle": "item/props/vending_mashine"
+		"0": "item/props/vending_machine",
+		"particle": "item/props/vending_machine"
 	},
 	"elements": [
 		{

assets/minecraft/shaders/core/particle.fsh

@@ -0,0 +1,29 @@
+#version 150
+
+#moj_import <fog.glsl>
+
+uniform sampler2D Sampler0;
+
+uniform vec4 ColorModulator;
+uniform float FogStart;
+uniform float FogEnd;
+uniform vec4 FogColor;
+
+in float vertexDistance;
+in vec2 texCoord0;
+in vec4 vertexColor;
+
+out vec4 fragColor;
+
+void main() {
+    vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator;
+    if (color.a < 0.1) {
+        discard;
+    }
+    fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
+
+	// Emissive
+	if (color.a > 0.996 && color.a < 0.997) {
+		fragColor = linear_fog(texture(Sampler0, texCoord0), vertexDistance, FogStart, FogEnd, FogColor);
+	}
+}

assets/minecraft/shaders/core/rendertype_armor_cutout_no_cull.fsh

@@ -0,0 +1,31 @@
+#version 150
+
+#moj_import <fog.glsl>
+
+uniform sampler2D Sampler0;
+
+uniform vec4 ColorModulator;
+uniform float FogStart;
+uniform float FogEnd;
+uniform vec4 FogColor;
+
+in float vertexDistance;
+in vec4 vertexColor;
+in vec2 texCoord0;
+in vec2 texCoord1;
+in vec4 normal;
+
+out vec4 fragColor;
+
+void main() {
+    vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator;
+    if (color.a < 0.1) {
+        discard;
+    }
+    fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
+
+	// Emissive
+	if (color.a > 0.996 && color.a < 0.997) {
+		fragColor = linear_fog(texture(Sampler0, texCoord0), vertexDistance, FogStart, FogEnd, FogColor);
+	}
+}

assets/minecraft/shaders/core/rendertype_cutout.fsh

@@ -0,0 +1,29 @@
+#version 150
+
+#moj_import <fog.glsl>
+
+uniform sampler2D Sampler0;
+
+uniform vec4 ColorModulator;
+uniform float FogStart;
+uniform float FogEnd;
+uniform vec4 FogColor;
+
+in float vertexDistance;
+in vec4 vertexColor;
+in vec2 texCoord0;
+
+out vec4 fragColor;
+
+void main() {
+    vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator;
+    if (color.a < 0.1) {
+        discard;
+    }
+    fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
+
+	// Emissive
+	if (color.a > 0.996 && color.a < 0.997) {
+		fragColor = linear_fog(texture(Sampler0, texCoord0), vertexDistance, FogStart, FogEnd, FogColor);
+	}
+}

assets/minecraft/shaders/core/rendertype_entity_cutout.fsh

@@ -0,0 +1,34 @@
+#version 150
+
+#moj_import <fog.glsl>
+
+uniform sampler2D Sampler0;
+
+uniform vec4 ColorModulator;
+uniform float FogStart;
+uniform float FogEnd;
+uniform vec4 FogColor;
+
+in float vertexDistance;
+in vec4 vertexColor;
+in vec4 lightMapColor;
+in vec4 overlayColor;
+in vec2 texCoord0;
+
+out vec4 fragColor;
+
+void main() {
+    vec4 color = texture(Sampler0, texCoord0);
+    if (color.a < 0.1) {
+        discard;
+    }
+    color *= vertexColor * ColorModulator;
+    color.rgb = mix(overlayColor.rgb, color.rgb, overlayColor.a);
+    color *= lightMapColor;
+    fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
+
+	// Emissive
+	if (color.a > 0.996 && color.a < 0.997) {
+		fragColor = linear_fog(texture(Sampler0, texCoord0), vertexDistance, FogStart, FogEnd, FogColor);
+	}
+}

assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull.fsh

@@ -0,0 +1,35 @@
+#version 150
+
+#moj_import <fog.glsl>
+
+uniform sampler2D Sampler0;
+
+uniform vec4 ColorModulator;
+uniform float FogStart;
+uniform float FogEnd;
+uniform vec4 FogColor;
+
+in float vertexDistance;
+in vec4 vertexColor;
+in vec4 lightMapColor;
+in vec4 overlayColor;
+in vec2 texCoord0;
+in vec4 normal;
+
+out vec4 fragColor;
+
+void main() {
+    vec4 color = texture(Sampler0, texCoord0);
+    if (color.a < 0.1) {
+        discard;
+    }
+    color *= vertexColor * ColorModulator;
+    color.rgb = mix(overlayColor.rgb, color.rgb, overlayColor.a);
+    color *= lightMapColor;
+    fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
+
+	// Emissive
+	if (color.a > 0.996 && color.a < 0.997) {
+		fragColor = linear_fog(texture(Sampler0, texCoord0), vertexDistance, FogStart, FogEnd, FogColor);
+	}
+}

assets/minecraft/shaders/core/rendertype_entity_decal.fsh

@@ -0,0 +1,32 @@
+#version 150
+
+#moj_import <fog.glsl>
+
+uniform sampler2D Sampler0;
+
+uniform vec4 ColorModulator;
+uniform float FogStart;
+uniform float FogEnd;
+uniform vec4 FogColor;
+
+in float vertexDistance;
+in vec4 vertexColor;
+in vec4 overlayColor;
+in vec2 texCoord0;
+
+out vec4 fragColor;
+
+void main() {
+    vec4 color = texture(Sampler0, texCoord0);
+    if (color.a < 0.1) {
+        discard;
+    }
+    color.rgb = mix(overlayColor.rgb, color.rgb, overlayColor.a);
+    color *= vertexColor * ColorModulator;
+    fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
+
+	// Emissive
+	if (color.a > 0.996 && color.a < 0.997) {
+		fragColor = linear_fog(texture(Sampler0, texCoord0), vertexDistance, FogStart, FogEnd, FogColor);
+	}
+}

assets/minecraft/shaders/core/rendertype_entity_translucent_cull.fsh

@@ -0,0 +1,31 @@
+#version 150
+
+#moj_import <fog.glsl>
+
+uniform sampler2D Sampler0;
+
+uniform vec4 ColorModulator;
+uniform float FogStart;
+uniform float FogEnd;
+uniform vec4 FogColor;
+
+in float vertexDistance;
+in vec4 vertexColor;
+in vec2 texCoord0;
+in vec2 texCoord1;
+in vec4 normal;
+
+out vec4 fragColor;
+
+void main() {
+    vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator;
+    if (color.a < 0.1) {
+        discard;
+    }
+    fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
+
+	// Emissive
+	if (color.a > 0.996 && color.a < 0.997) {
+		fragColor = linear_fog(texture(Sampler0, texCoord0), vertexDistance, FogStart, FogEnd, FogColor);
+	}
+}

assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh

@@ -0,0 +1,30 @@
+#version 150
+
+#moj_import <fog.glsl>
+
+uniform sampler2D Sampler0;
+
+uniform vec4 ColorModulator;
+uniform float FogStart;
+uniform float FogEnd;
+uniform vec4 FogColor;
+
+in float vertexDistance;
+in vec4 vertexColor;
+in vec2 texCoord0;
+in vec2 texCoord1;
+
+out vec4 fragColor;
+
+void main() {
+    vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator;
+    if (color.a < 0.1) {
+        discard;
+    }
+    fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
+
+	// Emissive
+	if (color.a > 0.996 && color.a < 0.997) {
+		fragColor = linear_fog(texture(Sampler0, texCoord0), vertexDistance, FogStart, FogEnd, FogColor);
+	}
+}

assets/minecraft/shaders/core/rendertype_solid.fsh

@@ -0,0 +1,27 @@
+#version 150
+
+#moj_import <fog.glsl>
+
+uniform sampler2D Sampler0;
+
+uniform vec4 ColorModulator;
+uniform float FogStart;
+uniform float FogEnd;
+uniform vec4 FogColor;
+
+in float vertexDistance;
+in vec4 vertexColor;
+in vec2 texCoord0;
+in vec4 normal;
+
+out vec4 fragColor;
+
+void main() {
+    vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator;
+    fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
+
+	// Emissive
+	if (color.a > 0.996 && color.a < 0.997) {
+		fragColor = linear_fog(texture(Sampler0, texCoord0), vertexDistance, FogStart, FogEnd, FogColor);
+	}
+}

assets/minecraft/shaders/core/rendertype_translucent.fsh

@@ -0,0 +1,26 @@
+#version 150
+
+#moj_import <fog.glsl>
+
+uniform sampler2D Sampler0;
+
+uniform vec4 ColorModulator;
+uniform float FogStart;
+uniform float FogEnd;
+uniform vec4 FogColor;
+
+in float vertexDistance;
+in vec4 vertexColor;
+in vec2 texCoord0;
+
+out vec4 fragColor;
+
+void main() {
+    vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator;
+    fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
+
+	// Emissive
+	if (color.a > 0.996 && color.a < 0.997) {
+		fragColor = linear_fog(texture(Sampler0, texCoord0), vertexDistance, FogStart, FogEnd, FogColor);
+	}
+}

assets/minecraft/shaders/core/rendertype_translucent_moving_block.fsh

@@ -0,0 +1,21 @@
+#version 150
+
+uniform sampler2D Sampler0;
+uniform sampler2D Sampler2;
+
+uniform vec4 ColorModulator;
+
+in vec4 vertexColor;
+in vec2 texCoord0;
+
+out vec4 fragColor;
+
+void main() {
+    vec4 color = texture(Sampler0, texCoord0) * vertexColor;
+    fragColor = color * ColorModulator;
+
+	// Emissive
+	if (color.a > 0.996 && color.a < 0.997) {
+		fragColor = texture(Sampler0, texCoord0) * ColorModulator;
+	}
+}

pack.mcmeta

@@ -2,5 +2,20 @@
   "pack": {
     "pack_format": 42,
     "description": "§b§lHytale Thankmas §f§l2024§7 •\n§3Server Resource Pack ⛏"
-  }
+  },
+"overlays": {
+		"entries": [
+			{
+				"formats": {"min_inclusive": 36, "max_inclusive": 2147483647},
+				"directory": "shaders_v36"
+			}
+		]
+	},
+	"sodium": {
+		"ignored_shaders": [
+			"rendertype_solid.fsh",
+			"rendertype_cutout.fsh",
+			"rendertype_translucent.fsh"
+		]
+	}
 }