fix beds; improve concrete

src/LabPbr-128x-LIN.pack.yml

@@ -0,0 +1,34 @@
+edition: java
+format: 8
+name: Textureless-LabPbr-128x
+description: No Textures! PBR shader required.
+tags: 128x LabPBR
+encoding:
+  format: lab-1.3
+  sampler: nearest
+  opacity: {}
+  color-red: {}
+  color-green: {}
+  color-blue: {}
+  height: {}
+  occlusion: {}
+  normal-x: {}
+  normal-y: {}
+  normal-z: {}
+  specular: {}
+  smooth: {}
+  rough: {}
+  metal:
+    sampler: nearest
+  f0:
+    sampler: nearest
+  hcm: {}
+  porosity: {}
+  sss: {}
+  emissive: {}
+block-texture-size: 128
+item-texture-size: 128
+texture-scale: 4
+auto-generate-occlusion: false
+occlusion-quality: 0.1
+occlusion-power: 0.5

src/LabPbr-128x.pack.yml

@@ -5,7 +5,7 @@ description: No Textures! PBR shader required.
 tags: 128x LabPBR
 encoding:
   format: lab-1.3
-  sampler: bicubic
+  sampler: bilinear
   opacity: {}
   color-red: {}
   color-green: {}
@@ -22,6 +22,7 @@ encoding:
     sampler: nearest
   f0:
     sampler: nearest
+  hcm: {}
   porosity: {}
   sss: {}
   emissive: {}

src/assets/minecraft/optifine/cem/bed.jem

