add jungle_log, smooth_stone; revise spruce_log, dirt, grass_path, gl…

…ass; add log horizontal ctm

src/assets/minecraft/models/block/grass_path.json

@@ -0,0 +1,31 @@
+{   "parent": "block/block",
+    "textures": {
+        "particle": "block/dirt",
+        "top": "block/grass_path_top",
+        "side": "block/grass_path_side",
+        "bottom": "block/dirt",
+        "overlay": "block/grass_path_side_overlay"
+    },
+    "elements": [
+        {   "from": [ 0, 0, 0 ],
+            "to": [ 16, 15, 16 ],
+            "faces": {
+                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
+                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#top" },
+                "north": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "north" },
+                "south": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "south" },
+                "west":  { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "west" },
+                "east":  { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "east" }
+            }
+        },
+        {   "from": [ 0, 0, 0 ],
+            "to": [ 16, 15, 16 ],
+            "faces": {
+                "north": { "uv": [ 0, 1, 16, 16 ], "texture": "#overlay", "cullface": "north" },
+                "south": { "uv": [ 0, 1, 16, 16 ], "texture": "#overlay", "cullface": "south" },
+                "west":  { "uv": [ 0, 1, 16, 16 ], "texture": "#overlay", "cullface": "west" },
+                "east":  { "uv": [ 0, 1, 16, 16 ], "texture": "#overlay", "cullface": "east" }
+            }
+        }
+    ]
+}

src/assets/minecraft/optifine/block.properties

@@ -0,0 +1 @@
+layer.cutout_mipped=grass_path

src/assets/minecraft/optifine/ctm/dark_oak_log/dark_oak_log.properties

@@ -0,0 +1,3 @@
+matchTiles=dark_oak_log
+method=horizontal
+tiles=1 2 3 4

src/assets/minecraft/optifine/ctm/dark_oak_log/dark_oak_log_curved.pbr.yml

@@ -0,0 +1,31 @@
+alpha:
+  value: 255
+albedo:
+  value-red: 62
+  value-green: 47
+  value-blue: 27
+height:
+  texture: height.png
+  scale: 0.3
+normal:
+  strength: 0.2
+  noise: 2
+  curve-x: 90
+occlusion:
+  quality: 0.1
+  z-bias: 0.2
+  z-scale: 2
+  steps: 6
+smooth:
+  value: 0.05
+f0:
+  value: 0.03
+porosity:
+  value: 0.55
+wrap-x: false
+parts:
+- name: 4
+  left: 0
+  top: 0
+  width: 16
+  height: 16

src/assets/minecraft/optifine/ctm/dark_oak_log/dark_oak_log_curved_double.pbr.yml

@@ -0,0 +1,36 @@
+alpha:
+  value: 255
+albedo:
+  value-red: 62
+  value-green: 47
+  value-blue: 27
+height:
+  texture: height_double.png
+  scale: 0.3
+normal:
+  strength: 0.2
+  noise: 2
+  curve-x: 90
+occlusion:
+  quality: 0.1
+  z-bias: 0.2
+  z-scale: 2
+  steps: 6
+smooth:
+  value: 0.05
+f0:
+  value: 0.03
+porosity:
+  value: 0.55
+wrap-x: false
+parts:
+- name: 1
+  left: 0
+  top: 0
+  width: 16
+  height: 16
+- name: 3
+  left: 16
+  top: 0
+  width: 16
+  height: 16

src/assets/minecraft/optifine/ctm/dark_oak_log/dark_oak_log_flat.pbr.yml

@@ -0,0 +1,30 @@
+alpha:
+  value: 255
+albedo:
+  value-red: 62
+  value-green: 47
+  value-blue: 27
+height:
+  texture: height.png
+  scale: 0.3
+normal:
+  strength: 0.2
+  noise: 2
+occlusion:
+  quality: 0.1
+  z-bias: 0.2
+  z-scale: 2
+  steps: 6
+smooth:
+  value: 0.05
+f0:
+  value: 0.03
+porosity:
+  value: 0.55
+wrap-x: false
+parts:
+- name: 2
+  left: 0
+  top: 0
+  width: 16
+  height: 16

src/assets/minecraft/optifine/ctm/jungle_log/jungle_log.properties

@@ -0,0 +1,3 @@
+matchTiles=jungle_log
+method=horizontal
+tiles=1 2 3 4

src/assets/minecraft/optifine/ctm/jungle_log/jungle_log_curved.pbr.yml

