fix broken ctm; improved stripped oak +dark oak +spruce, sand, red sa…

…nd, red muchroom block, gravel, basalt +smooth, dirt side

src/assets/minecraft/blockstates/dark_oak_log.json

@@ -0,0 +1,59 @@
+{
+  "variants": {
+    "axis=y": [
+      {
+        "model": "block/dark_oak_log"
+      },
+      {
+        "model": "block/dark_oak_log",
+        "y": 90
+      },
+      {
+        "model": "block/dark_oak_log",
+        "y": 180
+      },
+      {
+        "model": "block/dark_oak_log",
+        "y": 270
+      }
+    ],
+    "axis=z": [
+      {
+        "model": "block/dark_oak_log_horizontal",
+        "y": 90
+      },
+      {
+        "model": "block/dark_oak_log_horizontal",
+        "y": 90,
+        "x": 90
+      },
+      {
+        "model": "block/dark_oak_log_horizontal",
+        "y": 90,
+        "x": 180
+      },
+      {
+        "model": "block/dark_oak_log_horizontal",
+        "y": 90,
+        "x": 270
+      }
+    ],
+    "axis=x": [
+      {
+        "model": "block/dark_oak_log_horizontal"
+      },
+      {
+        "model": "block/dark_oak_log_horizontal",
+        "x": 90
+      },
+      {
+        "model": "block/dark_oak_log_horizontal",
+        "x": 180
+      },
+      {
+        "model": "block/dark_oak_log_horizontal",
+        "x": 270
+      }
+    ]
+  }
+}

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

@@ -0,0 +1,7 @@
+{
+  "parent": "block/cube_column_horizontal2",
+  "textures": {
+    "end": "block/dark_oak_log_top",
+    "side": "block/dark_oak_log"
+  }
+}

src/assets/minecraft/optifine/ctm/basalt_side/mat.yml

@@ -1,30 +1,26 @@
 publish-item: true
-color:
-  value-red: 70
-  value-green: 70
-  value-blue: 72
 height:
   shift: -0.08
   scale: 0.4
   edge-fade-x: 1
   edge-fade-y: 1
 normal:
-  noise: 6
+  noise: 8
   method: sobel3
-  strength: 6
+  strength: 8
 occlusion:
-  step-distance: 0.2
-  z-bias: 0.2
-  z-scale: 24
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 16
 smooth:
   shift: 0.1
 f0:
-  value: 0.041
+  value: 0.059
 porosity:
   value: 0.4
 ctm:
   method: of-repeat
-  width: 6
-  height: 6
+  width: 4
+  height: 4
   match-tiles: basalt_side
   placeholder: true

src/assets/minecraft/optifine/ctm/basalt_top/mat.yml

@@ -0,0 +1,26 @@
+publish-item: true
+height:
+  shift: -0.04
+  scale: 0.3
+  edge-fade-x: 0.8
+  edge-fade-y: 0.8
+normal:
+  noise: 8
+  method: sobel3
+  strength: 3
+occlusion:
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 5
+smooth:
+  shift: -0.1
+f0:
+  value: 0.059
+porosity:
+  value: 0.45
+ctm:
+  method: of-repeat
+  width: 4
+  height: 4
+  match-tiles: basalt_top
+  placeholder: true

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

@@ -1,3 +1,3 @@
 matchTiles=dark_oak_log
 method=horizontal
-tiles=1 2 3 4
+tiles=left textures/block/dark_oak_wood right textures/block/dark_oak_log

src/assets/minecraft/optifine/ctm/dark_oak_log/dark_oak_log_curved_double.mat.yml → src/assets/minecraft/optifine/ctm/dark_oak_log/double_curve/mat.yml

@@ -1,8 +1,4 @@
-wrap-x: false
-color:
-  texture: color_double.png
 height:
-  texture: height_double.png
   shift: -0.2
   scale: 0.26
   edge-fade-x: 1
@@ -18,12 +14,12 @@ f0:
 porosity:
   value: 0.55
 parts:
-- name: 1
+- name: left
   left: 0
   top: 0
   width: 32
   height: 32
-- name: 3
+- name: right
   left: 32
   top: 0
   width: 32

src/assets/minecraft/optifine/ctm/dirt_side/mat.yml

@@ -1,23 +1,20 @@
 publish-item: true
 height:
-  shift: -0.25
-  scale: 0.2
-  edge-fade-x: 3
-  edge-fade-y: 3
+  scale: 0.3
+  edge-fade-x: 1
+  edge-fade-y: 2.5
 normal:
-  noise: 10
+  noise: 12
   method: sobel3
   strength: 4
 occlusion:
-  step-distance: 0.15
-  z-bias: 2
-  z-scale: 20
-smooth:
-  value: 0.1
+  step-distance: 0.1
+  z-bias: 0.4
+  z-scale: 10
 f0:
   value: 0.03
 porosity:
-  value: 0.6
+  value: 0.7
 ctm:
   method: of-repeat
   width: 8

src/assets/minecraft/optifine/ctm/gravel/mat.yml

@@ -0,0 +1,23 @@
+publish-item: true
+height:
+  scale: 0.4
+  auto-level: false
+  edge-fade-x: 1
+  edge-fade-y: 1
+  edge-fade-strength: 0.6
+normal:
+  noise: 12
+occlusion:
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 4
+smooth:
+  shift: 0.1
+f0:
+  value: 0.04
+ctm:
+  method: of-repeat
+  width: 6
+  height: 6
+  match-tiles: gravel
+  placeholder: true

src/assets/minecraft/optifine/ctm/smooth_basalt_side/mat.yml

@@ -1,26 +1,23 @@
-color:
-  value-red: 58
-  value-green: 58
-  value-blue: 61
 height:
   shift: -0.08
-  scale: 0.4
+  scale: 0.2
   edge-fade-x: 2
   edge-fade-y: 2
 normal:
-  method: sobel5
-  strength: 1.5
+  noise: 2
+  method: sobel3
+  strength: 4
 occlusion:
-  step-distance: 0.2
-  z-bias: 0.2
-  z-scale: 16
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 8
 f0:
-  value: 0.041
+  value: 0.059
 porosity:
   value: 0.4
 ctm:
   method: of-repeat
-  width: 6
-  height: 6
+  width: 4
+  height: 4
   match-tiles: smooth_basalt
   placeholder: true

src/assets/minecraft/optifine/ctm/smooth_basalt_top/mat.properties

@@ -0,0 +1 @@
+faces=top bottom

src/assets/minecraft/optifine/ctm/smooth_basalt_top/mat.yml

@@ -0,0 +1,24 @@
+publish-item: true
+height:
+  shift: -0.04
+  scale: 0.1
+  edge-fade-x: 0.8
+  edge-fade-y: 0.8
+normal:
+  noise: 2
+  method: sobel3
+  strength: 1
+occlusion:
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 2
+f0:
+  value: 0.059
+porosity:
+  value: 0.45
+ctm:
+  method: of-repeat
+  width: 4
+  height: 4
+  match-tiles: smooth_basalt
+  placeholder: true