@@ -1,5 +1,4 @@
 {
-	"texture": "textures/entity/bed/blue.png",
 	"textureSize": [64, 64],
 	"models": [
 		{

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

@@ -2,20 +2,17 @@ publish-item: true
 color:
   value: '#949494'
 height:
+  texture: bump.png
   shift: -0.04
   scale: 0.06
   auto-level: true
 normal:
-  noise: 3
+  noise: 4
   method: sobel-high
-  strength: 2
 occlusion:
-  scale: 0.6
-  step-distance: 0.1
+  step-distance: 0.2
   z-bias: 2
-  z-scale: 20
-smooth:
-  scale: 0.35
+  z-scale: 4
 f0:
   value: 0.072
 ctm:

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

@@ -6,7 +6,7 @@ height:
 occlusion:
   z-scale: 4
 smooth:
-  shift: 0.1548
+  scale: 0.7523
 hcm:
   value: 234
 ctm:

src/assets/minecraft/textures/block/beacon/mat.yml

@@ -1,15 +1,11 @@
-publish-inventory: true
+publish-item: true
 opacity:
   value: 255
 color:
-  value-red: 73
-  value-green: 213
-  value-blue: 204
+  value: '#49D5CC'
 normal:
   curve-x: 90
   curve-y: 90
-  radius-x: 0.25
-  radius-y: 0.25
   method: sobel3
 occlusion:
   value: 0

src/assets/minecraft/textures/block/cauldron_side/mat.yml

@@ -3,12 +3,12 @@ wrap-y: false
 color:
   value: '#555353'
 height:
-  value: 0
-  scale: 0.8
+  scale: 0
 normal:
   noise: 3
+  curve-x: 60
   method: sobel3
-  strength: 1.5
+  strength: 5
 occlusion:
   step-distance: 0.2
   z-bias: 0

src/assets/minecraft/textures/block/cauldron_top/mat.yml

@@ -3,10 +3,11 @@ wrap-y: false
 color:
   value: '#555353'
 height:
-  value: 0
+  scale: 0
 normal:
   noise: 3
   method: sobel-high
+  strength: 2
 occlusion:
   step-distance: 0.2
   z-bias: 0

src/assets/minecraft/textures/block/cave_vines/mat.yml

@@ -9,4 +9,5 @@ height:
 normal:
   noise: 4
   method: sobel5
-ctm: {}
+smooth:
+  scale: 0.5

src/assets/minecraft/textures/block/cave_vines_lit/mat.yml

@@ -9,6 +9,7 @@ height:
 normal:
   noise: 4
   method: sobel5
+smooth:
+  scale: 0.5
 emissive:
   scale: 0.2
-ctm: {}

src/assets/minecraft/textures/block/cave_vines_plant/mat.yml

@@ -7,4 +7,5 @@ height:
 normal:
   noise: 4
   method: sobel5
-ctm: {}
+smooth:
+  scale: 0.5

src/assets/minecraft/textures/block/cave_vines_plant_lit/mat.yml

@@ -7,8 +7,9 @@ height:
 normal:
   noise: 4
   method: sobel5
+smooth:
+  scale: 0.5
 sss:
   scale: 1.6
 emissive:
   scale: 0.2
-ctm: {}

src/assets/minecraft/textures/block/dirt_path_side_overlay/mat.yml

@@ -1,10 +1,9 @@
 publish-item: true
 wrap-x: true
 wrap-y: false
+blend-mode: cutout
 color:
-  value-red: 113
-  value-green: 94
-  value-blue: 63
+  value: '#715E3F'
 height:
   shift: -0.1
   scale: 0.2

src/assets/minecraft/textures/block/weeping_vines/mat.yml

@@ -1,13 +1,14 @@
-create-inventory: true
-albedo:
-  value-red: 109
-  value-green: 2
-  value-blue: 0
+publish-item: true
+wrap-x: false
+model: cross
 height:
-  value: 0
+  scale: 0
+normal:
+  method: sobel3
+  strength: 1.5
 smooth:
-  value: 0.47
+  value: 0.3090
+f0:
+  value: 0.03
 sss:
   value: 0.6
-occlusion:
-  value: 0

src/assets/minecraft/textures/block/weeping_vines_plant/mat.yml

@@ -1,14 +1,14 @@
 publish-item: true
-model-type: cross
-color:
-  value-red: 109
-  value-green: 2
-  value-blue: 0
+wrap-x: false
+model: cross
 height:
-  value: 0
-occlusion:
-  value: 0
+  scale: 0
+normal:
+  method: sobel3
+  strength: 1.5
 smooth:
-  value: 0.47
+  value: 0.3090
+f0:
+  value: 0.03
 sss:
   value: 0.6

src/assets/minecraft/textures/entity/bear/polarbear/mat.yml

@@ -2,6 +2,8 @@ texture-width: 256
 texture-height: 128
 wrap-x: false
 wrap-y: false
+opacity:
+  value: 255
 height:
   scale: 0
 normal:
@@ -16,7 +18,6 @@ smooth:
   value: 0.08
 sss:
   value: 0.24
-ctm: {}
 filters:
 - name: head-up
   left: 0.0546875

src/assets/minecraft/textures/entity/snow_golem/mat.yml

@@ -11,7 +11,8 @@ occlusion:
   step-distance: 0.05
   z-bias: 4
   z-scale: 4
-ctm: {}
+smooth:
+  shift: -0.3613
 filters:
 - name: head-up
   left: 0.125

src/assets/minecraft/textures/entity/witch/mat.yml

@@ -8,14 +8,11 @@ height:
   scale: 0
 normal:
   method: sobel-low
-  strength: 5
+  strength: 4
 occlusion:
   z-scale: 3
-smooth:
-  scale: 0.6
 emissive:
   scale: 0.2
-ctm: {}
 filters:
 - name: Head-Up
   left: 0.125

src/assets/minecraft/textures/entity/wolf/wolf/mat.yml

@@ -10,6 +10,8 @@ normal:
 occlusion:
   step-distance: 0.15
   z-scale: 3
+smooth:
+  scale: 0.6
 f0:
   value: 0.04
 sss:

src/assets/minecraft/textures/entity/wolf/wolf_angry/mat.yml

@@ -10,6 +10,8 @@ normal:
 occlusion:
   step-distance: 0.15
   z-scale: 3
+smooth:
+  scale: 0.6
 f0:
   value: 0.04
 sss:

src/assets/minecraft/textures/entity/wolf/wolf_tame/mat.yml

@@ -10,6 +10,8 @@ normal:
 occlusion:
   step-distance: 0.15
   z-scale: 3
+smooth:
+  scale: 0.6
 f0:
   value: 0.04
 sss: