diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index b2f718a8..e8600949 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -336,8 +336,24 @@ jobs: uses: actions/download-artifact@v2 with: name: Textureless-LabPbr-32x + - run: mv 'Textureless-LabPbr-32x.zip' 'Textureless-LabPbr-32x-v${{ github.event.inputs.version }}.zip' - name: Upload LabPbr 32x run: | curl -X POST \ - -F 'metadata={changelog: "Release ${{github.event.inputs.version}}", changelogType: "text", releaseType: "release", displayName: "LabPBR 32x", gameVersions: [8203]}' \ - -F 'file=@Textureless-LabPbr-32x.zip' 'https://minecraft.curseforge.com/api/projects/469686/upload-file?token=${{secrets.CF_API_TOKEN}}' + -F 'metadata={changelog: "Release ${{github.event.inputs.version}}", changelogType: "text", releaseType: "release", displayName: "LabPBR 32x v${{ github.event.inputs.version }}", gameVersions: [8203]}' \ + -F 'file=@Textureless-LabPbr-32x-v${{ github.event.inputs.version }}.zip' 'https://minecraft.curseforge.com/api/projects/469686/upload-file?token=${{secrets.CF_API_TOKEN}}' + + Upload-Models-CurseForge: + runs-on: ubuntu-latest + needs: Create-Release + steps: + - name: Download LabPbr Models 32x + uses: actions/download-artifact@v2 + with: + name: Textureless-Models-LabPbr-32x + - run: mv 'Textureless-Models-LabPbr-32x.zip' 'Textureless-Models-LabPbr-32x-v${{ github.event.inputs.version }}.zip' + - name: Upload LabPbr Models 32x + run: | + curl -X POST \ + -F 'metadata={changelog: "Release ${{github.event.inputs.version}}", changelogType: "text", releaseType: "release", displayName: "LabPBR 32x v${{ github.event.inputs.version }}", gameVersions: [8203]}' \ + -F 'file=@Textureless-Models-LabPbr-32x-v${{ github.event.inputs.version }}.zip' 'https://minecraft.curseforge.com/api/projects/582743/upload-file?token=${{secrets.CF_API_TOKEN}}' diff --git a/media/models-logo.png b/media/models-logo.png new file mode 100644 index 00000000..3b6a4b57 Binary files /dev/null and b/media/models-logo.png differ diff --git a/src-models/assets/minecraft/blockstates/crimson_roots.json b/src-models/assets/minecraft/blockstates/crimson_roots.json new file mode 100644 index 00000000..ebf6c123 --- /dev/null +++ b/src-models/assets/minecraft/blockstates/crimson_roots.json @@ -0,0 +1,36 @@ +{ + "variants": { + "": [ + { + "model": "block/crimson_roots" + }, + { + "model": "block/crimson_roots", + "y": 90 + }, + { + "model": "block/crimson_roots", + "y": 180 + }, + { + "model": "block/crimson_roots", + "y": 270 + }, + { + "model": "block/crimson_roots2" + }, + { + "model": "block/crimson_roots2", + "y": 90 + }, + { + "model": "block/crimson_roots2", + "y": 180 + }, + { + "model": "block/crimson_roots2", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src-models/assets/minecraft/models/block/crimson_roots.json b/src-models/assets/minecraft/models/block/crimson_roots.json new file mode 100644 index 00000000..092a1bb3 --- /dev/null +++ b/src-models/assets/minecraft/models/block/crimson_roots.json @@ -0,0 +1,7 @@ +{ + "parent": "block/template_grass1", + "textures": { + "grass": "block/crimson_roots", + "particle": "block/crimson_roots_inventory" + } +} \ No newline at end of file diff --git a/src-models/assets/minecraft/models/block/crimson_roots2.json b/src-models/assets/minecraft/models/block/crimson_roots2.json new file mode 100644 index 00000000..deeade07 --- /dev/null +++ b/src-models/assets/minecraft/models/block/crimson_roots2.json @@ -0,0 +1,7 @@ +{ + "parent": "block/template_grass2", + "textures": { + "grass": "block/crimson_roots", + "particle": "block/crimson_roots_inventory" + } +} \ No newline at end of file diff --git a/src/assets/minecraft/optifine/ctm/clay/bump.png b/src/assets/minecraft/optifine/ctm/clay/bump.png new file mode 100644 index 00000000..bfe43865 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/clay/bump.png differ diff --git a/src/assets/minecraft/optifine/ctm/clay/color.png b/src/assets/minecraft/optifine/ctm/clay/color.png new file mode 100644 index 00000000..41ff4a6f Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/clay/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/clay/height.png b/src/assets/minecraft/optifine/ctm/clay/height.png new file mode 100644 index 00000000..b42b9cd6 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/clay/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/clay/mat.yml b/src/assets/minecraft/optifine/ctm/clay/mat.yml new file mode 100644 index 00000000..c729b1b6 --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/clay/mat.yml @@ -0,0 +1,20 @@ +publish-item: true +height: + scale: 0.4 + edge-fade-x: 1 + edge-fade-y: 1 +normal: + method: sobel-low + strength: 1 +occlusion: + step-distance: 0.1 + z-bias: 1 + z-scale: 4 +f0: + value: 0.053 +ctm: + method: of-repeat + width: 6 + height: 6 + match-tiles: clay + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/clay/normal.png b/src/assets/minecraft/optifine/ctm/clay/normal.png new file mode 100644 index 00000000..89fe0e47 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/clay/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/clay/occlusion.png b/src/assets/minecraft/optifine/ctm/clay/occlusion.png new file mode 100644 index 00000000..be80ba3a Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/clay/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/clay/slipperystonework-albedo.png b/src/assets/minecraft/optifine/ctm/clay/slipperystonework-albedo.png new file mode 100644 index 00000000..2fb30416 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/clay/slipperystonework-albedo.png differ diff --git a/src/assets/minecraft/optifine/ctm/clay/slipperystonework-ao.png b/src/assets/minecraft/optifine/ctm/clay/slipperystonework-ao.png new file mode 100644 index 00000000..00aafeb2 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/clay/slipperystonework-ao.png differ diff --git a/src/assets/minecraft/optifine/ctm/clay/slipperystonework-height.png b/src/assets/minecraft/optifine/ctm/clay/slipperystonework-height.png new file mode 100644 index 00000000..4487fe25 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/clay/slipperystonework-height.png differ diff --git a/src/assets/minecraft/optifine/ctm/clay/slipperystonework-normal.png b/src/assets/minecraft/optifine/ctm/clay/slipperystonework-normal.png new file mode 100644 index 00000000..6f0f2b5d Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/clay/slipperystonework-normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/clay/slipperystonework-rough.png b/src/assets/minecraft/optifine/ctm/clay/slipperystonework-rough.png new file mode 100644 index 00000000..f1b39a32 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/clay/slipperystonework-rough.png differ diff --git a/src/assets/minecraft/optifine/ctm/clay/smooth.png b/src/assets/minecraft/optifine/ctm/clay/smooth.png new file mode 100644 index 00000000..6ec9d51f Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/clay/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/concrete/mat.yml b/src/assets/minecraft/optifine/ctm/concrete/mat.yml index 2bc5590c..35ea369c 100644 --- a/src/assets/minecraft/optifine/ctm/concrete/mat.yml +++ b/src/assets/minecraft/optifine/ctm/concrete/mat.yml @@ -4,17 +4,19 @@ color: value-green: 148 value-blue: 148 height: - scale: 0.05 + texture: bump.png + shift: -0.02 + scale: 0.06 auto-level: true normal: - noise: 2 + noise: 3 method: sobel-high - strength: 3 + strength: 2 occlusion: - scale: 0.2 - step-distance: 0.15 - z-bias: 0.6 - z-scale: 3 + scale: 0.6 + step-distance: 0.1 + z-bias: 2 + z-scale: 20 smooth: scale: 0.35 f0: diff --git a/src/assets/minecraft/optifine/ctm/concrete/normal.png b/src/assets/minecraft/optifine/ctm/concrete/normal.png index c9bca9c0..629112e4 100644 Binary files a/src/assets/minecraft/optifine/ctm/concrete/normal.png and b/src/assets/minecraft/optifine/ctm/concrete/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/concrete/occlusion.png b/src/assets/minecraft/optifine/ctm/concrete/occlusion.png index 6507a028..c4210b55 100644 Binary files a/src/assets/minecraft/optifine/ctm/concrete/occlusion.png and b/src/assets/minecraft/optifine/ctm/concrete/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_nylium/bump.png b/src/assets/minecraft/optifine/ctm/crimson_nylium/bump.png new file mode 100644 index 00000000..105f8dbc Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_nylium/bump.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_nylium/color.png b/src/assets/minecraft/optifine/ctm/crimson_nylium/color.png new file mode 100644 index 00000000..60d8e3c4 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_nylium/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_nylium/f0.png b/src/assets/minecraft/optifine/ctm/crimson_nylium/f0.png new file mode 100644 index 00000000..3ed41fdb Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_nylium/f0.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_nylium/height.png b/src/assets/minecraft/optifine/ctm/crimson_nylium/height.png new file mode 100644 index 00000000..fcc4c7fc Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_nylium/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_nylium/mat.yml b/src/assets/minecraft/optifine/ctm/crimson_nylium/mat.yml new file mode 100644 index 00000000..021a4fdf --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/crimson_nylium/mat.yml @@ -0,0 +1,23 @@ +publish-item: true +height: + shift: -0.14 + scale: 0.4 + edge-fade-x: 2 + edge-fade-y: 2 +normal: + noise: 5 + method: sobel3 + strength: 0.6 +occlusion: + step-distance: 0.1 + z-bias: 1 + z-scale: 5 +smooth: + shift: 0.15 + scale: 0.7 +ctm: + method: of-repeat + width: 8 + height: 8 + match-tiles: crimson_nylium + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/crimson_nylium/normal.png b/src/assets/minecraft/optifine/ctm/crimson_nylium/normal.png new file mode 100644 index 00000000..19afaecd Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_nylium/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_nylium/occlusion.png b/src/assets/minecraft/optifine/ctm/crimson_nylium/occlusion.png new file mode 100644 index 00000000..81cc2357 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_nylium/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_nylium/smooth.png b/src/assets/minecraft/optifine/ctm/crimson_nylium/smooth.png new file mode 100644 index 00000000..ade87610 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_nylium/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_nylium/sss.png b/src/assets/minecraft/optifine/ctm/crimson_nylium/sss.png new file mode 100644 index 00000000..a030b548 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_nylium/sss.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/2/bump.png b/src/assets/minecraft/optifine/ctm/crimson_roots/2/bump.png new file mode 100644 index 00000000..d5e1978b Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/2/bump.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/2/color.png b/src/assets/minecraft/optifine/ctm/crimson_roots/2/color.png new file mode 100644 index 00000000..eae7f162 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/2/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/2/color.xcf b/src/assets/minecraft/optifine/ctm/crimson_roots/2/color.xcf new file mode 100644 index 00000000..534f448a Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/2/color.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/2/mat.yml b/src/assets/minecraft/optifine/ctm/crimson_roots/2/mat.yml new file mode 100644 index 00000000..0e64114b --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/crimson_roots/2/mat.yml @@ -0,0 +1,19 @@ +wrap-x: false +wrap-y: false +model: cross_mirrored +blend-mode: cutout +height: + texture: opacity.png + scale: 0.05 + edge-fade-x: 0.01 + edge-fade-y: 0.01 +normal: + noise: 3 + method: sobel5 +occlusion: + scale: 0.6 + step-distance: 0.15 + z-bias: 0.2 +f0: + value: 0.03 +ctm: {} diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/2/normal.png b/src/assets/minecraft/optifine/ctm/crimson_roots/2/normal.png new file mode 100644 index 00000000..fdf539c6 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/2/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/2/occlusion.png b/src/assets/minecraft/optifine/ctm/crimson_roots/2/occlusion.png new file mode 100644 index 00000000..79a012c6 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/2/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/2/opacity.png b/src/assets/minecraft/optifine/ctm/crimson_roots/2/opacity.png new file mode 100644 index 00000000..bd804b7a Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/2/opacity.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/2/smooth.png b/src/assets/minecraft/optifine/ctm/crimson_roots/2/smooth.png new file mode 100644 index 00000000..bd07802f Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/2/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/2/sss.png b/src/assets/minecraft/optifine/ctm/crimson_roots/2/sss.png new file mode 100644 index 00000000..cc289947 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/2/sss.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/3/bump.png b/src/assets/minecraft/optifine/ctm/crimson_roots/3/bump.png new file mode 100644 index 00000000..169584c2 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/3/bump.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/3/color.png b/src/assets/minecraft/optifine/ctm/crimson_roots/3/color.png new file mode 100644 index 00000000..e8a42803 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/3/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/3/color.xcf b/src/assets/minecraft/optifine/ctm/crimson_roots/3/color.xcf new file mode 100644 index 00000000..249711a0 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/3/color.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/3/mat.yml b/src/assets/minecraft/optifine/ctm/crimson_roots/3/mat.yml new file mode 100644 index 00000000..0e64114b --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/crimson_roots/3/mat.yml @@ -0,0 +1,19 @@ +wrap-x: false +wrap-y: false +model: cross_mirrored +blend-mode: cutout +height: + texture: opacity.png + scale: 0.05 + edge-fade-x: 0.01 + edge-fade-y: 0.01 +normal: + noise: 3 + method: sobel5 +occlusion: + scale: 0.6 + step-distance: 0.15 + z-bias: 0.2 +f0: + value: 0.03 +ctm: {} diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/3/normal.png b/src/assets/minecraft/optifine/ctm/crimson_roots/3/normal.png new file mode 100644 index 00000000..95f6be71 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/3/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/3/occlusion.png b/src/assets/minecraft/optifine/ctm/crimson_roots/3/occlusion.png new file mode 100644 index 00000000..17426e7b Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/3/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/3/opacity.png b/src/assets/minecraft/optifine/ctm/crimson_roots/3/opacity.png new file mode 100644 index 00000000..7925ab79 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/3/opacity.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/3/smooth.png b/src/assets/minecraft/optifine/ctm/crimson_roots/3/smooth.png new file mode 100644 index 00000000..1b22a46a Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/3/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/3/sss.png b/src/assets/minecraft/optifine/ctm/crimson_roots/3/sss.png new file mode 100644 index 00000000..cb28aa2f Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/crimson_roots/3/sss.png differ diff --git a/src/assets/minecraft/optifine/ctm/crimson_roots/crimson_roots.properties b/src/assets/minecraft/optifine/ctm/crimson_roots/crimson_roots.properties new file mode 100644 index 00000000..6e44256c --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/crimson_roots/crimson_roots.properties @@ -0,0 +1,4 @@ +matchTiles=crimson_roots +method=random +symmetry=opposite +tiles=textures/block/crimson_roots 2-3 diff --git a/src/assets/minecraft/optifine/ctm/gold_block/mat.yml b/src/assets/minecraft/optifine/ctm/gold_block/mat.yml index 32e8cc03..033f9036 100644 --- a/src/assets/minecraft/optifine/ctm/gold_block/mat.yml +++ b/src/assets/minecraft/optifine/ctm/gold_block/mat.yml @@ -10,8 +10,8 @@ occlusion: z-bias: 2 z-scale: 1 smooth: - shift: 0.7 - scale: 0.5 + shift: 2.6 + scale: 0.2 metal: value: 231 porosity: diff --git a/src/assets/minecraft/optifine/ctm/iron_block/mat.yml b/src/assets/minecraft/optifine/ctm/iron_block/mat.yml index 71b323eb..8a4e0991 100644 --- a/src/assets/minecraft/optifine/ctm/iron_block/mat.yml +++ b/src/assets/minecraft/optifine/ctm/iron_block/mat.yml @@ -9,8 +9,8 @@ normal: occlusion: z-scale: 0.2 smooth: - shift: 0.6 - scale: 0.6 + shift: 4 + scale: 0.2 metal: value: 230 porosity: diff --git a/src/assets/minecraft/optifine/ctm/red_sand/mat.yml b/src/assets/minecraft/optifine/ctm/red_sand/mat.yml index b71a6b03..3ebef2da 100644 --- a/src/assets/minecraft/optifine/ctm/red_sand/mat.yml +++ b/src/assets/minecraft/optifine/ctm/red_sand/mat.yml @@ -1,3 +1,4 @@ +publish-item: true height: shift: -0.25 scale: 0.16 diff --git a/src/assets/minecraft/optifine/ctm/sand/mat.yml b/src/assets/minecraft/optifine/ctm/sand/mat.yml index f89bc16c..bbec2ae1 100644 --- a/src/assets/minecraft/optifine/ctm/sand/mat.yml +++ b/src/assets/minecraft/optifine/ctm/sand/mat.yml @@ -1,3 +1,4 @@ +publish-item: true height: shift: -0.25 scale: 0.16 diff --git a/src/assets/minecraft/optifine/ctm/warped_nylium/bump.png b/src/assets/minecraft/optifine/ctm/warped_nylium/bump.png new file mode 100644 index 00000000..105f8dbc Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/warped_nylium/bump.png differ diff --git a/src/assets/minecraft/optifine/ctm/warped_nylium/color.png b/src/assets/minecraft/optifine/ctm/warped_nylium/color.png new file mode 100644 index 00000000..4bcca4ce Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/warped_nylium/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/warped_nylium/f0.png b/src/assets/minecraft/optifine/ctm/warped_nylium/f0.png new file mode 100644 index 00000000..3ed41fdb Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/warped_nylium/f0.png differ diff --git a/src/assets/minecraft/optifine/ctm/warped_nylium/height.png b/src/assets/minecraft/optifine/ctm/warped_nylium/height.png new file mode 100644 index 00000000..fcc4c7fc Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/warped_nylium/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/warped_nylium/mat.yml b/src/assets/minecraft/optifine/ctm/warped_nylium/mat.yml new file mode 100644 index 00000000..09287694 --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/warped_nylium/mat.yml @@ -0,0 +1,24 @@ +publish-item: true +blend-mode: cutout +height: + shift: -0.14 + scale: 0.4 + edge-fade-x: 2 + edge-fade-y: 2 +normal: + noise: 5 + method: sobel3 + strength: 0.6 +occlusion: + step-distance: 0.1 + z-bias: 1 + z-scale: 5 +smooth: + shift: 0.15 + scale: 0.7 +ctm: + method: of-repeat + width: 8 + height: 8 + match-tiles: warped_nylium + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/warped_nylium/normal.png b/src/assets/minecraft/optifine/ctm/warped_nylium/normal.png new file mode 100644 index 00000000..19afaecd Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/warped_nylium/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/warped_nylium/occlusion.png b/src/assets/minecraft/optifine/ctm/warped_nylium/occlusion.png new file mode 100644 index 00000000..81cc2357 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/warped_nylium/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/warped_nylium/smooth.png b/src/assets/minecraft/optifine/ctm/warped_nylium/smooth.png new file mode 100644 index 00000000..ade87610 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/warped_nylium/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/warped_nylium/sss.png b/src/assets/minecraft/optifine/ctm/warped_nylium/sss.png new file mode 100644 index 00000000..a030b548 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/warped_nylium/sss.png differ diff --git a/src/assets/minecraft/textures/block/barrel_bottom/color.png b/src/assets/minecraft/textures/block/barrel_bottom/color.png new file mode 100644 index 00000000..69079764 Binary files /dev/null and b/src/assets/minecraft/textures/block/barrel_bottom/color.png differ diff --git a/src/assets/minecraft/textures/block/barrel_bottom/height.png b/src/assets/minecraft/textures/block/barrel_bottom/height.png index edf01314..c57181b0 100644 Binary files a/src/assets/minecraft/textures/block/barrel_bottom/height.png and b/src/assets/minecraft/textures/block/barrel_bottom/height.png differ diff --git a/src/assets/minecraft/textures/block/barrel_bottom/mat.yml b/src/assets/minecraft/textures/block/barrel_bottom/mat.yml index 4451caed..16334d17 100644 --- a/src/assets/minecraft/textures/block/barrel_bottom/mat.yml +++ b/src/assets/minecraft/textures/block/barrel_bottom/mat.yml @@ -1,25 +1,26 @@ -alpha: +publish-item: true +wrap-x: true +wrap-y: true +opacity: value: 255 -albedo: - value-red: 138 - value-green: 102 - value-blue: 58 height: scale: 0.8 normal: - strength: 0.5 - curve-x: 20 - curve-y: 20 - filter: sobel-high + noise: 4 + curve-x: 90 + curve-y: 90 + radius-x: 0.16 + radius-y: 0.16 + method: sobel-low + strength: 4 occlusion: - z-bias: 1 - z-scale: 2 - step-distance: 0.2 + step-distance: 0.1 + z-bias: 0.6 + z-scale: 6 smooth: - value: 0.08 + value: 0.043 f0: value: 0.04 porosity: - value: 0.59 -create-inventory: true -wrap-x: false + value: 0.9 +ctm: {} diff --git a/src/assets/minecraft/textures/block/barrel_bottom/normal.png b/src/assets/minecraft/textures/block/barrel_bottom/normal.png new file mode 100644 index 00000000..5527ad91 Binary files /dev/null and b/src/assets/minecraft/textures/block/barrel_bottom/normal.png differ diff --git a/src/assets/minecraft/textures/block/barrel_bottom/occlusion.png b/src/assets/minecraft/textures/block/barrel_bottom/occlusion.png index bd77707f..6b0b2594 100644 Binary files a/src/assets/minecraft/textures/block/barrel_bottom/occlusion.png and b/src/assets/minecraft/textures/block/barrel_bottom/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/barrel_side/albedo.png b/src/assets/minecraft/textures/block/barrel_side/albedo.png index 429bb164..03b2c9a4 100644 Binary files a/src/assets/minecraft/textures/block/barrel_side/albedo.png and b/src/assets/minecraft/textures/block/barrel_side/albedo.png differ diff --git a/src/assets/minecraft/textures/block/barrel_side/f0.png b/src/assets/minecraft/textures/block/barrel_side/f0.png index b9c4c498..43839b9e 100644 Binary files a/src/assets/minecraft/textures/block/barrel_side/f0.png and b/src/assets/minecraft/textures/block/barrel_side/f0.png differ diff --git a/src/assets/minecraft/textures/block/barrel_side/height.png b/src/assets/minecraft/textures/block/barrel_side/height.png index 8bcfa960..c817225f 100644 Binary files a/src/assets/minecraft/textures/block/barrel_side/height.png and b/src/assets/minecraft/textures/block/barrel_side/height.png differ diff --git a/src/assets/minecraft/textures/block/barrel_side/mat.yml b/src/assets/minecraft/textures/block/barrel_side/mat.yml index 0769d1df..73531342 100644 --- a/src/assets/minecraft/textures/block/barrel_side/mat.yml +++ b/src/assets/minecraft/textures/block/barrel_side/mat.yml @@ -1,17 +1,23 @@ -publish-inventory: true +publish-item: true wrap-x: false wrap-y: false opacity: value: 255 height: - shift: -0.08 - edge-fade-x: 0.4 - edge-fade-y: 0.4 + shift: -0.12 + scale: 0.5 + edge-fade-x: 0.5 + edge-fade-y: 0.5 normal: + noise: 1 curve-x: 90 + curve-y: 90 radius-x: 0.4 + radius-y: 0.16 method: sobel-low + strength: 4 occlusion: - step-distance: 0.2 + step-distance: 0.1 z-bias: 1 - z-scale: 3 + z-scale: 6 +ctm: {} diff --git a/src/assets/minecraft/textures/block/barrel_side/metal.png b/src/assets/minecraft/textures/block/barrel_side/metal.png index 0b04eca3..cc043530 100644 Binary files a/src/assets/minecraft/textures/block/barrel_side/metal.png and b/src/assets/minecraft/textures/block/barrel_side/metal.png differ diff --git a/src/assets/minecraft/textures/block/barrel_side/normal.png b/src/assets/minecraft/textures/block/barrel_side/normal.png index af1dfb42..317f04c9 100644 Binary files a/src/assets/minecraft/textures/block/barrel_side/normal.png and b/src/assets/minecraft/textures/block/barrel_side/normal.png differ diff --git a/src/assets/minecraft/textures/block/barrel_side/occlusion.png b/src/assets/minecraft/textures/block/barrel_side/occlusion.png index 331b6bcf..45ede02b 100644 Binary files a/src/assets/minecraft/textures/block/barrel_side/occlusion.png and b/src/assets/minecraft/textures/block/barrel_side/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/barrel_side/porosity.png b/src/assets/minecraft/textures/block/barrel_side/porosity.png index f228e212..ad332bb0 100644 Binary files a/src/assets/minecraft/textures/block/barrel_side/porosity.png and b/src/assets/minecraft/textures/block/barrel_side/porosity.png differ diff --git a/src/assets/minecraft/textures/block/barrel_side/smooth.png b/src/assets/minecraft/textures/block/barrel_side/smooth.png index c6f4f1c1..38349660 100644 Binary files a/src/assets/minecraft/textures/block/barrel_side/smooth.png and b/src/assets/minecraft/textures/block/barrel_side/smooth.png differ diff --git a/src/assets/minecraft/textures/block/barrel_top/albedo.png b/src/assets/minecraft/textures/block/barrel_top/albedo.png index d8a1b83c..65cf9970 100644 Binary files a/src/assets/minecraft/textures/block/barrel_top/albedo.png and b/src/assets/minecraft/textures/block/barrel_top/albedo.png differ diff --git a/src/assets/minecraft/textures/block/barrel_top/height.png b/src/assets/minecraft/textures/block/barrel_top/height.png index 1de340d2..9c269969 100644 Binary files a/src/assets/minecraft/textures/block/barrel_top/height.png and b/src/assets/minecraft/textures/block/barrel_top/height.png differ diff --git a/src/assets/minecraft/textures/block/barrel_top/mat.yml b/src/assets/minecraft/textures/block/barrel_top/mat.yml index e5198b6b..3ca5e336 100644 --- a/src/assets/minecraft/textures/block/barrel_top/mat.yml +++ b/src/assets/minecraft/textures/block/barrel_top/mat.yml @@ -1,15 +1,20 @@ -publish-inventory: true -wrap-x: false -wrap-y: false -alpha: +publish-item: true +wrap-x: true +wrap-y: true +opacity: value: 255 height: - scale: 0.6 + scale: 0.8 normal: + noise: 4 + curve-x: 90 + curve-y: 90 + radius-x: 0.16 + radius-y: 0.16 method: sobel-low - curve-x: 20 - curve-y: 20 + strength: 4 occlusion: - step-distance: 0.2 - z-bias: 1 - z-scale: 3 + step-distance: 0.1 + z-bias: 0.6 + z-scale: 6 +ctm: {} diff --git a/src/assets/minecraft/textures/block/barrel_top/normal.png b/src/assets/minecraft/textures/block/barrel_top/normal.png new file mode 100644 index 00000000..930812ef Binary files /dev/null and b/src/assets/minecraft/textures/block/barrel_top/normal.png differ diff --git a/src/assets/minecraft/textures/block/barrel_top/occlusion.png b/src/assets/minecraft/textures/block/barrel_top/occlusion.png index f7d59477..970d1f17 100644 Binary files a/src/assets/minecraft/textures/block/barrel_top/occlusion.png and b/src/assets/minecraft/textures/block/barrel_top/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/barrel_top_open/color.png b/src/assets/minecraft/textures/block/barrel_top_open/color.png new file mode 100644 index 00000000..a0134930 Binary files /dev/null and b/src/assets/minecraft/textures/block/barrel_top_open/color.png differ diff --git a/src/assets/minecraft/textures/block/barrel_top_open/height.png b/src/assets/minecraft/textures/block/barrel_top_open/height.png index 82adc05f..0b497491 100644 Binary files a/src/assets/minecraft/textures/block/barrel_top_open/height.png and b/src/assets/minecraft/textures/block/barrel_top_open/height.png differ diff --git a/src/assets/minecraft/textures/block/barrel_top_open/mat.yml b/src/assets/minecraft/textures/block/barrel_top_open/mat.yml index 8cbf82b9..16334d17 100644 --- a/src/assets/minecraft/textures/block/barrel_top_open/mat.yml +++ b/src/assets/minecraft/textures/block/barrel_top_open/mat.yml @@ -1,21 +1,24 @@ -wrap-x: false +publish-item: true +wrap-x: true +wrap-y: true opacity: value: 255 -color: - value-red: 138 - value-green: 102 - value-blue: 58 +height: + scale: 0.8 normal: - curve-x: 20 - curve-y: 20 - method: sobel-high - strength: 0.5 + noise: 4 + curve-x: 90 + curve-y: 90 + radius-x: 0.16 + radius-y: 0.16 + method: sobel-low + strength: 4 occlusion: - step-distance: 0.25 - z-bias: 1 - z-scale: 3 + step-distance: 0.1 + z-bias: 0.6 + z-scale: 6 smooth: - value: 0.08 + value: 0.043 f0: value: 0.04 porosity: diff --git a/src/assets/minecraft/textures/block/barrel_top_open/normal.png b/src/assets/minecraft/textures/block/barrel_top_open/normal.png new file mode 100644 index 00000000..503a3454 Binary files /dev/null and b/src/assets/minecraft/textures/block/barrel_top_open/normal.png differ diff --git a/src/assets/minecraft/textures/block/barrel_top_open/occlusion.png b/src/assets/minecraft/textures/block/barrel_top_open/occlusion.png index 38988fd9..b6802c2b 100644 Binary files a/src/assets/minecraft/textures/block/barrel_top_open/occlusion.png and b/src/assets/minecraft/textures/block/barrel_top_open/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_side/big_dripleaf_side.png b/src/assets/minecraft/textures/block/big_dripleaf_side/big_dripleaf_side.png new file mode 100644 index 00000000..f596e329 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_side/big_dripleaf_side.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_side/mat.yml b/src/assets/minecraft/textures/block/big_dripleaf_side/mat.yml new file mode 100644 index 00000000..15588586 --- /dev/null +++ b/src/assets/minecraft/textures/block/big_dripleaf_side/mat.yml @@ -0,0 +1,21 @@ +wrap-x: false +wrap-y: false +color: + value-red: 113 + value-green: 144 + value-blue: 52 +height: + texture: opacity.png + scale: 0.08 + edge-fade-x: 0.01 + edge-fade-y: 0.01 +normal: + curve-x: 90 + curve-y: 90 +smooth: + value: 0.4 +f0: + value: 0.03 +sss: + value: 0.2 +ctm: {} diff --git a/src/assets/minecraft/textures/block/big_dripleaf_side/opacity.png b/src/assets/minecraft/textures/block/big_dripleaf_side/opacity.png new file mode 100644 index 00000000..8f80deaa Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_side/opacity.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_stem/big_dripleaf_stem.png b/src/assets/minecraft/textures/block/big_dripleaf_stem/big_dripleaf_stem.png new file mode 100644 index 00000000..56b1aee5 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_stem/big_dripleaf_stem.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_stem/bump.png b/src/assets/minecraft/textures/block/big_dripleaf_stem/bump.png new file mode 100644 index 00000000..7eccc944 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_stem/bump.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_stem/mat.yml b/src/assets/minecraft/textures/block/big_dripleaf_stem/mat.yml new file mode 100644 index 00000000..21bdae51 --- /dev/null +++ b/src/assets/minecraft/textures/block/big_dripleaf_stem/mat.yml @@ -0,0 +1,22 @@ +wrap-x: false +color: + value-red: 84 + value-green: 106 + value-blue: 46 +height: + texture: opacity.png + scale: 0.1 + edge-fade-x: 0.01 +normal: + method: sobel5 + strength: 2 +occlusion: + step-distance: 0.1 + z-scale: 12 +smooth: + value: 0.2 +f0: + value: 0.04 +sss: + value: 0.2 +ctm: {} diff --git a/src/assets/minecraft/textures/block/big_dripleaf_stem/normal.png b/src/assets/minecraft/textures/block/big_dripleaf_stem/normal.png new file mode 100644 index 00000000..2fd33106 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_stem/normal.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_stem/occlusion.png b/src/assets/minecraft/textures/block/big_dripleaf_stem/occlusion.png new file mode 100644 index 00000000..53bd6a83 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_stem/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_stem/opacity.png b/src/assets/minecraft/textures/block/big_dripleaf_stem/opacity.png new file mode 100644 index 00000000..7a240195 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_stem/opacity.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_tip/big_dripleaf_tip.png b/src/assets/minecraft/textures/block/big_dripleaf_tip/big_dripleaf_tip.png new file mode 100644 index 00000000..5f42e9a9 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_tip/big_dripleaf_tip.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_tip/bump.png b/src/assets/minecraft/textures/block/big_dripleaf_tip/bump.png new file mode 100644 index 00000000..fcd1d1e3 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_tip/bump.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_tip/mat.yml b/src/assets/minecraft/textures/block/big_dripleaf_tip/mat.yml new file mode 100644 index 00000000..b09a8a5b --- /dev/null +++ b/src/assets/minecraft/textures/block/big_dripleaf_tip/mat.yml @@ -0,0 +1,25 @@ +wrap-x: false +wrap-y: false +color: + value-red: 113 + value-green: 144 + value-blue: 52 +height: + texture: opacity.png + scale: 0.08 + edge-fade-x: 0.01 + edge-fade-y: 0.01 +normal: + curve-x: 45 + curve-y: 120 + method: sobel5 + strength: 2 +occlusion: + step-distance: 0.1 + z-bias: 1 + z-scale: 4 +smooth: + value: 0.4 +f0: + value: 0.03 +ctm: {} diff --git a/src/assets/minecraft/textures/block/big_dripleaf_tip/normal.png b/src/assets/minecraft/textures/block/big_dripleaf_tip/normal.png new file mode 100644 index 00000000..51cb4f21 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_tip/normal.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_tip/occlusion.png b/src/assets/minecraft/textures/block/big_dripleaf_tip/occlusion.png new file mode 100644 index 00000000..d76ade1a Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_tip/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_tip/opacity.png b/src/assets/minecraft/textures/block/big_dripleaf_tip/opacity.png new file mode 100644 index 00000000..79a60240 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_tip/opacity.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_tip/sss.png b/src/assets/minecraft/textures/block/big_dripleaf_tip/sss.png new file mode 100644 index 00000000..2b5f7b40 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_tip/sss.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_top/big_dripleaf_top.png b/src/assets/minecraft/textures/block/big_dripleaf_top/big_dripleaf_top.png new file mode 100644 index 00000000..f6974840 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_top/big_dripleaf_top.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_top/bump.png b/src/assets/minecraft/textures/block/big_dripleaf_top/bump.png new file mode 100644 index 00000000..a1a53365 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_top/bump.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_top/mat.yml b/src/assets/minecraft/textures/block/big_dripleaf_top/mat.yml new file mode 100644 index 00000000..46c90d0e --- /dev/null +++ b/src/assets/minecraft/textures/block/big_dripleaf_top/mat.yml @@ -0,0 +1,25 @@ +wrap-x: false +wrap-y: false +color: + value-red: 113 + value-green: 144 + value-blue: 52 +height: + texture: opacity.png + scale: 0.08 + edge-fade-x: 0.01 + edge-fade-y: 0.01 +normal: + curve-x: 45 + curve-y: 60 + method: sobel5 + strength: 2 +occlusion: + step-distance: 0.1 + z-bias: 1 + z-scale: 4 +smooth: + value: 0.4 +f0: + value: 0.03 +ctm: {} diff --git a/src/assets/minecraft/textures/block/big_dripleaf_top/normal.png b/src/assets/minecraft/textures/block/big_dripleaf_top/normal.png new file mode 100644 index 00000000..69b26f9e Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_top/normal.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_top/occlusion.png b/src/assets/minecraft/textures/block/big_dripleaf_top/occlusion.png new file mode 100644 index 00000000..e144a270 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_top/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_top/opacity.png b/src/assets/minecraft/textures/block/big_dripleaf_top/opacity.png new file mode 100644 index 00000000..f0426dd0 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_top/opacity.png differ diff --git a/src/assets/minecraft/textures/block/big_dripleaf_top/sss.png b/src/assets/minecraft/textures/block/big_dripleaf_top/sss.png new file mode 100644 index 00000000..66c7e136 Binary files /dev/null and b/src/assets/minecraft/textures/block/big_dripleaf_top/sss.png differ diff --git a/src/assets/minecraft/textures/block/clay/height.png b/src/assets/minecraft/textures/block/clay/height.png deleted file mode 100644 index b8ed7e51..00000000 Binary files a/src/assets/minecraft/textures/block/clay/height.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/clay/mat.yml b/src/assets/minecraft/textures/block/clay/mat.yml deleted file mode 100644 index 1f9c9f2c..00000000 --- a/src/assets/minecraft/textures/block/clay/mat.yml +++ /dev/null @@ -1,22 +0,0 @@ -publish-inventory: true -opacity: - value: 255 -color: - value-red: 161 - value-green: 166 - value-blue: 179 -height: - scale: 0.4 -normal: - method: sobel-low - strength: 1 -occlusion: - step-distance: 0.2 - z-bias: 0 - z-scale: 6 -smooth: - value: 0.4 -f0: - value: 0.02 -porosity: - value: 0.1 diff --git a/src/assets/minecraft/textures/block/clay/occlusion.png b/src/assets/minecraft/textures/block/clay/occlusion.png deleted file mode 100644 index 4e0051c5..00000000 Binary files a/src/assets/minecraft/textures/block/clay/occlusion.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/crimson_hyphae/mat.yml b/src/assets/minecraft/textures/block/crimson_hyphae/mat.yml index 3a546cc7..5c2fbff0 100644 --- a/src/assets/minecraft/textures/block/crimson_hyphae/mat.yml +++ b/src/assets/minecraft/textures/block/crimson_hyphae/mat.yml @@ -18,6 +18,4 @@ f0: value: 0.07 sss: value: 0 -emissive: - scale: 0.5 ctm: {} diff --git a/src/assets/minecraft/textures/block/crimson_nylium/albedo.png b/src/assets/minecraft/textures/block/crimson_nylium/albedo.png deleted file mode 100644 index 7087ae96..00000000 Binary files a/src/assets/minecraft/textures/block/crimson_nylium/albedo.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/crimson_nylium/height.png b/src/assets/minecraft/textures/block/crimson_nylium/height.png deleted file mode 100644 index 3c154579..00000000 Binary files a/src/assets/minecraft/textures/block/crimson_nylium/height.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/crimson_nylium/mat.yml b/src/assets/minecraft/textures/block/crimson_nylium/mat.yml deleted file mode 100644 index 69ef7c01..00000000 --- a/src/assets/minecraft/textures/block/crimson_nylium/mat.yml +++ /dev/null @@ -1,20 +0,0 @@ -alpha: - value: 255 -albedo: {} -height: - scale: 0.32 -normal: - strength: 0.6 - noise: 5 - filter: sobel3 -occlusion: - quality: 0.1 - z-bias: 0 - z-scale: 5 - step-distance: 0.2 -smooth: {} -f0: - value: 0.02 -sss: - value: 0.08 -create-inventory: true diff --git a/src/assets/minecraft/textures/block/crimson_nylium/occlusion.png b/src/assets/minecraft/textures/block/crimson_nylium/occlusion.png deleted file mode 100644 index 1fb612aa..00000000 Binary files a/src/assets/minecraft/textures/block/crimson_nylium/occlusion.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/crimson_nylium/smooth.png b/src/assets/minecraft/textures/block/crimson_nylium/smooth.png deleted file mode 100644 index fa6e0cc4..00000000 Binary files a/src/assets/minecraft/textures/block/crimson_nylium/smooth.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/crimson_roots/alpha.png b/src/assets/minecraft/textures/block/crimson_roots/.ignore/alpha.png similarity index 100% rename from src/assets/minecraft/textures/block/crimson_roots/alpha.png rename to src/assets/minecraft/textures/block/crimson_roots/.ignore/alpha.png diff --git a/src/assets/minecraft/textures/block/crimson_roots/.ignore/crimson_roots.png b/src/assets/minecraft/textures/block/crimson_roots/.ignore/crimson_roots.png new file mode 100644 index 00000000..3744c0a6 Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_roots/.ignore/crimson_roots.png differ diff --git a/src/assets/minecraft/textures/block/crimson_roots/.ignore/mat.yml b/src/assets/minecraft/textures/block/crimson_roots/.ignore/mat.yml new file mode 100644 index 00000000..69beaa77 --- /dev/null +++ b/src/assets/minecraft/textures/block/crimson_roots/.ignore/mat.yml @@ -0,0 +1,14 @@ +wrap-x: false +wrap-y: false +color: + value-red: 123 + value-green: 7 + value-blue: 45 +height: + value: 0 +occlusion: + value: 0.0 +smooth: + value: 0.2 +sss: + value: 0.31 diff --git a/src/assets/minecraft/textures/block/crimson_roots/bump.png b/src/assets/minecraft/textures/block/crimson_roots/bump.png new file mode 100644 index 00000000..639ee3d5 Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_roots/bump.png differ diff --git a/src/assets/minecraft/textures/block/crimson_roots/color.png b/src/assets/minecraft/textures/block/crimson_roots/color.png new file mode 100644 index 00000000..6ffbd05d Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_roots/color.png differ diff --git a/src/assets/minecraft/textures/block/crimson_roots/color.xcf b/src/assets/minecraft/textures/block/crimson_roots/color.xcf new file mode 100644 index 00000000..a4616f16 Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_roots/color.xcf differ diff --git a/src/assets/minecraft/textures/block/crimson_roots/mat.yml b/src/assets/minecraft/textures/block/crimson_roots/mat.yml index 69beaa77..38cd833e 100644 --- a/src/assets/minecraft/textures/block/crimson_roots/mat.yml +++ b/src/assets/minecraft/textures/block/crimson_roots/mat.yml @@ -1,14 +1,19 @@ +publish-item: true wrap-x: false wrap-y: false -color: - value-red: 123 - value-green: 7 - value-blue: 45 height: - value: 0 + texture: opacity.png + scale: 0.05 + edge-fade-x: 0.01 + edge-fade-y: 0.01 +normal: + noise: 3 + method: sobel5 occlusion: - value: 0.0 -smooth: - value: 0.2 -sss: - value: 0.31 + scale: 0.6 + step-distance: 0.1 + z-bias: 0.2 + z-scale: 6 +f0: + value: 0.03 +ctm: {} diff --git a/src/assets/minecraft/textures/block/crimson_roots/normal.png b/src/assets/minecraft/textures/block/crimson_roots/normal.png new file mode 100644 index 00000000..914217f6 Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_roots/normal.png differ diff --git a/src/assets/minecraft/textures/block/crimson_roots/occlusion.png b/src/assets/minecraft/textures/block/crimson_roots/occlusion.png new file mode 100644 index 00000000..57fd2f11 Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_roots/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/crimson_roots/opacity.png b/src/assets/minecraft/textures/block/crimson_roots/opacity.png new file mode 100644 index 00000000..600495d4 Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_roots/opacity.png differ diff --git a/src/assets/minecraft/textures/block/crimson_roots/smooth.png b/src/assets/minecraft/textures/block/crimson_roots/smooth.png new file mode 100644 index 00000000..e6ab0fdb Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_roots/smooth.png differ diff --git a/src/assets/minecraft/textures/block/crimson_roots/sss-base.png b/src/assets/minecraft/textures/block/crimson_roots/sss-base.png new file mode 100644 index 00000000..4776aa66 Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_roots/sss-base.png differ diff --git a/src/assets/minecraft/textures/block/crimson_roots/sss.png b/src/assets/minecraft/textures/block/crimson_roots/sss.png new file mode 100644 index 00000000..ca054ba4 Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_roots/sss.png differ diff --git a/src/assets/minecraft/textures/block/crimson_stem/mat.yml b/src/assets/minecraft/textures/block/crimson_stem/mat.yml index 5742286c..6916a3f3 100644 --- a/src/assets/minecraft/textures/block/crimson_stem/mat.yml +++ b/src/assets/minecraft/textures/block/crimson_stem/mat.yml @@ -7,7 +7,6 @@ height: normal: noise: 6 curve-x: 90 - radius-x: 0.6 method: sobel3 occlusion: step-distance: 0.2 @@ -19,5 +18,4 @@ f0: value: 0.07 sss: value: 0 -emissive: - scale: 0.5 +ctm: {} diff --git a/src/assets/minecraft/textures/block/nether_portal/albedo.png b/src/assets/minecraft/textures/block/nether_portal/color.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_portal/albedo.png rename to src/assets/minecraft/textures/block/nether_portal/color.png diff --git a/src/assets/minecraft/textures/block/nether_portal/mat.yml b/src/assets/minecraft/textures/block/nether_portal/mat.yml index e69de29b..dd3f7a2b 100644 --- a/src/assets/minecraft/textures/block/nether_portal/mat.yml +++ b/src/assets/minecraft/textures/block/nether_portal/mat.yml @@ -0,0 +1,15 @@ +opacity: + input: + sampler: bilinear +color: + input-red: + sampler: bilinear + input-green: + sampler: bilinear + input-blue: + sampler: bilinear +emissive: + scale: 4 + input: + sampler: bilinear +ctm: {} diff --git a/src/assets/minecraft/textures/block/nether_portal/alpha.png b/src/assets/minecraft/textures/block/nether_portal/opacity.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_portal/alpha.png rename to src/assets/minecraft/textures/block/nether_portal/opacity.png diff --git a/src/assets/minecraft/textures/block/warped_hyphae/albedo.png b/src/assets/minecraft/textures/block/warped_hyphae/albedo.png deleted file mode 100644 index a4cd586e..00000000 Binary files a/src/assets/minecraft/textures/block/warped_hyphae/albedo.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/warped_hyphae/color.png b/src/assets/minecraft/textures/block/warped_hyphae/color.png new file mode 100644 index 00000000..bfa52f43 Binary files /dev/null and b/src/assets/minecraft/textures/block/warped_hyphae/color.png differ diff --git a/src/assets/minecraft/textures/block/warped_hyphae/color.xcf b/src/assets/minecraft/textures/block/warped_hyphae/color.xcf new file mode 100644 index 00000000..eefe27c2 Binary files /dev/null and b/src/assets/minecraft/textures/block/warped_hyphae/color.xcf differ diff --git a/src/assets/minecraft/textures/block/warped_hyphae/emissive.png b/src/assets/minecraft/textures/block/warped_hyphae/emissive.png index 627dde11..d7b97c4f 100644 Binary files a/src/assets/minecraft/textures/block/warped_hyphae/emissive.png and b/src/assets/minecraft/textures/block/warped_hyphae/emissive.png differ diff --git a/src/assets/minecraft/textures/block/warped_hyphae/height.png b/src/assets/minecraft/textures/block/warped_hyphae/height.png index 925f0ffa..c69ea413 100644 Binary files a/src/assets/minecraft/textures/block/warped_hyphae/height.png and b/src/assets/minecraft/textures/block/warped_hyphae/height.png differ diff --git a/src/assets/minecraft/textures/block/warped_hyphae/mat.yml b/src/assets/minecraft/textures/block/warped_hyphae/mat.yml index 1f36c0a7..771c18a7 100644 --- a/src/assets/minecraft/textures/block/warped_hyphae/mat.yml +++ b/src/assets/minecraft/textures/block/warped_hyphae/mat.yml @@ -1,24 +1,22 @@ -alpha: - value: 255 -albedo: {} +publish-item: true +wrap-x: false height: shift: -0.02 scale: 0.2 + edge-fade-x: 1 normal: - strength: 0.6 - noise: 3 - filter: sobel-low + noise: 6 + method: sobel3 occlusion: - z-bias: 0 - z-scale: 60 step-distance: 0.2 -smooth: {} + z-bias: 0 + z-scale: 20 +smooth: + value: 0.22 f0: - value: 0.04 -porosity: {} + value: 0.07 sss: - scale: 3 + value: 0 emissive: scale: 0.7 -create-inventory: true -wrap-x: false +ctm: {} diff --git a/src/assets/minecraft/textures/block/warped_hyphae/occlusion.png b/src/assets/minecraft/textures/block/warped_hyphae/occlusion.png index 9b75175b..60b2caab 100644 Binary files a/src/assets/minecraft/textures/block/warped_hyphae/occlusion.png and b/src/assets/minecraft/textures/block/warped_hyphae/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/warped_hyphae/porosity.png b/src/assets/minecraft/textures/block/warped_hyphae/porosity.png index bcfd5840..aaa704ce 100644 Binary files a/src/assets/minecraft/textures/block/warped_hyphae/porosity.png and b/src/assets/minecraft/textures/block/warped_hyphae/porosity.png differ diff --git a/src/assets/minecraft/textures/block/warped_hyphae/smooth.png b/src/assets/minecraft/textures/block/warped_hyphae/smooth.png deleted file mode 100644 index 2fc7255b..00000000 Binary files a/src/assets/minecraft/textures/block/warped_hyphae/smooth.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/warped_hyphae/sss.png b/src/assets/minecraft/textures/block/warped_hyphae/sss.png deleted file mode 100644 index 627dde11..00000000 Binary files a/src/assets/minecraft/textures/block/warped_hyphae/sss.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/warped_stem/mat.yml b/src/assets/minecraft/textures/block/warped_stem/mat.yml index 5742286c..b1593610 100644 --- a/src/assets/minecraft/textures/block/warped_stem/mat.yml +++ b/src/assets/minecraft/textures/block/warped_stem/mat.yml @@ -7,7 +7,6 @@ height: normal: noise: 6 curve-x: 90 - radius-x: 0.6 method: sobel3 occlusion: step-distance: 0.2 @@ -20,4 +19,5 @@ f0: sss: value: 0 emissive: - scale: 0.5 + scale: 0.7 +ctm: {}