smoker partial; assorted fixes (mostly AO)

Null-MC · Mar 27, 2021 · e7e53f5 · e7e53f5
1 parent 4bdac22
commit e7e53f5
Show file tree

Hide file tree

Showing 248 changed files with 461 additions and 563 deletions.
diff --git a/src/Textureless-Lab11-32x.pack.yml b/src/Textureless-Lab11-32x.pack.yml
@@ -0,0 +1,32 @@
+format: 6
+description: No Textures! PBR shader required.
+tags: 32x MollyVX
+encoding:
+  format: lab-1.1
+  sampler: nearest
+  alpha: {}
+  diffuse-red: {}
+  diffuse-green: {}
+  diffuse-blue: {}
+  albedo-red: {}
+  albedo-green: {}
+  albedo-blue: {}
+  height: {}
+  occlusion: {}
+  normal-x: {}
+  normal-y: {}
+  normal-z: {}
+  specular: {}
+  smooth: {}
+  rough: {}
+  metal: {}
+  f0: {}
+  porosity: {}
+  sss: {}
+  emissive: {}
+block-texture-size: 32
+texture-scale: 2
+auto-generate-occlusion: true
+occlusion-quality: 0.06
+occlusion-power: 0.5
+edition: Java
diff --git a/src/Textureless-LabBakedAO-32x.pack.yml b/src/Textureless-LabBakedAO-32x.pack.yml
@@ -40,7 +40,7 @@ encoding:
     texture: none
   height: {}
   occlusion:
-    range-min: 255
+    range-min: 128
   normal-x: {}
   normal-y: {}
   normal-z: {}
@@ -56,5 +56,6 @@ block-texture-size: 32
 texture-scale: 2
 diffuse-occlusion-strength: 0.5
 auto-generate-occlusion: true
-occlusion-quality: 0.04
+occlusion-quality: 0.06
+occlusion-power: 0.5
 edition: Java
diff --git a/src/Textureless-LabBakedAO-64x.pack.yml b/src/Textureless-LabBakedAO-64x.pack.yml
@@ -60,5 +60,6 @@ encoding:
 block-texture-size: 64
 texture-scale: 4
 auto-generate-occlusion: true
-occlusion-quality: 0.04
+occlusion-quality: 0.06
+occlusion-power: 0.5
 edition: Java
diff --git a/src/Textureless-LabPbr-128x.pack.yml b/src/Textureless-LabPbr-128x.pack.yml
@@ -32,5 +32,6 @@ encoding:
 block-texture-size: 128
 texture-scale: 8
 auto-generate-occlusion: true
-occlusion-quality: 0.04
+occlusion-quality: 0.06
+occlusion-power: 0.5
 edition: Java
diff --git a/src/Textureless-LabPbr-16x.pack.yml b/src/Textureless-LabPbr-16x.pack.yml
@@ -30,5 +30,6 @@ encoding:
   emissive: {}
 block-texture-size: 16
 auto-generate-occlusion: true
-occlusion-quality: 0.04
+occlusion-quality: 0.06
+occlusion-power: 1
 edition: Java
diff --git a/src/Textureless-LabPbr-32x.pack.yml b/src/Textureless-LabPbr-32x.pack.yml
@@ -4,8 +4,7 @@ tags: 32x LabPBR
 encoding:
   format: lab-1.3
   sampler: nearest
-  alpha:
-    sampler: nearest
+  alpha: {}
   diffuse-red: {}
   diffuse-green: {}
   diffuse-blue: {}
@@ -29,5 +28,6 @@ encoding:
 block-texture-size: 32
 texture-scale: 2
 auto-generate-occlusion: true
-occlusion-quality: 0.04
+occlusion-quality: 0.1
+occlusion-power: 2
 edition: Java
diff --git a/src/Textureless-LabPbr-64x.pack.yml b/src/Textureless-LabPbr-64x.pack.yml
@@ -32,5 +32,6 @@ encoding:
 block-texture-size: 64
 texture-scale: 4
 auto-generate-occlusion: true
