diff --git a/src/Oversized-LabPbr-128x.pack.yml b/src/Oversized-LabPbr-128x.pack.yml index 1f5e2c1..b03615e 100644 --- a/src/Oversized-LabPbr-128x.pack.yml +++ b/src/Oversized-LabPbr-128x.pack.yml @@ -1,9 +1,10 @@ +edition: Java format: 6 description: CTM Expirement Pack tags: LabPbr 128x encoding: format: lab-1.3 - sampler: average + sampler: nearest alpha: {} diffuse-red: {} diffuse-green: {} @@ -11,11 +12,15 @@ encoding: albedo-red: {} albedo-green: {} albedo-blue: {} - height: {} + height: + sampler: average occlusion: {} - normal-x: {} - normal-y: {} - normal-z: {} + normal-x: + sampler: average + normal-y: + sampler: average + normal-z: + sampler: average specular: {} smooth: {} rough: {} @@ -27,4 +32,3 @@ encoding: block-texture-size: 128 texture-scale: 0.25 auto-generate-occlusion: false -edition: Java diff --git a/src/Oversized-LabPbr-256x.pack.yml b/src/Oversized-LabPbr-256x.pack.yml index c3bb1ee..1052846 100644 --- a/src/Oversized-LabPbr-256x.pack.yml +++ b/src/Oversized-LabPbr-256x.pack.yml @@ -1,10 +1,34 @@ edition: Java +format: 6 description: CTM Expirement Pack tags: LabPbr 256x -format: 6 encoding: format: lab-1.3 - sampler: average + sampler: nearest + alpha: {} + diffuse-red: {} + diffuse-green: {} + diffuse-blue: {} + albedo-red: {} + albedo-green: {} + albedo-blue: {} + height: + sampler: average + occlusion: {} + normal-x: + sampler: average + normal-y: + sampler: average + normal-z: + sampler: average + specular: {} + smooth: {} + rough: {} + metal: {} + f0: {} + porosity: {} + sss: {} + emissive: {} block-texture-size: 256 texture-scale: 0.5 auto-generate-occlusion: false diff --git a/src/Oversized-LabPbr-512x.pack.yml b/src/Oversized-LabPbr-512x.pack.yml index 42e81ee..fe28532 100644 --- a/src/Oversized-LabPbr-512x.pack.yml +++ b/src/Oversized-LabPbr-512x.pack.yml @@ -1,9 +1,29 @@ edition: Java +format: 6 description: CTM Expirement Pack tags: LabPbr 512x -format: 6 encoding: format: lab-1.3 - sampler: average + 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: 512 auto-generate-occlusion: false diff --git a/src/assets/minecraft/optifine/ctm/oversized/andesite/height.png b/src/assets/minecraft/optifine/ctm/oversized/andesite/height.png index 4d1cc9a..52db429 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/andesite/height.png and b/src/assets/minecraft/optifine/ctm/oversized/andesite/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/andesite/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/andesite/mat.yml index 5ebc0fd..ce5e98c 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/andesite/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/andesite/mat.yml @@ -2,22 +2,21 @@ alpha: value: 255 height: shift: -0.12 - scale: 0.3 edge-fade-x: 2 edge-fade-y: 2 normal: - strength: 20 method: sobel3 + strength: 10 occlusion: + step-distance: 0.1 z-bias: 0 z-scale: 200 - step-distance: 0.1 smooth: scale: 0.4 f0: - value: 0.036 + value: 0.03 porosity: - value: 0.16 + value: 0.4 ctm: type: repeat count-x: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/andesite/normal.png b/src/assets/minecraft/optifine/ctm/oversized/andesite/normal.png deleted file mode 100644 index 6f589e9..0000000 Binary files a/src/assets/minecraft/optifine/ctm/oversized/andesite/normal.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/birch_log/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/birch_log/mat.yml index f983016..6c28444 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/birch_log/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/birch_log/mat.yml @@ -7,10 +7,11 @@ height: f0: value: 0.03 porosity: - value: 0.7 -ctm-count-x: 2 -ctm-count-y: 2 -ctm-type: repeat + value: 0.9 +ctm: + type: repeat + count-x: 2 + count-y: 2 filters: - left: 0.0 top: 0.0 diff --git a/src/assets/minecraft/optifine/ctm/oversized/birch_planks/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/birch_planks/mat.yml index 1e53304..07ba923 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/birch_planks/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/birch_planks/mat.yml @@ -4,6 +4,12 @@ height: shift: -0.1 scale: 0.5 edge-fade-x: 0.3 +rough: + scale: 1.5 +f0: + value: 0.04 +porosity: + scale: 0.1 ctm: type: repeat count-x: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/blackstone/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/blackstone/mat.yml index 32035f8..25454a3 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/blackstone/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/blackstone/mat.yml @@ -8,9 +8,11 @@ height: occlusion: scale: 0.2 smooth: - scale: 0.36 + scale: 0.5 +f0: + value: 0.04 porosity: - value: 0.24 + value: 0.6 ctm: type: repeat count-x: 3 diff --git a/src/assets/minecraft/optifine/ctm/oversized/blue_ice/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/blue_ice/mat.yml index d08144f..63e7eb1 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/blue_ice/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/blue_ice/mat.yml @@ -4,19 +4,17 @@ alpha: color: red height: shift: -0.04 - scale: 0.4 edge-fade-x: 2 edge-fade-y: 2 occlusion: scale: 0.2 z-bias: 1 z-scale: 10 -smooth: {} -metal: {} f0: - value: 0.017 + value: 0.02 sss: value: 1 -ctm-count-x: 4 -ctm-count-y: 4 -ctm-type: repeat +ctm: + type: repeat + count-x: 4 + count-y: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/bricks/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/bricks/mat.yml index a2b8a08..be0c844 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/bricks/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/bricks/mat.yml @@ -1,16 +1,15 @@ -alpha: - value: 255 height: shift: -0.24 - scale: 0.25 + scale: 0.5 normal: - strength: 4 method: sobel-high - noise: 3 + strength: 4 occlusion: + step-distance: 0.05 z-bias: 1 z-scale: 20 - step-distance: 0.05 +smooth: + scale: 0.2 ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/bricks/porosity.png b/src/assets/minecraft/optifine/ctm/oversized/bricks/porosity.png index e74c3bc..03cf956 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/bricks/porosity.png and b/src/assets/minecraft/optifine/ctm/oversized/bricks/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/chiseled_red_sandstone/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/chiseled_red_sandstone/mat.yml index c8ab4d9..040aa82 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/chiseled_red_sandstone/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/chiseled_red_sandstone/mat.yml @@ -8,7 +8,7 @@ height: occlusion: scale: 0.3 smooth: - scale: 0.2 + scale: 0.5 porosity: value: 0.78 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/chiseled_red_sandstone/normal-x.png b/src/assets/minecraft/optifine/ctm/oversized/chiseled_red_sandstone/normal-x.png new file mode 100644 index 0000000..b7dbf3b Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/chiseled_red_sandstone/normal-x.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/chiseled_red_sandstone/normal.png b/src/assets/minecraft/optifine/ctm/oversized/chiseled_red_sandstone/normal.png index b7dbf3b..77c4285 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/chiseled_red_sandstone/normal.png and b/src/assets/minecraft/optifine/ctm/oversized/chiseled_red_sandstone/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/chiseled_sandstone/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/chiseled_sandstone/mat.yml index b0d318b..c02a907 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/chiseled_sandstone/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/chiseled_sandstone/mat.yml @@ -1,13 +1,11 @@ -alpha: - value: 255 height: shift: -0.02 - scale: 0.2 + scale: 0.4 edge-fade-x: 1 f0: value: 0.03 porosity: - value: 0.8 + value: 0.9 ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/clay/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/clay/mat.yml index 441fd58..95603c3 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/clay/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/clay/mat.yml @@ -8,9 +8,9 @@ height: occlusion: scale: 0.4 smooth: - scale: 1.5 -sss: - value: 0.12 + scale: 0.6 +f0: + value: 0.06 ctm: type: repeat count-x: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/coarse_dirt/height-x.png b/src/assets/minecraft/optifine/ctm/oversized/coarse_dirt/height-x.png new file mode 100644 index 0000000..1a32a0e Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/coarse_dirt/height-x.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/coarse_dirt/height.png b/src/assets/minecraft/optifine/ctm/oversized/coarse_dirt/height.png index 1a32a0e..77dbe6f 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/coarse_dirt/height.png and b/src/assets/minecraft/optifine/ctm/oversized/coarse_dirt/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/coarse_dirt/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/coarse_dirt/mat.yml index 923bb4c..425836e 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/coarse_dirt/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/coarse_dirt/mat.yml @@ -5,6 +5,8 @@ height: scale: 0.3 edge-fade-x: 2 edge-fade-y: 2 +normal: + strength: 2 smooth: scale: 0.08 f0: diff --git a/src/assets/minecraft/optifine/ctm/oversized/coarse_dirt/normal.jpg b/src/assets/minecraft/optifine/ctm/oversized/coarse_dirt/normal-x.jpg similarity index 100% rename from src/assets/minecraft/optifine/ctm/oversized/coarse_dirt/normal.jpg rename to src/assets/minecraft/optifine/ctm/oversized/coarse_dirt/normal-x.jpg diff --git a/src/assets/minecraft/optifine/ctm/oversized/cobblestone/height.png b/src/assets/minecraft/optifine/ctm/oversized/cobblestone/height.png index ae33054..21e0dad 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/cobblestone/height.png and b/src/assets/minecraft/optifine/ctm/oversized/cobblestone/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/cobblestone/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/cobblestone/mat.yml index d31bc7f..ef2c867 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/cobblestone/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/cobblestone/mat.yml @@ -2,19 +2,18 @@ alpha: value: 255 height: shift: -0.3 - scale: 0.5 + scale: 0.8 edge-fade-x: 1 edge-fade-y: 1 normal: - strength: 3 + strength: 2 occlusion: + scale: 0.6 + step-distance: 0.1 z-bias: 1 z-scale: 44 - step-distance: 0.1 f0: - value: 0.03 -porosity: - value: 0.7 + value: 0.04 ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/cobblestone/normal-x.png b/src/assets/minecraft/optifine/ctm/oversized/cobblestone/normal-x.png deleted file mode 100644 index 480c262..0000000 Binary files a/src/assets/minecraft/optifine/ctm/oversized/cobblestone/normal-x.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/cobblestone/normal.png b/src/assets/minecraft/optifine/ctm/oversized/cobblestone/normal.png index 272d699..480c262 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/cobblestone/normal.png and b/src/assets/minecraft/optifine/ctm/oversized/cobblestone/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/cobblestone/porosity.png b/src/assets/minecraft/optifine/ctm/oversized/cobblestone/porosity.png new file mode 100644 index 0000000..1dadc26 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/cobblestone/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/concrete/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/concrete/mat.yml index 9fda329..527b05e 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/concrete/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/concrete/mat.yml @@ -6,12 +6,11 @@ height: edge-fade-x: 2 edge-fade-y: 2 occlusion: + step-distance: 0.05 z-bias: 1 z-scale: 6 - step-distance: 0.05 -smooth: {} f0: - value: 0.191 + value: 0.06 porosity: value: 0.6 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/copper_block/albedo.png b/src/assets/minecraft/optifine/ctm/oversized/copper_block/albedo.png new file mode 100644 index 0000000..27d0561 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/copper_block/albedo.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/copper_block/height.png b/src/assets/minecraft/optifine/ctm/oversized/copper_block/height.png new file mode 100644 index 0000000..f3e4fbb Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/copper_block/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/copper_block/mat.properties b/src/assets/minecraft/optifine/ctm/oversized/copper_block/mat.properties new file mode 100644 index 0000000..05b5ae2 --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/oversized/copper_block/mat.properties @@ -0,0 +1,5 @@ +matchTiles=gold_block +method=repeat +width=2 +height=2 +tiles=textures/block/gold_block 1-3 diff --git a/src/assets/minecraft/optifine/ctm/oversized/copper_block/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/copper_block/mat.yml new file mode 100644 index 0000000..24f74ca --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/oversized/copper_block/mat.yml @@ -0,0 +1,24 @@ +wrap-x: true +wrap-y: true +alpha: + value: 255 +height: + shift: -0.2 + scale: 0.2 + edge-fade-x: 0.4 + edge-fade-y: 0.4 +occlusion: + step-distance: 0.05 + z-bias: 0.4 + z-scale: 3 +smooth: + scale: 0.8 +metal: + value: 234 +porosity: + value: 0 +ctm: + type: repeat + count-x: 2 + count-y: 2 + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/oversized/copper_block/normal.png b/src/assets/minecraft/optifine/ctm/oversized/copper_block/normal.png new file mode 100644 index 0000000..85cdd1f Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/copper_block/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/copper_block/occlusion.png b/src/assets/minecraft/optifine/ctm/oversized/copper_block/occlusion.png new file mode 100644 index 0000000..043bad9 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/copper_block/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/copper_block/smooth.png b/src/assets/minecraft/optifine/ctm/oversized/copper_block/smooth.png new file mode 100644 index 0000000..29eb179 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/copper_block/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_log/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_log/mat.yml index 44edbdb..85b3acb 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_log/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_log/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 height: shift: -0.11 scale: 0.16 @@ -8,7 +6,9 @@ height: occlusion: scale: 0.16 smooth: - scale: 0.1 + scale: 0.02 +f0: + value: 0.04 porosity: value: 0.24 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/albedo.png b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/albedo.png new file mode 100644 index 0000000..baa7db9 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/albedo.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/height.png b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/height.png new file mode 100644 index 0000000..ccfcd33 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/mat.properties b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/mat.properties new file mode 100644 index 0000000..6b00f3e --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/mat.properties @@ -0,0 +1,5 @@ +matchTiles=dark_oak_planks +method=repeat +width=2 +height=2 +tiles=0-3 diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/mat.yml new file mode 100644 index 0000000..3b9a17d --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/mat.yml @@ -0,0 +1,23 @@ +wrap-x: true +wrap-y: true +alpha: + value: 255 +height: + shift: -0.43 + scale: 0.13 + edge-fade-x: 2 + edge-fade-y: 0.4 +normal: + strength: 1.2 +occlusion: + step-distance: 0.05 + z-bias: 0 + z-scale: 140 +f0: + value: 0.03 +porosity: + value: 0.4 +ctm: + type: repeat + count-x: 2 + count-y: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/normal.png b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/normal.png new file mode 100644 index 0000000..e6960ad Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/occlusion-x.png b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/occlusion-x.png similarity index 100% rename from src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/occlusion-x.png rename to src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/occlusion-x.png diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/occlusion.png b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/occlusion.png similarity index 100% rename from src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/occlusion.png rename to src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/occlusion.png diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/smooth.png new file mode 100644 index 0000000..be334fc Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/source.txt b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/source.txt new file mode 100644 index 0000000..effb496 --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/.ignore/source.txt @@ -0,0 +1 @@ +https://www.cgbookcase.com/textures/wooden-planks-05 \ No newline at end of file diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/albedo.png b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/albedo.png index baa7db9..1f6a926 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/albedo.png and b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/albedo.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/height.png b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/height.png index ccfcd33..86a45b0 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/height.png and b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/mat.properties b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/mat.properties index 6b00f3e..c1adcac 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/mat.properties +++ b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/mat.properties @@ -1,5 +1,5 @@ matchTiles=dark_oak_planks method=repeat -width=2 -height=2 -tiles=0-3 +width=4 +height=4 +tiles=0-15 diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/mat.yml index 683febe..5b45adc 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/mat.yml @@ -1,25 +1,10 @@ -wrap-x: true -wrap-y: true -alpha: - value: 255 height: - shift: -0.43 - scale: 0.13 - edge-fade-x: 2 - edge-fade-y: 0.4 -normal: - strength: 1.2 -occlusion: - z-bias: 0 - z-scale: 140 - step-distance: 0.05 + scale: 0.04 smooth: - scale: 0.5 -f0: - value: 0.03 + scale: 0.2 porosity: - value: 0.71 + value: 0.8 ctm: type: repeat - count-x: 2 - count-y: 2 + count-x: 4 + count-y: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/normal.png b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/normal.png index e6960ad..9ee40f7 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/normal.png and b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/smooth.png b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/smooth.png index be334fc..1f6e365 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/smooth.png and b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/source.txt b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/source.txt index effb496..34c2085 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/source.txt +++ b/src/assets/minecraft/optifine/ctm/oversized/dark_oak_planks/source.txt @@ -1 +1 @@ -https://www.cgbookcase.com/textures/wooden-planks-05 \ No newline at end of file +https://ambientcg.com/view?id=Wood042 \ No newline at end of file diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/albedo.png b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/albedo.png new file mode 100644 index 0000000..f43443f Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/albedo.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/height.png b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/height.png new file mode 100644 index 0000000..d6c3306 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/mat.properties b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/mat.properties new file mode 100644 index 0000000..19ba0cd --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/mat.properties @@ -0,0 +1,5 @@ +matchTiles=dark_prismarine +method=repeat +width=4 +height=4 +tiles=0-15 diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/mat.yml new file mode 100644 index 0000000..aa65038 --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/mat.yml @@ -0,0 +1,16 @@ +alpha: + value: 255 +height: + shift: -0.12 + scale: 0.1 + edge-fade-x: 0.4 + edge-fade-y: 0.4 +occlusion: + scale: 0.2 + z-scale: 8 +f0: + value: 0.04 +ctm: + type: repeat + count-x: 4 + count-y: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/normal.png b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/normal.png new file mode 100644 index 0000000..a9e4ef4 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/occlusion.png b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/occlusion.png new file mode 100644 index 0000000..1b24b9c Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/porosity.png b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/porosity.png new file mode 100644 index 0000000..5aaee6f Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/smooth.png b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/smooth.png new file mode 100644 index 0000000..08c6e51 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/source.txt b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/source.txt new file mode 100644 index 0000000..f843973 --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/oversized/dark_prismarine/source.txt @@ -0,0 +1 @@ +https://cc0textures.com/view?id=Tiles020 \ No newline at end of file diff --git a/src/assets/minecraft/optifine/ctm/oversized/diorite/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/diorite/mat.yml index 50dc412..25fc8a2 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/diorite/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/diorite/mat.yml @@ -1,12 +1,13 @@ alpha: value: 255 height: - shift: -0.2 - scale: 0.5 + shift: -0.1 edge-fade-x: 2 edge-fade-y: 2 occlusion: scale: 0.5 +f0: + value: 0.04 porosity: value: 0.16 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/dirt/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/dirt/mat.yml index 1383801..46b8bbb 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/dirt/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/dirt/mat.yml @@ -4,19 +4,19 @@ alpha: value: 255 height: shift: -0.31 - scale: 0.3 + scale: 0.9 edge-fade-x: 2 edge-fade-y: 2 occlusion: + step-distance: 0.05 z-bias: 0 z-scale: 80 - step-distance: 0.05 smooth: - scale: 0.1 + scale: 0.2 f0: value: 0.03 porosity: - value: 0.78 + scale: 0.8 ctm: type: repeat count-x: 3 diff --git a/src/assets/minecraft/optifine/ctm/oversized/dirt/porosity.png b/src/assets/minecraft/optifine/ctm/oversized/dirt/porosity.png new file mode 100644 index 0000000..f872c52 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/dirt/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/emerald_ore/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/emerald_ore/mat.yml index 244069c..6044b81 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/emerald_ore/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/emerald_ore/mat.yml @@ -2,13 +2,16 @@ alpha: value: 255 height: shift: -0.08 - scale: 0.3 edge-fade-x: 1 edge-fade-y: 1 occlusion: scale: 0.5 +smooth: + scale: 0.9 f0: - value: 0.05 + value: 0.08 +sss: + scale: 2 ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/farmland/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/farmland/mat.yml index 5ee0065..0005c5a 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/farmland/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/farmland/mat.yml @@ -2,15 +2,17 @@ alpha: value: 255 height: shift: -0.31 - scale: 0.3 + scale: 0.8 edge-fade-x: 2 edge-fade-y: 2 occlusion: scale: 0.3 z-bias: 0.5 z-scale: 10 -smooth: - scale: 0.5 +rough: + scale: 2.6 +f0: + value: 0.02 porosity: value: 0.08 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/gold_block/albedo.png b/src/assets/minecraft/optifine/ctm/oversized/gold_block/albedo.png index e9862de..5ad35cc 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/gold_block/albedo.png and b/src/assets/minecraft/optifine/ctm/oversized/gold_block/albedo.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/gold_block/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/gold_block/mat.yml index 4e3cabe..1a999ac 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/gold_block/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/gold_block/mat.yml @@ -7,15 +7,14 @@ height: scale: 0.1 edge-fade-x: 0.4 edge-fade-y: 0.4 -normal: {} occlusion: + step-distance: 0.05 z-bias: 0.4 z-scale: 3 - step-distance: 0.05 smooth: scale: 1.2 metal: - value: 255 + value: 231 porosity: value: 0 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/gold_block/occlusion-x.png b/src/assets/minecraft/optifine/ctm/oversized/gold_block/occlusion-x.png deleted file mode 100644 index 41a5931..0000000 Binary files a/src/assets/minecraft/optifine/ctm/oversized/gold_block/occlusion-x.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/gold_block/rough.png b/src/assets/minecraft/optifine/ctm/oversized/gold_block/rough.png deleted file mode 100644 index 72f3154..0000000 Binary files a/src/assets/minecraft/optifine/ctm/oversized/gold_block/rough.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/gold_block/smooth.png b/src/assets/minecraft/optifine/ctm/oversized/gold_block/smooth.png new file mode 100644 index 0000000..29eb179 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/gold_block/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/gold_ore/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/gold_ore/mat.yml index f17663b..7a8f428 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/gold_ore/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/gold_ore/mat.yml @@ -7,15 +7,10 @@ height: edge-fade-y: 1 normal: strength: 4 - noise: 3 occlusion: + step-distance: 0.05 z-bias: 0 z-scale: 60 - step-distance: 0.05 -smooth: - scale: 2 -metal: - value: 255 porosity: value: 0 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/gold_ore/metal.png b/src/assets/minecraft/optifine/ctm/oversized/gold_ore/metal.png new file mode 100644 index 0000000..f649bcd Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/gold_ore/metal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/granite/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/granite/mat.yml index 3cc1757..f72e9a1 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/granite/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/granite/mat.yml @@ -3,16 +3,20 @@ wrap-y: true alpha: value: 255 height: - shift: -0.4 - scale: 0.15 - edge-fade-x: 2 - edge-fade-y: 2 + shift: -0.2 + scale: 0.5 + edge-fade-x: 0.6 + edge-fade-y: 0.6 occlusion: + step-distance: 0.05 z-bias: 0 z-scale: 70 - step-distance: 0.05 +smooth: + scale: 2 +f0: + value: 0.053 porosity: - value: 0.04 + value: 0.2 ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/grass_block/default/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/grass_block/default/mat.yml index 1d498b8..d0b03a2 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/grass_block/default/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/grass_block/default/mat.yml @@ -1,10 +1,10 @@ wrap-x: true wrap-y: true +color-tint: '#91BD59' alpha: value: 255 height: shift: -0.1 - scale: 0.5 edge-fade-x: 1 edge-fade-y: 1 occlusion: @@ -13,7 +13,6 @@ smooth: scale: 0.8 f0: value: 0.017 -porosity: {} sss: value: 0.2 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/grass_block/forest_oak/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/grass_block/forest_oak/mat.yml index b2bd32c..8fff36f 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/grass_block/forest_oak/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/grass_block/forest_oak/mat.yml @@ -1,3 +1,4 @@ +color-tint: '#79C05A' alpha: value: 255 height: diff --git a/src/assets/minecraft/optifine/ctm/oversized/grass_block/forest_spruce/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/grass_block/forest_spruce/mat.yml index 7ddd2aa..8251913 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/grass_block/forest_spruce/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/grass_block/forest_spruce/mat.yml @@ -1,3 +1,4 @@ +color-tint: '#86B783' alpha: value: 255 height: diff --git a/src/assets/minecraft/optifine/ctm/oversized/grass_block/savanna/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/grass_block/savanna/mat.yml index 5b2f972..cc20da5 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/grass_block/savanna/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/grass_block/savanna/mat.yml @@ -1,5 +1,6 @@ wrap-x: true wrap-y: true +color-tint: '#BFB755' alpha: value: 255 height: diff --git a/src/assets/minecraft/optifine/ctm/oversized/grass_block/swamp/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/grass_block/swamp/mat.yml index abc10be..66e047a 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/grass_block/swamp/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/grass_block/swamp/mat.yml @@ -1,15 +1,14 @@ -alpha: - value: 255 +color-tint: '#6A7039' height: shift: -0.14 - scale: 0.12 + scale: 0.28 edge-fade-x: 1 edge-fade-y: 1 occlusion: z-bias: 0.1 z-scale: 14 -porosity: - value: 0.31 +smooth: + scale: 0.02 ctm: type: repeat count-x: 8 diff --git a/src/assets/minecraft/optifine/ctm/oversized/grass_block/swamp/normal.png b/src/assets/minecraft/optifine/ctm/oversized/grass_block/swamp/normal.png index f625321..615b8a8 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/grass_block/swamp/normal.png and b/src/assets/minecraft/optifine/ctm/oversized/grass_block/swamp/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/grass_block/swamp/porosity.png b/src/assets/minecraft/optifine/ctm/oversized/grass_block/swamp/porosity.png new file mode 100644 index 0000000..1869a5b Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/grass_block/swamp/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/grass_path_top/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/grass_path_top/mat.yml index 6b06206..f89fdb6 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/grass_path_top/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/grass_path_top/mat.yml @@ -1,12 +1,9 @@ alpha: value: 255 -height: {} occlusion: scale: 0.2 smooth: scale: 0.1 -porosity: - value: 0.63 ctm: type: repeat count-x: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/grass_path_top/porosity.png b/src/assets/minecraft/optifine/ctm/oversized/grass_path_top/porosity.png new file mode 100644 index 0000000..e873321 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/grass_path_top/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/gravel/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/gravel/mat.yml index 7154a1b..a14ac88 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/gravel/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/gravel/mat.yml @@ -4,16 +4,16 @@ alpha: value: 255 height: shift: -0.56 - scale: 0.12 + scale: 0.36 edge-fade-x: 1 edge-fade-y: 1 occlusion: z-bias: 0 z-scale: 12 smooth: - scale: 0.28 + scale: 0.5 f0: - value: 0.07 + value: 0.04 ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/hopper/f0.png b/src/assets/minecraft/optifine/ctm/oversized/hopper/f0-x.png similarity index 100% rename from src/assets/minecraft/optifine/ctm/oversized/hopper/f0.png rename to src/assets/minecraft/optifine/ctm/oversized/hopper/f0-x.png diff --git a/src/assets/minecraft/optifine/ctm/oversized/hopper/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/hopper/mat.yml index e5c23b2..4b226cd 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/hopper/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/hopper/mat.yml @@ -8,8 +8,8 @@ occlusion: scale: 0.1 z-bias: 0.5 z-scale: 6 -metal: {} -porosity: {} +smooth: + scale: 0.4 ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/hopper/metal.png b/src/assets/minecraft/optifine/ctm/oversized/hopper/metal.png new file mode 100644 index 0000000..4ee52f1 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/hopper/metal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/ice/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/ice/mat.yml index a024a89..3e5a926 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/ice/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/ice/mat.yml @@ -11,10 +11,12 @@ occlusion: scale: 0.2 z-bias: 1 z-scale: 10 +smooth: + scale: 0.88 f0: value: 0.017 sss: - value: 0.39 + value: 1 ctm: type: repeat count-x: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/iron_block/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/iron_block/mat.yml index d2a8f5c..f52828e 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/iron_block/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/iron_block/mat.yml @@ -1,14 +1,21 @@ +color-tint: '#fefefd' alpha: value: 255 +albedo: + scale-red: 1.5 + scale-green: 1.5 + scale-blue: 1.5 height: - scale: 0.1 + scale: 0.3 edge-fade-y: 0.4 +normal: + strength: 1 occlusion: + step-distance: 0.1 z-bias: 1 z-scale: 24 - step-distance: 0.1 metal: - value: 255 + value: 237 porosity: value: 0 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/iron_block/normal-x.png b/src/assets/minecraft/optifine/ctm/oversized/iron_block/normal-x.png new file mode 100644 index 0000000..ecd406a Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/iron_block/normal-x.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/iron_block/normal.png b/src/assets/minecraft/optifine/ctm/oversized/iron_block/normal.png index ecd406a..88672c2 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/iron_block/normal.png and b/src/assets/minecraft/optifine/ctm/oversized/iron_block/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/iron_ore/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/iron_ore/mat.yml index 7c43ac3..367a528 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/iron_ore/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/iron_ore/mat.yml @@ -1,19 +1,17 @@ -alpha: - value: 255 height: shift: -0.1 - scale: 0.2 + scale: 0.5 edge-fade-x: 0.5 edge-fade-y: 0.5 normal: - strength: 2 method: sobel3 + strength: 2 occlusion: + step-distance: 0.1 z-bias: 1 z-scale: 44 - step-distance: 0.1 smooth: - scale: 0.9 + scale: 0.8 ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/iron_trapdoor/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/iron_trapdoor/mat.yml index 6785f0c..91ef7e1 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/iron_trapdoor/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/iron_trapdoor/mat.yml @@ -5,14 +5,13 @@ alpha: texture: alpha color: red height: - scale: 0.14 + scale: 0.3 edge-fade-x: 0.1 edge-fade-y: 0.1 occlusion: z-scale: 10 smooth: scale: 0.85 -porosity: {} ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/lapis_ore/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/lapis_ore/mat.yml index fdbb54b..ef04008 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/lapis_ore/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/lapis_ore/mat.yml @@ -2,11 +2,15 @@ alpha: value: 255 height: shift: -0.08 - scale: 0.3 + scale: 0.6 edge-fade-x: 1 edge-fade-y: 1 occlusion: scale: 0.5 +f0: + value: 0.08 +sss: + value: 0.8 ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/lapis_ore/normal-x.png b/src/assets/minecraft/optifine/ctm/oversized/lapis_ore/normal-x.png new file mode 100644 index 0000000..53703ab Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/lapis_ore/normal-x.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/lapis_ore/normal.png b/src/assets/minecraft/optifine/ctm/oversized/lapis_ore/normal.png index 53703ab..82a270b 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/lapis_ore/normal.png and b/src/assets/minecraft/optifine/ctm/oversized/lapis_ore/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/magma/height-x.png b/src/assets/minecraft/optifine/ctm/oversized/magma/height-x.png new file mode 100644 index 0000000..a8d04cc Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/magma/height-x.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/magma/height.png b/src/assets/minecraft/optifine/ctm/oversized/magma/height.png index a8d04cc..b098e8a 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/magma/height.png and b/src/assets/minecraft/optifine/ctm/oversized/magma/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/magma/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/magma/mat.yml index 29c98d9..7263d6b 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/magma/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/magma/mat.yml @@ -1,22 +1,22 @@ alpha: value: 255 height: - shift: -0.13 - scale: 0.4 edge-fade-x: 2 edge-fade-y: 2 normal: - strength: 8 method: sobel3 + strength: 8 occlusion: z-bias: 0.3 z-scale: 8 +smooth: + scale: 2 f0: value: 0.03 porosity: value: 0 emissive: - scale: 0.85 + scale: 0.9 ctm: type: repeat count-x: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/magma/normal.png b/src/assets/minecraft/optifine/ctm/oversized/magma/normal-x.png similarity index 100% rename from src/assets/minecraft/optifine/ctm/oversized/magma/normal.png rename to src/assets/minecraft/optifine/ctm/oversized/magma/normal-x.png diff --git a/src/assets/minecraft/optifine/ctm/oversized/nether_bricks/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/nether_bricks/mat.yml index 8235b5f..729c0c7 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/nether_bricks/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/nether_bricks/mat.yml @@ -2,17 +2,14 @@ alpha: value: 255 height: shift: -0.25 - scale: 0.3 - edge-fade-x: 1 - edge-fade-y: 0.5 + edge-fade-x: 0.4 + edge-fade-y: 0.2 occlusion: + step-distance: 0.1 z-bias: 1 z-scale: 40 - step-distance: 0.1 f0: value: 0.03 -porosity: - value: 0.65 ctm: type: repeat count-x: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/nether_bricks/porosity.png b/src/assets/minecraft/optifine/ctm/oversized/nether_bricks/porosity.png new file mode 100644 index 0000000..335e781 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/nether_bricks/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/nether_bricks_top/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/nether_bricks_top/mat.yml index 0cdc674..e98c858 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/nether_bricks_top/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/nether_bricks_top/mat.yml @@ -1,7 +1,8 @@ alpha: value: 255 height: - scale: 0.2 + shift: -0.1 + scale: 0.5 edge-fade-x: 0.4 edge-fade-y: 0.4 occlusion: diff --git a/src/assets/minecraft/optifine/ctm/oversized/netherrack/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/netherrack/mat.yml index 2778907..695acc7 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/netherrack/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/netherrack/mat.yml @@ -2,7 +2,6 @@ alpha: value: 255 height: shift: -0.16 - scale: 0.9 edge-fade-x: 2 edge-fade-y: 2 normal: diff --git a/src/assets/minecraft/optifine/ctm/oversized/oak_planks/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/oak_planks/mat.yml index fed59d2..6b21189 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/oak_planks/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/oak_planks/mat.yml @@ -2,14 +2,13 @@ alpha: value: 255 height: shift: -0.14 - scale: 0.16 + scale: 0.3 edge-fade-x: 0.4 edge-fade-y: 0.4 occlusion: + step-distance: 0.05 z-bias: 0 z-scale: 140 - step-distance: 0.05 -porosity: {} ctm: type: repeat count-x: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/podzol/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/podzol/mat.yml index d2ed4a6..18784f3 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/podzol/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/podzol/mat.yml @@ -2,13 +2,15 @@ alpha: value: 255 height: shift: -0.39 - scale: 0.1 + scale: 0.3 edge-fade-x: 2 edge-fade-y: 2 occlusion: scale: 0.3 smooth: scale: 0.5 +porosity: + value: 0.7 ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/polished_andesite/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/polished_andesite/mat.yml index 5b4b58d..ee9991b 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/polished_andesite/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/polished_andesite/mat.yml @@ -1,9 +1,5 @@ alpha: value: 255 -normal: - value-x: 127 - value-y: 127 - value-z: 255 smooth: scale: 0.8 f0: diff --git a/src/assets/minecraft/optifine/ctm/oversized/polished_blackstone_bricks/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/polished_blackstone_bricks/mat.yml index fe9af92..d4ebb48 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/polished_blackstone_bricks/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/polished_blackstone_bricks/mat.yml @@ -2,7 +2,7 @@ alpha: value: 255 height: shift: -0.24 - scale: 0.08 + scale: 0.3 edge-fade-x: 1 edge-fade-y: 1 occlusion: diff --git a/src/assets/minecraft/optifine/ctm/oversized/polished_diorite/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/polished_diorite/mat.yml index 2d5f5ab..cd6066a 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/polished_diorite/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/polished_diorite/mat.yml @@ -4,6 +4,8 @@ height: scale: 0.1 edge-fade-x: 0.4 edge-fade-y: 0.4 +f0: + value: 0.04 ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/polished_granite/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/polished_granite/mat.yml index 20d21d4..7942f94 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/polished_granite/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/polished_granite/mat.yml @@ -1,5 +1,7 @@ alpha: value: 255 +f0: + value: 0.08 ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/prismarine/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/prismarine/mat.yml index 8b60b2a..aa65038 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/prismarine/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/prismarine/mat.yml @@ -2,14 +2,14 @@ alpha: value: 255 height: shift: -0.12 - scale: 0.04 + scale: 0.1 edge-fade-x: 0.4 edge-fade-y: 0.4 occlusion: scale: 0.2 z-scale: 8 -porosity: - value: 0 +f0: + value: 0.04 ctm: type: repeat count-x: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/prismarine/porosity.png b/src/assets/minecraft/optifine/ctm/oversized/prismarine/porosity.png new file mode 100644 index 0000000..5aaee6f Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/prismarine/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/albedo.png b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/albedo.png new file mode 100644 index 0000000..b7dfb6e Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/albedo.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/height.png b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/height.png new file mode 100644 index 0000000..5e7a26d Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/mat.properties b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/mat.properties new file mode 100644 index 0000000..631347b --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/mat.properties @@ -0,0 +1,5 @@ +matchTiles=prismarine_bricks +method=repeat +width=4 +height=4 +tiles=0-15 diff --git a/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/mat.yml new file mode 100644 index 0000000..dfbbf7a --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/mat.yml @@ -0,0 +1,13 @@ +height: + shift: -0.1 + scale: 0.4 + edge-fade-x: 1 + edge-fade-y: 1 +smooth: + scale: 0.8 +f0: + value: 0.04 +ctm: + type: repeat + count-x: 4 + count-y: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/normal.png b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/normal.png new file mode 100644 index 0000000..d5da536 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/occlusion.png b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/occlusion.png new file mode 100644 index 0000000..bf85364 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/porosity.png b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/porosity.png new file mode 100644 index 0000000..f84e9fa Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/smooth.png b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/smooth.png new file mode 100644 index 0000000..98e633f Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/source.txt b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/source.txt new file mode 100644 index 0000000..b162839 --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/oversized/prismarine_bricks/source.txt @@ -0,0 +1 @@ +https://ambientcg.com/view?id=Tiles089 \ No newline at end of file diff --git a/src/assets/minecraft/optifine/ctm/oversized/quartz_block/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/quartz_block/mat.yml index 6286873..cec371e 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/quartz_block/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/quartz_block/mat.yml @@ -2,8 +2,10 @@ alpha: value: 255 height: scale: 0.08 +rough: + scale: 2 f0: - value: 0.06 + value: 0.035 porosity: value: 0 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/red_nether_bricks/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/red_nether_bricks/mat.yml index e4e842c..241d639 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/red_nether_bricks/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/red_nether_bricks/mat.yml @@ -2,7 +2,7 @@ alpha: value: 255 height: shift: -0.24 - scale: 0.2 + scale: 0.3 edge-fade-x: 2 edge-fade-y: 0.8 occlusion: diff --git a/src/assets/minecraft/optifine/ctm/oversized/red_sand/normal-x.png b/src/assets/minecraft/optifine/ctm/oversized/red_sand/normal-x.png new file mode 100644 index 0000000..673a325 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/red_sand/normal-x.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/red_sand/normal.png b/src/assets/minecraft/optifine/ctm/oversized/red_sand/normal.png index 673a325..09635c6 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/red_sand/normal.png and b/src/assets/minecraft/optifine/ctm/oversized/red_sand/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/sand/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/sand/mat.yml index 5556e29..fb0b29e 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/sand/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/sand/mat.yml @@ -1,16 +1,16 @@ alpha: value: 255 height: - shift: -0.36 - scale: 0.16 - edge-fade-x: 2 - edge-fade-y: 2 + shift: -0.5 + scale: 0.3 + edge-fade-x: 1 + edge-fade-y: 1 occlusion: scale: 0.45 f0: value: 0.06 porosity: - value: 0.5 + value: 0.6 ctm: type: repeat count-x: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/sandstone/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/sandstone/mat.yml index 9f93639..2a2ee19 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/sandstone/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/sandstone/mat.yml @@ -1,18 +1,17 @@ alpha: value: 255 height: - shift: -0.1 - scale: 0.3 + shift: -0.05 + scale: 0.8 edge-fade-x: 2 edge-fade-y: 1 normal: - strength: 6 method: variance + strength: 6 noise: 2 occlusion: z-bias: 0.1 z-scale: 60 -smooth: {} f0: value: 0.06 porosity: diff --git a/src/assets/minecraft/optifine/ctm/oversized/sandstone/normal.png b/src/assets/minecraft/optifine/ctm/oversized/sandstone/normal.png index 751a3d6..9fd1c0b 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/sandstone/normal.png and b/src/assets/minecraft/optifine/ctm/oversized/sandstone/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/smooth_sandstone/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/smooth_sandstone/mat.yml index 0c31267..38a15d4 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/smooth_sandstone/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/smooth_sandstone/mat.yml @@ -2,7 +2,7 @@ alpha: value: 255 height: shift: -0.18 - scale: 0.28 + scale: 0.7 edge-fade-x: 2 edge-fade-y: 1 occlusion: diff --git a/src/assets/minecraft/optifine/ctm/oversized/smooth_stone/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/smooth_stone/mat.yml index 9695103..12bac76 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/smooth_stone/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/smooth_stone/mat.yml @@ -7,8 +7,10 @@ height: edge-fade-y: 2 occlusion: scale: 0.04 -smooth: - scale: 0.5 +rough: + scale: 1.3 +f0: + value: 0.04 porosity: value: 0.39 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/snow/height.png b/src/assets/minecraft/optifine/ctm/oversized/snow/height.png index 40d5cac..d2bc5cc 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/snow/height.png and b/src/assets/minecraft/optifine/ctm/oversized/snow/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/snow/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/snow/mat.yml index d7ec523..72843a1 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/snow/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/snow/mat.yml @@ -1,18 +1,16 @@ alpha: value: 255 height: - shift: -0.35 - scale: 0.3 - edge-fade-x: 1 - edge-fade-y: 1 + shift: -0.1 + scale: 0.5 + edge-fade-x: 0.8 + edge-fade-y: 0.8 occlusion: scale: 0.3 -metal: {} f0: value: 0.017 -porosity: {} sss: - value: 0.16 + value: 0.3 ctm: type: repeat count-x: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/snow/normal.png b/src/assets/minecraft/optifine/ctm/oversized/snow/normal.png index d4c6e94..45d3cc4 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/snow/normal.png and b/src/assets/minecraft/optifine/ctm/oversized/snow/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/snow/rough.png b/src/assets/minecraft/optifine/ctm/oversized/snow/rough.png deleted file mode 100644 index 59bc6ea..0000000 Binary files a/src/assets/minecraft/optifine/ctm/oversized/snow/rough.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/snow/smooth.png b/src/assets/minecraft/optifine/ctm/oversized/snow/smooth.png new file mode 100644 index 0000000..5e3e263 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/snow/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/soul_soil/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/soul_soil/mat.yml index 416da5b..2102f4b 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/soul_soil/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/soul_soil/mat.yml @@ -1,14 +1,14 @@ alpha: value: 255 height: - shift: -0.4 - scale: 0.15 + shift: -0.7 + scale: 0.7 edge-fade-x: 0.6 edge-fade-y: 0.6 f0: value: 0.03 porosity: - value: 0.3 + value: 0.6 ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/sponge/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/sponge/mat.yml index 6466ad8..52aefef 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/sponge/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/sponge/mat.yml @@ -2,7 +2,7 @@ alpha: value: 255 height: shift: -0.24 - scale: 0.25 + scale: 0.75 edge-fade-x: 1 edge-fade-y: 1 occlusion: diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/albedo.jpg b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/albedo.jpg similarity index 100% rename from src/assets/minecraft/optifine/ctm/oversized/spruce_planks/albedo.jpg rename to src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/albedo.jpg diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/height.jpg b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/height.jpg similarity index 100% rename from src/assets/minecraft/optifine/ctm/oversized/spruce_planks/height.jpg rename to src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/height.jpg diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/mat.properties b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/mat.properties new file mode 100644 index 0000000..e8724bf --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/mat.properties @@ -0,0 +1,5 @@ +matchTiles=spruce_planks +method=repeat +width=4 +height=4 +tiles=textures/block/spruce_planks 1-15 diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/mat.yml new file mode 100644 index 0000000..f5a6f56 --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/mat.yml @@ -0,0 +1,16 @@ +alpha: + value: 255 +height: + shift: -0.24 + scale: 0.1 + edge-fade-x: 1 + edge-fade-y: 1 +f0: + value: 0.03 +porosity: + value: 0.7 +ctm: + type: repeat + count-x: 4 + count-y: 4 + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/normal.jpg b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/normal.jpg similarity index 100% rename from src/assets/minecraft/optifine/ctm/oversized/spruce_planks/normal.jpg rename to src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/normal.jpg diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/occlusion.jpg b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/occlusion.jpg similarity index 100% rename from src/assets/minecraft/optifine/ctm/oversized/spruce_planks/occlusion.jpg rename to src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/occlusion.jpg diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/smooth.png new file mode 100644 index 0000000..7e97f29 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/source.txt b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/source.txt new file mode 100644 index 0000000..21aa266 --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/.ignore/source.txt @@ -0,0 +1 @@ +https://cc0textures.com/view?id=WoodFloor003 \ No newline at end of file diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/albedo.png b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/albedo.png new file mode 100644 index 0000000..f2d5291 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/albedo.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/height.png b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/height.png new file mode 100644 index 0000000..9e6267d Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/mat.yml index eaf875e..3c249f8 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/mat.yml @@ -1,12 +1,8 @@ -alpha: - value: 255 height: - shift: -0.24 - scale: 0.1 + shift: -0.13 + scale: 0.2 edge-fade-x: 1 edge-fade-y: 1 -f0: - value: 0.03 ctm: type: repeat count-x: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/normal.png b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/normal.png new file mode 100644 index 0000000..996eaf3 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/occlusion.png b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/occlusion.png new file mode 100644 index 0000000..3cd6c86 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/porosity.png b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/porosity.png new file mode 100644 index 0000000..80c9c76 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/smooth.png b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/smooth.png index 7e97f29..5035190 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/smooth.png and b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/source.txt b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/source.txt index 21aa266..ee1abdd 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/source.txt +++ b/src/assets/minecraft/optifine/ctm/oversized/spruce_planks/source.txt @@ -1 +1 @@ -https://cc0textures.com/view?id=WoodFloor003 \ No newline at end of file +https://ambientcg.com/view?id=Planks004 \ No newline at end of file diff --git a/src/assets/minecraft/optifine/ctm/oversized/stone/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/stone/mat.yml index 3ca5717..f529306 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/stone/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/stone/mat.yml @@ -6,15 +6,15 @@ height: edge-fade-x: 1 edge-fade-y: 1 occlusion: + step-distance: 0.1 z-bias: 0.01 z-scale: 20 - step-distance: 0.1 smooth: - scale: 0.2 + scale: 0.8 f0: - value: 0.07 + value: 0.04 porosity: - value: 0.39 + value: 0.6 ctm: type: repeat count-x: 4 diff --git a/src/assets/minecraft/optifine/ctm/oversized/stone_bricks/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/stone_bricks/mat.yml index 445cb9a..34a72b6 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/stone_bricks/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/stone_bricks/mat.yml @@ -6,13 +6,15 @@ height: edge-fade-x: 2 edge-fade-y: 0.5 occlusion: + step-distance: 0.1 z-bias: 0 z-scale: 200 - step-distance: 0.1 smooth: - scale: 0.08 + scale: 0.5 +f0: + value: 0.04 porosity: - value: 0.47 + value: 0.5 ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/terracotta_side/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/terracotta_side/mat.yml index 226eb57..a73687b 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/terracotta_side/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/terracotta_side/mat.yml @@ -1,10 +1,10 @@ +color-tint: '#9c5d41' alpha: value: 255 height: - shift: -0.08 - scale: 0.4 - edge-fade-x: 4 - edge-fade-y: 4 + shift: -0.1 + edge-fade-x: 0.6 + edge-fade-y: 0.6 smooth: scale: 0.3 f0: diff --git a/src/assets/minecraft/optifine/ctm/oversized/terracotta_top/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/terracotta_top/mat.yml index a0dc559..affd9c0 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/terracotta_top/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/terracotta_top/mat.yml @@ -1,8 +1,9 @@ +color-tint: '#9c5d41' alpha: value: 255 height: shift: -0.12 - scale: 0.3 + scale: 0.6 edge-fade-x: 2 edge-fade-y: 2 smooth: diff --git a/src/assets/minecraft/optifine/ctm/oversized/wet_sponge/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/wet_sponge/mat.yml index b86fc9e..b632c4c 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/wet_sponge/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/wet_sponge/mat.yml @@ -2,15 +2,17 @@ alpha: value: 255 height: shift: -0.24 - scale: 0.1 + scale: 0.4 edge-fade-x: 1 edge-fade-y: 1 occlusion: scale: 0.4 smooth: - scale: 2 + scale: 8 +f0: + value: 0.02 sss: - scale: 0.1 + scale: 0.6 ctm: type: repeat count-x: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/white_stained_glass/height.png b/src/assets/minecraft/optifine/ctm/oversized/white_stained_glass/height.png index 74ad021..fcad181 100644 Binary files a/src/assets/minecraft/optifine/ctm/oversized/white_stained_glass/height.png and b/src/assets/minecraft/optifine/ctm/oversized/white_stained_glass/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/oversized/white_stained_glass/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/white_stained_glass/mat.yml index eb0d416..369e091 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/white_stained_glass/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/white_stained_glass/mat.yml @@ -2,8 +2,11 @@ alpha: input: texture: alpha color: red +height: + scale: 0.3 f0: value: 0.04 -ctm-type: repeat -ctm-count-x: 2 -ctm-count-y: 2 +ctm: + type: repeat + count-x: 2 + count-y: 2 diff --git a/src/assets/minecraft/optifine/ctm/oversized/wool/black/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/wool/black/mat.yml index 51f1e68..fc32574 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/wool/black/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/wool/black/mat.yml @@ -12,6 +12,8 @@ occlusion: smooth: texture: ../smooth.png scale: 0.05 +f0: + value: 0.04 porosity: value: 0.8 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/wool/brown/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/wool/brown/mat.yml index 51f1e68..fc32574 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/wool/brown/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/wool/brown/mat.yml @@ -12,6 +12,8 @@ occlusion: smooth: texture: ../smooth.png scale: 0.05 +f0: + value: 0.04 porosity: value: 0.8 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/wool/gray/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/wool/gray/mat.yml index 51f1e68..fc32574 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/wool/gray/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/wool/gray/mat.yml @@ -12,6 +12,8 @@ occlusion: smooth: texture: ../smooth.png scale: 0.05 +f0: + value: 0.04 porosity: value: 0.8 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/wool/green/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/wool/green/mat.yml index 51f1e68..fc32574 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/wool/green/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/wool/green/mat.yml @@ -12,6 +12,8 @@ occlusion: smooth: texture: ../smooth.png scale: 0.05 +f0: + value: 0.04 porosity: value: 0.8 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/wool/light_gray/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/wool/light_gray/mat.yml index 51f1e68..fc32574 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/wool/light_gray/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/wool/light_gray/mat.yml @@ -12,6 +12,8 @@ occlusion: smooth: texture: ../smooth.png scale: 0.05 +f0: + value: 0.04 porosity: value: 0.8 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/wool/white/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/wool/white/mat.yml index 51f1e68..fc32574 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/wool/white/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/wool/white/mat.yml @@ -12,6 +12,8 @@ occlusion: smooth: texture: ../smooth.png scale: 0.05 +f0: + value: 0.04 porosity: value: 0.8 ctm: diff --git a/src/assets/minecraft/optifine/ctm/oversized/wool/yellow/mat.yml b/src/assets/minecraft/optifine/ctm/oversized/wool/yellow/mat.yml index 51f1e68..fc32574 100644 --- a/src/assets/minecraft/optifine/ctm/oversized/wool/yellow/mat.yml +++ b/src/assets/minecraft/optifine/ctm/oversized/wool/yellow/mat.yml @@ -12,6 +12,8 @@ occlusion: smooth: texture: ../smooth.png scale: 0.05 +f0: + value: 0.04 porosity: value: 0.8 ctm: diff --git a/src/assets/minecraft/textures/block/acacia_leaves/pbr.yml b/src/assets/minecraft/textures/block/acacia_leaves/pbr.yml index 56602bb..cf11baf 100644 --- a/src/assets/minecraft/textures/block/acacia_leaves/pbr.yml +++ b/src/assets/minecraft/textures/block/acacia_leaves/pbr.yml @@ -1,5 +1,6 @@ wrap-x: false wrap-y: false +color-tint: '#48B518' alpha: input: texture: alpha @@ -9,10 +10,8 @@ height: normal: strength: 5 occlusion: - quality: 0.06 z-bias: 1 z-scale: 8 - steps: 20 smooth: scale: 0.2 f0: diff --git a/src/assets/minecraft/textures/block/acacia_log/pbr.yml b/src/assets/minecraft/textures/block/acacia_log/pbr.yml index 37b0f2e..40b282a 100644 --- a/src/assets/minecraft/textures/block/acacia_log/pbr.yml +++ b/src/assets/minecraft/textures/block/acacia_log/pbr.yml @@ -3,13 +3,11 @@ wrap-y: true alpha: value: 255 height: - scale: 0.14 + scale: 0.3 edge-fade-x: 0.6 -normal: - curve-x: 90 occlusion: - z-scale: 28 step-distance: 0.1 + z-scale: 28 smooth: scale: 0.4 porosity: diff --git a/src/assets/minecraft/textures/block/birch_leaves/pbr.yml b/src/assets/minecraft/textures/block/birch_leaves/pbr.yml index c1b57a9..423db2e 100644 --- a/src/assets/minecraft/textures/block/birch_leaves/pbr.yml +++ b/src/assets/minecraft/textures/block/birch_leaves/pbr.yml @@ -1,11 +1,11 @@ wrap-x: false wrap-y: false +color-tint: '#80a755' alpha: input: texture: alpha color: red sampler: nearest - scale: 0.7 albedo: scale-red: 0.7 scale-green: 0.7 @@ -21,4 +21,3 @@ smooth: scale: 0.2 f0: value: 0.02 -sss: {} diff --git a/src/assets/minecraft/textures/block/black_stained_glass/pbr.yml b/src/assets/minecraft/textures/block/black_stained_glass/pbr.yml index 93cf52b..67db6fb 100644 --- a/src/assets/minecraft/textures/block/black_stained_glass/pbr.yml +++ b/src/assets/minecraft/textures/block/black_stained_glass/pbr.yml @@ -3,7 +3,7 @@ alpha: texture: alpha color: red height: - scale: 0.16 + scale: 0.2 f0: scale: 0.08 porosity: diff --git a/src/assets/minecraft/textures/block/chain/pbr.yml b/src/assets/minecraft/textures/block/chain/pbr.yml index 5c6c835..8cd8219 100644 --- a/src/assets/minecraft/textures/block/chain/pbr.yml +++ b/src/assets/minecraft/textures/block/chain/pbr.yml @@ -5,19 +5,14 @@ alpha: texture: alpha color: red sampler: nearest -albedo: {} height: value: 0 normal: strength: 2 occlusion: - quality: 0.08 z-bias: 0.8 z-scale: 5 - steps: 8 smooth: - scale: 0.9 -metal: - value: 230 + scale: 0.5 porosity: value: 0 diff --git a/src/assets/minecraft/textures/block/chain/rough.png b/src/assets/minecraft/textures/block/chain/rough.png deleted file mode 100644 index 1e2cf6f..0000000 Binary files a/src/assets/minecraft/textures/block/chain/rough.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/coal_ore/pbr.yml b/src/assets/minecraft/textures/block/coal_ore/pbr.yml index 0c39d6a..f12b803 100644 --- a/src/assets/minecraft/textures/block/coal_ore/pbr.yml +++ b/src/assets/minecraft/textures/block/coal_ore/pbr.yml @@ -6,8 +6,8 @@ occlusion: z-bias: 0.2 z-scale: 16 smooth: - value: 0.08 -f0: value: 0.5 +f0: + value: 0.16 porosity: value: 140 diff --git a/src/assets/minecraft/textures/block/crying_obsidian/pbr.yml b/src/assets/minecraft/textures/block/crying_obsidian/pbr.yml index 28f830d..11fd208 100644 --- a/src/assets/minecraft/textures/block/crying_obsidian/pbr.yml +++ b/src/assets/minecraft/textures/block/crying_obsidian/pbr.yml @@ -1,6 +1,8 @@ alpha: value: 255 height: - scale: 0.3 + scale: 0.8 +smooth: + scale: 0.9 f0: - value: 0.04 + value: 0.047 diff --git a/src/assets/minecraft/textures/block/dark_oak_leaves/pbr.yml b/src/assets/minecraft/textures/block/dark_oak_leaves/pbr.yml index b2d63aa..af0dd27 100644 --- a/src/assets/minecraft/textures/block/dark_oak_leaves/pbr.yml +++ b/src/assets/minecraft/textures/block/dark_oak_leaves/pbr.yml @@ -1,5 +1,6 @@ wrap-x: false wrap-y: false +color-tint: '#48B518' alpha: input: texture: alpha @@ -17,4 +18,3 @@ smooth: scale: 0.6 f0: value: 0.017 -sss: {} diff --git a/src/assets/minecraft/textures/block/grass/pbr.yml b/src/assets/minecraft/textures/block/grass/pbr.yml index 0a5f4e4..bf69f72 100644 --- a/src/assets/minecraft/textures/block/grass/pbr.yml +++ b/src/assets/minecraft/textures/block/grass/pbr.yml @@ -1,5 +1,6 @@ wrap-x: false wrap-y: false +color-tint: '#559833' alpha: input: texture: alpha diff --git a/src/assets/minecraft/textures/block/honeycomb_block/height.png b/src/assets/minecraft/textures/block/honeycomb_block/height.png index 53df136..43ba92e 100644 Binary files a/src/assets/minecraft/textures/block/honeycomb_block/height.png and b/src/assets/minecraft/textures/block/honeycomb_block/height.png differ diff --git a/src/assets/minecraft/textures/block/honeycomb_block/normal-x.png b/src/assets/minecraft/textures/block/honeycomb_block/normal-x.png new file mode 100644 index 0000000..dab0b43 Binary files /dev/null and b/src/assets/minecraft/textures/block/honeycomb_block/normal-x.png differ diff --git a/src/assets/minecraft/textures/block/honeycomb_block/normal.png b/src/assets/minecraft/textures/block/honeycomb_block/normal.png index dab0b43..f3f3e91 100644 Binary files a/src/assets/minecraft/textures/block/honeycomb_block/normal.png and b/src/assets/minecraft/textures/block/honeycomb_block/normal.png differ diff --git a/src/assets/minecraft/textures/block/honeycomb_block/pbr.yml b/src/assets/minecraft/textures/block/honeycomb_block/pbr.yml index 7b3f362..0eb109c 100644 --- a/src/assets/minecraft/textures/block/honeycomb_block/pbr.yml +++ b/src/assets/minecraft/textures/block/honeycomb_block/pbr.yml @@ -1,4 +1,6 @@ alpha: value: 255 height: - scale: 0.25 + scale: 0.4 +f0: + value: 0.04 diff --git a/src/assets/minecraft/textures/block/melon_side/pbr.yml b/src/assets/minecraft/textures/block/melon_side/pbr.yml index 4062506..26074cd 100644 --- a/src/assets/minecraft/textures/block/melon_side/pbr.yml +++ b/src/assets/minecraft/textures/block/melon_side/pbr.yml @@ -4,10 +4,7 @@ alpha: height: shift: -0.1 scale: 0.25 -normal: - curve-x: 90 - curve-y: 90 -smooth: - scale: 0.2 +f0: + value: 0.04 porosity: value: 0 diff --git a/src/assets/minecraft/textures/block/melon_top/pbr.yml b/src/assets/minecraft/textures/block/melon_top/pbr.yml index f02488d..8b7f9b8 100644 --- a/src/assets/minecraft/textures/block/melon_top/pbr.yml +++ b/src/assets/minecraft/textures/block/melon_top/pbr.yml @@ -4,7 +4,7 @@ alpha: value: 255 height: shift: -0.2 - scale: 0.3 + scale: 0.8 normal: strength: 2 curve-x: 90 @@ -12,7 +12,5 @@ normal: occlusion: z-bias: 1 z-scale: 10 -smooth: - scale: 0.2 -porosity: - value: 0 +f0: + value: 0.04 diff --git a/src/assets/minecraft/textures/block/melon_top/porosity.png b/src/assets/minecraft/textures/block/melon_top/porosity.png new file mode 100644 index 0000000..3125141 Binary files /dev/null and b/src/assets/minecraft/textures/block/melon_top/porosity.png differ diff --git a/src/assets/minecraft/textures/block/nether_brick_fence/pbr.yml b/src/assets/minecraft/textures/block/nether_brick_fence/pbr.yml index ec78d31..74400da 100644 --- a/src/assets/minecraft/textures/block/nether_brick_fence/pbr.yml +++ b/src/assets/minecraft/textures/block/nether_brick_fence/pbr.yml @@ -1,9 +1,7 @@ alpha: value: 255 height: - scale: 0.08 -normal: - noise: 1.4 + scale: 0.04 occlusion: value: 0 z-bias: 0.1 @@ -14,4 +12,3 @@ metal: value: 255 f0: value: 0 -porosity: {} diff --git a/src/assets/minecraft/textures/block/oak_leaves/pbr.yml b/src/assets/minecraft/textures/block/oak_leaves/pbr.yml index a061f0e..582dd90 100644 --- a/src/assets/minecraft/textures/block/oak_leaves/pbr.yml +++ b/src/assets/minecraft/textures/block/oak_leaves/pbr.yml @@ -1,5 +1,6 @@ wrap-x: false wrap-y: false +color-tint: '#48B518' alpha: input: texture: alpha @@ -16,4 +17,5 @@ smooth: scale: 0.6 f0: value: 0.017 -sss: {} +sss: + scale: 3 diff --git a/src/assets/minecraft/textures/block/oak_log/pbr.yml b/src/assets/minecraft/textures/block/oak_log/mat.yml similarity index 64% rename from src/assets/minecraft/textures/block/oak_log/pbr.yml rename to src/assets/minecraft/textures/block/oak_log/mat.yml index 7321a7b..a226dcb 100644 --- a/src/assets/minecraft/textures/block/oak_log/pbr.yml +++ b/src/assets/minecraft/textures/block/oak_log/mat.yml @@ -1,16 +1,14 @@ wrap-x: false wrap-y: true -alpha: - value: 255 height: shift: -0.4 - scale: 0.2 + scale: 0.5 edge-fade-x: 0.4 -normal: - curve-x: 90 occlusion: scale: 0.35 smooth: scale: 0.08 porosity: - value: 0.63 + value: 0.8 +filters: +- normal-curve-x: 90 diff --git a/src/assets/minecraft/textures/block/oak_log_top/pbr.yml b/src/assets/minecraft/textures/block/oak_log_top/pbr.yml index 2f85343..b13f497 100644 --- a/src/assets/minecraft/textures/block/oak_log_top/pbr.yml +++ b/src/assets/minecraft/textures/block/oak_log_top/pbr.yml @@ -2,7 +2,7 @@ alpha: value: 255 height: shift: -0.25 - scale: 0.08 + scale: 0.2 occlusion: scale: 0.35 z-bias: 1 diff --git a/src/assets/minecraft/textures/block/obsidian/normal.png b/src/assets/minecraft/textures/block/obsidian/normal.png index 07f80d5..4407e36 100644 Binary files a/src/assets/minecraft/textures/block/obsidian/normal.png and b/src/assets/minecraft/textures/block/obsidian/normal.png differ diff --git a/src/assets/minecraft/textures/block/obsidian/pbr.yml b/src/assets/minecraft/textures/block/obsidian/pbr.yml index 5e43c2a..df792d8 100644 --- a/src/assets/minecraft/textures/block/obsidian/pbr.yml +++ b/src/assets/minecraft/textures/block/obsidian/pbr.yml @@ -1,8 +1,11 @@ alpha: value: 255 height: - scale: 0.3 + shift: -0.2 + scale: 0.5 normal: - strength: 1.5 + strength: 2 +smooth: + scale: 0.8 f0: value: 0.04 diff --git a/src/assets/minecraft/textures/block/piston_inner/pbr.yml b/src/assets/minecraft/textures/block/piston_inner/pbr.yml index 610180c..b18e8c9 100644 --- a/src/assets/minecraft/textures/block/piston_inner/pbr.yml +++ b/src/assets/minecraft/textures/block/piston_inner/pbr.yml @@ -2,7 +2,7 @@ alpha: value: 255 height: shift: -0.1 - scale: 0.1 + scale: 0.2 normal: strength: 1.8 occlusion: @@ -10,6 +10,5 @@ occlusion: z-scale: 4 smooth: scale: 0.45 -f0: {} porosity: value: 0 diff --git a/src/assets/minecraft/textures/block/piston_side/pbr.yml b/src/assets/minecraft/textures/block/piston_side/pbr.yml index e3948b0..362a91b 100644 --- a/src/assets/minecraft/textures/block/piston_side/pbr.yml +++ b/src/assets/minecraft/textures/block/piston_side/pbr.yml @@ -3,7 +3,7 @@ alpha: value: 255 height: shift: -0.1 - scale: 0.04 + scale: 0.1 normal: strength: 0.8 occlusion: @@ -11,7 +11,5 @@ occlusion: z-scale: 4 smooth: scale: 0.8 -metal: {} -f0: {} porosity: value: 0 diff --git a/src/assets/minecraft/textures/block/piston_top/pbr.yml b/src/assets/minecraft/textures/block/piston_top/pbr.yml index fa8c1ec..cd3371e 100644 --- a/src/assets/minecraft/textures/block/piston_top/pbr.yml +++ b/src/assets/minecraft/textures/block/piston_top/pbr.yml @@ -2,7 +2,7 @@ alpha: value: 255 height: shift: -0.1 - scale: 0.1 + scale: 0.2 normal: strength: 1.8 occlusion: @@ -10,4 +10,3 @@ occlusion: z-scale: 4 smooth: scale: 0.8 -f0: {} diff --git a/src/assets/minecraft/textures/block/piston_top/porosity.png b/src/assets/minecraft/textures/block/piston_top/porosity.png new file mode 100644 index 0000000..5a9e674 Binary files /dev/null and b/src/assets/minecraft/textures/block/piston_top/porosity.png differ diff --git a/src/assets/minecraft/textures/block/powered_rail_alt/pbr.yml b/src/assets/minecraft/textures/block/powered_rail_alt/pbr.yml index abcbce1..b0ef6b5 100644 --- a/src/assets/minecraft/textures/block/powered_rail_alt/pbr.yml +++ b/src/assets/minecraft/textures/block/powered_rail_alt/pbr.yml @@ -6,12 +6,9 @@ alpha: color: red height: shift: -0.16 - scale: 0.4 + scale: 0.8 normal: strength: 2.4 occlusion: - quality: 0.06 z-bias: 1 z-scale: 16 - steps: 8 -smooth: {} diff --git a/src/assets/minecraft/textures/block/pumpkin_side/pbr.yml b/src/assets/minecraft/textures/block/pumpkin_side/pbr.yml index 3d6a91e..72f4c63 100644 --- a/src/assets/minecraft/textures/block/pumpkin_side/pbr.yml +++ b/src/assets/minecraft/textures/block/pumpkin_side/pbr.yml @@ -3,7 +3,6 @@ alpha: value: 255 height: shift: -0.11 - scale: 0.6 normal: strength: 3 curve-x: 90 diff --git a/src/assets/minecraft/textures/block/pumpkin_top/pbr.yml b/src/assets/minecraft/textures/block/pumpkin_top/pbr.yml index 6890ab2..86d1cd0 100644 --- a/src/assets/minecraft/textures/block/pumpkin_top/pbr.yml +++ b/src/assets/minecraft/textures/block/pumpkin_top/pbr.yml @@ -3,7 +3,6 @@ alpha: value: 255 height: shift: -0.3 - scale: 0.5 normal: strength: 2 curve-x: 90 diff --git a/src/assets/minecraft/textures/block/quartz_pillar/normal.png b/src/assets/minecraft/textures/block/quartz_pillar/normal.png index 7e98724..5abe2bf 100644 Binary files a/src/assets/minecraft/textures/block/quartz_pillar/normal.png and b/src/assets/minecraft/textures/block/quartz_pillar/normal.png differ diff --git a/src/assets/minecraft/textures/block/quartz_pillar/pbr.yml b/src/assets/minecraft/textures/block/quartz_pillar/pbr.yml index ae54b9d..a027289 100644 --- a/src/assets/minecraft/textures/block/quartz_pillar/pbr.yml +++ b/src/assets/minecraft/textures/block/quartz_pillar/pbr.yml @@ -2,14 +2,11 @@ alpha: value: 255 height: shift: -0.1 - scale: 0.24 -normal: - noise: 2 - curve-x: 90 + scale: 0.6 occlusion: z-bias: 0.5 z-scale: 12 f0: value: 0.06 porosity: - scale: 20 + value: 0.6 diff --git a/src/assets/minecraft/textures/block/quartz_pillar/rough.png b/src/assets/minecraft/textures/block/quartz_pillar/rough.png deleted file mode 100644 index a66ca7f..0000000 Binary files a/src/assets/minecraft/textures/block/quartz_pillar/rough.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/quartz_pillar/smooth.png b/src/assets/minecraft/textures/block/quartz_pillar/smooth.png new file mode 100644 index 0000000..1f23cc9 Binary files /dev/null and b/src/assets/minecraft/textures/block/quartz_pillar/smooth.png differ diff --git a/src/assets/minecraft/textures/block/rail_alt/pbr.yml b/src/assets/minecraft/textures/block/rail_alt/pbr.yml index 508c9ba..f34d233 100644 --- a/src/assets/minecraft/textures/block/rail_alt/pbr.yml +++ b/src/assets/minecraft/textures/block/rail_alt/pbr.yml @@ -6,12 +6,9 @@ alpha: color: red height: shift: -0.24 - scale: 0.32 + scale: 0.5 normal: strength: 2 occlusion: - quality: 0.08 z-bias: 0 z-scale: 8 - steps: 12 -smooth: {} diff --git a/src/assets/minecraft/textures/block/redstone_ore/normal-x.png b/src/assets/minecraft/textures/block/redstone_ore/normal-x.png new file mode 100644 index 0000000..9246e84 Binary files /dev/null and b/src/assets/minecraft/textures/block/redstone_ore/normal-x.png differ diff --git a/src/assets/minecraft/textures/block/redstone_ore/normal.png b/src/assets/minecraft/textures/block/redstone_ore/normal.png index 9246e84..33b01ca 100644 Binary files a/src/assets/minecraft/textures/block/redstone_ore/normal.png and b/src/assets/minecraft/textures/block/redstone_ore/normal.png differ diff --git a/src/assets/minecraft/textures/block/redstone_ore/pbr.yml b/src/assets/minecraft/textures/block/redstone_ore/pbr.yml index 42fe5bb..129d5c1 100644 --- a/src/assets/minecraft/textures/block/redstone_ore/pbr.yml +++ b/src/assets/minecraft/textures/block/redstone_ore/pbr.yml @@ -2,4 +2,7 @@ alpha: value: 255 height: scale: 0.2 -emissive: {} +metal: + value: 0 +f0: + value: 0.04 diff --git a/src/assets/minecraft/textures/block/spruce_leaves_1/pbr.yml b/src/assets/minecraft/textures/block/spruce_leaves_1/pbr.yml index 4fba25e..4c2f076 100644 --- a/src/assets/minecraft/textures/block/spruce_leaves_1/pbr.yml +++ b/src/assets/minecraft/textures/block/spruce_leaves_1/pbr.yml @@ -1,11 +1,12 @@ wrap-x: false wrap-y: false +color-tint: '#619961' alpha: + scale: 0.7 input: texture: alpha color: red sampler: nearest - scale: 0.7 height: value: 0 occlusion: @@ -15,6 +16,5 @@ smooth: scale: 0.7 f0: value: 0.017 -porosity: {} sss: value: 0.6 diff --git a/src/assets/minecraft/textures/block/spruce_leaves_2/pbr.yml b/src/assets/minecraft/textures/block/spruce_leaves_2/pbr.yml index 924e678..5be54e1 100644 --- a/src/assets/minecraft/textures/block/spruce_leaves_2/pbr.yml +++ b/src/assets/minecraft/textures/block/spruce_leaves_2/pbr.yml @@ -1,11 +1,12 @@ wrap-x: false wrap-y: false +color-tint: '#619961' alpha: + scale: 0.7 input: texture: alpha color: red sampler: nearest - scale: 0.7 height: value: 0 occlusion: @@ -15,6 +16,5 @@ smooth: scale: 0.8 f0: value: 0.017 -porosity: {} sss: value: 0.6 diff --git a/src/assets/minecraft/textures/block/spruce_log/pbr.yml b/src/assets/minecraft/textures/block/spruce_log/pbr.yml index 7d430bf..040108a 100644 --- a/src/assets/minecraft/textures/block/spruce_log/pbr.yml +++ b/src/assets/minecraft/textures/block/spruce_log/pbr.yml @@ -4,10 +4,8 @@ alpha: value: 255 height: shift: -0.16 - scale: 0.08 + scale: 0.2 edge-fade-x: 1 -normal: - curve-x: 90 occlusion: scale: 0.3 smooth: diff --git a/src/assets/minecraft/textures/block/stripped_oak_wood/pbr.yml b/src/assets/minecraft/textures/block/stripped_oak_wood/pbr.yml index f35701e..ce773a3 100644 --- a/src/assets/minecraft/textures/block/stripped_oak_wood/pbr.yml +++ b/src/assets/minecraft/textures/block/stripped_oak_wood/pbr.yml @@ -4,10 +4,9 @@ alpha: value: 255 height: shift: -0.18 - scale: 0.14 + scale: 0.08 occlusion: z-scale: 4 -smooth: {} f0: value: 0.03 porosity: diff --git a/src/assets/minecraft/textures/block/tall_grass/pbr.yml b/src/assets/minecraft/textures/block/tall_grass/pbr.yml index 23bfc15..fe8945b 100644 --- a/src/assets/minecraft/textures/block/tall_grass/pbr.yml +++ b/src/assets/minecraft/textures/block/tall_grass/pbr.yml @@ -1,10 +1,10 @@ wrap-x: false wrap-y: false +color-tint: '#559833' alpha: input: texture: alpha color: red -occlusion: {} smooth: scale: 0.5 sss: