diff --git a/src/assets/minecraft/models/block/bricks.json b/src/assets/minecraft/models/block/bricks.json new file mode 100644 index 00000000..ef7adf33 --- /dev/null +++ b/src/assets/minecraft/models/block/bricks.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "block/bricks", + "end": "block/bricks_top" + } +} \ No newline at end of file diff --git a/src/assets/minecraft/optifine/ctm/grass_block_top/mat.yml b/src/assets/minecraft/optifine/ctm/grass_block_top/mat.yml index f4c32d51..b911c6a3 100644 --- a/src/assets/minecraft/optifine/ctm/grass_block_top/mat.yml +++ b/src/assets/minecraft/optifine/ctm/grass_block_top/mat.yml @@ -14,8 +14,8 @@ normal: noise: 6 filter: sobel3 occlusion: - z-bias: 1 - z-scale: 3 + z-bias: 16 + z-scale: 2 step-distance: 0.3 smooth: {} f0: diff --git a/src/assets/minecraft/optifine/ctm/red_sand/mat.yml b/src/assets/minecraft/optifine/ctm/red_sand/mat.yml index a9d5421f..e0b93dd1 100644 --- a/src/assets/minecraft/optifine/ctm/red_sand/mat.yml +++ b/src/assets/minecraft/optifine/ctm/red_sand/mat.yml @@ -1,3 +1,5 @@ +wrap-x: true +wrap-y: true alpha: value: 255 albedo: @@ -21,11 +23,9 @@ smooth: f0: value: 0.03 porosity: - scale: 0.8 + scale: 0.4 sss: scale: 0.12 ctm-count-x: 8 ctm-count-y: 8 -wrap-x: true -wrap-y: true ctm-type: repeat diff --git a/src/assets/minecraft/optifine/ctm/sand/mat.yml b/src/assets/minecraft/optifine/ctm/sand/mat.yml index 04f95a81..7c3d3a02 100644 --- a/src/assets/minecraft/optifine/ctm/sand/mat.yml +++ b/src/assets/minecraft/optifine/ctm/sand/mat.yml @@ -22,7 +22,7 @@ smooth: {} f0: value: 0.03 porosity: - scale: 0.8 + scale: 0.3 sss: scale: 0.24 ctm-count-x: 8 diff --git a/src/assets/minecraft/textures/block/bricks/mat.yml b/src/assets/minecraft/textures/block/bricks/mat.yml index dc57033b..cf1bc4aa 100644 --- a/src/assets/minecraft/textures/block/bricks/mat.yml +++ b/src/assets/minecraft/textures/block/bricks/mat.yml @@ -6,11 +6,13 @@ alpha: height: scale: 0.6 normal: - strength: 0.6 - noise: 6 - filter: sobel-low + strength: 0.4 + noise: 2 + filter: sobel-high occlusion: z-bias: 0 - z-scale: 2 + z-scale: 3 step-distance: 0.15 +smooth: + scale: 2 create-inventory: true diff --git a/src/assets/minecraft/textures/block/bricks_top/albedo.png b/src/assets/minecraft/textures/block/bricks_top/albedo.png new file mode 100644 index 00000000..5e1cc314 Binary files /dev/null and b/src/assets/minecraft/textures/block/bricks_top/albedo.png differ diff --git a/src/assets/minecraft/textures/block/bricks_top/f0.png b/src/assets/minecraft/textures/block/bricks_top/f0.png new file mode 100644 index 00000000..aaf81ed8 Binary files /dev/null and b/src/assets/minecraft/textures/block/bricks_top/f0.png differ diff --git a/src/assets/minecraft/textures/block/bricks_top/height.png b/src/assets/minecraft/textures/block/bricks_top/height.png new file mode 100644 index 00000000..79e12124 Binary files /dev/null and b/src/assets/minecraft/textures/block/bricks_top/height.png differ diff --git a/src/assets/minecraft/textures/block/bricks_top/mat.yml b/src/assets/minecraft/textures/block/bricks_top/mat.yml new file mode 100644 index 00000000..a97d29e6 --- /dev/null +++ b/src/assets/minecraft/textures/block/bricks_top/mat.yml @@ -0,0 +1,18 @@ +publish-inventory: true +wrap-x: true +wrap-y: true +alpha: + value: 255 +height: + scale: 0.3 +normal: + strength: 0.4 + noise: 2 + filter: sobel-high +occlusion: + z-bias: 0 + z-scale: 3 + step-distance: 0.15 +smooth: + scale: 2 +create-inventory: true diff --git a/src/assets/minecraft/textures/block/bricks_top/porosity.png b/src/assets/minecraft/textures/block/bricks_top/porosity.png new file mode 100644 index 00000000..6c5d5781 Binary files /dev/null and b/src/assets/minecraft/textures/block/bricks_top/porosity.png differ diff --git a/src/assets/minecraft/textures/block/bricks_top/smooth.png b/src/assets/minecraft/textures/block/bricks_top/smooth.png new file mode 100644 index 00000000..e5d48c37 Binary files /dev/null and b/src/assets/minecraft/textures/block/bricks_top/smooth.png differ diff --git a/src/assets/minecraft/textures/block/coal_block/pbr.yml b/src/assets/minecraft/textures/block/coal_block/pbr.yml index f06986a0..f07a9036 100644 --- a/src/assets/minecraft/textures/block/coal_block/pbr.yml +++ b/src/assets/minecraft/textures/block/coal_block/pbr.yml @@ -1,22 +1,21 @@ +publish-inventory: true alpha: value: 255 albedo: - value-red: 9 - value-green: 7 - value-blue: 7 + value-red: 5 + value-green: 2 + value-blue: 2 height: scale: 0.8 normal: - strength: 2 + strength: 1.5 noise: 6 - filter: sobel-low + filter: sobel3 occlusion: - quality: 0.1 z-bias: 0 z-scale: 6 step-distance: 0.2 -smooth: - scale: 0.45 +smooth: {} f0: - value: 0.17 + scale: 0.017 create-inventory: true diff --git a/src/assets/minecraft/textures/block/coal_block/smooth.png b/src/assets/minecraft/textures/block/coal_block/smooth.png index 19950f97..fefda2c5 100644 Binary files a/src/assets/minecraft/textures/block/coal_block/smooth.png and b/src/assets/minecraft/textures/block/coal_block/smooth.png differ diff --git a/src/assets/minecraft/textures/block/dirt/porosity.png b/src/assets/minecraft/textures/block/dirt/porosity.png index e9406cb2..8a3b60ea 100644 Binary files a/src/assets/minecraft/textures/block/dirt/porosity.png and b/src/assets/minecraft/textures/block/dirt/porosity.png differ diff --git a/src/assets/minecraft/textures/block/grass/pbr.yml b/src/assets/minecraft/textures/block/grass/pbr.yml index 984b8db3..a38b013d 100644 --- a/src/assets/minecraft/textures/block/grass/pbr.yml +++ b/src/assets/minecraft/textures/block/grass/pbr.yml @@ -17,5 +17,5 @@ smooth: f0: value: 0.017 sss: - scale: 0.4 + scale: 0.8 create-inventory: true diff --git a/src/assets/minecraft/textures/block/grass/sss.png b/src/assets/minecraft/textures/block/grass/sss.png index 94c62250..56964405 100644 Binary files a/src/assets/minecraft/textures/block/grass/sss.png and b/src/assets/minecraft/textures/block/grass/sss.png differ diff --git a/src/assets/minecraft/textures/block/magma/emissive.png b/src/assets/minecraft/textures/block/magma/emissive.png index 5982c771..5e426b58 100644 Binary files a/src/assets/minecraft/textures/block/magma/emissive.png and b/src/assets/minecraft/textures/block/magma/emissive.png differ diff --git a/src/assets/minecraft/textures/block/tall_grass/pbr.yml b/src/assets/minecraft/textures/block/tall_grass/pbr.yml index b05d81a6..7ee042a9 100644 --- a/src/assets/minecraft/textures/block/tall_grass/pbr.yml +++ b/src/assets/minecraft/textures/block/tall_grass/pbr.yml @@ -17,7 +17,7 @@ smooth: f0: value: 0.017 sss: - scale: 0.6 + scale: 0.8 create-inventory: true parts: - name: tall_grass_top