-occlusion-quality: 0.04
+occlusion-quality: 0.1
+occlusion-power: 1
 edition: Java
diff --git a/src/Textureless-OldBakedAO-32x.pack.yml b/src/Textureless-OldBakedAO-32x.pack.yml
@@ -38,8 +38,7 @@ encoding:
     texture: none
   albedo-blue:
     texture: none
-  height:
-    max-value: 0.2
+  height: {}
   occlusion:
     texture: none
   normal-x: {}
@@ -56,5 +55,6 @@ encoding:
 block-texture-size: 32
 texture-scale: 2
 auto-generate-occlusion: true
-occlusion-quality: 0.04
+occlusion-quality: 0.06
+occlusion-power: 0.5
 edition: Java
diff --git a/src/assets/minecraft/textures/block/acacia_door/pbr.yml b/src/assets/minecraft/textures/block/acacia_door/pbr.yml
@@ -4,9 +4,8 @@ normal:
   strength: 0.5
   filter: sobel-low
 occlusion:
-  quality: 0.1
   z-bias: 0
-  z-scale: 5
+  z-scale: 3
   step-distance: 0.2
 porosity:
   value: 0.3

diff --git a/src/assets/minecraft/textures/block/acacia_log/pbr.yml b/src/assets/minecraft/textures/block/acacia_log/pbr.yml
@@ -14,9 +14,8 @@ normal:
   curve-x: 90
   filter: sobel3
 occlusion:
-  quality: 0.1
   z-bias: 0
-  z-scale: 5
+  z-scale: 3
   step-distance: 0.2
 smooth:
   value: 0.01

diff --git a/src/assets/minecraft/textures/block/acacia_log_top/pbr.yml b/src/assets/minecraft/textures/block/acacia_log_top/pbr.yml
@@ -7,10 +7,8 @@ normal:
   strength: 0.6
   filter: sobel-low
 occlusion:
-  quality: 0.1
-  z-bias: 0
-  z-scale: 5
-  step-distance: 0.2
+  z-scale: 3
+  step-distance: 0.15
 smooth:
   value: 0.08
 f0:

diff --git a/src/assets/minecraft/textures/block/acacia_planks/pbr.yml b/src/assets/minecraft/textures/block/acacia_planks/pbr.yml
@@ -6,10 +6,8 @@ normal:
   noise: 2
   filter: sobel3
 occlusion:
-  quality: 0.1
-  z-bias: 0
-  z-scale: 5
-  step-distance: 0.2
+  z-scale: 3
+  step-distance: 0.15
 smooth: {}
 metal: {}
 f0:

diff --git a/src/assets/minecraft/textures/block/acacia_wood/pbr.yml b/src/assets/minecraft/textures/block/acacia_wood/pbr.yml
@@ -11,9 +11,8 @@ normal:
   noise: 3
   filter: sobel3
 occlusion:
-  quality: 0.1
-  z-bias: 0
-  z-scale: 5
+  z-bias: 1
+  z-scale: 3
   step-distance: 0.2
 smooth:
   value: 0.01

diff --git a/src/assets/minecraft/textures/block/ancient_debris_side/pbr.yml b/src/assets/minecraft/textures/block/ancient_debris_side/pbr.yml
@@ -11,9 +11,8 @@ normal:
   noise: 5
   filter: sobel-low
 occlusion:
-  quality: 0.1
-  z-bias: 0
-  z-scale: 6
+  z-bias: 1
+  z-scale: 3
   step-distance: 0.2
 smooth:
   scale: 1.5

diff --git a/src/assets/minecraft/textures/block/ancient_debris_top/pbr.yml b/src/assets/minecraft/textures/block/ancient_debris_top/pbr.yml
@@ -13,9 +13,8 @@ normal:
   noise: 5
   filter: sobel-low
 occlusion:
