Merge pull request #317 from MCME/dev/1.21.4-sodium

Dev/1.21.4 sodium

assets/minecraft/models/item/leather_boots.json → 1_21_1/assets/minecraft/models/item/leather_boots.json

@@ -811,7 +811,7 @@
         "custom_model_data": 116
           },
         "name": 116,
-        "model": "mcme:block/unused_block_0"
+        "model": "block/unused_block_0"
       },
       {
        "predicate": {
@@ -825,7 +825,7 @@
         "custom_model_data": 118
           },
         "name": 118,
-        "model": "mcme:block/unused_block_0"
+        "model": "block/unused_block_0"
       },
       {
        "predicate": {
@@ -874,7 +874,7 @@
         "custom_model_data": 125
           },
         "name": 125,
-        "model": "mcme:block/unused_block_0"
+        "model": "block/unused_block_0"
       },
       {
        "predicate": {

1_21_1/assets/minecraft/models/item/paper.json

@@ -0,0 +1,255 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/paper"
+  },
+  "overrides": [
+    {
+      "predicate": {
+        "custom_model_data": 1
+      },
+      "model": "gui/page_up"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 2
+      },
+      "model": "gui/page_down"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 3
+      },
+      "model": "gui/page_left"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 4
+      },
+      "model": "gui/page_right"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 5
+      },
+      "model": "gui/terra"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 6
+      },
+      "model": "gui/terra_alt"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 7
+      },
+      "model": "gui/plant"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 8
+      },
+      "model": "gui/plant_alt"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 9
+      },
+      "model": "gui/crop"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 10
+      },
+      "model": "gui/crop_alt"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 11
+      },
+      "model": "gui/block"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 12
+      },
+      "model": "gui/block_alt"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 13
+      },
+      "model": "gui/roof"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 14
+      },
+      "model": "gui/roof_alt"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 15
+      },
+      "model": "gui/fence"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 16
+      },
+      "model": "gui/fence_alt"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 17
+      },
+      "model": "gui/thin"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 18
+      },
+      "model": "gui/thin_alt"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 19
+      },
+      "model": "gui/glass"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 20
+      },
+      "model": "gui/glass_alt"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 21
+      },
+      "model": "gui/exter"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 22
+      },
+      "model": "gui/exter_alt"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 23
+      },
+      "model": "gui/inter"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 24
+      },
+      "model": "gui/inter_alt"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 25
+      },
+      "model": "gui/deco"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 26
+      },
+      "model": "gui/deco_alt"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 27
+      },
+      "model": "gui/curtain"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 28
+      },
+      "model": "gui/curtain_alt"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 29
+      },
+      "model": "gui/barrel"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 30
+      },
+      "model": "gui/barrel_alt"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 31
+      },
+      "model": "gui/misc"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 32
+      },
+      "model": "gui/misc_alt",
+	  "name": 32
+    },
+    {
+      "predicate": {
+        "custom_model_data": 33
+      },
+      "model": "gui/2gondor"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 34
+      },
+      "model": "gui/heads"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 35
+      },
+      "model": "gui/block_collection_mask"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 36
+      },
+      "model": "block/replace"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 37
+      },
+      "model": "block/replace"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 38
+      },
+      "model": "block/replace"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 39
+      },
+      "model": "block/replace"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 40
+      },
+      "model": "gui/trees"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 41
+      },
+      "model": "gui/trees_alt"
+    }
+  ]
+}

1_21_1/assets/minecraft/shaders/core/render/block.fsh

@@ -0,0 +1,81 @@
+#version 150
+
+#moj_import <light.glsl>
+#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 lightColor;
+in vec2 texCoord;
+in vec2 texCoord2;
+in vec3 Pos;
+in float transition;
+
+flat in int isCustom;
+flat in int noshadow;
+
+flat in float customMipFade;
+flat in float baseBrightness;
+flat in float aoIntensity;
+flat in float customModelNormalShading;
+flat in float underShadowStrength;
+flat in float distanceDensity;
+
+#define USE_CUSTOM_MIP (false)
+#define MIP_DISTANCE_NEAR (30.0)
+#define MIP_DISTANCE_FAR (80.0)
+#define MIP_DISTANCE_VERY_FAR (100.0)
+
+out vec4 fragColor;
+
+vec4 applyEdgeFilterAndMipmapping(sampler2D Sampler0, vec2 mipCoord, vec2 atlasSize) {
+    vec2 textureSize = atlasSize;
+
+	// Initialize variables for blending
+	vec4 blendedColor = vec4(0.0);
+	float totalAlpha = 0.0;
+
+	// Loop through neighboring pixels for blending
+	for (float dx = -1.0; dx <= 1.0; dx++) {
+		for (float dy = -1.0; dy <= 1.0; dy++) {
+			vec2 offset = vec2(dx, dy) / textureSize; // Adjust offset to match texture coordinates
+			vec4 neighborColor = texture(Sampler0, mipCoord + offset);
+
+			// Accumulate alpha values for blending
+			float alpha = neighborColor.a;
+			blendedColor += neighborColor * alpha;
+			totalAlpha += alpha;
+		}
+	}
+
+	// Normalize the blended color
+	if (totalAlpha > 0.0) {
+		blendedColor /= totalAlpha;
+	}
+
+	return blendedColor;
+}
+
+void main() {
+    //vec4 color = mix(texture(Sampler0, texCoord), texture(Sampler0, texCoord2), transition);
+    vec2 atlasSize = textureSize(Sampler0, 0);
+    vec4 color;
+    color = texture(Sampler0, texCoord);
+
+    //color = vec4(mippedCoordX,mippedCoordX,mippedCoordX,1.0);
+    //fragColor = color;
+
+    //custom lighting
+    #define BLOCK
+    #moj_import<objmc_light.glsl>
+
+    if (color.a < 0.1) discard;
+    fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
+    //fragColor = vertexColor;
+}