@@ -0,0 +1,33 @@
+alpha:
+  value: 255
+albedo:
+  value-red: 88
+  value-green: 70
+  value-blue: 26
+height:
+  texture: height.png
+  scale: 0.5
+normal:
+  strength: 0.5
+  noise: 2
+  curve-x: 90
+  filter: sobel-high
+occlusion:
+  quality: 0.1
+  z-bias: 0.1
+  z-scale: 1
+  steps: 4
+smooth:
+  value: 0.06
+metal:
+  value: 0
+f0:
+  value: 0.04
+porosity:
+  value: 0.4
+parts:
+- name: "4"
+  top: 0
+  left: 0
+  width: 16
+  height: 16

src/assets/minecraft/optifine/ctm/jungle_log/jungle_log_curved_double.pbr.yml

@@ -0,0 +1,38 @@
+alpha:
+  value: 255
+albedo:
+  value-red: 88
+  value-green: 70
+  value-blue: 26
+height:
+  texture: height_double.png
+  scale: 0.5
+normal:
+  strength: 0.5
+  noise: 2
+  curve-x: 90
+  filter: sobel-high
+occlusion:
+  quality: 0.1
+  z-bias: 0.1
+  z-scale: 1
+  steps: 4
+smooth:
+  value: 0.06
+metal:
+  value: 0
+f0:
+  value: 0.04
+porosity:
+  value: 0.4
+parts:
+- name: 1
+  left: 0
+  top: 0
+  width: 16
+  height: 16
+- name: 3
+  left: 16
+  top: 0
+  width: 16
+  height: 16

src/assets/minecraft/optifine/ctm/jungle_log/jungle_log_flat.pbr.yml

@@ -0,0 +1,32 @@
+alpha:
+  value: 255
+albedo:
+  value-red: 88
+  value-green: 70
+  value-blue: 26
+height:
+  texture: height.png
+  scale: 0.5
+normal:
+  strength: 0.5
+  noise: 2
+  filter: sobel-high
+occlusion:
+  quality: 0.1
+  z-bias: 0.1
+  z-scale: 1
+  steps: 4
+smooth:
+  value: 0.06
+metal:
+  value: 0
+f0:
+  value: 0.04
+porosity:
+  value: 0.4
+parts:
+- name: "2"
+  top: 0
+  left: 0
+  width: 16
+  height: 16

src/assets/minecraft/optifine/ctm/sandstone/sandstone.properties → src/assets/minecraft/optifine/ctm/sandstone.properties

@@ -1,4 +1,4 @@
 matchTiles=sandstone
 connect=tile
 method=top
-tiles=0
+tiles=textures/block/sandstone_bottom

src/assets/minecraft/textures/block/dark_oak_log/pbr.yml

@@ -1,12 +1,11 @@
-wrap-x: false
 alpha:
   value: 255
 albedo:
   value-red: 62
   value-green: 47
   value-blue: 27
 height:
-  scale: 0.2
+  scale: 0.3
 normal:
   strength: 0.2
   noise: 2
@@ -22,3 +21,4 @@ f0:
   value: 0.03
 porosity:
   value: 0.55
+wrap-x: false

src/assets/minecraft/textures/block/dirt/pbr.yml

@@ -2,14 +2,14 @@ alpha:
   value: 255
 albedo: {}
 height:
-  scale: 0.4
+  scale: 0.3
 normal:
   noise: 2
   filter: sobel-high
 occlusion:
   quality: 0.1
   z-bias: 0.2
-  z-scale: 4
+  z-scale: 2
   steps: 6
 smooth: {}
 f0:

src/assets/minecraft/textures/block/glass/pbr.yml

@@ -0,0 +1,18 @@
+albedo:
+  value-red: 180
+  value-green: 215
+  value-blue: 221
+height: {}
+normal:
+  strength: 0.7
+  filter: sobel-low
+occlusion:
+  quality: 0.1
+  z-bias: 0.1
+  z-scale: 2
+  steps: 4
+smooth: {}
+f0:
+  value: 0.04
+porosity:
+  value: 0

src/assets/minecraft/textures/block/grass_block_side/pbr.yml

@@ -2,17 +2,18 @@ alpha:
   value: 255
 albedo: {}
 height:
-  scale: 0.4
+  scale: 0.3
 normal:
   noise: 2
   filter: sobel-high
 occlusion:
   quality: 0.1
   z-bias: 0.2
-  z-scale: 4
+  z-scale: 2
   steps: 6
 smooth: {}
 f0:
   value: 0.05
 porosity:
   value: 0.78
+wrap-y: false

src/assets/minecraft/textures/block/grass_path_side/pbr.yml

@@ -0,0 +1,15 @@
+height:
+  scale: 0.3
+normal:
+  noise: 2
+  filter: sobel-high
+occlusion:
+  quality: 0.1
+  z-bias: 0.2
+  z-scale: 2
+  steps: 6
+f0:
+  value: 0.05
+porosity:
+  value: 0.78
+wrap-y: false