-  quality: 0.1
-  z-bias: 0
-  z-scale: 6
+  z-bias: 1
+  z-scale: 3
   step-distance: 0.2
 smooth: {}
 metal: {}

diff --git a/src/assets/minecraft/textures/block/andesite/pbr.yml b/src/assets/minecraft/textures/block/andesite/pbr.yml
@@ -11,10 +11,8 @@ normal:
   noise: 3
   filter: sobel-low
 occlusion:
-  quality: 0.1
-  z-bias: 0
-  z-scale: 5
-  step-distance: 0.2
+  z-scale: 2
+  step-distance: 0.15
 smooth:
   value: 0.12
 f0:

diff --git a/src/assets/minecraft/textures/block/barrel_bottom/pbr.yml b/src/assets/minecraft/textures/block/barrel_bottom/pbr.yml
@@ -12,8 +12,8 @@ normal:
   curve-y: 20
   filter: sobel-high
 occlusion:
-  z-bias: 0
-  z-scale: 5
+  z-bias: 1
+  z-scale: 2
   step-distance: 0.2
 smooth:
   value: 0.08

diff --git a/src/assets/minecraft/textures/block/barrel_side/pbr.yml b/src/assets/minecraft/textures/block/barrel_side/pbr.yml
@@ -9,9 +9,8 @@ normal:
   curve-x: 90
   filter: sobel-high
 occlusion:
-  quality: 0.1
-  z-bias: 0
-  z-scale: 4
+  z-bias: 1
+  z-scale: 3
   step-distance: 0.2
 smooth: {}
 porosity: {}

diff --git a/src/assets/minecraft/textures/block/barrel_top/pbr.yml b/src/assets/minecraft/textures/block/barrel_top/pbr.yml
@@ -8,8 +8,7 @@ normal:
   curve-y: 20
   filter: sobel-high
 occlusion:
-  quality: 0.1
-  z-bias: 0
+  z-bias: 1
   z-scale: 3
   step-distance: 0.2
 smooth: {}

diff --git a/src/assets/minecraft/textures/block/barrel_top_open/pbr.yml b/src/assets/minecraft/textures/block/barrel_top_open/pbr.yml
@@ -11,8 +11,7 @@ normal:
   curve-y: 20
   filter: sobel-high
 occlusion:
-  quality: 0.1
-  z-bias: 0
+  z-bias: 1
   z-scale: 3
   step-distance: 0.25
 smooth:

diff --git a/src/assets/minecraft/textures/block/basalt_side/pbr.yml b/src/assets/minecraft/textures/block/basalt_side/pbr.yml
@@ -10,7 +10,7 @@ normal:
   noise: 2
   filter: sobel3
 occlusion:
-  z-bias: 0
+  z-bias: 1
   z-scale: 6
   step-distance: 0.2
 smooth:

diff --git a/src/assets/minecraft/textures/block/basalt_top/pbr.yml b/src/assets/minecraft/textures/block/basalt_top/pbr.yml
@@ -11,9 +11,8 @@ normal:
   noise: 2
   filter: sobel-low
 occlusion:
-  quality: 0.1
-  z-bias: 0
-  z-scale: 6
+  z-bias: 1
+  z-scale: 3
   step-distance: 0.2
 smooth:
   value: 0.02

diff --git a/src/assets/minecraft/textures/block/bedrock/pbr.yml b/src/assets/minecraft/textures/block/bedrock/pbr.yml
@@ -8,8 +8,8 @@ normal:
   noise: 4
   filter: sobel-low
 occlusion:
-  z-bias: 0
-  z-scale: 5
+  z-bias: 1
+  z-scale: 3
   step-distance: 0.2
 smooth: {}
 f0: {}

diff --git a/src/assets/minecraft/textures/block/bee_nest_front/pbr.yml b/src/assets/minecraft/textures/block/bee_nest_front/pbr.yml
@@ -8,8 +8,8 @@ normal:
   strength: 0.8
   filter: sobel3
 occlusion:
-  z-bias: 0
-  z-scale: 6
+  z-bias: 1
+  z-scale: 4
   step-distance: 0.2
 smooth: {}
 f0: {}

diff --git a/src/assets/minecraft/textures/block/bee_nest_front_honey/pbr.yml b/src/assets/minecraft/textures/block/bee_nest_front_honey/pbr.yml
@@ -8,8 +8,8 @@ normal:
   strength: 0.8
   filter: sobel3
 occlusion:
-  z-bias: 0
-  z-scale: 6
+  z-bias: 1
+  z-scale: 4
   step-distance: 0.2
 smooth: {}
 f0: {}

diff --git a/src/assets/minecraft/textures/block/bee_nest_side/pbr.yml b/src/assets/minecraft/textures/block/bee_nest_side/pbr.yml
@@ -10,8 +10,8 @@ normal:
   curve-y: 60
   filter: sobel3
 occlusion:
-  z-bias: 0
-  z-scale: 6
+  z-bias: 1
+  z-scale: 4
   step-distance: 0.2
 smooth: {}
 f0: {}

diff --git a/src/assets/minecraft/textures/block/bee_nest_top/pbr.yml b/src/assets/minecraft/textures/block/bee_nest_top/pbr.yml
@@ -9,9 +9,8 @@ normal:
   curve-y: 60
   filter: sobel-high
 occlusion:
-  quality: 0.1
-  z-bias: 0
-  z-scale: 6
+  z-bias: 1
+  z-scale: 3
   step-distance: 0.2
 sss:
   scale: 0.2

diff --git a/src/assets/minecraft/textures/block/beehive_end/pbr.yml b/src/assets/minecraft/textures/block/beehive_end/pbr.yml
@@ -12,8 +12,8 @@ normal:
   strength: 0.5
   filter: sobel-high
 occlusion:
-  z-bias: 0
-  z-scale: 5
+  z-bias: 1
+  z-scale: 2
   step-distance: 0.2
 smooth:
   value: 0.08

diff --git a/src/assets/minecraft/textures/block/beehive_front/pbr.yml b/src/assets/minecraft/textures/block/beehive_front/pbr.yml
@@ -7,8 +7,8 @@ height:
 normal:
   filter: sobel-high
 occlusion:
-  z-bias: 0
-  z-scale: 6
+  z-bias: 1
+  z-scale: 5
   step-distance: 0.2
 smooth: {}
 f0: {}

diff --git a/src/assets/minecraft/textures/block/beehive_front_honey/pbr.yml b/src/assets/minecraft/textures/block/beehive_front_honey/pbr.yml
@@ -7,8 +7,8 @@ height:
 normal:
   filter: sobel-high
 occlusion:
-  z-bias: 0
-  z-scale: 6
+  z-bias: 1
+  z-scale: 5
   step-distance: 0.2
 smooth: {}
 f0: {}

diff --git a/src/assets/minecraft/textures/block/beehive_side/pbr.yml b/src/assets/minecraft/textures/block/beehive_side/pbr.yml
@@ -7,8 +7,8 @@ height:
 normal:
   filter: sobel-high
 occlusion:
-  z-bias: 0
-  z-scale: 6
+  z-bias: 1
+  z-scale: 5
   step-distance: 0.2
 smooth: {}
 f0: {}

diff --git a/src/assets/minecraft/textures/block/birch_door/pbr.yml b/src/assets/minecraft/textures/block/birch_door/pbr.yml
@@ -3,9 +3,8 @@ height:
 normal:
   filter: sobel-high
 occlusion:
-  quality: 0.1
-  z-bias: 0
-  z-scale: 2
+  z-bias: 1
+  z-scale: 6
   step-distance: 0.2
 porosity:
   value: 0.2